Merge branch 'develop' of https://translate.element.io/git/riot-ios/riot-ios into doug/fix-weblate

# Conflicts:
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/id.lproj/Vector.strings
#	Riot/Assets/it.lproj/Vector.strings
#	Riot/Assets/pt_BR.lproj/Vector.strings
#	Riot/Assets/sk.lproj/Vector.strings
#	Riot/Assets/uk.lproj/Vector.strings
This commit is contained in:
Doug
2022-10-14 11:26:20 +01:00
8 changed files with 395 additions and 20 deletions
+1 -1
View File
@@ -2454,7 +2454,7 @@ To enable access, tap Settings> Location and select Always";
// First item is client name and second item is session display name
"user_session_name" = "%@: %@";
/* %1$@ will be the verification state and %2$@ will be user_session_item_details_verification_unknown or user_other_session_unverified_current_session_details */
/* %1$@ will be the verification state and %2$@ will be user_session_item_details_verification_unknown or user_other_session_current_session_details */
"user_session_item_details" = "%1$@ · %2$@";
"user_session_item_details_last_activity" = "Last activity %@";
"user_inactive_session_item" = "Inactive for 90+ days";