450-Resolve_merge_conflict_on_update_with_upstream

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

Merge tag `6.000` into 450-Resolve_merge_conflict_on_update_with_upstream

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