450-Resolve_merge_conflict_on_update_with_upstream

Description

Automate update-with-upstream pipeline is failing because of merge conflict (https://gitlab.e.foundation/e/os/mail/-/pipelines/188739). The conflicts need to be resolved, so that our ~Mail app fork can be updated with the upstream changes.

This MR resolve the conflicted files.

Issue(s)

• https://gitlab.e.foundation/e/os/backlog/-/issues/450

Test environment

Download apk from https://gitlab.e.foundation/e/os/mail/-/jobs/314884/artifacts/file/app/k9mail/build/outputs/apk/debug/k9mail-debug.apk

Test procedures

Navigate through the app, check all functionality (at least basic) is working

Technical details

This MR merge with the latest upstream tag 6.000 with main & resolved the strings.xml files conflict.

Conflicts:

- app/ui/legacy/src/main/res/values-fa/strings.xml
- app/ui/legacy/src/main/res/values-sv/strings.xml

Screenshots

Check list

• Self review
• Test procedure explained
• Tested on fresh install
• Tested applied as an update
• License
• Internal documentation
• User documentation