diff --git a/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict
index 4ce975f7a..7c4eeaa74 100644
--- a/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict
@@ -4,26 +4,24 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Уведзеная лічба %1$d</string>
 			<key>few</key>
 			<string>Уведзена %1$d лічбы</string>
 			<key>many</key>
 			<string>Уведзена %1$d лічб</string>
+			<key>one</key>
+			<string>Уведзеная лічба %1$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -35,83 +33,83 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Прачытана %1$@ і %2$d іншым</string>
 			<key>few</key>
 			<string>Прачытана %1$@ і %2$d іншымі</string>
 			<key>many</key>
 			<string>Прачытана %1$@ і %2$d іншымі</string>
+			<key>one</key>
+			<string>Прачытана %1$@ і %2$d іншым</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d іншы</string>
 			<key>few</key>
 			<string>%d іншыя</string>
 			<key>many</key>
 			<string>%d іншых</string>
+			<key>one</key>
+			<string>%d іншы</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d удзельнік</string>
 			<key>few</key>
 			<string>%1$d удзельнікі</string>
 			<key>many</key>
 			<string>%1$d удзельнікаў</string>
+			<key>one</key>
+			<string>%1$d удзельнік</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d голас</string>
 			<key>few</key>
 			<string>%d галасы</string>
 			<key>many</key>
 			<string>%d галасоў</string>
+			<key>one</key>
+			<string>%d голас</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -123,11 +121,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -139,11 +137,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -155,11 +153,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -171,47 +169,47 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d паведамленне</string>
 			<key>few</key>
 			<string>%1$@: %2$d паведамленні</string>
 			<key>many</key>
 			<string>%1$@: %2$d паведамленняў</string>
+			<key>one</key>
+			<string>%1$@: %2$d паведамленне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d апавяшчэнне</string>
 			<key>few</key>
 			<string>%d апавяшчэнні</string>
 			<key>many</key>
 			<string>%d апавяшчэнняў</string>
+			<key>one</key>
+			<string>%d апавяшчэнне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -223,119 +221,119 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d запрашэнне</string>
 			<key>few</key>
 			<string>%d запрашэнні</string>
 			<key>many</key>
 			<string>%d запрашэнняў</string>
+			<key>one</key>
+			<string>%d запрашэнне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d новае паведамленне</string>
 			<key>few</key>
 			<string>%d новыя паведамленні</string>
 			<key>many</key>
 			<string>%d новых паведамленняў</string>
+			<key>one</key>
+			<string>%d новае паведамленне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d непрачытанае апавяшчэнне</string>
 			<key>few</key>
 			<string>%d непрачытаныя апавяшчэнні</string>
 			<key>many</key>
 			<string>%d непрачытаных апавяшчэнняў</string>
+			<key>one</key>
+			<string>%d непрачытанае апавяшчэнне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d пакой</string>
 			<key>few</key>
 			<string>%d пакоі</string>
 			<key>many</key>
 			<string>%d пакояў</string>
+			<key>one</key>
+			<string>%d пакой</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>У вас %1$d спроба разблакіроўкі</string>
 			<key>few</key>
 			<string>У вас %1$d спробы разблакіроўкі</string>
 			<key>many</key>
 			<string>У вас %1$d спроб разблакіроўкі</string>
+			<key>one</key>
+			<string>У вас %1$d спроба разблакіроўкі</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Няправільны PIN-код. У вас застаўся %1$d шанец</string>
 			<key>few</key>
 			<string>Няправільны PIN-код. У вас засталася %1$d шанцы</string>
 			<key>many</key>
 			<string>Няправільны PIN-код. У вас засталася %1$d шанцаў</string>
+			<key>one</key>
+			<string>Няправільны PIN-код. У вас застаўся %1$d шанец</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -347,29 +345,29 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Замацаванае паведамленне</string>
 			<key>few</key>
 			<string>%1$d Замацаваныя паведамленні</string>
 			<key>many</key>
 			<string>%1$d Замацаваных паведамленняў</string>
+			<key>one</key>
+			<string>%1$d Замацаванае паведамленне</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -381,29 +379,29 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d удзельнік</string>
 			<key>few</key>
 			<string>%1$d удзельнікі</string>
 			<key>many</key>
 			<string>%1$d удзельнікаў</string>
+			<key>one</key>
+			<string>%1$d удзельнік</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -415,11 +413,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -431,11 +429,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -447,11 +445,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,65 +461,65 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d змена ў пакоі</string>
 			<key>few</key>
 			<string>%1$d змены ў пакоі</string>
 			<key>many</key>
 			<string>%1$d змен у пакоі</string>
+			<key>one</key>
+			<string>%1$d змена ў пакоі</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ і %3$d іншы</string>
 			<key>few</key>
 			<string></string>
 			<key>many</key>
 			<string>%1$@, %2$@ і %3$d іншыя</string>
+			<key>one</key>
+			<string>%1$@, %2$@ і %3$d іншы</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ піша</string>
 			<key>few</key>
 			<string>%1$@ пішуць</string>
 			<key>many</key>
 			<string>%1$@ пішуць</string>
+			<key>one</key>
+			<string>%1$@ піша</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -533,11 +531,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -549,42 +547,44 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Знайшлі %1$d пастаўшчыка push-апавяшчэнняў: %2$@</string>
 			<key>few</key>
 			<string>Знайшлі %1$d пастаўшчыкоў push-апавяшчэнняў: %2$@</string>
 			<key>many</key>
 			<string>Знайшлі %1$d пастаўшчыкоў push-апавяшчэнняў: %2$@</string>
+			<key>one</key>
+			<string>Знайшлі %1$d пастаўшчыка push-апавяшчэнняў: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d знойдзены размеркавальнік: %2$@.</string>
 			<key>few</key>
 			<string>%1$d знойдзены размеркавальнікі: %2$@.</string>
 			<key>many</key>
 			<string>%1$d знойдзена размеркавальнікаў: %2$@.</string>
+			<key>one</key>
+			<string>%1$d знойдзены размеркавальнік: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict
index 0c6d8f7dc..3ddfe278e 100644
--- a/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d въведени цифри</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Прочетено от %1$@ и %2$d други</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d други</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d членове</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d гласа</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d отговора</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d стаи</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d пространства</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d съобщения</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d известия</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d покани</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d нови съобщения</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d непрочетени известени съобщения</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d стаи</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Имате %1$d опита да отключите</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Грешен PIN. Имате още %1$d шанса</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d закачени съобщения</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d души</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d промени в стаята</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ и %3$d други</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ пишат</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Found %1$d push providers: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d distributors found: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict
index c34ea5737..c41be4c79 100644
--- a/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict
@@ -4,116 +4,114 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>zadána %1$d číslice</string>
 			<key>few</key>
 			<string>zadány %1$d číslice</string>
+			<key>one</key>
+			<string>zadána %1$d číslice</string>
 			<key>other</key>
 			<string>zadáno %1$d číslic</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d procento z celkového počtu hlasů</string>
 			<key>few</key>
 			<string>%1$d procenta z celkového počtu hlasů</string>
+			<key>one</key>
+			<string>%1$d procento z celkového počtu hlasů</string>
 			<key>other</key>
 			<string>%1$d procent z celkového počtu hlasů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Přečetl(a) %1$@ a %2$d další</string>
 			<key>few</key>
 			<string>Přečetl(a) %1$@ a %2$d další</string>
+			<key>one</key>
+			<string>Přečetl(a) %1$@ a %2$d další</string>
 			<key>other</key>
 			<string>Přečetl(a) %1$@ a %2$d dalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d další</string>
 			<key>few</key>
 			<string>%d další</string>
+			<key>one</key>
+			<string>%d další</string>
 			<key>other</key>
 			<string>%d dalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d člen</string>
 			<key>few</key>
 			<string>%1$d členové</string>
+			<key>one</key>
+			<string>%1$d člen</string>
 			<key>other</key>
 			<string>%1$d členů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d hlas</string>
 			<key>few</key>
 			<string>%d hlasy</string>
+			<key>one</key>
+			<string>%d hlas</string>
 			<key>other</key>
 			<string>%d hlasů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -123,492 +121,494 @@
 			<key>other</key>
 			<string>%1$d odpovědí</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d místnost</string>
 			<key>few</key>
 			<string>%1$d místnosti</string>
+			<key>one</key>
+			<string>%1$d místnost</string>
 			<key>other</key>
 			<string>%1$d místností</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d vybraný</string>
 			<key>few</key>
 			<string>%1$d vybrané</string>
+			<key>one</key>
+			<string>%1$d vybraný</string>
 			<key>other</key>
 			<string>%1$d vybraných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d prostor</string>
 			<key>few</key>
 			<string>%1$d prostory</string>
+			<key>one</key>
+			<string>%1$d prostor</string>
 			<key>other</key>
 			<string>%1$d prostorů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d zpráva</string>
 			<key>few</key>
 			<string>%1$@: %2$d zprávy</string>
+			<key>one</key>
+			<string>%1$@: %2$d zpráva</string>
 			<key>other</key>
 			<string>%1$@: %2$d zpráv</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d oznámení</string>
 			<key>few</key>
 			<string>%d oznámení</string>
+			<key>one</key>
+			<string>%d oznámení</string>
 			<key>other</key>
 			<string>%d oznámení</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Máte %d novou zprávu.</string>
 			<key>few</key>
 			<string>Máte %d nové zprávy.</string>
+			<key>one</key>
+			<string>Máte %d novou zprávu.</string>
 			<key>other</key>
 			<string>Máte %d nových zpráv.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pozvánka</string>
 			<key>few</key>
 			<string>%d pozvánky</string>
+			<key>one</key>
+			<string>%d pozvánka</string>
 			<key>other</key>
 			<string>%d pozvánek</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nová zpráva</string>
 			<key>few</key>
 			<string>%d nové zprávy</string>
+			<key>one</key>
+			<string>%d nová zpráva</string>
 			<key>other</key>
 			<string>%d nových zpráv</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nepřečtená oznámená zpráva</string>
 			<key>few</key>
 			<string>%d nepřečtené oznámené zprávy</string>
+			<key>one</key>
+			<string>%d nepřečtená oznámená zpráva</string>
 			<key>other</key>
 			<string>%d nepřečtených oznámených zpráv</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d místnost</string>
 			<key>few</key>
 			<string>%d místnosti</string>
+			<key>one</key>
+			<string>%d místnost</string>
 			<key>other</key>
 			<string>%d místností</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Máte %1$d pokus pro odemknutí</string>
 			<key>few</key>
 			<string>Máte %1$d pokusy pro odemknutí</string>
+			<key>one</key>
+			<string>Máte %1$d pokus pro odemknutí</string>
 			<key>other</key>
 			<string>Máte %1$d pokusů pro odemknutí</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Špatný PIN. Máte %1$d další pokus</string>
 			<key>few</key>
 			<string>Špatný PIN. Máte %1$d další pokusy</string>
+			<key>one</key>
+			<string>Špatný PIN. Máte %1$d další pokus</string>
 			<key>other</key>
 			<string>Špatný PIN. Máte %1$d dalších pokusů</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Opustit %1$d místnost a prostor</string>
 			<key>few</key>
 			<string>Opustit %1$d místnosti a prostor</string>
+			<key>one</key>
+			<string>Opustit %1$d místnost a prostor</string>
 			<key>other</key>
 			<string>Opustit %1$d místností a prostor</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Připnutá zpráva</string>
 			<key>few</key>
 			<string>%1$d Připnuté zprávy</string>
+			<key>one</key>
+			<string>%1$d Připnutá zpráva</string>
 			<key>other</key>
 			<string>%1$d Připnutých zpráv</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d vykázán(a)</string>
 			<key>few</key>
 			<string>%1$d vykázáni</string>
+			<key>one</key>
+			<string>%1$d vykázán(a)</string>
 			<key>other</key>
 			<string>%1$d vykázáných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d osoba</string>
 			<key>few</key>
 			<string>%1$d osoby</string>
+			<key>one</key>
+			<string>%1$d osoba</string>
 			<key>other</key>
 			<string>%1$d osob</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d pozván(a)</string>
 			<key>few</key>
 			<string>%1$d pozváni</string>
+			<key>one</key>
+			<string>%1$d pozván(a)</string>
 			<key>other</key>
 			<string>%1$d pozvaných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d další chce vstoupit do této místnosti</string>
 			<key>few</key>
 			<string>%1$@ +%2$d další chtějí vstoupit do této místnosti</string>
+			<key>one</key>
+			<string>%1$@ +%2$d další chce vstoupit do této místnosti</string>
 			<key>other</key>
 			<string>%1$@ +%2$d dalších chce vstoupit do této místnosti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d člen reagoval s %2$@</string>
 			<key>few</key>
 			<string>%1$d členové reagovali s %2$@</string>
+			<key>one</key>
+			<string>%1$d člen reagoval s %2$@</string>
 			<key>other</key>
 			<string>%1$d členů reagovalo s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Vy a %1$d člen jste reagovali s %2$@</string>
 			<key>few</key>
 			<string>Vy a %1$d členové jste reagovali s %2$@</string>
+			<key>one</key>
+			<string>Vy a %1$d člen jste reagovali s %2$@</string>
 			<key>other</key>
 			<string>Vy a %1$d členů reagovalo s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d změna místnosti</string>
 			<key>few</key>
 			<string>%1$d změny místnosti</string>
+			<key>one</key>
+			<string>%1$d změna místnosti</string>
 			<key>other</key>
 			<string>%1$d změn místnosti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ a %3$d další</string>
 			<key>few</key>
 			<string>%1$@, %2$@ a %3$d další</string>
+			<key>one</key>
+			<string>%1$@, %2$@ a %3$d další</string>
 			<key>other</key>
 			<string>%1$@, %2$@ a %3$d dalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ píše</string>
 			<key>few</key>
 			<string>%1$@ píší</string>
+			<key>one</key>
+			<string>%1$@ píše</string>
 			<key>other</key>
 			<string>%1$@ píše</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Odstranit %1$d místnost od %2$@</string>
 			<key>few</key>
 			<string>Odstranit %1$d místnosti od %2$@</string>
+			<key>one</key>
+			<string>Odstranit %1$d místnost od %2$@</string>
 			<key>other</key>
 			<string>Odstranit %1$d místností od %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Zablokovali jste %1$d uživatele. Nebudete dostávat oznámení od tohoto uživatele.</string>
 			<key>few</key>
 			<string>Zablokovali jste %1$d uživatele. Nebudete dostávat oznámení od těchto uživatelů.</string>
+			<key>one</key>
+			<string>Zablokovali jste %1$d uživatele. Nebudete dostávat oznámení od tohoto uživatele.</string>
 			<key>other</key>
 			<string>Zablokovali jste %1$d uživatelů. Nebudete dostávat oznámení od těchto uživatelů.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Nalezen %1$d push poskytovatel: %2$@</string>
 			<key>few</key>
 			<string>Nalezeni %1$d push poskytovatelé: %2$@</string>
+			<key>one</key>
+			<string>Nalezen %1$d push poskytovatel: %2$@</string>
 			<key>other</key>
 			<string>Nalezeno %1$d push poskytovatelů: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Nalezen %1$d distributor: %2$@.</string>
 			<key>few</key>
 			<string>Nalezeni %1$d distributoři: %2$@.</string>
+			<key>one</key>
+			<string>Nalezen %1$d distributor: %2$@.</string>
 			<key>other</key>
 			<string>Nalezeno %1$d distributorů: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict
index db43540e9..f3c3fd87f 100644
--- a/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict
@@ -4,200 +4,198 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$d nodau wedi eu cynnig</string>
-			<key>one</key>
-			<string>%1$d nod wedi ei gynnig</string>
-			<key>two</key>
-			<string>%1$d nod wedi eu cynnig</string>
 			<key>few</key>
 			<string>%1$d nod wedi eu cynnig</string>
 			<key>many</key>
 			<string>%1$d nod wedi eu cynnig</string>
+			<key>one</key>
+			<string>%1$d nod wedi ei gynnig</string>
 			<key>other</key>
 			<string>%1$d nod wedi eu cynnig</string>
+			<key>two</key>
+			<string>%1$d nod wedi eu cynnig</string>
+			<key>zero</key>
+			<string>%1$d nodau wedi eu cynnig</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$d y cant o'r holl bleidleisiau</string>
-			<key>one</key>
-			<string>%1$d y cant o'r holl bleidleisiau</string>
-			<key>two</key>
-			<string>%1$d y cant o'r holl bleidleisiau</string>
 			<key>few</key>
 			<string>%1$d y cant o'r holl bleidleisiau</string>
 			<key>many</key>
 			<string>%1$d y cant o'r holl bleidleisiau</string>
+			<key>one</key>
+			<string>%1$d y cant o'r holl bleidleisiau</string>
 			<key>other</key>
 			<string>%1$d y cant o'r holl bleidleisiau</string>
+			<key>two</key>
+			<string>%1$d y cant o'r holl bleidleisiau</string>
+			<key>zero</key>
+			<string>%1$d y cant o'r holl bleidleisiau</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Wedi'i ddarllen gan %1$@ a %2$d arall</string>
-			<key>one</key>
-			<string>Wedi'i ddarllen gan %1$@ a %2$d arall</string>
-			<key>two</key>
-			<string>Wedi'i ddarllen gan %1$@ a %2$d arall</string>
 			<key>few</key>
 			<string>Wedi'i ddarllen gan %1$@ a %2$d arall</string>
 			<key>many</key>
 			<string>Wedi'i ddarllen gan %1$@ a %2$d arall</string>
+			<key>one</key>
+			<string>Wedi'i ddarllen gan %1$@ a %2$d arall</string>
 			<key>other</key>
 			<string>Wedi'i ddarllen gan %1$@ a %2$d arall</string>
+			<key>two</key>
+			<string>Wedi'i ddarllen gan %1$@ a %2$d arall</string>
+			<key>zero</key>
+			<string>Wedi'i ddarllen gan %1$@ a %2$d arall</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%d arall</string>
-			<key>one</key>
-			<string>%d arall</string>
-			<key>two</key>
-			<string>%d arall</string>
 			<key>few</key>
 			<string>%d arall</string>
 			<key>many</key>
 			<string>%d arall</string>
+			<key>one</key>
+			<string>%d arall</string>
 			<key>other</key>
 			<string>%d arall</string>
+			<key>two</key>
+			<string>%d arall</string>
+			<key>zero</key>
+			<string>%d arall</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$d Aelodau</string>
-			<key>one</key>
-			<string>%1$d Aelod</string>
-			<key>two</key>
-			<string>%1$d Aelod</string>
 			<key>few</key>
 			<string>%1$d Aelod</string>
 			<key>many</key>
 			<string>%1$d Aelod</string>
+			<key>one</key>
+			<string>%1$d Aelod</string>
 			<key>other</key>
 			<string>%1$d Aelod</string>
+			<key>two</key>
+			<string>%1$d Aelod</string>
+			<key>zero</key>
+			<string>%1$d Aelodau</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%d pleidleisiau</string>
-			<key>one</key>
-			<string>%d pleidlais</string>
-			<key>two</key>
-			<string>%d pleidlais</string>
 			<key>few</key>
 			<string>%d pleidlais</string>
 			<key>many</key>
 			<string>%d pleidlais</string>
+			<key>one</key>
+			<string>%d pleidlais</string>
 			<key>other</key>
 			<string>%d pleidlais</string>
+			<key>two</key>
+			<string>%d pleidlais</string>
+			<key>zero</key>
+			<string>%d pleidleisiau</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$d atebion</string>
-			<key>one</key>
-			<string>%1$d ateb</string>
-			<key>two</key>
-			<string>%1$d ateb</string>
 			<key>few</key>
 			<string>%1$d ateb</string>
 			<key>many</key>
 			<string>%1$d ateb</string>
+			<key>one</key>
+			<string>%1$d ateb</string>
 			<key>other</key>
 			<string>%1$d ateb</string>
+			<key>two</key>
+			<string>%1$d ateb</string>
+			<key>zero</key>
+			<string>%1$d atebion</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$d Ystafelloedd</string>
-			<key>one</key>
-			<string>%1$d Ystafell</string>
-			<key>two</key>
-			<string>%1$d Ystafell</string>
 			<key>few</key>
 			<string>%1$d Ystafell</string>
 			<key>many</key>
 			<string>%1$d Ystafell</string>
+			<key>one</key>
+			<string>%1$d Ystafell</string>
 			<key>other</key>
 			<string>%1$d Ystafell</string>
+			<key>two</key>
+			<string>%1$d Ystafell</string>
+			<key>zero</key>
+			<string>%1$d Ystafelloedd</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,83 +207,83 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$d Gofodau</string>
+			<key>few</key>
+			<string>%1$d Gofod</string>
+			<key>many</key>
+			<string>%1$d Gofod</string>
 			<key>one</key>
 			<string>%1$d Gofod</string>
+			<key>other</key>
+			<string>%1$d Gofod</string>
 			<key>two</key>
 			<string>%1$d Ofod</string>
-			<key>few</key>
-			<string>%1$d Gofod</string>
-			<key>many</key>
-			<string>%1$d Gofod</string>
-			<key>other</key>
-			<string>%1$d Gofod</string>
+			<key>zero</key>
+			<string>%1$d Gofodau</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$@: %2$d negeseuon</string>
-			<key>one</key>
-			<string>%1$@: %2$d neges</string>
-			<key>two</key>
-			<string>%1$@: %2$d neges</string>
 			<key>few</key>
 			<string>%1$@: %2$d neges</string>
 			<key>many</key>
 			<string>%1$@: %2$d neges</string>
+			<key>one</key>
+			<string>%1$@: %2$d neges</string>
 			<key>other</key>
 			<string>%1$@: %2$d neges</string>
+			<key>two</key>
+			<string>%1$@: %2$d neges</string>
+			<key>zero</key>
+			<string>%1$@: %2$d negeseuon</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%d hysbysiadau</string>
-			<key>one</key>
-			<string>%d hysbysiad</string>
-			<key>two</key>
-			<string>%d hysbysiad</string>
 			<key>few</key>
 			<string>%d hysbysiad</string>
 			<key>many</key>
 			<string>%d hysbysiad</string>
+			<key>one</key>
+			<string>%d hysbysiad</string>
 			<key>other</key>
 			<string>%d hysbysiad</string>
+			<key>two</key>
+			<string>%d hysbysiad</string>
+			<key>zero</key>
+			<string>%d hysbysiadau</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -297,203 +295,203 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%d gwahoddiadau</string>
-			<key>one</key>
-			<string>%d gwahoddiadau</string>
-			<key>two</key>
-			<string>%d gwahoddiadau</string>
 			<key>few</key>
 			<string>%d gwahoddiadau</string>
 			<key>many</key>
 			<string>%d gwahoddiadau</string>
+			<key>one</key>
+			<string>%d gwahoddiadau</string>
 			<key>other</key>
 			<string>%d gwahoddiadau</string>
+			<key>two</key>
+			<string>%d gwahoddiadau</string>
+			<key>zero</key>
+			<string>%d gwahoddiadau</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%d negeseuon newydd</string>
-			<key>one</key>
-			<string>%d neges newydd</string>
-			<key>two</key>
-			<string>%d neges newydd</string>
 			<key>few</key>
 			<string>%d neges newydd</string>
 			<key>many</key>
 			<string>%d neges newydd</string>
+			<key>one</key>
+			<string>%d neges newydd</string>
 			<key>other</key>
 			<string>%d neges newydd</string>
+			<key>two</key>
+			<string>%d neges newydd</string>
+			<key>zero</key>
+			<string>%d negeseuon newydd</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%d negeseuon hysbyswyd heb eu darllen</string>
-			<key>one</key>
-			<string>%d neges hysbyswyd heb ei ddarllen</string>
-			<key>two</key>
-			<string>%d neges hysbyswyd heb eu darllen</string>
 			<key>few</key>
 			<string>%d neges hysbyswyd heb eu darllen</string>
 			<key>many</key>
 			<string>%d neges hysbyswyd heb eu darllen</string>
+			<key>one</key>
+			<string>%d neges hysbyswyd heb ei ddarllen</string>
 			<key>other</key>
 			<string>%d neges hysbyswyd heb eu darllen</string>
+			<key>two</key>
+			<string>%d neges hysbyswyd heb eu darllen</string>
+			<key>zero</key>
+			<string>%d negeseuon hysbyswyd heb eu darllen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%d ystafelloedd</string>
-			<key>one</key>
-			<string>%d ystafell</string>
-			<key>two</key>
-			<string>%d ystafell</string>
 			<key>few</key>
 			<string>%d ystafell</string>
 			<key>many</key>
 			<string>%d ystafell</string>
+			<key>one</key>
+			<string>%d ystafell</string>
 			<key>other</key>
 			<string>%d ystafell</string>
+			<key>two</key>
+			<string>%d ystafell</string>
+			<key>zero</key>
+			<string>%d ystafelloedd</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Does gennych %1$d ceisiadau i ddatgloi</string>
+			<key>few</key>
+			<string>Mae gennych %1$d chais i ddatgloi</string>
+			<key>many</key>
+			<string>Mae gennych %1$d chais i ddatgloi</string>
 			<key>one</key>
 			<string>Mae gennych %1$d cais i ddatgloi</string>
+			<key>other</key>
+			<string>Mae gennych %1$d cais i ddatgloi</string>
 			<key>two</key>
 			<string>Mae gennych %1$d gais i ddatgloi</string>
-			<key>few</key>
-			<string>Mae gennych %1$d chais i ddatgloi</string>
-			<key>many</key>
-			<string>Mae gennych %1$d chais i ddatgloi</string>
-			<key>other</key>
-			<string>Mae gennych %1$d cais i ddatgloi</string>
+			<key>zero</key>
+			<string>Does gennych %1$d ceisiadau i ddatgloi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>PIN anghywir. Does gennych %1$d cais arall</string>
+			<key>few</key>
+			<string>PIN anghywir. Mae gennych %1$d chais arall</string>
+			<key>many</key>
+			<string>PIN anghywir. Mae gennych %1$d chais arall</string>
 			<key>one</key>
 			<string>PIN anghywir. Mae gennych %1$d cais arall</string>
+			<key>other</key>
+			<string>PIN anghywir. Mae gennych %1$d cais arall</string>
 			<key>two</key>
 			<string>PIN anghywir. Mae gennych %1$d gais arall</string>
-			<key>few</key>
-			<string>PIN anghywir. Mae gennych %1$d chais arall</string>
-			<key>many</key>
-			<string>PIN anghywir. Mae gennych %1$d chais arall</string>
-			<key>other</key>
-			<string>PIN anghywir. Mae gennych %1$d cais arall</string>
+			<key>zero</key>
+			<string>PIN anghywir. Does gennych %1$d cais arall</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Gadael %1$d ystafelloedd a gofodau</string>
-			<key>one</key>
-			<string>Gadael %1$d ystafell a gofod</string>
-			<key>two</key>
-			<string>Gadael %1$d ystafell a gofod</string>
 			<key>few</key>
 			<string>Gadael %1$d ystafell a gofod</string>
 			<key>many</key>
 			<string>Gadael %1$d ystafell a gofod</string>
+			<key>one</key>
+			<string>Gadael %1$d ystafell a gofod</string>
 			<key>other</key>
 			<string>Gadael %1$d ystafell a gofod</string>
+			<key>two</key>
+			<string>Gadael %1$d ystafell a gofod</string>
+			<key>zero</key>
+			<string>Gadael %1$d ystafelloedd a gofodau</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$d Negeseuon wedi'u pinio</string>
-			<key>one</key>
-			<string>%1$d Neges wedi'i phinio</string>
-			<key>two</key>
-			<string>%1$d Neges wedi'i phinio</string>
 			<key>few</key>
 			<string>%1$d Neges wedi'i phinio</string>
 			<key>many</key>
 			<string>%1$d Neges wedi'i phinio</string>
+			<key>one</key>
+			<string>%1$d Neges wedi'i phinio</string>
 			<key>other</key>
 			<string>%1$d Neges wedi'i phinio</string>
+			<key>two</key>
+			<string>%1$d Neges wedi'i phinio</string>
+			<key>zero</key>
+			<string>%1$d Negeseuon wedi'u pinio</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -505,35 +503,35 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$d personau</string>
-			<key>one</key>
-			<string>%1$d person</string>
-			<key>two</key>
-			<string>%1$d berson</string>
 			<key>few</key>
 			<string>%1$d person</string>
 			<key>many</key>
 			<string>%1$d pherson</string>
+			<key>one</key>
+			<string>%1$d person</string>
 			<key>other</key>
 			<string>%1$d person</string>
+			<key>two</key>
+			<string>%1$d berson</string>
+			<key>zero</key>
+			<string>%1$d personau</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,155 +543,155 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Dyw %1$@ na +%2$d arall eisiau ymuno â'r ystafell hon</string>
-			<key>one</key>
-			<string>Mae %1$@ +%2$d arall eisiau ymuno â'r ystafell hon</string>
-			<key>two</key>
-			<string>Mae %1$@ +%2$d arall eisiau ymuno â'r ystafell hon</string>
 			<key>few</key>
 			<string>Mae %1$@ +%2$d arall eisiau ymuno â'r ystafell hon</string>
 			<key>many</key>
 			<string>Mae %1$@ +%2$d arall eisiau ymuno â'r ystafell hon</string>
+			<key>one</key>
+			<string>Mae %1$@ +%2$d arall eisiau ymuno â'r ystafell hon</string>
 			<key>other</key>
 			<string>Mae %1$@ +%2$d arall eisiau ymuno â'r ystafell hon</string>
+			<key>two</key>
+			<string>Mae %1$@ +%2$d arall eisiau ymuno â'r ystafell hon</string>
+			<key>zero</key>
+			<string>Dyw %1$@ na +%2$d arall eisiau ymuno â'r ystafell hon</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Ymatebodd %1$d aelodau gyda %2$@</string>
-			<key>one</key>
-			<string>Ymatebodd %1$d aelodau gyda %2$@</string>
-			<key>two</key>
-			<string>Ymatebodd %1$d aelod gyda %2$@</string>
 			<key>few</key>
 			<string>Ymatebodd %1$d aelod gyda %2$@</string>
 			<key>many</key>
 			<string>Ymatebodd %1$d aelod gyda %2$@</string>
+			<key>one</key>
+			<string>Ymatebodd %1$d aelodau gyda %2$@</string>
 			<key>other</key>
 			<string>Ymatebodd %1$d aelod gyda %2$@</string>
+			<key>two</key>
+			<string>Ymatebodd %1$d aelod gyda %2$@</string>
+			<key>zero</key>
+			<string>Ymatebodd %1$d aelodau gyda %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Fe wnaethoch chi a%1$d aelod ymateb gyda%2$@</string>
-			<key>one</key>
-			<string>Fe wnaethoch chi a%1$d aelod ymateb gyda%2$@</string>
-			<key>two</key>
-			<string>Fe wnaethoch chi a%1$d aelod ymateb gyda%2$@</string>
 			<key>few</key>
 			<string>Fe wnaethoch chi a%1$d aelod ymateb gyda%2$@</string>
 			<key>many</key>
 			<string>Fe wnaethoch chi a%1$d aelod ymateb gyda%2$@</string>
+			<key>one</key>
+			<string>Fe wnaethoch chi a%1$d aelod ymateb gyda%2$@</string>
 			<key>other</key>
 			<string>Fe wnaethoch chi a%1$d aelod ymateb gyda%2$@</string>
+			<key>two</key>
+			<string>Fe wnaethoch chi a%1$d aelod ymateb gyda%2$@</string>
+			<key>zero</key>
+			<string>Fe wnaethoch chi a%1$d aelod ymateb gyda%2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$d newid ystafelloedd</string>
-			<key>one</key>
-			<string>%1$d newid ystafell</string>
-			<key>two</key>
-			<string>%1$d newid ystafell</string>
 			<key>few</key>
 			<string>%1$d newid ystafell</string>
 			<key>many</key>
 			<string>%1$d newid ystafell</string>
+			<key>one</key>
+			<string>%1$d newid ystafell</string>
 			<key>other</key>
 			<string>%1$d newid ystafell</string>
+			<key>two</key>
+			<string>%1$d newid ystafell</string>
+			<key>zero</key>
+			<string>%1$d newid ystafelloedd</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>%1$@, %2$@ a %3$d arall</string>
-			<key>one</key>
-			<string>%1$@, %2$@ a %3$d arall</string>
-			<key>two</key>
-			<string>%1$@, %2$@ a %3$d arall</string>
 			<key>few</key>
 			<string>%1$@, %2$@ a %3$d arall</string>
 			<key>many</key>
 			<string>%1$@, %2$@ a %3$d arall</string>
+			<key>one</key>
+			<string>%1$@, %2$@ a %3$d arall</string>
 			<key>other</key>
 			<string>%1$@, %2$@ a %3$d arall</string>
+			<key>two</key>
+			<string>%1$@, %2$@ a %3$d arall</string>
+			<key>zero</key>
+			<string>%1$@, %2$@ a %3$d arall</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Mae %1$@ yn teipio</string>
-			<key>one</key>
-			<string>Mae %1$@ yn teipio</string>
-			<key>two</key>
-			<string>Mae %1$@ yn teipio</string>
 			<key>few</key>
 			<string>Mae %1$@ yn teipio</string>
 			<key>many</key>
 			<string>Mae %1$@ yn teipio</string>
+			<key>one</key>
+			<string>Mae %1$@ yn teipio</string>
 			<key>other</key>
 			<string>Mae %1$@ yn teipio</string>
+			<key>two</key>
+			<string>Mae %1$@ yn teipio</string>
+			<key>zero</key>
+			<string>Mae %1$@ yn teipio</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -705,78 +703,80 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Rydych wedi rhwystro %1$d defnyddiwr. Fyddwch chi ddim yn derbyn hysbysiadau ar gyfer y defnyddiwr hwn.</string>
-			<key>one</key>
-			<string>Rydych wedi rhwystro %1$d defnyddiwr. Fyddwch chi ddim yn derbyn hysbysiadau ar gyfer y defnyddiwr hwn.</string>
-			<key>two</key>
-			<string>Rydych wedi rhwystro %1$d defnyddiwr. Fyddwch chi ddim yn derbyn hysbysiadau ar gyfer y defnyddiwr hwn.</string>
 			<key>few</key>
 			<string>Rydych wedi rhwystro %1$d defnyddiwr. Fyddwch chi ddim yn derbyn hysbysiadau ar gyfer y defnyddiwr hwn.</string>
 			<key>many</key>
 			<string>Rydych wedi rhwystro %1$d defnyddiwr. Fyddwch chi ddim yn derbyn hysbysiadau ar gyfer y defnyddiwr hwn.</string>
+			<key>one</key>
+			<string>Rydych wedi rhwystro %1$d defnyddiwr. Fyddwch chi ddim yn derbyn hysbysiadau ar gyfer y defnyddiwr hwn.</string>
 			<key>other</key>
 			<string>Rydych wedi rhwystro %1$d defnyddiwr. Fyddwch chi ddim yn derbyn hysbysiadau ar gyfer y defnyddiwr hwn.</string>
+			<key>two</key>
+			<string>Rydych wedi rhwystro %1$d defnyddiwr. Fyddwch chi ddim yn derbyn hysbysiadau ar gyfer y defnyddiwr hwn.</string>
+			<key>zero</key>
+			<string>Rydych wedi rhwystro %1$d defnyddiwr. Fyddwch chi ddim yn derbyn hysbysiadau ar gyfer y defnyddiwr hwn.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Wedi canfod %1$d darparwyr gwthio: %2$@</string>
-			<key>one</key>
-			<string>Wedi canfod %1$d darparwr gwthio: %2$@</string>
-			<key>two</key>
-			<string>Wedi canfod %1$d darparwr gwthio: %2$@</string>
 			<key>few</key>
 			<string>Wedi canfod %1$d darparwr gwthio: %2$@</string>
 			<key>many</key>
 			<string>Wedi canfod %1$d darparwr gwthio: %2$@</string>
+			<key>one</key>
+			<string>Wedi canfod %1$d darparwr gwthio: %2$@</string>
 			<key>other</key>
 			<string>Wedi canfod %1$d darparwr gwthio: %2$@</string>
+			<key>two</key>
+			<string>Wedi canfod %1$d darparwr gwthio: %2$@</string>
+			<key>zero</key>
+			<string>Wedi canfod %1$d darparwyr gwthio: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>zero</key>
-			<string>Wedi canfod %1$d dosbarthwyr: %2$@</string>
-			<key>one</key>
-			<string>Wedi canfod %1$d dosbarthwr: %2$@</string>
-			<key>two</key>
-			<string>Wedi canfod %1$d dosbarthwr: %2$@</string>
 			<key>few</key>
 			<string>Wedi canfod %1$d dosbarthwr: %2$@</string>
 			<key>many</key>
 			<string>Wedi canfod %1$d dosbarthwr: %2$@</string>
+			<key>one</key>
+			<string>Wedi canfod %1$d dosbarthwr: %2$@</string>
 			<key>other</key>
 			<string>Wedi canfod %1$d dosbarthwr: %2$@</string>
+			<key>two</key>
+			<string>Wedi canfod %1$d dosbarthwr: %2$@</string>
+			<key>zero</key>
+			<string>Wedi canfod %1$d dosbarthwyr: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/da.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/da.lproj/Localizable.stringsdict
index 782782710..6ca95783c 100644
--- a/ElementX/Resources/Localizations/da.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/da.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d cifre indtastet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d procent af det samlede antal stemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Læst af %1$@ og %2$d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d medlemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d stemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -111,11 +109,11 @@
 			<key>other</key>
 			<string>%1$d svar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d Rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -143,11 +141,11 @@
 			<key>other</key>
 			<string>%1$d valgt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -159,11 +157,11 @@
 			<key>other</key>
 			<string>%1$d Klynger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -175,11 +173,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d beskeder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -191,11 +189,11 @@
 			<key>other</key>
 			<string>%d notifikationer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -207,11 +205,11 @@
 			<key>other</key>
 			<string>Du har %d nye beskeder.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -223,11 +221,11 @@
 			<key>other</key>
 			<string>%d invitationer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,11 @@
 			<key>other</key>
 			<string>%d nye beskeder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -255,11 +253,11 @@
 			<key>other</key>
 			<string>%d ulæste beskeder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -271,11 +269,11 @@
 			<key>other</key>
 			<string>%d rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -287,11 +285,11 @@
 			<key>other</key>
 			<string>Du har %1$d forsøg på at låse op</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -303,11 +301,11 @@
 			<key>other</key>
 			<string>Forkert PIN-kode. Du har %1$d flere chancer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -319,11 +317,11 @@
 			<key>other</key>
 			<string>Forlad %1$d rum og Klynger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -335,11 +333,11 @@
 			<key>other</key>
 			<string>%1$d Fastgjorte beskeder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +349,11 @@
 			<key>other</key>
 			<string>%1$d Spærret</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -367,11 +365,11 @@
 			<key>other</key>
 			<string>%1$d personer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -383,11 +381,11 @@
 			<key>other</key>
 			<string>%1$d Inviteret</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -399,11 +397,11 @@
 			<key>other</key>
 			<string>%1$@ + %2$d andre ønsker at deltage i dette rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -415,11 +413,11 @@
 			<key>other</key>
 			<string>%1$d medlemmer reagerede med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -431,11 +429,11 @@
 			<key>other</key>
 			<string>Du og %1$d medlemmer reagerede med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -447,11 +445,11 @@
 			<key>other</key>
 			<string>%1$d rumændringer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +461,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ og %3$d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -479,11 +477,11 @@
 			<key>other</key>
 			<string>%1$@ skriver</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -495,11 +493,11 @@
 			<key>other</key>
 			<string>Fjern %1$d rum fra %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -511,11 +509,11 @@
 			<key>other</key>
 			<string>Du har blokeret %1$d brugere. Du vil ikke modtage meddelelser fra disse brugere.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -527,11 +525,11 @@
 			<key>other</key>
 			<string>Fandt %1$d push-udbydere: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -543,6 +541,8 @@
 			<key>other</key>
 			<string>%1$d distributører fundet:%2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict
index 6cd4ef38a..60c10d93c 100644
--- a/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d eingegebene Ziffern</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d Prozent aller Stimmen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Gelesen von %1$@ und %2$d weiteren</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d weitere</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Mitglieder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d Stimmen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d Antworten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Chats</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d ausgewählt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d Nachrichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d Mitteilungen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d Einladungen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d neue Nachrichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d ungelesene gemeldete Nachrichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d Chats</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Du hast %1$d Versuche, um zu entsperren</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Falsche PIN. Du hast %1$d weitere Versuche</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>%1$d Chats und Space verlassen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d fixierte Nachrichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d gesperrt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Personen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d eingeladen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d weitere möchten diesem Chat beitreten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d Mitglieder reagierten mit %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Du und %1$d Mitglieder reagierten mit %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d Änderungen im Chat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ und %3$d weitere Person</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ schreiben…</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>%1$d chats aus %2$@ entfernen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>Du hast %1$d Nutzer gesperrt. Du wirst für diese Nutzer keine Benachrichtigungen erhalten.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>%1$d Push-Dienst gefunden: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d Verteiler gefunden: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict
index be612300e..0b6ce09ec 100644
--- a/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d ψηφία εισήχθησαν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d τοις εκατό του συνόλου των ψήφων</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Διαβάστηκε από %1$@ και %2$d ακόμη</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d ακόμη</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Μέλη</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d ψήφοι</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d απαντήσεις</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Αίθουσες</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d επιλέχθηκαν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Χώροι</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d μηνύματα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d ειδοποιήσεις</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>Έχετε %d νέα μηνύματα.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d προσκλήσεις</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d νέα μηνύματα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d μη αναγνωσμένα ειδοποημένα μηνύματα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d αίθουσες</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Έχετε %1$d προσπάθειες να ξεκλειδώσετε</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Λάθος PIN. Έχεις %1$d ακόμη ευκαιρίες</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Αφήστε τις αίθουσες και τους χώρους του %1$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Καρφιτσωμένα μηνύματα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Αποκλείστηκαν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Άτομα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Προσκλήθηκαν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d άλλοι θέλουν να συμμετάσχουν σε αυτή την αίθουσα</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d μέλη αντέδρασαν με %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Εσύ και τα %1$d μέλη αντιδράσατε με %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d αλλαγές αίθουσας</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ και %3$d ακόμη</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>Οι χρήστες %1$@ πληκτρολογούν</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Αφαιρούνται οι %1$d αίθουσες από %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>Αποκλείσατε τους χρήστες %1$d. Δεν θα λαμβάνετε ειδοποιήσεις για αυτούς τους χρήστες.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Βρέθηκαν %1$d πάροχοι push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>Βρέθηκαν %1$d διανομείς: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict
index 7402ca0c8..6c73a444b 100644
--- a/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d digits entered</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Read by %1$@ and %2$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Members</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notifications</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d invitations</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d new messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d unread notified messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>You have %1$d attempts to unlock</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Wrong PIN. You have %1$d more chances</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Pinned messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d People</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d room changes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ and %3$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ are typing</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Found %1$d push providers: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d distributors found: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict
index 532a2fc93..ed9bba195 100644
--- a/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d dígitos introducidos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Leído por %1$@ y %2$d otros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d otros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d miembros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mensajes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notificaciones</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d invitaciones</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d mensajes nuevos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d mensajes notificados no leídos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Tienes %1$d intentos de desbloqueo</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>PIN incorrecto. Tienes %1$d oportunidades más</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d mensajes fijados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Personas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ y otros %2$d más quieren unirse a esta sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d cambios en la sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ y %3$d otros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ están escribiendo</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Se encontraron %1$d proveedores de push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d distribuidores encontrados: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict
index 5c54fd0bf..373b948e1 100644
--- a/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d numbrit sisestatud</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d protsenti kõikidest antud häältest</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Seda lugesid %1$@ ja veel %2$d kasutajat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d muud</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d liiget</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d häält</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d vastust</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d jututuba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d on valitud</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d kogukonda</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d sõnumit</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d teavitust</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>Sul on %d uut sõnumit.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d kutset</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d uut sõnumit</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d lugemata sõnumit, millele on teavitus saadetud</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d jututuba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Sul on lukustuse eemaldamiseks jäänud %1$d katset</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Vale PIN-kood. Saad proovida veel %1$d korda</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Lahku %1$d-st jututoast ja kogukonnast</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d esiletõstetud sõnumit</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d suhtluskeeluga kasutajat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d osalejat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d saatis kutse</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ + veel %2$d kasutajat soovivad selle jututoaga liituda</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d liige reageerisid: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Sina ja veel %1$d liiget reageerisid: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d jututoa muudatust</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ ja veel %3$d osalejat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ kirjutavad</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Eemalda %1$d jututuba „%2$@“ kogukonnast</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>Sa oled blokeerinud %1$d kasutajat. Sa ei saa tema kohta teavitusi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Leidsime %1$d tõuketeenuse pakkujat: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>Leidus %1$d tõuketeenuse levitajat: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict
index 061d476aa..7ad50171f 100644
--- a/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d digits entered</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>%1$@(e)k eta beste %2$d(e)k irakurri dute</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>beste %d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d kide</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d boto</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mezu</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d jakinarazpen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d gonbidapen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d mezu berri</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>Irakurri gabeko %d mezuren jakinarazpena</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d gela</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>%1$d saiakera dituzu desblokeatzeko</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Pin okerra. %1$d aukera gehiago dituzu.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>Finkatutako %1$d mezu</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d pertsona</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ + beste %2$d gelara batu nahi dute</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d gela aldaketa</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@, eta beste %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ idazten ari dira</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>%1$d push hornitzaile aurkitu dira: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d banatzailea aurkitu dira: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict
index 8a626920e..b4195735b 100644
--- a/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d رقم وارد شده</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>خوانده شده توسط%1$@ و%2$d نفر دیگر</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d عضو</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d رأی</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@:%2$d پیام‌</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%dاعلان‌</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d دعوت</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d پیام جدید</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d پیام اعلان نشده</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d اتاق</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>شما %1$d تلاش برای باز کردن قفل دارید</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>پین اشتباه است. شما %1$d شانس دیگر دارید</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Pinned messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d نفر</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$dتغییر اتاق</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ and %3$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ are typing</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Found %1$d push providers: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d distributors found: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict
index ff850f967..1efad0477 100644
--- a/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d numeroa syötetty</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d prosenttia kaikista äänistä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>%1$@ ja %2$d muuta on lukenut viestin</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d muuta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Jäsentä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d ääntä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d vastausta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Huonetta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d valittu</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Tilaa</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d viestiä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d ilmoitusta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>Sinulla on %d uutta viestiä.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d kutsua</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d uutta viestiä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d lukematonta viestiä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d huoneessa</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Sinulla on %1$d yritystä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Väärä PIN-koodi. Sinulla on %1$d yritystä jäljellä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Poistu %1$d huoneesta ja tilasta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d kiinnitettyä viestiä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d porttikiellettyä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d henkilöä</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d kutsuttua</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d muuta haluavat liittyä tähän huoneeseen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d jäsentä reagoivat %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Sinä ja %1$d jäsentä reagoitte %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d muutosta huoneeseen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ ja %3$d muuta</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ kirjoittavat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Poista %1$d huonetta tilasta %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>Estit %1$d käyttäjää. Et saa ilmoituksia näiltä käyttäjiltä.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Löytyi %1$d push-palveluntarjoajaa: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d jakelijaa löytyi: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict
index f41efa63e..3bd39a9be 100644
--- a/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d chiffres saisis</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d pour cent du total des votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Lu par %1$@ et %2$d autres</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d autres</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Membres</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d réponses</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Salons</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d éléments sélectionnés</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Espaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@ : %2$d messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notifications</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>Vous avez %d nouveaux messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d invitations</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d nouveaux messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d messages notifiés non lus</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d salons</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Il reste %1$d tentatives pour déverrouiller</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Code PIN incorrect. Il reste %1$d tentatives</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Quitter %1$d salons et l'espace</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d messages épinglés</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banni(e)s</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Personnes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invité(e)s</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ et %2$d autres personnes souhaitent rejoindre ce salon</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d membres ont réagi avec %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Vous et %1$d membres avez réagi avec %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d changements dans le salon</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ et %3$d autres</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ écrivent</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Retirer %1$d salons de %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>Vous avez bloqué %1$d utilisateurs. Vous ne recevrez pas de notifications pour ces utilisateurs.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>%1$d fournisseurs de Push détectés : %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d distributeurs détectés :%2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/hr.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/hr.lproj/Localizable.stringsdict
index a2ac415ef..e24555684 100644
--- a/ElementX/Resources/Localizations/hr.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/hr.lproj/Localizable.stringsdict
@@ -4,152 +4,150 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d unesena znamenka</string>
 			<key>few</key>
 			<string>%1$d unesene znamenke</string>
+			<key>one</key>
+			<string>%1$d unesena znamenka</string>
 			<key>other</key>
 			<string>%1$d unesenih znamenaka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d posto ukupnog broja glasova</string>
 			<key>few</key>
 			<string>%1$d posto ukupnog broja glasova</string>
+			<key>one</key>
+			<string>%1$d posto ukupnog broja glasova</string>
 			<key>other</key>
 			<string>%1$d posto ukupnog broja glasova</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Pročitao %1$@ i ostalih %2$d</string>
 			<key>few</key>
 			<string>Pročitala %1$@ i ostala %2$d</string>
+			<key>one</key>
+			<string>Pročitao %1$@ i ostalih %2$d</string>
 			<key>other</key>
 			<string>Pročitalo %1$@ i ostalih %2$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>još %d</string>
 			<key>few</key>
 			<string>još %d</string>
+			<key>one</key>
+			<string>još %d</string>
 			<key>other</key>
 			<string>još %d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d član</string>
 			<key>few</key>
 			<string>%1$d člana</string>
+			<key>one</key>
+			<string>%1$d član</string>
 			<key>other</key>
 			<string>%1$d članova</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d glas</string>
 			<key>few</key>
 			<string>%d glasa</string>
+			<key>one</key>
+			<string>%d glas</string>
 			<key>other</key>
 			<string>%d glasova</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d odgovor</string>
 			<key>few</key>
 			<string>%1$d odgovora</string>
+			<key>one</key>
+			<string>%1$d odgovor</string>
 			<key>other</key>
 			<string>%1$d odgovora</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d soba</string>
 			<key>few</key>
 			<string>%1$d sobe</string>
+			<key>one</key>
+			<string>%1$d soba</string>
 			<key>other</key>
 			<string>%1$d soba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,65 +159,65 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d prostor</string>
 			<key>few</key>
 			<string>%1$d prostora</string>
+			<key>one</key>
+			<string>%1$d prostor</string>
 			<key>other</key>
 			<string>%1$d prostora</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d poruka</string>
 			<key>few</key>
 			<string>%1$@: %2$d poruke</string>
+			<key>one</key>
+			<string>%1$@: %2$d poruka</string>
 			<key>other</key>
 			<string>%1$@: %2$d poruka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d obavijest</string>
 			<key>few</key>
 			<string>%d obavijesti</string>
+			<key>one</key>
+			<string>%d obavijest</string>
 			<key>other</key>
 			<string>%d obavijesti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -231,317 +229,317 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pozivnica</string>
 			<key>few</key>
 			<string>%d pozivnice</string>
+			<key>one</key>
+			<string>%d pozivnica</string>
 			<key>other</key>
 			<string>%d pozivnica</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nova poruka</string>
 			<key>few</key>
 			<string>%d nove poruke</string>
+			<key>one</key>
+			<string>%d nova poruka</string>
 			<key>other</key>
 			<string>%d novih poruka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nepročitana poruka s obavijesti</string>
 			<key>few</key>
 			<string>%d nepročitane poruke s obavijesti</string>
+			<key>one</key>
+			<string>%d nepročitana poruka s obavijesti</string>
 			<key>other</key>
 			<string>%d nepročitanih poruka s obavijesti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d soba</string>
 			<key>few</key>
 			<string>%d sobe</string>
+			<key>one</key>
+			<string>%d soba</string>
 			<key>other</key>
 			<string>%d soba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Imate %1$d pokušaj otključavanja</string>
 			<key>few</key>
 			<string>Imate %1$d pokušaja otključavanja</string>
+			<key>one</key>
+			<string>Imate %1$d pokušaj otključavanja</string>
 			<key>other</key>
 			<string>Imate %1$d pokušaja otključavanja</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Pogrešan PIN. Imate još %1$d pokušaj</string>
 			<key>few</key>
 			<string>Pogrešan PIN. Imate još %1$d pokušaja</string>
+			<key>one</key>
+			<string>Pogrešan PIN. Imate još %1$d pokušaj</string>
 			<key>other</key>
 			<string>Pogrešan PIN. Imate još %1$d pokušaja</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Napusti %1$d sobu i prostor</string>
 			<key>few</key>
 			<string>Napusti %1$d sobe i prostor</string>
+			<key>one</key>
+			<string>Napusti %1$d sobu i prostor</string>
 			<key>other</key>
 			<string>Napusti %1$d soba i prostor</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d prikvačena poruka</string>
 			<key>few</key>
 			<string>%1$d prikvačene poruke</string>
+			<key>one</key>
+			<string>%1$d prikvačena poruka</string>
 			<key>other</key>
 			<string>%1$d prikvačenih poruka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d zabranjen</string>
 			<key>few</key>
 			<string>%1$d zabranjena</string>
+			<key>one</key>
+			<string>%1$d zabranjen</string>
 			<key>other</key>
 			<string>%1$d zabranjenih</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d osoba</string>
 			<key>few</key>
 			<string>%1$d osobe</string>
+			<key>one</key>
+			<string>%1$d osoba</string>
 			<key>other</key>
 			<string>%1$d ljudi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d pozvan</string>
 			<key>few</key>
 			<string>%1$d pozvana</string>
+			<key>one</key>
+			<string>%1$d pozvan</string>
 			<key>other</key>
 			<string>%1$d pozvanih</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ i još %2$d želi se pridružiti ovoj sobi</string>
 			<key>few</key>
 			<string>%1$@ i još %2$d želi se pridružiti ovoj sobi</string>
+			<key>one</key>
+			<string>%1$@ i još %2$d želi se pridružiti ovoj sobi</string>
 			<key>other</key>
 			<string>%1$@ i još %2$d želi se pridružiti ovoj sobi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d član reagirao je s %2$@</string>
 			<key>few</key>
 			<string>%1$d člana reagirala su s %2$@</string>
+			<key>one</key>
+			<string>%1$d član reagirao je s %2$@</string>
 			<key>other</key>
 			<string>%1$d članova reagiralo je s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Vi i %1$d član reagirali ste s %2$@</string>
 			<key>few</key>
 			<string>Vi i %1$d člana reagirali ste s %2$@</string>
+			<key>one</key>
+			<string>Vi i %1$d član reagirali ste s %2$@</string>
 			<key>other</key>
 			<string>Vi i %1$d članova reagirali ste s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d promjena sobe</string>
 			<key>few</key>
 			<string>%1$d promjene sobe</string>
+			<key>one</key>
+			<string>%1$d promjena sobe</string>
 			<key>other</key>
 			<string>%1$d promjena sobe</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ i ostalih %3$d</string>
 			<key>few</key>
 			<string>%1$@, %2$@ i ostalih %3$d</string>
+			<key>one</key>
+			<string>%1$@, %2$@ i ostalih %3$d</string>
 			<key>other</key>
 			<string>%1$@, %2$@ i ostalih %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ tipka</string>
 			<key>few</key>
 			<string>%1$@ tipka</string>
+			<key>one</key>
+			<string>%1$@ tipka</string>
 			<key>other</key>
 			<string>%1$@ tipka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -553,60 +551,62 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Blokirali ste %1$d korisnika. Nećete primati obavijesti za ovog korisnika.</string>
 			<key>few</key>
 			<string>Blokirali ste %1$d korisnika. Nećete primati obavijesti za te korisnike.</string>
+			<key>one</key>
+			<string>Blokirali ste %1$d korisnika. Nećete primati obavijesti za ovog korisnika.</string>
 			<key>other</key>
 			<string>Blokirali ste %1$d korisnika. Nećete primati obavijesti za te korisnike.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Pronađen je %1$d pružatelj push obavijesti: %2$@</string>
 			<key>few</key>
 			<string>Pronađena su %1$d pružatelja push obavijesti: %2$@</string>
+			<key>one</key>
+			<string>Pronađen je %1$d pružatelj push obavijesti: %2$@</string>
 			<key>other</key>
 			<string>Pronađeno je %1$d pružatelja push obavijesti: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Pronađen je %1$d distributer: %2$@.</string>
 			<key>few</key>
 			<string>Pronađena su %1$d distributera: %2$@.</string>
+			<key>one</key>
+			<string>Pronađen je %1$d distributer: %2$@.</string>
 			<key>other</key>
 			<string>Pronađeno je %1$d distributera: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict
index ca11fae7b..9424c4f21 100644
--- a/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d megadott számjegy</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>az összes szavazat %1$d százaléka</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Olvasta: %1$@ és még %2$d felhasználó</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d további felhasználó</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d tag</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d szavazat</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -111,11 +109,11 @@
 			<key>other</key>
 			<string>%1$d válasz</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d szoba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -143,11 +141,11 @@
 			<key>other</key>
 			<string>%1$d kiválasztva</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -159,11 +157,11 @@
 			<key>other</key>
 			<string>%1$d tér</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -175,11 +173,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d üzenet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -191,11 +189,11 @@
 			<key>other</key>
 			<string>%d értesítés</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -207,11 +205,11 @@
 			<key>other</key>
 			<string>Van %d új üzenete.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -223,11 +221,11 @@
 			<key>other</key>
 			<string>%d meghívó</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,11 @@
 			<key>other</key>
 			<string>%d új üzenet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -255,11 +253,11 @@
 			<key>other</key>
 			<string>%d olvasatlan értesített üzenet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -271,11 +269,11 @@
 			<key>other</key>
 			<string>%d szoba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -287,11 +285,11 @@
 			<key>other</key>
 			<string>%1$d próbálkozása van a feloldáshoz</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -303,11 +301,11 @@
 			<key>other</key>
 			<string>Hibás PIN-kód. Még %1$d próbálkozási lehetősége maradt.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -319,11 +317,11 @@
 			<key>other</key>
 			<string>%1$d szoba és tér elhagyása</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -335,11 +333,11 @@
 			<key>other</key>
 			<string>%1$d kitűzött üzenet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +349,11 @@
 			<key>other</key>
 			<string>%1$d kitiltva</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -367,11 +365,11 @@
 			<key>other</key>
 			<string>%1$d személy</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -383,11 +381,11 @@
 			<key>other</key>
 			<string>%1$d meghívott</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -399,11 +397,11 @@
 			<key>other</key>
 			<string>%1$@ és még %2$d felhasználó szeretne csatlakozni ehhez a szobához</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -415,11 +413,11 @@
 			<key>other</key>
 			<string>%1$d tag reagált így: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -431,11 +429,11 @@
 			<key>other</key>
 			<string>Ön és %1$d tag reagáltak így: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -447,11 +445,11 @@
 			<key>other</key>
 			<string>%1$d szobaváltozás</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +461,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ és %3$d további felhasználó</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -479,11 +477,11 @@
 			<key>other</key>
 			<string>%1$@ éppen ír…</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -495,11 +493,11 @@
 			<key>other</key>
 			<string>%1$d szoba eltávolítása innen: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -511,11 +509,11 @@
 			<key>other</key>
 			<string>Letiltott %1$d felhasználót. Nem fog értesítéseket kapni ezekről a felhasználókról.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -527,11 +525,11 @@
 			<key>other</key>
 			<string>%1$d leküldéses értesítési szolgáltató találva: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -543,6 +541,8 @@
 			<key>other</key>
 			<string>%1$d forgalmazó található: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict
index 9dac8d174..9c74c26f9 100644
--- a/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -15,11 +13,11 @@
 			<key>other</key>
 			<string>%1$d digit dimasukkan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -29,11 +27,11 @@
 			<key>other</key>
 			<string>%1$d persen dari total suara</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -43,11 +41,11 @@
 			<key>other</key>
 			<string>Dibaca oleh %1$@ dan %2$d lainnya</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -57,11 +55,11 @@
 			<key>other</key>
 			<string>%d lainnya</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -71,11 +69,11 @@
 			<key>other</key>
 			<string>%1$d Anggota</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -85,11 +83,11 @@
 			<key>other</key>
 			<string>%d suara</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -99,11 +97,11 @@
 			<key>other</key>
 			<string>%1$d balasan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -115,11 +113,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -131,11 +129,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -147,11 +145,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d pesan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -175,11 +173,11 @@
 			<key>other</key>
 			<string>%d pemberitahuan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -191,11 +189,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -205,11 +203,11 @@
 			<key>other</key>
 			<string>%d undangan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -219,11 +217,11 @@
 			<key>other</key>
 			<string>%d pesan baru</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -233,11 +231,11 @@
 			<key>other</key>
 			<string>%d pesan pemberitahuan yang belum dibaca</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -247,11 +245,11 @@
 			<key>other</key>
 			<string>%d ruangan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -261,11 +259,11 @@
 			<key>other</key>
 			<string>Anda memiliki %1$d percobaan lagi untuk membuka kunci</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -275,11 +273,11 @@
 			<key>other</key>
 			<string>PIN salah. Anda memiliki %1$d percobaan lagi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -291,11 +289,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>%1$d Pesan yang disematkan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -335,11 +333,11 @@
 			<key>other</key>
 			<string>%1$d orang</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +349,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -365,11 +363,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d lainnya ingin bergabung ke ruangan ini</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -379,11 +377,11 @@
 			<key>other</key>
 			<string>%1$d anggota bereaksi dengan %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -393,11 +391,11 @@
 			<key>other</key>
 			<string>Anda dan %1$d anggota bereaksi dengan %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -407,11 +405,11 @@
 			<key>other</key>
 			<string>%1$d perubahan ruangan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -421,11 +419,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@, dan %3$d lainnya</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -435,11 +433,11 @@
 			<key>other</key>
 			<string>%1$@ sedang mengetik</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -451,11 +449,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -467,11 +465,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>Ditemukan %1$d penyedia notifikasi dorongan: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -495,6 +493,8 @@
 			<key>other</key>
 			<string>%1$d distributor ditemukan: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict
index 47a28e6f9..f486ee365 100644
--- a/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d cifre inserite</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percento dei voti totali</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Visualizzato da %1$@ e altri %2$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>altri %d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d Membri</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d voti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d risposte</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Stanze</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selezionati</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spazi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d messaggi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notifiche</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>Hai %d nuovi messaggi.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d inviti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d nuovi messaggi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d messaggi notificati non letti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d stanze</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Hai %1$d tentativi di sblocco</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>PIN sbagliato. Hai altri %1$d tentativi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Lascia %1$d stanze e spazi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Messaggi fissati</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Bannati</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Persone</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invitati</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d vogliono entrare in questa stanza</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d membri hanno reagito con %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Tu e %1$d altri membri avete reagito con %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d modifiche alla stanza</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ e altri %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ stanno scrivendo</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Rimuovi %1$d stanze da %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>Hai bloccato%1$d utenti. Non riceverai notifiche da questi utenti.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Provider %1$d push trovati: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d distributori trovati: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/ja.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/ja.lproj/Localizable.stringsdict
index e49babefa..ec93f68c7 100644
--- a/ElementX/Resources/Localizations/ja.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ja.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -15,11 +13,11 @@
 			<key>other</key>
 			<string>%1$d 桁入力済</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -29,11 +27,11 @@
 			<key>other</key>
 			<string>総投票数うち%1$d%</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -43,11 +41,11 @@
 			<key>other</key>
 			<string>既読: %1$@ ほか %2$d 人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -57,11 +55,11 @@
 			<key>other</key>
 			<string>他 %d 人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -71,11 +69,11 @@
 			<key>other</key>
 			<string>%1$d 人のメンバー</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -85,11 +83,11 @@
 			<key>other</key>
 			<string>%d 票</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -99,11 +97,11 @@
 			<key>other</key>
 			<string>%1$d 件の返信</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d 個のルーム</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d 個を選択</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -141,11 +139,11 @@
 			<key>other</key>
 			<string>%1$d 個のスペース</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -155,11 +153,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d件のメッセージ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -169,11 +167,11 @@
 			<key>other</key>
 			<string>%d 件の通知</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -183,11 +181,11 @@
 			<key>other</key>
 			<string>新着のメッセージが%d 件あります。</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -197,11 +195,11 @@
 			<key>other</key>
 			<string>%d 件の招待</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -211,11 +209,11 @@
 			<key>other</key>
 			<string>%d 件の新着メッセージ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d件の未読メッセージ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,11 @@
 			<key>other</key>
 			<string>%d 個のルーム</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -253,11 +251,11 @@
 			<key>other</key>
 			<string>%1$d 回試すことができます</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -267,11 +265,11 @@
 			<key>other</key>
 			<string>PINが間違っています。あと %1$d 回試すことができます。</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -281,11 +279,11 @@
 			<key>other</key>
 			<string>%1$d 個のルームとスペースを退出</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -295,11 +293,11 @@
 			<key>other</key>
 			<string>%1$d 個のピン留めされたメッセージ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -309,11 +307,11 @@
 			<key>other</key>
 			<string>%1$d 人の追放</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -323,11 +321,11 @@
 			<key>other</key>
 			<string>%1$d 人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d 件の招待</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +349,11 @@
 			<key>other</key>
 			<string>%1$@ 他 %2$d 人がルーム参加を希望</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -365,11 +363,11 @@
 			<key>other</key>
 			<string>%1$d 人の反応 %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -379,11 +377,11 @@
 			<key>other</key>
 			<string>あなたと %1$d 人の反応 %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -393,11 +391,11 @@
 			<key>other</key>
 			<string>%1$d 個のルーム更新点</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -407,11 +405,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ 他 %3$d 人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -421,11 +419,11 @@
 			<key>other</key>
 			<string>%1$@ が入力中</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -435,11 +433,11 @@
 			<key>other</key>
 			<string>%2$@ から%1$d 個のルームを削除</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d 人のユーザーをブロックしました。以降の通知を受信しません。</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +461,11 @@
 			<key>other</key>
 			<string>%1$d 個の通知プロバイダーを発見: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -477,6 +475,8 @@
 			<key>other</key>
 			<string>%1$d 個のディストリビューターを発見: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict
index 7375a6e89..20c51407d 100644
--- a/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d ციფრი ჩაიწერა</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>წაკითხულია %1$@ და %2$d-ს ადამიანის მიერ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d სხვა</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d წევრები</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d ხმა</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d შეტყობინება</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d შეტყობინება</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d მოწვევები</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d ახალი მესიჯი</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d წაუკითხავი შეტყობინება</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d ოთახი</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>თქვენ გაქვთ %1$d მცდელობა განსაბლოკად</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>არასწორი PIN. თქვენ %1$d შანსი დაგრჩათ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Pinned messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d ადამიანი</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$dოთახის ცვლილებები</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@%2$@და %3$d სხვა</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ წერენ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>მოიძებნა %1$d push პროვაიდერი: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d დისტრიბუტორი მოიძებნა: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/ko.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/ko.lproj/Localizable.stringsdict
index fc5603bd4..9175e0aa8 100644
--- a/ElementX/Resources/Localizations/ko.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ko.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -15,11 +13,11 @@
 			<key>other</key>
 			<string>%1$d자리 입력됨</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -29,11 +27,11 @@
 			<key>other</key>
 			<string>%1$d 총 투표율</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -43,11 +41,11 @@
 			<key>other</key>
 			<string>읽은 사람 %1$@ 그리고 %2$d 다른 사람들</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -57,11 +55,11 @@
 			<key>other</key>
 			<string>%d 기타</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -71,11 +69,11 @@
 			<key>other</key>
 			<string>%1$d 회원</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -85,11 +83,11 @@
 			<key>other</key>
 			<string>%d 에 투표</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -99,11 +97,11 @@
 			<key>other</key>
 			<string>%1$d 답변</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d 방</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d개 선택됨</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -141,11 +139,11 @@
 			<key>other</key>
 			<string>%1$d 스페이스</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -155,11 +153,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d 메세지</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -169,11 +167,11 @@
 			<key>other</key>
 			<string>%d 알림</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -183,11 +181,11 @@
 			<key>other</key>
 			<string>%d개의 새 메시지가 있습니다.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -197,11 +195,11 @@
 			<key>other</key>
 			<string>%d 초대</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -211,11 +209,11 @@
 			<key>other</key>
 			<string>%d 새 메시지</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d 읽지 않은 메시지 알림</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,11 @@
 			<key>other</key>
 			<string>%d 방</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -253,11 +251,11 @@
 			<key>other</key>
 			<string>당신은 %1$d 회 잠금 해제 시도를 가지고 있습니다</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -267,11 +265,11 @@
 			<key>other</key>
 			<string>PIN이 잘못되었습니다. %1$d 번 남았습니다</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -281,11 +279,11 @@
 			<key>other</key>
 			<string>방 %1$d개 및 스페이스 나가기</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -295,11 +293,11 @@
 			<key>other</key>
 			<string>%1$d 고정된 메시지</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -309,11 +307,11 @@
 			<key>other</key>
 			<string>%1$d명 차단됨</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -323,11 +321,11 @@
 			<key>other</key>
 			<string>%1$d 사람</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d명 초대됨</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +349,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d 명이 이 방에 참여하고 싶어합니다.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -365,11 +363,11 @@
 			<key>other</key>
 			<string>%1$d 회원들이 반응했습니다: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -379,11 +377,11 @@
 			<key>other</key>
 			<string>당신과 %1$d 멤버들은 다음과 같이 반응했습니다 %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -393,11 +391,11 @@
 			<key>other</key>
 			<string>%1$d 방 변경</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -407,11 +405,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ 및 %3$d 기타</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -421,11 +419,11 @@
 			<key>other</key>
 			<string>%1$@ 입력 중입니다</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -435,11 +433,11 @@
 			<key>other</key>
 			<string>%2$@에서 방 %1$d개 제거</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d명의 사용자를 차단했습니다. 이제 해당 사용자들의 알림을 받지 않습니다.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +461,11 @@
 			<key>other</key>
 			<string>%1$d 푸시 제공자를 찾았습니다: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -477,6 +475,8 @@
 			<key>other</key>
 			<string>%1$d 배포자 목록: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict
index 48f9ec631..ee450597a 100644
--- a/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d digits entered</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Read by %1$@ and %2$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,47 +63,47 @@
 			<key>other</key>
 			<string>%d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d narys</string>
 			<key>few</key>
 			<string>%1$d nariai</string>
+			<key>one</key>
+			<string>%1$d narys</string>
 			<key>other</key>
 			<string>%1$d narių</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d balsas</string>
 			<key>few</key>
 			<string>%d balsai</string>
+			<key>one</key>
+			<string>%d balsas</string>
 			<key>other</key>
 			<string>%d balsų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -117,11 +115,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -133,11 +131,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -149,11 +147,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -165,47 +163,47 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d žinutė</string>
 			<key>few</key>
 			<string>%1$@: %2$d žinutės</string>
+			<key>one</key>
+			<string>%1$@: %2$d žinutė</string>
 			<key>other</key>
 			<string>%1$@: %2$d žinučių</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pranešimas</string>
 			<key>few</key>
 			<string>%d pranešimai</string>
+			<key>one</key>
+			<string>%d pranešimas</string>
 			<key>other</key>
 			<string>%d pranešimų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -217,83 +215,83 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d kvietimas</string>
 			<key>few</key>
 			<string>%d kvietimai</string>
+			<key>one</key>
+			<string>%d kvietimas</string>
 			<key>other</key>
 			<string>%d kvietimų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nauja žinutė</string>
 			<key>few</key>
 			<string>%d naujos žinutės</string>
+			<key>one</key>
+			<string>%d nauja žinutė</string>
 			<key>other</key>
 			<string>%d naujų žinučių</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d neperskaityta žinutė</string>
 			<key>few</key>
 			<string>%d neperskaitytos žinutės</string>
+			<key>one</key>
+			<string>%d neperskaityta žinutė</string>
 			<key>other</key>
 			<string>%d neperskaitytų žinučių</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d kambaryje</string>
 			<key>few</key>
 			<string>%d kambariuose</string>
+			<key>one</key>
+			<string>%d kambaryje</string>
 			<key>other</key>
 			<string>%d kambarių</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>You have %1$d attempts to unlock</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Wrong PIN. You have %1$d more chances</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Pinned messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,29 +367,29 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d asmuo</string>
 			<key>few</key>
 			<string>%1$d asmenys</string>
+			<key>one</key>
+			<string>%1$d asmuo</string>
 			<key>other</key>
 			<string>%1$d asmenų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -403,11 +401,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -419,11 +417,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -435,11 +433,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -451,29 +449,29 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d kambario pakeitimas</string>
 			<key>few</key>
 			<string>%1$d kambario pakeitimai</string>
+			<key>one</key>
+			<string>%1$d kambario pakeitimas</string>
 			<key>other</key>
 			<string>%1$d kambario pakeitimų</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -485,11 +483,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ and %3$d others</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -501,11 +499,11 @@
 			<key>other</key>
 			<string>%1$@ are typing</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -517,11 +515,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -533,11 +531,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -549,11 +547,11 @@
 			<key>other</key>
 			<string>Found %1$d push providers: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -565,6 +563,8 @@
 			<key>other</key>
 			<string>%1$d distributors found: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict
index b89893bbc..a6bcb1a69 100644
--- a/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d sifre angitt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d prosent av totalt antall stemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Lest av %1$@ og %2$d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d medlemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d stemmer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -111,11 +109,11 @@
 			<key>other</key>
 			<string>%1$d svar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d Rom</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -143,11 +141,11 @@
 			<key>other</key>
 			<string>%1$d valgt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -159,11 +157,11 @@
 			<key>other</key>
 			<string>%1$d Områder</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -175,11 +173,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d meldinger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -191,11 +189,11 @@
 			<key>other</key>
 			<string>%d varsler</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -207,11 +205,11 @@
 			<key>other</key>
 			<string>Du har %d nye meldinger.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -223,11 +221,11 @@
 			<key>other</key>
 			<string>%d invitasjoner</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,11 @@
 			<key>other</key>
 			<string>%d nye meldinger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -255,11 +253,11 @@
 			<key>other</key>
 			<string>%d uleste varslede meldinger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -271,11 +269,11 @@
 			<key>other</key>
 			<string>%d rom</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -287,11 +285,11 @@
 			<key>other</key>
 			<string>Du har %1$d forsøk på å låse opp</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -303,11 +301,11 @@
 			<key>other</key>
 			<string>Feil PIN-kode. Du har %1$d forsøk igjen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -319,11 +317,11 @@
 			<key>other</key>
 			<string>Forlat %1$d rom og område</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -335,11 +333,11 @@
 			<key>other</key>
 			<string>%1$d Festede meldinger</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +349,11 @@
 			<key>other</key>
 			<string>%1$d utestengt</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -367,11 +365,11 @@
 			<key>other</key>
 			<string>%1$d personer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -383,11 +381,11 @@
 			<key>other</key>
 			<string>%1$d invitert</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -399,11 +397,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d andre ønsker å bli med i dette rommet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -415,11 +413,11 @@
 			<key>other</key>
 			<string>%1$d medlemmer reagerte med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -431,11 +429,11 @@
 			<key>other</key>
 			<string>Du og %1$d medlemmer reagerte med%2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -447,11 +445,11 @@
 			<key>other</key>
 			<string>%1$d romendringer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +461,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ og %3$d andre</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -479,11 +477,11 @@
 			<key>other</key>
 			<string>%1$@ skriver</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -495,11 +493,11 @@
 			<key>other</key>
 			<string>Fjern %1$d rommene fra %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -511,11 +509,11 @@
 			<key>other</key>
 			<string>Du blokkerte%1$d brukere. Du vil ikke motta varsler for disse brukerne.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -527,11 +525,11 @@
 			<key>other</key>
 			<string>Fant %1$d push-leverandører: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -543,6 +541,8 @@
 			<key>other</key>
 			<string>%1$d distributører funnet: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict
index 0c1bcc6ba..63ac0c1b5 100644
--- a/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d cijfers ingevoerd</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Gelezen door %1$@ en %2$d anderen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d anderen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d leden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d stemmen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d antwoorden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d berichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d meldingen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d uitnodigingen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d nieuwe berichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d ongelezen berichten met melding</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d kamers</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Je hebt %1$d pogingen om te ontgrendelen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Verkeerde pincode. Je hebt nog %1$d kansen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Vastgezette berichten</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d personen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d kamerveranderingen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ en %3$d anderen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ zijn aan het typen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>%1$d push-providers gevonden: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d verdelers gevonden: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict
index edd379b4a..e6d30d03a 100644
--- a/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict
@@ -4,152 +4,150 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Wprowadzono %1$d cyfrę</string>
 			<key>few</key>
 			<string>Wprowadzono %1$d cyfry</string>
 			<key>many</key>
 			<string>Wprowadzono %1$d cyfr</string>
+			<key>one</key>
+			<string>Wprowadzono %1$d cyfrę</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d procent wszystkich głosów</string>
 			<key>few</key>
 			<string>%1$d procenty wszystkich głosów</string>
 			<key>many</key>
 			<string>%1$d procent wszystkich głosów</string>
+			<key>one</key>
+			<string>%1$d procent wszystkich głosów</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Odczytano przez %1$@ i %2$d inną</string>
 			<key>few</key>
 			<string>Odczytano przez %1$@ i %2$d innych</string>
 			<key>many</key>
 			<string>Odczytano przez %1$@ i %2$d innych</string>
+			<key>one</key>
+			<string>Odczytano przez %1$@ i %2$d inną</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d inny</string>
 			<key>few</key>
 			<string>%d innych</string>
 			<key>many</key>
 			<string>%d innych</string>
+			<key>one</key>
+			<string>%d inny</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d członek</string>
 			<key>few</key>
 			<string>%1$d członków</string>
 			<key>many</key>
 			<string>%1$d członków</string>
+			<key>one</key>
+			<string>%1$d członek</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d głos</string>
 			<key>few</key>
 			<string>%d głosy</string>
 			<key>many</key>
 			<string>%d głosów</string>
+			<key>one</key>
+			<string>%d głos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d odpowiedź</string>
 			<key>few</key>
 			<string>%1$d odpowiedzi</string>
 			<key>many</key>
 			<string>%1$d odpowiedzi</string>
+			<key>one</key>
+			<string>%1$d odpowiedź</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Pokój</string>
 			<key>few</key>
 			<string>%1$d Pokoje</string>
 			<key>many</key>
 			<string>%1$d Pokoi</string>
+			<key>one</key>
+			<string>%1$d Pokój</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,65 +159,65 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Przestrzeń</string>
 			<key>few</key>
 			<string>%1$d Przestrzenie</string>
 			<key>many</key>
 			<string>%1$d Przestrzeni</string>
+			<key>one</key>
+			<string>%1$d Przestrzeń</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d wiadomość</string>
 			<key>few</key>
 			<string>%1$@: %2$d wiadomości</string>
 			<key>many</key>
 			<string>%1$@: %2$d wiadomości</string>
+			<key>one</key>
+			<string>%1$@: %2$d wiadomość</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d powiadomienie</string>
 			<key>few</key>
 			<string>%d powiadomienia</string>
 			<key>many</key>
 			<string>%d powiadomień</string>
+			<key>one</key>
+			<string>%d powiadomienie</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -231,155 +229,155 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d zaproszenie</string>
 			<key>few</key>
 			<string>%d zaproszenia</string>
 			<key>many</key>
 			<string>%d zaproszeń</string>
+			<key>one</key>
+			<string>%d zaproszenie</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nowa wiadomość</string>
 			<key>few</key>
 			<string>%d nowe wiadomości</string>
 			<key>many</key>
 			<string>%d nowych wiadomości</string>
+			<key>one</key>
+			<string>%d nowa wiadomość</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nieprzeczytana wiadomość</string>
 			<key>few</key>
 			<string>%d nieprzeczytane wiadomość</string>
 			<key>many</key>
 			<string>%d nieprzeczytanych wiadomości</string>
+			<key>one</key>
+			<string>%d nieprzeczytana wiadomość</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pokój</string>
 			<key>few</key>
 			<string>%d pokoje</string>
 			<key>many</key>
 			<string>%d pokoi</string>
+			<key>one</key>
+			<string>%d pokój</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Masz %1$d próbę, żeby odblokować</string>
 			<key>few</key>
 			<string>Masz %1$d próby, żeby odblokować</string>
 			<key>many</key>
 			<string>Masz %1$d prób, żeby odblokować</string>
+			<key>one</key>
+			<string>Masz %1$d próbę, żeby odblokować</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Błędny PIN. Pozostała %1$d próba</string>
 			<key>few</key>
 			<string>Błędny PIN. Pozostały %1$d próby</string>
 			<key>many</key>
 			<string>Błędny PIN. Pozostało %1$d prób</string>
+			<key>one</key>
+			<string>Błędny PIN. Pozostała %1$d próba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Opuść %1$d pokój i przestrzeń</string>
 			<key>few</key>
 			<string>Opuść %1$d pokoje i przestrzeń</string>
 			<key>many</key>
 			<string>Opuść %1$d pokojów i przestrzeń</string>
+			<key>one</key>
+			<string>Opuść %1$d pokój i przestrzeń</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d przypięta wiadomość</string>
 			<key>few</key>
 			<string>%1$d przypięte wiadomości</string>
 			<key>many</key>
 			<string>%1$d przypiętych wiadomości</string>
+			<key>one</key>
+			<string>%1$d przypięta wiadomość</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -391,29 +389,29 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d osoba</string>
 			<key>few</key>
 			<string>%1$d osoby</string>
 			<key>many</key>
 			<string>%1$d osób</string>
+			<key>one</key>
+			<string>%1$d osoba</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -425,119 +423,119 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d inny chce dołączyć do pokoju</string>
 			<key>few</key>
 			<string>%1$@ +%2$d innych chce dołączyć do pokoju</string>
 			<key>many</key>
 			<string>%1$@ +%2$d innych chce dołączyć do pokoju</string>
+			<key>one</key>
+			<string>%1$@ +%2$d inny chce dołączyć do pokoju</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d członek zareagował z %2$@</string>
 			<key>few</key>
 			<string>%1$d członków zareagowało z %2$@</string>
 			<key>many</key>
 			<string>%1$d członków zareagowało z %2$@</string>
+			<key>one</key>
+			<string>%1$d członek zareagował z %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Ty i %1$d członek zareagowaliście z %2$@</string>
 			<key>few</key>
 			<string>Ty i %1$d członków zareagowaliście z %2$@</string>
 			<key>many</key>
 			<string>Ty i %1$d członków zareagowaliście z %2$@</string>
+			<key>one</key>
+			<string>Ty i %1$d członek zareagowaliście z %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d zmiana pokoju</string>
 			<key>few</key>
 			<string>%1$d zmiany pokoju</string>
 			<key>many</key>
 			<string>%1$d zmian pokoju</string>
+			<key>one</key>
+			<string>%1$d zmiana pokoju</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ i %3$d inny</string>
 			<key>few</key>
 			<string>%1$@, %2$@ i %3$d innych</string>
 			<key>many</key>
 			<string>%1$@, %2$@ i %3$d innych</string>
+			<key>one</key>
+			<string>%1$@, %2$@ i %3$d inny</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ pisze</string>
 			<key>few</key>
 			<string>%1$@ piszą</string>
 			<key>many</key>
 			<string>%1$@ piszą</string>
+			<key>one</key>
+			<string>%1$@ pisze</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -549,60 +547,62 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Zablokowano %1$d użytkownika. Nie otrzymasz od niego żadnych powiadomień.</string>
 			<key>few</key>
 			<string>Zablokowano %1$d użytkowników. Nie otrzymasz od nich żadnych powiadomień.</string>
 			<key>many</key>
 			<string>Zablokowano %1$d użytkowników. Nie otrzymasz od nich żadnych powiadomień.</string>
+			<key>one</key>
+			<string>Zablokowano %1$d użytkownika. Nie otrzymasz od niego żadnych powiadomień.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Znaleziono %1$d dostawcę push: %2$@</string>
 			<key>few</key>
 			<string>Znaleziono %1$d dostawców push: %2$@</string>
 			<key>many</key>
 			<string>Znaleziono %1$d dostawców push: %2$@</string>
+			<key>one</key>
+			<string>Znaleziono %1$d dostawcę push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Znaleziono %1$d dystrybutora: %2$@.</string>
 			<key>few</key>
 			<string>Znaleziono %1$d dystrybutorów: %2$@.</string>
 			<key>many</key>
 			<string>Znaleziono %1$d dystrybutorów: %2$@.</string>
+			<key>one</key>
+			<string>Znaleziono %1$d dystrybutora: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict
index c548f57b1..6784a8ea2 100644
--- a/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d dígitos digitados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d por cento de todos os votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Lido por %1$@ e outros %2$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d membros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d respostas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selecionados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d espaços</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mensagens</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notificações</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d convites</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d novas mensagens</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d mensagens notificadas não lidas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Você tem %1$d tentativas de desbloqueio</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>PIN incorreto. Você tem mais %1$d chances</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Sair de %1$d salas e do espaço</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d mensagens fixadas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d banidos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d pessoas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d convidados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ + outros %2$d desejam entrar nesta sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d membros reagiram com %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Você e mais %1$d membros reagiram com %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d alterações na sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ e %3$d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ estão digitando</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remover %1$d salas de %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>Você bloqueou %1$d usuários. Você não receberá notificações deles.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Foram encontrados %1$d provedores de push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d distribuidores encontrados: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict
index 93e3f2732..38bc139b8 100644
--- a/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d dígitos inseridos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d porcento de todos os votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Lida por %1$@ e %2$d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d participantes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d votos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d respostas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d espaços</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mensagens</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d notificações</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d convites</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d mensagens novas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d mensagens notificadas não lidas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Tens %1$d tentativas de desbloqueio</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>PIN incorreto. Tens mais %1$d tentativas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Sair do espaço e de %1$d salas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Mensagens afixadas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d banidos</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d pessoas</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d convidados</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d outros querem entrar nesta sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d membros reagiram com %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Tu e %1$d membros reagiram com %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d alterações à sala</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ e %3$d outros</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ estão a escrever</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>Bloqueaste %1$d utilizadores. Não receberás notificações deles.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>%1$d fornecedores de envio encontrados: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d distribuidores encontrados: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict
index a91edfce8..d49ba4501 100644
--- a/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict
@@ -4,152 +4,150 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d cifră introdusă</string>
 			<key>few</key>
 			<string>%1$d cifre introduse</string>
+			<key>one</key>
+			<string>%1$d cifră introdusă</string>
 			<key>other</key>
 			<string>%1$d cifre introduse</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d la suta din totalul voturilor</string>
 			<key>few</key>
 			<string>%1$d la suta din totalul voturilor</string>
+			<key>one</key>
+			<string>%1$d la suta din totalul voturilor</string>
 			<key>other</key>
 			<string>%1$d la suta din totalul voturilor</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Citit de %1$@ și incă %2$d</string>
 			<key>few</key>
 			<string>Citit de %1$@ și incă %2$d</string>
+			<key>one</key>
+			<string>Citit de %1$@ și incă %2$d</string>
 			<key>other</key>
 			<string>Citit de %1$@ și incă %2$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d altul</string>
 			<key>few</key>
 			<string>%d alții</string>
+			<key>one</key>
+			<string>%d altul</string>
 			<key>other</key>
 			<string>%d alții</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Membru</string>
 			<key>few</key>
 			<string>%1$d Membri</string>
+			<key>one</key>
+			<string>%1$d Membru</string>
 			<key>other</key>
 			<string>%1$d Membri</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d vot</string>
 			<key>few</key>
 			<string>%d voturi</string>
+			<key>one</key>
+			<string>%d vot</string>
 			<key>other</key>
 			<string>%d voturi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d răspuns</string>
 			<key>few</key>
 			<string>%1$d răspunsuri</string>
+			<key>one</key>
+			<string>%1$d răspuns</string>
 			<key>other</key>
 			<string>%1$d răspunsuri</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Camera</string>
 			<key>few</key>
 			<string>%1$d Camere</string>
+			<key>one</key>
+			<string>%1$d Camera</string>
 			<key>other</key>
 			<string>%1$d Camere</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,29 +159,29 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Spațiu</string>
 			<key>few</key>
 			<string>%1$d Spații</string>
+			<key>one</key>
+			<string>%1$d Spațiu</string>
 			<key>other</key>
 			<string>%1$d Spații</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -195,11 +193,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mesaje</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -211,11 +209,11 @@
 			<key>other</key>
 			<string>%d notificări</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -227,11 +225,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -243,11 +241,11 @@
 			<key>other</key>
 			<string>%d invitații</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -259,11 +257,11 @@
 			<key>other</key>
 			<string>%d mesaje noi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -275,11 +273,11 @@
 			<key>other</key>
 			<string>%d mesaje notificate necitite</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -291,245 +289,245 @@
 			<key>other</key>
 			<string>%d camere</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Aveți %1$d încercare de deblocare</string>
 			<key>few</key>
 			<string>Aveți %1$d încercări de deblocare</string>
+			<key>one</key>
+			<string>Aveți %1$d încercare de deblocare</string>
 			<key>other</key>
 			<string>Aveți %1$d încercări de deblocare</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>PIN greșit. Mai aveți %1$d sansa</string>
 			<key>few</key>
 			<string>PIN greșit. Mai aveți %1$d sanse</string>
+			<key>one</key>
+			<string>PIN greșit. Mai aveți %1$d sansa</string>
 			<key>other</key>
 			<string>PIN greșit. Mai aveți %1$d sanse</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Părăsiți %1$d cameră și spațiul</string>
 			<key>few</key>
 			<string>Părăsiți %1$d camere și spațiul</string>
+			<key>one</key>
+			<string>Părăsiți %1$d cameră și spațiul</string>
 			<key>other</key>
 			<string>Părăsiți %1$d camere și spațiul</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Mesaj fixat</string>
 			<key>few</key>
 			<string>%1$d Mesaje fixate</string>
+			<key>one</key>
+			<string>%1$d Mesaj fixat</string>
 			<key>other</key>
 			<string>%1$d Mesaje fixate</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Interzis</string>
 			<key>few</key>
 			<string>%1$d Interziși</string>
+			<key>one</key>
+			<string>%1$d Interzis</string>
 			<key>other</key>
 			<string>%1$d Interziși</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d persoană</string>
 			<key>few</key>
 			<string>%1$d persoane</string>
+			<key>one</key>
+			<string>%1$d persoană</string>
 			<key>other</key>
 			<string>%1$d persoane</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Invitat</string>
 			<key>few</key>
 			<string>%1$d Invitați</string>
+			<key>one</key>
+			<string>%1$d Invitat</string>
 			<key>other</key>
 			<string>%1$d Invitați</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d utilizator doresc să se alăture acestei camere</string>
 			<key>few</key>
 			<string>%1$@ +%2$d utilizatori doresc să se alăture acestei camere</string>
+			<key>one</key>
+			<string>%1$@ +%2$d utilizator doresc să se alăture acestei camere</string>
 			<key>other</key>
 			<string>%1$@ +%2$d utilizatori doresc să se alăture acestei camere</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d membru a reacționat cu %2$@</string>
 			<key>few</key>
 			<string>%1$d membri au reacționat cu %2$@</string>
+			<key>one</key>
+			<string>%1$d membru a reacționat cu %2$@</string>
 			<key>other</key>
 			<string>%1$d membri au reacționat cu %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Dumneavoastră si %1$d membru ați reacționat cu %2$@</string>
 			<key>few</key>
 			<string>Dumneavoastră si %1$d membri ați reacționat cu %2$@</string>
+			<key>one</key>
+			<string>Dumneavoastră si %1$d membru ați reacționat cu %2$@</string>
 			<key>other</key>
 			<string>Dumneavoastră si %1$d membri ați reacționat cu %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d schimbare a camerii</string>
 			<key>few</key>
 			<string>%1$d schimbări ale camerei</string>
+			<key>one</key>
+			<string>%1$d schimbare a camerii</string>
 			<key>other</key>
 			<string>%1$d schimbări ale camerei</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ și încă %3$d</string>
 			<key>few</key>
 			<string>%1$@, %2$@ și încă %3$d</string>
+			<key>one</key>
+			<string>%1$@, %2$@ și încă %3$d</string>
 			<key>other</key>
 			<string>%1$@, %2$@ și încă %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ tastează</string>
 			<key>few</key>
 			<string>%1$@ tastează</string>
+			<key>one</key>
+			<string>%1$@ tastează</string>
 			<key>other</key>
 			<string>%1$@ tastează</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -541,60 +539,62 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Ai blocat%1$d utilizator. Nu veți primi notificări pentru acest utilizator.</string>
 			<key>few</key>
 			<string>Ai blocat%1$d utilizatori. Nu veți primi notificări pentru acești utilizatori.</string>
+			<key>one</key>
+			<string>Ai blocat%1$d utilizator. Nu veți primi notificări pentru acest utilizator.</string>
 			<key>other</key>
 			<string>Ai blocat%1$d utilizatori. Nu veți primi notificări pentru acești utilizatori.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>S-a găsit %1$d furnizor push: %2$@</string>
 			<key>few</key>
 			<string>S-au găsit %1$d furnizori push: %2$@</string>
+			<key>one</key>
+			<string>S-a găsit %1$d furnizor push: %2$@</string>
 			<key>other</key>
 			<string>S-au găsit %1$d furnizori push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d distribuitor găsit: %2$@.</string>
 			<key>few</key>
 			<string>%1$d distribuitori găsiți: %2$@.</string>
+			<key>one</key>
+			<string>%1$d distribuitor găsit: %2$@.</string>
 			<key>other</key>
 			<string>%1$d distribuitori găsiți: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict
index 52bf61708..3c76571df 100644
--- a/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict
@@ -4,615 +4,615 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Введена %1$d цифра</string>
 			<key>few</key>
 			<string>Введено %1$d цифры</string>
 			<key>many</key>
 			<string>Введено %1$d цифр</string>
+			<key>one</key>
+			<string>Введена %1$d цифра</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d процент от общего числа голосов</string>
 			<key>few</key>
 			<string>%1$d процента от общего числа голосов</string>
 			<key>many</key>
 			<string>%1$d процентов от общего числа голосов</string>
+			<key>one</key>
+			<string>%1$d процент от общего числа голосов</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Прочитано %1$@ и %2$d другим</string>
 			<key>few</key>
 			<string>Прочитано %1$@ и %2$d другими</string>
 			<key>many</key>
 			<string>Прочитано %1$@ и %2$d другими</string>
+			<key>one</key>
+			<string>Прочитано %1$@ и %2$d другим</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d</string>
 			<key>few</key>
 			<string>%d другие</string>
 			<key>many</key>
 			<string>%d другие</string>
+			<key>one</key>
+			<string>%d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d участник</string>
 			<key>few</key>
 			<string>%1$d участников</string>
 			<key>many</key>
 			<string>%1$d участников</string>
+			<key>one</key>
+			<string>%1$d участник</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d голос</string>
 			<key>few</key>
 			<string>%d голоса</string>
 			<key>many</key>
 			<string>%d голосов</string>
+			<key>one</key>
+			<string>%d голос</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d ответ</string>
 			<key>few</key>
 			<string>%1$d ответа</string>
 			<key>many</key>
 			<string>%1$d ответов</string>
+			<key>one</key>
+			<string>%1$d ответ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Комната</string>
 			<key>few</key>
 			<string>%1$d Комнат</string>
 			<key>many</key>
 			<string>%1$d Комнат</string>
+			<key>one</key>
+			<string>%1$d Комната</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d выбран</string>
 			<key>few</key>
 			<string>%1$d выбрано</string>
 			<key>many</key>
 			<string>%1$d выбрано</string>
+			<key>one</key>
+			<string>%1$d выбран</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d пространство</string>
 			<key>few</key>
 			<string>%1$d пространства</string>
 			<key>many</key>
 			<string>%1$d пространств</string>
+			<key>one</key>
+			<string>%1$d пространство</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d сообщение</string>
 			<key>few</key>
 			<string>%1$@: %2$d сообщения</string>
 			<key>many</key>
 			<string>%1$@: %2$d сообщений</string>
+			<key>one</key>
+			<string>%1$@: %2$d сообщение</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d уведомление</string>
 			<key>few</key>
 			<string>%d уведомления</string>
 			<key>many</key>
 			<string>%d уведомлений</string>
+			<key>one</key>
+			<string>%d уведомление</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>У Вас %d новое сообщение.</string>
 			<key>few</key>
 			<string>У Вас %d новых сообщения.</string>
 			<key>many</key>
 			<string>У Вас %d новых сообщений.</string>
+			<key>one</key>
+			<string>У Вас %d новое сообщение.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d приглашение</string>
 			<key>few</key>
 			<string>%d приглашения</string>
 			<key>many</key>
 			<string>%d приглашений</string>
+			<key>one</key>
+			<string>%d приглашение</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d новое сообщение</string>
 			<key>few</key>
 			<string>%d новых сообщения</string>
 			<key>many</key>
 			<string>%d новых сообщений</string>
+			<key>one</key>
+			<string>%d новое сообщение</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d непрочитанное уведомление</string>
 			<key>few</key>
 			<string>%d непрочитанных уведомления</string>
 			<key>many</key>
 			<string>%d непрочитанных уведомлений</string>
+			<key>one</key>
+			<string>%d непрочитанное уведомление</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d комната</string>
 			<key>few</key>
 			<string>%d комнаты</string>
 			<key>many</key>
 			<string>%d комнат</string>
+			<key>one</key>
+			<string>%d комната</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>У вас осталась %1$d попытка разблокировки</string>
 			<key>few</key>
 			<string>У вас остались %1$d попытки разблокировки</string>
 			<key>many</key>
 			<string>У вас осталось %1$d попыток разблокировки</string>
+			<key>one</key>
+			<string>У вас осталась %1$d попытка разблокировки</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Неверный PIN-код. У вас осталась %1$d попытка</string>
 			<key>few</key>
 			<string>Неверный PIN-код. У вас остались %1$d попытки</string>
 			<key>many</key>
 			<string>Неверный PIN-код. У вас осталось %1$d попыток</string>
+			<key>one</key>
+			<string>Неверный PIN-код. У вас осталась %1$d попытка</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Покинуть %1$d комнату и пространство</string>
 			<key>few</key>
 			<string>Покинуть %1$d комнат и пространство</string>
 			<key>many</key>
 			<string>Покинуть %1$d комнат и пространство</string>
+			<key>one</key>
+			<string>Покинуть %1$d комнату и пространство</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d закреплённое сообщение</string>
 			<key>few</key>
 			<string>%1$d закреплённых сообщения</string>
 			<key>many</key>
 			<string>%1$d закреплённых сообщений</string>
+			<key>one</key>
+			<string>%1$d закреплённое сообщение</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d заблокирован</string>
 			<key>few</key>
 			<string>%1$d заблокированы</string>
 			<key>many</key>
 			<string>%1$d заблокированы</string>
+			<key>one</key>
+			<string>%1$d заблокирован</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d пользователь</string>
 			<key>few</key>
 			<string>%1$d пользователя</string>
 			<key>many</key>
 			<string>%1$d пользователей</string>
+			<key>one</key>
+			<string>%1$d пользователь</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d приглашён</string>
 			<key>few</key>
 			<string>%1$d приглашены</string>
 			<key>many</key>
 			<string>%1$d приглашены</string>
+			<key>one</key>
+			<string>%1$d приглашён</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d хочет присоединиться к этой комнате</string>
 			<key>few</key>
 			<string>%1$@ +%2$d хотят присоединиться к этой комнате</string>
 			<key>many</key>
 			<string>%1$@ +%2$d хотят присоединиться к этой комнате</string>
+			<key>one</key>
+			<string>%1$@ +%2$d хочет присоединиться к этой комнате</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d участник отреагировал %2$@</string>
 			<key>few</key>
 			<string>%1$d участника отреагировало %2$@</string>
 			<key>many</key>
 			<string>%1$d участников отреагировало %2$@</string>
+			<key>one</key>
+			<string>%1$d участник отреагировал %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Вы и %1$d участник отреагировали %2$@</string>
 			<key>few</key>
 			<string>Вы и %1$d участника отреагировали %2$@</string>
 			<key>many</key>
 			<string>Вы и %1$d участников отреагировали %2$@</string>
+			<key>one</key>
+			<string>Вы и %1$d участник отреагировали %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d изменение в комнате</string>
 			<key>few</key>
 			<string>%1$d изменения в комнате</string>
 			<key>many</key>
 			<string>%1$d изменений в комнате</string>
+			<key>one</key>
+			<string>%1$d изменение в комнате</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ и %3$d</string>
 			<key>few</key>
 			<string>%1$@, %2$@ и другие %3$d</string>
 			<key>many</key>
 			<string>%1$@, %2$@ и другие %3$d</string>
+			<key>one</key>
+			<string>%1$@, %2$@ и %3$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ печатает</string>
 			<key>few</key>
 			<string>%1$@ печатают</string>
 			<key>many</key>
 			<string>%1$@ печатают</string>
+			<key>one</key>
+			<string>%1$@ печатает</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Удалить %1$d комнату из %2$@</string>
 			<key>few</key>
 			<string>Удалить %1$d комнаты из %2$@</string>
 			<key>many</key>
 			<string>Удалить %1$d комнат из %2$@</string>
+			<key>one</key>
+			<string>Удалить %1$d комнату из %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Вы заблокировали пользователя %1$d. Вы не будете получать уведомления от этого пользователей.</string>
 			<key>few</key>
 			<string>Вы заблокировали пользователей %1$d. Вы не будете получать уведомления от этих пользователей.</string>
 			<key>many</key>
 			<string>Вы заблокировали пользователей %1$d. Вы не будете получать уведомления от этих пользователей.</string>
+			<key>one</key>
+			<string>Вы заблокировали пользователя %1$d. Вы не будете получать уведомления от этого пользователей.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Найден %1$d push-провайдер: %2$@</string>
 			<key>few</key>
 			<string>Найдено %1$d push-провайдеров: %2$@</string>
 			<key>many</key>
 			<string>Найдено %1$d push-провайдеров: %2$@</string>
+			<key>one</key>
+			<string>Найден %1$d push-провайдер: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d провайдер найден: %2$@.</string>
 			<key>few</key>
 			<string>%1$d провайдеров найдено: %2$@.</string>
 			<key>many</key>
 			<string>%1$d провайдеров найдено: %2$@.</string>
+			<key>one</key>
+			<string>%1$d провайдер найден: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict
index 4049b5c36..221c41e68 100644
--- a/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict
@@ -4,224 +4,222 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d zadaná číslica</string>
 			<key>few</key>
 			<string>%1$d zadané číslice</string>
+			<key>one</key>
+			<string>%1$d zadaná číslica</string>
 			<key>other</key>
 			<string>%1$d zadaných číslic</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d percento z celkového počtu hlasov</string>
 			<key>few</key>
 			<string>%1$d percentá z celkového počtu hlasov</string>
+			<key>one</key>
+			<string>%1$d percento z celkového počtu hlasov</string>
 			<key>other</key>
 			<string>%1$d percent z celkového počtu hlasov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Prečítal/a %1$@ a %2$d ďalší</string>
 			<key>few</key>
 			<string>Prečítal/a %1$@ a %2$d ďalší</string>
+			<key>one</key>
+			<string>Prečítal/a %1$@ a %2$d ďalší</string>
 			<key>other</key>
 			<string>Prečítal/a %1$@ a %2$d ďalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d ďalší</string>
 			<key>few</key>
 			<string>%d ďalší</string>
+			<key>one</key>
+			<string>%d ďalší</string>
 			<key>other</key>
 			<string>%d ďalších</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d člen</string>
 			<key>few</key>
 			<string>%1$d členovia</string>
+			<key>one</key>
+			<string>%1$d člen</string>
 			<key>other</key>
 			<string>%1$d členov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d hlas</string>
 			<key>few</key>
 			<string>%d hlasy</string>
+			<key>one</key>
+			<string>%d hlas</string>
 			<key>other</key>
 			<string>%d hlasov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d odpoveď</string>
 			<key>few</key>
 			<string>%1$d odpovede</string>
+			<key>one</key>
+			<string>%1$d odpoveď</string>
 			<key>other</key>
 			<string>%1$d odpovedí</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d miestnosť</string>
 			<key>few</key>
 			<string>%1$d miestnosti</string>
+			<key>one</key>
+			<string>%1$d miestnosť</string>
 			<key>other</key>
 			<string>%1$d miestností</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d vybraná</string>
 			<key>few</key>
 			<string>%1$d vybrané</string>
+			<key>one</key>
+			<string>%1$d vybraná</string>
 			<key>other</key>
 			<string>%1$d vybraných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d priestor</string>
 			<key>few</key>
 			<string>%1$d priestory</string>
+			<key>one</key>
+			<string>%1$d priestor</string>
 			<key>other</key>
 			<string>%1$d priestorov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d správa</string>
 			<key>few</key>
 			<string>%1$@: %2$d správy</string>
+			<key>one</key>
+			<string>%1$@: %2$d správa</string>
 			<key>other</key>
 			<string>%1$@: %2$d správ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d oznámenie</string>
 			<key>few</key>
 			<string>%d oznámenia</string>
+			<key>one</key>
+			<string>%d oznámenie</string>
 			<key>other</key>
 			<string>%d oznámení</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -233,384 +231,386 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d pozvánka</string>
 			<key>few</key>
 			<string>%d pozvánky</string>
+			<key>one</key>
+			<string>%d pozvánka</string>
 			<key>other</key>
 			<string>%d pozvánok</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d nová správa</string>
 			<key>few</key>
 			<string>%d nové správy</string>
+			<key>one</key>
+			<string>%d nová správa</string>
 			<key>other</key>
 			<string>%d nových správ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d neprečítaná oznámená správa</string>
 			<key>few</key>
 			<string>%d neprečítané oznámené správy</string>
+			<key>one</key>
+			<string>%d neprečítaná oznámená správa</string>
 			<key>other</key>
 			<string>%d neprečítaných oznámených správ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d miestnosť</string>
 			<key>few</key>
 			<string>%d miestnosti</string>
+			<key>one</key>
+			<string>%d miestnosť</string>
 			<key>other</key>
 			<string>%d miestností</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Máte %1$d pokus na odomknutie</string>
 			<key>few</key>
 			<string>Máte %1$d pokusy na odomknutie</string>
+			<key>one</key>
+			<string>Máte %1$d pokus na odomknutie</string>
 			<key>other</key>
 			<string>Máte %1$d pokusov na odomknutie</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Nesprávny PIN kód. Máte ešte %1$d pokus</string>
 			<key>few</key>
 			<string>Nesprávny PIN kód. Máte ešte %1$d pokusy</string>
+			<key>one</key>
+			<string>Nesprávny PIN kód. Máte ešte %1$d pokus</string>
 			<key>other</key>
 			<string>Nesprávny PIN kód. Máte ešte %1$d pokusov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Opustiť %1$d miestnosť a priestor</string>
 			<key>few</key>
 			<string>Opustiť %1$d miestnosti a priestory</string>
+			<key>one</key>
+			<string>Opustiť %1$d miestnosť a priestor</string>
 			<key>other</key>
 			<string>Opustiť %1$d miestností a priestorov</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d pripnutá správa</string>
 			<key>few</key>
 			<string>%1$d pripnuté správy</string>
+			<key>one</key>
+			<string>%1$d pripnutá správa</string>
 			<key>other</key>
 			<string>%1$d pripnutých správ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d zakázaný</string>
 			<key>few</key>
 			<string>%1$d zakázaní</string>
+			<key>one</key>
+			<string>%1$d zakázaný</string>
 			<key>other</key>
 			<string>%1$d zakázaných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d osoba</string>
 			<key>few</key>
 			<string>%1$d osoby</string>
+			<key>one</key>
+			<string>%1$d osoba</string>
 			<key>other</key>
 			<string>%1$d osôb</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d pozvaný</string>
 			<key>few</key>
 			<string>%1$d pozvaní</string>
+			<key>one</key>
+			<string>%1$d pozvaný</string>
 			<key>other</key>
 			<string>%1$d pozvaných</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d ďalší chcú vstúpiť do tejto miestnosti</string>
 			<key>few</key>
 			<string>%1$@ +%2$d ďalší chcú vstúpiť do tejto miestnosti</string>
+			<key>one</key>
+			<string>%1$@ +%2$d ďalší chcú vstúpiť do tejto miestnosti</string>
 			<key>other</key>
 			<string>%1$@ +%2$d ďalších chce vstúpiť do tejto miestnosti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d člen reagoval s %2$@</string>
 			<key>few</key>
 			<string>%1$d členovia reagovali s %2$@</string>
+			<key>one</key>
+			<string>%1$d člen reagoval s %2$@</string>
 			<key>other</key>
 			<string>%1$d členov reagovalo s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Vy a %1$d člen reagoval s %2$@</string>
 			<key>few</key>
 			<string>Vy a %1$d členovia reagovali s %2$@</string>
+			<key>one</key>
+			<string>Vy a %1$d člen reagoval s %2$@</string>
 			<key>other</key>
 			<string>Vy a %1$d členov reagovalo s %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d zmena miestnosti</string>
 			<key>few</key>
 			<string>%1$d zmeny miestnosti</string>
+			<key>one</key>
+			<string>%1$d zmena miestnosti</string>
 			<key>other</key>
 			<string>%1$d zmien miestnosti</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@, %2$@ a %3$d ďalší</string>
 			<key>few</key>
 			<string>%1$@, %2$@ a %3$d ďalší</string>
+			<key>one</key>
+			<string>%1$@, %2$@ a %3$d ďalší</string>
 			<key>other</key>
 			<string>%1$@, %2$@ a %3$d ďalší</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ píše</string>
 			<key>few</key>
 			<string>%1$@ píšu</string>
+			<key>one</key>
+			<string>%1$@ píše</string>
 			<key>other</key>
 			<string>%1$@ píšu</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Odstrániť %1$d miestnosť z priestoru %2$@</string>
 			<key>few</key>
 			<string>Odstrániť %1$d miestnosti z priestoru %2$@</string>
+			<key>one</key>
+			<string>Odstrániť %1$d miestnosť z priestoru %2$@</string>
 			<key>other</key>
 			<string>Odstrániť %1$d miestností z priestoru %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Zablokovali ste %1$d používateľa. Nebudete dostávať oznámenia od tohto používateľa.</string>
 			<key>few</key>
 			<string>Zablokovali ste %1$d používateľov. Nebudete dostávať oznámenia od týchto používateľov.</string>
+			<key>one</key>
+			<string>Zablokovali ste %1$d používateľa. Nebudete dostávať oznámenia od tohto používateľa.</string>
 			<key>other</key>
 			<string>Zablokovali ste %1$d používateľov. Nebudete dostávať oznámenia od týchto používateľov.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Nájdený %1$d poskytovateľ služby push: %2$@</string>
 			<key>few</key>
 			<string>Nájdení %1$d poskytovatelia služby push: %2$@</string>
+			<key>one</key>
+			<string>Nájdený %1$d poskytovateľ služby push: %2$@</string>
 			<key>other</key>
 			<string>Nájdených %1$d poskytovateľov služby push: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d nájdený distribútor: %2$@.</string>
 			<key>few</key>
 			<string>%1$d nájdení distribútori: %2$@.</string>
+			<key>one</key>
+			<string>%1$d nájdený distribútor: %2$@.</string>
 			<key>other</key>
 			<string>%1$d nájdených distribútorov: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict
index 2ed4b6cf3..463e76fd3 100644
--- a/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d siffror angivna</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d procent av totala röster</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>Läst av %1$@ och %2$d andra</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d andra</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d medlemmar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d röster</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d svar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Utrymmen</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d meddelanden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d aviseringar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d inbjudningar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d nya meddelanden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d olästa aviserade meddelanden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Du har %1$d försök att låsa upp</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Fel PIN-kod. Du har %1$d försök kvar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Fästa meddelanden</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d Personer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@+ %2$d andra vill gå med i detta rum</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d medlemmar reagerade med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Du och %1$d medlemmarna reagerade med %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d rumsändringar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ och %3$d andra</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ skriver</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Hittade %1$d push-leverantörer: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d distributörer hittade:%2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/tr.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/tr.lproj/Localizable.stringsdict
index fd6b20bdd..a1430fbd7 100644
--- a/ElementX/Resources/Localizations/tr.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/tr.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d basamak girildi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>%1$@ ve %2$d diğer kişi tarafından okundu</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d diğer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d üyeleri</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d oy</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d mesaj</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d bildirim</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d davet</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d yeni mesaj</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d okunmamış mesaj bildirimi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d oda</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Kilidi açmak için %1$d deneme hakkınız var</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Yanlış PIN. %1$d kere daha şansınız var</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d Sabitlenmiş mesajlar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d kişi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Davetli</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d kişi daha bu odaya katılmak istiyor</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d oda değişikliği</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ ve %3$d diğer</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ yazıyor</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>%1$d gönderme sağlayıcısı bulundu: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d dağıtıcı bulundu: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/uk.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/uk.lproj/Localizable.stringsdict
index 2ff09e497..9a4e3ce32 100644
--- a/ElementX/Resources/Localizations/uk.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/uk.lproj/Localizable.stringsdict
@@ -4,152 +4,150 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Введена %1$d цифра</string>
 			<key>few</key>
 			<string>Введено %1$d цифри</string>
 			<key>many</key>
 			<string>Введено %1$d цифр</string>
+			<key>one</key>
+			<string>Введена %1$d цифра</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d відсоток від усіх голосів</string>
 			<key>few</key>
 			<string>%1$d відсотки від усіх голосів</string>
 			<key>many</key>
 			<string>%1$d відсотків від усіх голосів</string>
+			<key>one</key>
+			<string>%1$d відсоток від усіх голосів</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Прочитано %1$@ та %2$d іншим</string>
 			<key>few</key>
 			<string>Прочитано %1$@ та %2$d іншими</string>
 			<key>many</key>
 			<string>Прочитано %1$@ та %2$d іншими</string>
+			<key>one</key>
+			<string>Прочитано %1$@ та %2$d іншим</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d інший</string>
 			<key>few</key>
 			<string>%d інші</string>
 			<key>many</key>
 			<string>%d інші</string>
+			<key>one</key>
+			<string>%d інший</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d учасник</string>
 			<key>few</key>
 			<string>%1$d учасники</string>
 			<key>many</key>
 			<string>%1$d учасників</string>
+			<key>one</key>
+			<string>%1$d учасник</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d голос</string>
 			<key>few</key>
 			<string>%d голоси</string>
 			<key>many</key>
 			<string>%d голосів</string>
+			<key>one</key>
+			<string>%d голос</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d відповідь</string>
 			<key>few</key>
 			<string>%1$d відповіді</string>
 			<key>many</key>
 			<string>%1$d відповідей</string>
+			<key>one</key>
+			<string>%1$d відповідь</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d кімната</string>
 			<key>few</key>
 			<string>%1$d кімнати</string>
 			<key>many</key>
 			<string>%1$d кімнат</string>
+			<key>one</key>
+			<string>%1$d кімната</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,65 +159,65 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d простір</string>
 			<key>few</key>
 			<string>%1$d простори</string>
 			<key>many</key>
 			<string>%1$d просторів</string>
+			<key>one</key>
+			<string>%1$d простір</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@: %2$d повідомлення</string>
 			<key>few</key>
 			<string>%1$@: %2$d повідомлення</string>
 			<key>many</key>
 			<string>%1$@: %2$d повідомлень</string>
+			<key>one</key>
+			<string>%1$@: %2$d повідомлення</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d сповіщення</string>
 			<key>few</key>
 			<string>%d сповіщення</string>
 			<key>many</key>
 			<string>%d сповіщень</string>
+			<key>one</key>
+			<string>%d сповіщення</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -231,119 +229,119 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d запрошення</string>
 			<key>few</key>
 			<string>%d запрошення</string>
 			<key>many</key>
 			<string>%d запрошень</string>
+			<key>one</key>
+			<string>%d запрошення</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d нове повідомлення</string>
 			<key>few</key>
 			<string>%d нові повідомлення</string>
 			<key>many</key>
 			<string>%d нових повідомлень</string>
+			<key>one</key>
+			<string>%d нове повідомлення</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d непрочитане сповіщення</string>
 			<key>few</key>
 			<string>%d непрочитані сповіщення</string>
 			<key>many</key>
 			<string>%d непрочитаних сповіщень</string>
+			<key>one</key>
+			<string>%d непрочитане сповіщення</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%d кімната</string>
 			<key>few</key>
 			<string>%d кімнати</string>
 			<key>many</key>
 			<string>%d кімнат</string>
+			<key>one</key>
+			<string>%d кімната</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Ви маєте %1$d спробу</string>
 			<key>few</key>
 			<string>Ви маєте %1$d спроби</string>
 			<key>many</key>
 			<string>Ви маєте %1$d спроб</string>
+			<key>one</key>
+			<string>Ви маєте %1$d спробу</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Хибний PIN-код. Ви маєте ще %1$d шанс</string>
 			<key>few</key>
 			<string>Хибний PIN-код. Ви маєте ще %1$d шанси</string>
 			<key>many</key>
 			<string>Хибний PIN-код. Ви маєте ще %1$d шансів</string>
+			<key>one</key>
+			<string>Хибний PIN-код. Ви маєте ще %1$d шанс</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -355,29 +353,29 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d Закріплене повідомлення</string>
 			<key>few</key>
 			<string>%1$d Закріплених повідомлення</string>
 			<key>many</key>
 			<string>%1$d Закріплених повідомлення</string>
+			<key>one</key>
+			<string>%1$d Закріплене повідомлення</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -389,155 +387,155 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d особа</string>
 			<key>few</key>
 			<string>%1$d особи</string>
 			<key>many</key>
 			<string>%1$d осіб</string>
+			<key>one</key>
+			<string>%1$d особа</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d запрошено</string>
 			<key>few</key>
 			<string>%1$d запрошені</string>
 			<key>many</key>
 			<string>%1$d запрошених</string>
+			<key>one</key>
+			<string>%1$d запрошено</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ +%2$d інший хочуть приєднатися до цієї кімнати</string>
 			<key>few</key>
 			<string>%1$@ +%2$d інші хочуть приєднатися до цієї кімнати</string>
 			<key>many</key>
 			<string>%1$@ +%2$d інших хочуть приєднатися до цієї кімнати</string>
+			<key>one</key>
+			<string>%1$@ +%2$d інший хочуть приєднатися до цієї кімнати</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d учасник відреагував з %2$@</string>
 			<key>few</key>
 			<string>%1$d учасники відреагували з %2$@</string>
 			<key>many</key>
 			<string>%1$d учасників відреагували з %2$@</string>
+			<key>one</key>
+			<string>%1$d учасник відреагував з %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Ви та ще %1$d учасник відреагували з %2$@</string>
 			<key>few</key>
 			<string>Ви та ще %1$d учасники відреагували з %2$@</string>
 			<key>many</key>
 			<string>Ви та ще %1$d учасників відреагували з %2$@</string>
+			<key>one</key>
+			<string>Ви та ще %1$d учасник відреагували з %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$d зміна в кімнаті</string>
 			<key>few</key>
 			<string>%1$d зміни в кімнаті</string>
 			<key>many</key>
 			<string>%1$d змін у кімнаті</string>
+			<key>one</key>
+			<string>%1$d зміна в кімнаті</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@%2$@ та %3$d інший</string>
 			<key>few</key>
 			<string>%1$@%2$@ та %3$d інші</string>
 			<key>many</key>
 			<string>%1$@%2$@ та %3$d інших</string>
+			<key>one</key>
+			<string>%1$@%2$@ та %3$d інший</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>%1$@ пише</string>
 			<key>few</key>
 			<string>%1$@ пишуть</string>
 			<key>many</key>
 			<string>%1$@ пишуть</string>
+			<key>one</key>
+			<string>%1$@ пише</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -549,11 +547,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -565,42 +563,44 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Виявлено %1$d постачальника: %2$@</string>
 			<key>few</key>
 			<string>Виявлено %1$d постачальники: %2$@</string>
 			<key>many</key>
 			<string>Виявлено %1$d постачальників: %2$@</string>
+			<key>one</key>
+			<string>Виявлено %1$d постачальника: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
-			<key>one</key>
-			<string>Знайдений %1$d дистриб'ютор: %2$@.</string>
 			<key>few</key>
 			<string>Знайдено %1$d дистриб'ютори: %2$@.</string>
 			<key>many</key>
 			<string>Знайдено %1$d дистриб'юторів: %2$@.</string>
+			<key>one</key>
+			<string>Знайдений %1$d дистриб'ютор: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/ur.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/ur.lproj/Localizable.stringsdict
index 0efbf0a9a..d34b08f4b 100644
--- a/ElementX/Resources/Localizations/ur.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/ur.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d ہندسے درج</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>%1$@ اور %2$d دیگر نے لڑھا</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d دیگر</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d اراکین</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%d آراء</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@: %2$d پیغامات</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%d اطلاعات</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d دعوت نامے</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%d نئے پیغامات</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%d غیر مقروءہ مطلع پیغامات</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%d کمرے</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>آپکے پاس %1$d غیر مقفل کرنے کی کوششیں ہیں</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>غلط PIN۔ آپ کے پاس %1$d مزید موقعے ہیں</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d مثبوتہ پیغامات</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d اشخاص</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$d کمرے کی تبدیلیاں</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@، %2$@ اور %3$d دیگر</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%1$@ تحریر کر رہے ہیں</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>پائے %1$d دھکا فراہم کنندگان: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d تقسیم کاران ملے: %2$@۔</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/uz.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/uz.lproj/Localizable.stringsdict
index 3b717c716..f70a83410 100644
--- a/ElementX/Resources/Localizations/uz.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/uz.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -17,11 +15,11 @@
 			<key>other</key>
 			<string>%1$d ta raqam kiritildi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -33,11 +31,11 @@
 			<key>other</key>
 			<string>Jami ovozlarning %1$d foizi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -49,11 +47,11 @@
 			<key>other</key>
 			<string>%1$@ va %2$d boshqa kishilar tomonidan oʻqildi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -65,11 +63,11 @@
 			<key>other</key>
 			<string>%d boshqalar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -81,11 +79,11 @@
 			<key>other</key>
 			<string>%1$d ishtirokchilar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -97,11 +95,11 @@
 			<key>other</key>
 			<string>%dovozlar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d ta javob</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d Xonalar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -145,11 +143,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -161,11 +159,11 @@
 			<key>other</key>
 			<string>%1$d ta maydon</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -177,11 +175,11 @@
 			<key>other</key>
 			<string>%1$@:%2$d xabarlar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -193,11 +191,11 @@
 			<key>other</key>
 			<string>%dbildirishnomalar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%dtaklifnomalar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -241,11 +239,11 @@
 			<key>other</key>
 			<string>%dyangi xabarlar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>%do'qilmagan xabarlar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -273,11 +271,11 @@
 			<key>other</key>
 			<string>%dxonalar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -289,11 +287,11 @@
 			<key>other</key>
 			<string>Sizda %1$d ta ochishga urinish mavjud</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -305,11 +303,11 @@
 			<key>other</key>
 			<string>Notoʻgʻri PIN. Sizda yana %1$d ta imkoniyat bor</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -321,11 +319,11 @@
 			<key>other</key>
 			<string>%1$d ta xona va maydonni tar etish</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d ta qadalgan xabar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -353,11 +351,11 @@
 			<key>other</key>
 			<string>%1$dTaqiqlangan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -369,11 +367,11 @@
 			<key>other</key>
 			<string>%1$d odamlar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -385,11 +383,11 @@
 			<key>other</key>
 			<string>%1$d Taklif qilingan</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$@ + %2$d kishi bu xonaga qo‘shilmoqchi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -417,11 +415,11 @@
 			<key>other</key>
 			<string>%1$d ta a’zo %2$@ bilan munosabat bildirdi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>Siz va %1$d ta a’zo %2$@ bilan munosabat bildirdi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>%1$dxona o'zgarishi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -465,11 +463,11 @@
 			<key>other</key>
 			<string>%1$@, %2$@ va %3$d boshqalar</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -481,11 +479,11 @@
 			<key>other</key>
 			<string>%@ yozmoqda…</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -497,11 +495,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -513,11 +511,11 @@
 			<key>other</key>
 			<string>Siz %1$d ta foydalanuvchini blokladingiz. Bu foydalanuvchilar uchun bildirishnomalar olmaysiz.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -529,11 +527,11 @@
 			<key>other</key>
 			<string>Topildi %1$d push provayderlar: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -545,6 +543,8 @@
 			<key>other</key>
 			<string>%1$d ta distribyutor topildi: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/vi.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/vi.lproj/Localizable.stringsdict
index 5ce37d428..8b97cddb7 100644
--- a/ElementX/Resources/Localizations/vi.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/vi.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -15,11 +13,11 @@
 			<key>other</key>
 			<string>Đã nhập %1$d chữ số</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -31,11 +29,11 @@
 			<key>other</key>
 			<string>%1$d percents of total votes</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -45,11 +43,11 @@
 			<key>other</key>
 			<string>%1$@ và %2$d người khác đã đọc.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -59,11 +57,11 @@
 			<key>other</key>
 			<string>%d người khác</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -73,11 +71,11 @@
 			<key>other</key>
 			<string>%1$d số thành viên</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -87,11 +85,11 @@
 			<key>other</key>
 			<string>%d lượt bình chọn</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -103,11 +101,11 @@
 			<key>other</key>
 			<string>%1$d replies</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -119,11 +117,11 @@
 			<key>other</key>
 			<string>%1$d Rooms</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -135,11 +133,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -151,11 +149,11 @@
 			<key>other</key>
 			<string>%1$d Spaces</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -165,11 +163,11 @@
 			<key>other</key>
 			<string>%1$@:%2$d tin nhắn</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -179,11 +177,11 @@
 			<key>other</key>
 			<string>%d thông báo</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -195,11 +193,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -209,11 +207,11 @@
 			<key>other</key>
 			<string>%d lời mời</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -223,11 +221,11 @@
 			<key>other</key>
 			<string>%dtin nhắn mới</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -237,11 +235,11 @@
 			<key>other</key>
 			<string>%dtin nhắn chưa đọc đã thông báo</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -251,11 +249,11 @@
 			<key>other</key>
 			<string>%d phòng</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -265,11 +263,11 @@
 			<key>other</key>
 			<string>Bạn còn %1$d lần thử để mở khóa</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -279,11 +277,11 @@
 			<key>other</key>
 			<string>PIN không đúng. Còn %1$d lần thử</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -295,11 +293,11 @@
 			<key>other</key>
 			<string>Leave %1$d rooms and space</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -311,11 +309,11 @@
 			<key>other</key>
 			<string>%1$d Pinned messages</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -327,11 +325,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -341,11 +339,11 @@
 			<key>other</key>
 			<string>%1$d người</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -357,11 +355,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -373,11 +371,11 @@
 			<key>other</key>
 			<string>%1$@ +%2$d others want to join this room</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -389,11 +387,11 @@
 			<key>other</key>
 			<string>%1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -405,11 +403,11 @@
 			<key>other</key>
 			<string>You and %1$d members reacted with %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -419,11 +417,11 @@
 			<key>other</key>
 			<string>%1$d số lượng phòng thay đổi</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -433,11 +431,11 @@
 			<key>other</key>
 			<string>%1$@,%2$@ và %3$d người khác</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -447,11 +445,11 @@
 			<key>other</key>
 			<string>%1$@ đang gõ</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +461,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -479,11 +477,11 @@
 			<key>other</key>
 			<string>You blocked %1$d users. You will not receive notifications for these users.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -493,11 +491,11 @@
 			<key>other</key>
 			<string>Đã tìm thấy %1$d nhà cung cấp thông báo đẩy: %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -509,6 +507,8 @@
 			<key>other</key>
 			<string>%1$d distributors found: %2$@.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/zh-Hans.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/zh-Hans.lproj/Localizable.stringsdict
index 884f74ef7..7f26d6c98 100644
--- a/ElementX/Resources/Localizations/zh-Hans.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/zh-Hans.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -15,11 +13,11 @@
 			<key>other</key>
 			<string>已输入 %1$d 个数字</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -29,11 +27,11 @@
 			<key>other</key>
 			<string>%1$d 总投票百分比</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -43,11 +41,11 @@
 			<key>other</key>
 			<string>%1$@ 及其他 %2$d 人已读</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -57,11 +55,11 @@
 			<key>other</key>
 			<string>其他 %d 人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -71,11 +69,11 @@
 			<key>other</key>
 			<string>%1$d个成员</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -85,11 +83,11 @@
 			<key>other</key>
 			<string>%d 票</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -99,11 +97,11 @@
 			<key>other</key>
 			<string>%1$d 个回复</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d 房间</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -127,11 +125,11 @@
 			<key>other</key>
 			<string>%1$d 已选中</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -141,11 +139,11 @@
 			<key>other</key>
 			<string>%1$d 空间</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -155,11 +153,11 @@
 			<key>other</key>
 			<string>%1$@：%2$d 条消息</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -169,11 +167,11 @@
 			<key>other</key>
 			<string>%d 条通知</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -183,11 +181,11 @@
 			<key>other</key>
 			<string>您有 %d 条新消息。</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -197,11 +195,11 @@
 			<key>other</key>
 			<string>%d 个邀请</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -211,11 +209,11 @@
 			<key>other</key>
 			<string>%d 条新消息</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -225,11 +223,11 @@
 			<key>other</key>
 			<string>%d 条未读消息</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -239,11 +237,11 @@
 			<key>other</key>
 			<string>%d 个聊天室</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -253,11 +251,11 @@
 			<key>other</key>
 			<string>还剩 %1$d 次解锁机会</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -267,11 +265,11 @@
 			<key>other</key>
 			<string>PIN 码错误。还剩 %1$d 次机会</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -281,11 +279,11 @@
 			<key>other</key>
 			<string>离开 %1$d 个房间和空间</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -295,11 +293,11 @@
 			<key>other</key>
 			<string>%1$d 置顶消息</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -309,11 +307,11 @@
 			<key>other</key>
 			<string>%1$d 被禁用</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -323,11 +321,11 @@
 			<key>other</key>
 			<string>%1$d 个人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -337,11 +335,11 @@
 			<key>other</key>
 			<string>%1$d 受邀</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -351,11 +349,11 @@
 			<key>other</key>
 			<string>%1$@+ %2$d 其他人想加入这个房间</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -365,11 +363,11 @@
 			<key>other</key>
 			<string>%1$d 个成员添加表情符号 %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -379,11 +377,11 @@
 			<key>other</key>
 			<string>您与 %1$d 个成员添加表情符号 %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -393,11 +391,11 @@
 			<key>other</key>
 			<string>%1$d 个聊天室变化</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -407,11 +405,11 @@
 			<key>other</key>
 			<string>%1$@，%2$@ 和其他 %3$d 个人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -421,11 +419,11 @@
 			<key>other</key>
 			<string>%1$@ 正在输入</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -435,11 +433,11 @@
 			<key>other</key>
 			<string>移除 %1$d 个 %2$@ 中的聊天室</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -449,11 +447,11 @@
 			<key>other</key>
 			<string>您已屏蔽 %1$d 位用户。您将不再收到这些用户的推送通知。</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -463,11 +461,11 @@
 			<key>other</key>
 			<string>找到了 %1$d 个推送提供者：%2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -477,6 +475,8 @@
 			<key>other</key>
 			<string>找到 %1$d 个 distributors：%2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.stringsdict
index 8e9704137..29fec39c2 100644
--- a/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.stringsdict
+++ b/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.stringsdict
@@ -4,8 +4,6 @@
 <dict>
 	<key>a11y_digits_entered</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -15,11 +13,11 @@
 			<key>other</key>
 			<string>已輸入 %1$d 個位數</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_polls_percent_of_total</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -29,11 +27,11 @@
 			<key>other</key>
 			<string>總票數的百分之 %1$d</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>a11y_read_receipts_multiple_with_others</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -43,11 +41,11 @@
 			<key>other</key>
 			<string>%1$@ 與其他 %2$d 個人已讀</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -57,11 +55,11 @@
 			<key>other</key>
 			<string>其他 %d 個人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_member_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -71,11 +69,11 @@
 			<key>other</key>
 			<string>%1$d 位成員</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_poll_votes_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -85,11 +83,11 @@
 			<key>other</key>
 			<string>%d 票</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_replies</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -99,11 +97,11 @@
 			<key>other</key>
 			<string>%1$d 個回覆</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -113,11 +111,11 @@
 			<key>other</key>
 			<string>%1$d 個聊天室</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_selected_count</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -129,11 +127,11 @@
 			<key>other</key>
 			<string>%1$d selected</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>common_spaces</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -143,11 +141,11 @@
 			<key>other</key>
 			<string>%1$d 個空間</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_line_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -157,11 +155,11 @@
 			<key>other</key>
 			<string>%1$@：%2$d 則訊息</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_compat_summary_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -171,11 +169,11 @@
 			<key>other</key>
 			<string>%d 個通知</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_fallback_n_content</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -187,11 +185,11 @@
 			<key>other</key>
 			<string>You have %d new messages.</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_invitations</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -201,11 +199,11 @@
 			<key>other</key>
 			<string>%d 個邀請</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_new_messages_for_room</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -215,11 +213,11 @@
 			<key>other</key>
 			<string>%d 則新訊息</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -229,11 +227,11 @@
 			<key>other</key>
 			<string>%d 則未讀的已通知訊息</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>notification_unread_notified_messages_in_room_rooms</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -243,11 +241,11 @@
 			<key>other</key>
 			<string>%d 個聊天室</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -257,11 +255,11 @@
 			<key>other</key>
 			<string>您有 %1$d 次解鎖的機會</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_app_lock_subtitle_wrong_pin</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -271,11 +269,11 @@
 			<key>other</key>
 			<string>PIN 碼錯誤。您還有 %1$d 次機會</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_leave_space_submit</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -285,11 +283,11 @@
 			<key>other</key>
 			<string>離開 %1$d 個聊天室與空間</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_pinned_timeline_screen_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -299,11 +297,11 @@
 			<key>other</key>
 			<string>%1$d 則釘選的訊息</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_banned_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -315,11 +313,11 @@
 			<key>other</key>
 			<string>%1$d Banned</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -329,11 +327,11 @@
 			<key>other</key>
 			<string>%1$d 個人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_member_list_pending_header_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -345,11 +343,11 @@
 			<key>other</key>
 			<string>%1$d Invited</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_multiple_knock_requests_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -359,11 +357,11 @@
 			<key>other</key>
 			<string>%1$@ 與 %2$d 個其他人想要加入此聊天室</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -373,11 +371,11 @@
 			<key>other</key>
 			<string>%1$d 個成員有 %2$@ 個反應</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_reaction_including_you_a11y</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -387,11 +385,11 @@
 			<key>other</key>
 			<string>您與 %1$d 個成員有 %2$@ 的反應</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_timeline_state_changes</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -401,11 +399,11 @@
 			<key>other</key>
 			<string>%1$d 個聊天室變更</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -415,11 +413,11 @@
 			<key>other</key>
 			<string>%1$@、%2$@ 和其他 %3$d 個人</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_room_typing_notification</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -429,11 +427,11 @@
 			<key>other</key>
 			<string>%1$@ 正在打字</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>screen_space_remove_rooms_confirmation_title</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -445,11 +443,11 @@
 			<key>other</key>
 			<string>Remove %1$d rooms from %2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_blocked_users_result_some</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -459,11 +457,11 @@
 			<key>other</key>
 			<string>您已封鎖 %1$d 個使用者。您將不會收到來自這些使用者的通知。</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_detect_push_provider_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -473,11 +471,11 @@
 			<key>other</key>
 			<string>找到 %1$d 個推播提供者：%2$@</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 	<key>troubleshoot_notifications_test_unified_push_success</key>
 	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
 		<key>COUNT</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
@@ -487,6 +485,8 @@
 			<key>other</key>
 			<string>找到 %1$d 個散佈者：%2$@。</string>
 		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
 	</dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/Tools/Sources/Commands/DownloadStrings.swift b/Tools/Sources/Commands/DownloadStrings.swift
index e5d4cca47..c7b3007ba 100644
--- a/Tools/Sources/Commands/DownloadStrings.swift
+++ b/Tools/Sources/Commands/DownloadStrings.swift
@@ -28,8 +28,15 @@ struct DownloadStrings: ParsableCommand {
             return
         }
         
-        for case let fileURL as URL in enumerator where fileURL.pathExtension == "strings" {
-            try sortStringsFile(at: fileURL)
+        for case let fileURL as URL in enumerator {
+            switch fileURL.pathExtension {
+            case "strings":
+                try sortStringsFile(at: fileURL)
+            case "stringsdict":
+                try sortStringsdictFile(at: fileURL)
+            default:
+                break
+            }
         }
     }
     
@@ -37,23 +44,13 @@ struct DownloadStrings: ParsableCommand {
         let content = try String(contentsOf: url, encoding: .utf8)
         let lines = content.components(separatedBy: .newlines)
         
-        // Separate key-value lines from other lines (comments, empty lines)
-        let keyValuePattern = #"^\s*"(.+)"\s*=\s*".*";\s*$"#
-        let regex = try NSRegularExpression(pattern: keyValuePattern)
+        let keyValueRegex = /^\s*".+"\s*=\s*".*";\s*$/
         
-        var keyValueLines = [String]()
-        
-        for line in lines {
-            let range = NSRange(line.startIndex..., in: line)
-            if regex.firstMatch(in: line, range: range) != nil {
-                keyValueLines.append(line)
-            }
-        }
+        let keyValueLines = lines.filter { $0.wholeMatch(of: keyValueRegex) != nil }
         
         guard !keyValueLines.isEmpty else { return }
         
         let sortedLines = keyValueLines.sorted { lhs, rhs in
-            // Extract keys for comparison
             guard let lhsKey = extractKey(from: lhs),
                   let rhsKey = extractKey(from: rhs) else {
                 return lhs < rhs
@@ -65,6 +62,13 @@ struct DownloadStrings: ParsableCommand {
         try sortedContent.write(to: url, atomically: true, encoding: .utf8)
     }
     
+    private func sortStringsdictFile(at url: URL) throws {
+        let data = try Data(contentsOf: url)
+        let plist = try PropertyListSerialization.propertyList(from: data, format: nil)
+        let xmlData = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
+        try xmlData.write(to: url)
+    }
+    
     private func extractKey(from line: String) -> String? {
         guard let openQuote = line.firstIndex(of: "\"") else { return nil }
         let afterOpen = line.index(after: openQuote)