From 2bca187db0edb81774e5c08dbfcc5f27c5182a97 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 8 Dec 2023 19:21:54 +0100
Subject: [PATCH 1/2] Fix issue in script to download string regarding moving
 folders values-id to values-in

Move file and delete unwanted folder to avoid deleting other files.
---
 tools/localazy/downloadStrings.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/localazy/downloadStrings.sh b/tools/localazy/downloadStrings.sh
index 95ec7c5c13..c4a97868af 100755
--- a/tools/localazy/downloadStrings.sh
+++ b/tools/localazy/downloadStrings.sh
@@ -46,9 +46,12 @@ if [[ $allFiles == 1 ]]; then
   find . -name 'translations.xml' -print0 -exec bash -c "echo \"\" >> \"{}\"" \; >> /dev/null
 fi
 
-echo "Renaming all the folders values-id to values-in..."
 set +e
-find . -type d -name 'values-id' -execdir mv {} values-in 2> /dev/null \;
+echo "Moving files from values-id to values-in..."
+find . -type d -name 'values-id' -execdir mv {}/translations.xml {}/../values-in/translations.xml 2> /dev/null \;
+
+echo "Deleting all the folders values-id..."
+find . -type d -name 'values-id' -exec rm -rf {} 2> /dev/null \;
 set -e
 
 echo "Removing the generated config"

From 39cca2ce09593760d74cbdf844b1eb604687a9e8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 8 Dec 2023 18:25:51 +0100
Subject: [PATCH 2/2] Sync localazy using fixed script

---
 .../api/src/main/res/values-in/{values-id => }/translations.xml | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../api/src/main/res/values-in/{values-id => }/translations.xml | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../preferences/impl/src/main/res/values-fr/translations.xml    | 1 +
 .../src/main/res/values-in/{values-id => }/translations.xml     | 1 +
 .../preferences/impl/src/main/res/values-sk/translations.xml    | 1 +
 .../api/src/main/res/values-in/{values-id => }/translations.xml | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 features/verifysession/impl/src/main/res/values/localazy.xml    | 2 ++
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../api/src/main/res/values-in/{values-id => }/translations.xml | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 .../src/main/res/values-in/{values-id => }/translations.xml     | 0
 libraries/ui-strings/src/main/res/values-fr/translations.xml    | 1 +
 .../src/main/res/values-in/{values-id => }/translations.xml     | 1 +
 libraries/ui-strings/src/main/res/values-ru/translations.xml    | 1 +
 libraries/ui-strings/src/main/res/values-sk/translations.xml    | 1 +
 libraries/ui-strings/src/main/res/values/localazy.xml           | 1 +
 34 files changed, 10 insertions(+)
 rename features/analytics/api/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/analytics/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/call/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/createroom/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/ftue/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/invitelist/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/leaveroom/api/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/lockscreen/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/login/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/logout/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/messages/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/onboarding/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/poll/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/preferences/impl/src/main/res/values-in/{values-id => }/translations.xml (98%)
 rename features/rageshake/api/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/rageshake/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/roomdetails/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/roomlist/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/securebackup/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/signedout/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename features/verifysession/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename libraries/androidutils/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename libraries/eventformatter/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename libraries/permissions/api/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename libraries/push/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename libraries/textcomposer/impl/src/main/res/values-in/{values-id => }/translations.xml (100%)
 rename libraries/ui-strings/src/main/res/values-in/{values-id => }/translations.xml (99%)

diff --git a/features/analytics/api/src/main/res/values-in/values-id/translations.xml b/features/analytics/api/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/analytics/api/src/main/res/values-in/values-id/translations.xml
rename to features/analytics/api/src/main/res/values-in/translations.xml
diff --git a/features/analytics/impl/src/main/res/values-in/values-id/translations.xml b/features/analytics/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/analytics/impl/src/main/res/values-in/values-id/translations.xml
rename to features/analytics/impl/src/main/res/values-in/translations.xml
diff --git a/features/call/src/main/res/values-in/values-id/translations.xml b/features/call/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/call/src/main/res/values-in/values-id/translations.xml
rename to features/call/src/main/res/values-in/translations.xml
diff --git a/features/createroom/impl/src/main/res/values-in/values-id/translations.xml b/features/createroom/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/createroom/impl/src/main/res/values-in/values-id/translations.xml
rename to features/createroom/impl/src/main/res/values-in/translations.xml
diff --git a/features/ftue/impl/src/main/res/values-in/values-id/translations.xml b/features/ftue/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/ftue/impl/src/main/res/values-in/values-id/translations.xml
rename to features/ftue/impl/src/main/res/values-in/translations.xml
diff --git a/features/invitelist/impl/src/main/res/values-in/values-id/translations.xml b/features/invitelist/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/invitelist/impl/src/main/res/values-in/values-id/translations.xml
rename to features/invitelist/impl/src/main/res/values-in/translations.xml
diff --git a/features/leaveroom/api/src/main/res/values-in/values-id/translations.xml b/features/leaveroom/api/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/leaveroom/api/src/main/res/values-in/values-id/translations.xml
rename to features/leaveroom/api/src/main/res/values-in/translations.xml
diff --git a/features/lockscreen/impl/src/main/res/values-in/values-id/translations.xml b/features/lockscreen/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/lockscreen/impl/src/main/res/values-in/values-id/translations.xml
rename to features/lockscreen/impl/src/main/res/values-in/translations.xml
diff --git a/features/login/impl/src/main/res/values-in/values-id/translations.xml b/features/login/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/login/impl/src/main/res/values-in/values-id/translations.xml
rename to features/login/impl/src/main/res/values-in/translations.xml
diff --git a/features/logout/impl/src/main/res/values-in/values-id/translations.xml b/features/logout/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/logout/impl/src/main/res/values-in/values-id/translations.xml
rename to features/logout/impl/src/main/res/values-in/translations.xml
diff --git a/features/messages/impl/src/main/res/values-in/values-id/translations.xml b/features/messages/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/messages/impl/src/main/res/values-in/values-id/translations.xml
rename to features/messages/impl/src/main/res/values-in/translations.xml
diff --git a/features/onboarding/impl/src/main/res/values-in/values-id/translations.xml b/features/onboarding/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/onboarding/impl/src/main/res/values-in/values-id/translations.xml
rename to features/onboarding/impl/src/main/res/values-in/translations.xml
diff --git a/features/poll/impl/src/main/res/values-in/values-id/translations.xml b/features/poll/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/poll/impl/src/main/res/values-in/values-id/translations.xml
rename to features/poll/impl/src/main/res/values-in/translations.xml
diff --git a/features/preferences/impl/src/main/res/values-fr/translations.xml b/features/preferences/impl/src/main/res/values-fr/translations.xml
index 294843c7e9..dc5e6ff790 100644
--- a/features/preferences/impl/src/main/res/values-fr/translations.xml
+++ b/features/preferences/impl/src/main/res/values-fr/translations.xml
@@ -31,6 +31,7 @@ Si vous continuez, il est possible que certains de vos paramètres soient modifi
   <string name="screen_notification_settings_enable_notifications">"Activer les notifications sur cet appareil"</string>
   <string name="screen_notification_settings_failed_fixing_configuration">"La configuration n’a pas été corrigée, veuillez réessayer."</string>
   <string name="screen_notification_settings_group_chats">"Discussions de groupe"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"Invitations"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Votre serveur d’accueil ne supporte pas cette option pour les salons chiffrés, vous pourriez ne pas être notifié(e) dans certains salons."</string>
   <string name="screen_notification_settings_mentions_section_title">"Mentions"</string>
   <string name="screen_notification_settings_mode_all">"Tous"</string>
diff --git a/features/preferences/impl/src/main/res/values-in/values-id/translations.xml b/features/preferences/impl/src/main/res/values-in/translations.xml
similarity index 98%
rename from features/preferences/impl/src/main/res/values-in/values-id/translations.xml
rename to features/preferences/impl/src/main/res/values-in/translations.xml
index 89979aaec2..f33bf54cfb 100644
--- a/features/preferences/impl/src/main/res/values-in/values-id/translations.xml
+++ b/features/preferences/impl/src/main/res/values-in/translations.xml
@@ -31,6 +31,7 @@ Jika Anda melanjutkan, beberapa pengaturan Anda dapat berubah."</string>
   <string name="screen_notification_settings_enable_notifications">"Aktifkan pemberitahuan di perangkat ini"</string>
   <string name="screen_notification_settings_failed_fixing_configuration">"Pengaturan belum diperbaiki, silakan coba lagi."</string>
   <string name="screen_notification_settings_group_chats">"Obrolan grup"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"Undangan"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Homeserver Anda tidak mendukung opsi ini dalam ruangan terenkripsi, Anda mungkin tidak diberi tahu dalam beberapa ruangan."</string>
   <string name="screen_notification_settings_mentions_section_title">"Sebutan"</string>
   <string name="screen_notification_settings_mode_all">"Semua"</string>
diff --git a/features/preferences/impl/src/main/res/values-sk/translations.xml b/features/preferences/impl/src/main/res/values-sk/translations.xml
index 0464bf8bee..8171748e1d 100644
--- a/features/preferences/impl/src/main/res/values-sk/translations.xml
+++ b/features/preferences/impl/src/main/res/values-sk/translations.xml
@@ -31,6 +31,7 @@ Ak budete pokračovať, niektoré z vašich nastavení sa môžu zmeniť."</stri
   <string name="screen_notification_settings_enable_notifications">"Povoliť oznámenia na tomto zariadení"</string>
   <string name="screen_notification_settings_failed_fixing_configuration">"Konfigurácia nebola opravená, skúste to prosím znova."</string>
   <string name="screen_notification_settings_group_chats">"Skupinové rozhovory"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"Pozvánky"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Váš domovský server nepodporuje túto možnosť v šifrovaných miestnostiach, v niektorých miestnostiach nemusíte dostať upozornenie."</string>
   <string name="screen_notification_settings_mentions_section_title">"Zmienky"</string>
   <string name="screen_notification_settings_mode_all">"Všetky"</string>
diff --git a/features/rageshake/api/src/main/res/values-in/values-id/translations.xml b/features/rageshake/api/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/rageshake/api/src/main/res/values-in/values-id/translations.xml
rename to features/rageshake/api/src/main/res/values-in/translations.xml
diff --git a/features/rageshake/impl/src/main/res/values-in/values-id/translations.xml b/features/rageshake/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/rageshake/impl/src/main/res/values-in/values-id/translations.xml
rename to features/rageshake/impl/src/main/res/values-in/translations.xml
diff --git a/features/roomdetails/impl/src/main/res/values-in/values-id/translations.xml b/features/roomdetails/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/roomdetails/impl/src/main/res/values-in/values-id/translations.xml
rename to features/roomdetails/impl/src/main/res/values-in/translations.xml
diff --git a/features/roomlist/impl/src/main/res/values-in/values-id/translations.xml b/features/roomlist/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/roomlist/impl/src/main/res/values-in/values-id/translations.xml
rename to features/roomlist/impl/src/main/res/values-in/translations.xml
diff --git a/features/securebackup/impl/src/main/res/values-in/values-id/translations.xml b/features/securebackup/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/securebackup/impl/src/main/res/values-in/values-id/translations.xml
rename to features/securebackup/impl/src/main/res/values-in/translations.xml
diff --git a/features/signedout/impl/src/main/res/values-in/values-id/translations.xml b/features/signedout/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/signedout/impl/src/main/res/values-in/values-id/translations.xml
rename to features/signedout/impl/src/main/res/values-in/translations.xml
diff --git a/features/verifysession/impl/src/main/res/values-in/values-id/translations.xml b/features/verifysession/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from features/verifysession/impl/src/main/res/values-in/values-id/translations.xml
rename to features/verifysession/impl/src/main/res/values-in/translations.xml
diff --git a/features/verifysession/impl/src/main/res/values/localazy.xml b/features/verifysession/impl/src/main/res/values/localazy.xml
index 24b3a7cf26..9b785044d8 100644
--- a/features/verifysession/impl/src/main/res/values/localazy.xml
+++ b/features/verifysession/impl/src/main/res/values/localazy.xml
@@ -3,6 +3,8 @@
   <string name="screen_session_verification_cancelled_subtitle">"Something doesn’t seem right. Either the request timed out or the request was denied."</string>
   <string name="screen_session_verification_compare_emojis_subtitle">"Confirm that the emojis below match those shown on your other session."</string>
   <string name="screen_session_verification_compare_emojis_title">"Compare emojis"</string>
+  <string name="screen_session_verification_compare_numbers_subtitle">"Confirm that the numbers below match those shown on your other session."</string>
+  <string name="screen_session_verification_compare_numbers_title">"Compare numbers"</string>
   <string name="screen_session_verification_complete_subtitle">"Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted."</string>
   <string name="screen_session_verification_open_existing_session_subtitle">"Prove it’s you in order to access your encrypted message history."</string>
   <string name="screen_session_verification_open_existing_session_title">"Open an existing session"</string>
diff --git a/libraries/androidutils/src/main/res/values-in/values-id/translations.xml b/libraries/androidutils/src/main/res/values-in/translations.xml
similarity index 100%
rename from libraries/androidutils/src/main/res/values-in/values-id/translations.xml
rename to libraries/androidutils/src/main/res/values-in/translations.xml
diff --git a/libraries/eventformatter/impl/src/main/res/values-in/values-id/translations.xml b/libraries/eventformatter/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from libraries/eventformatter/impl/src/main/res/values-in/values-id/translations.xml
rename to libraries/eventformatter/impl/src/main/res/values-in/translations.xml
diff --git a/libraries/permissions/api/src/main/res/values-in/values-id/translations.xml b/libraries/permissions/api/src/main/res/values-in/translations.xml
similarity index 100%
rename from libraries/permissions/api/src/main/res/values-in/values-id/translations.xml
rename to libraries/permissions/api/src/main/res/values-in/translations.xml
diff --git a/libraries/push/impl/src/main/res/values-in/values-id/translations.xml b/libraries/push/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from libraries/push/impl/src/main/res/values-in/values-id/translations.xml
rename to libraries/push/impl/src/main/res/values-in/translations.xml
diff --git a/libraries/textcomposer/impl/src/main/res/values-in/values-id/translations.xml b/libraries/textcomposer/impl/src/main/res/values-in/translations.xml
similarity index 100%
rename from libraries/textcomposer/impl/src/main/res/values-in/values-id/translations.xml
rename to libraries/textcomposer/impl/src/main/res/values-in/translations.xml
diff --git a/libraries/ui-strings/src/main/res/values-fr/translations.xml b/libraries/ui-strings/src/main/res/values-fr/translations.xml
index 41262611e0..60e4e78c2e 100644
--- a/libraries/ui-strings/src/main/res/values-fr/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml
@@ -95,6 +95,7 @@
   <string name="action_try_again">"Essayer à nouveau"</string>
   <string name="action_view_source">"Afficher la source"</string>
   <string name="action_yes">"Oui"</string>
+  <string name="action_load_more">"Voir plus"</string>
   <string name="common_about">"À propos"</string>
   <string name="common_acceptable_use_policy">"Politique d’utilisation acceptable"</string>
   <string name="common_advanced_settings">"Paramètres avancés"</string>
diff --git a/libraries/ui-strings/src/main/res/values-in/values-id/translations.xml b/libraries/ui-strings/src/main/res/values-in/translations.xml
similarity index 99%
rename from libraries/ui-strings/src/main/res/values-in/values-id/translations.xml
rename to libraries/ui-strings/src/main/res/values-in/translations.xml
index 93eb4351a8..f7f05f71f2 100644
--- a/libraries/ui-strings/src/main/res/values-in/values-id/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-in/translations.xml
@@ -95,6 +95,7 @@
   <string name="action_try_again">"Coba lagi"</string>
   <string name="action_view_source">"Tampilkan sumber"</string>
   <string name="action_yes">"Ya"</string>
+  <string name="action_load_more">"Muat lainnya"</string>
   <string name="common_about">"Tentang"</string>
   <string name="common_acceptable_use_policy">"Kebijakan penggunaan wajar"</string>
   <string name="common_advanced_settings">"Pengaturan tingkat lanjut"</string>
diff --git a/libraries/ui-strings/src/main/res/values-ru/translations.xml b/libraries/ui-strings/src/main/res/values-ru/translations.xml
index af4f0f0487..b6576d988c 100644
--- a/libraries/ui-strings/src/main/res/values-ru/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ru/translations.xml
@@ -95,6 +95,7 @@
   <string name="action_try_again">"Повторить попытку"</string>
   <string name="action_view_source">"Показать источник"</string>
   <string name="action_yes">"Да"</string>
+  <string name="action_load_more">"Загрузить еще"</string>
   <string name="common_about">"О приложении"</string>
   <string name="common_acceptable_use_policy">"Политика допустимого использования"</string>
   <string name="common_advanced_settings">"Дополнительные параметры"</string>
diff --git a/libraries/ui-strings/src/main/res/values-sk/translations.xml b/libraries/ui-strings/src/main/res/values-sk/translations.xml
index cbbadc9c58..9b7db8c032 100644
--- a/libraries/ui-strings/src/main/res/values-sk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml
@@ -95,6 +95,7 @@
   <string name="action_try_again">"Skúste to znova"</string>
   <string name="action_view_source">"Zobraziť zdroj"</string>
   <string name="action_yes">"Áno"</string>
+  <string name="action_load_more">"Načítať viac"</string>
   <string name="common_about">"O aplikácii"</string>
   <string name="common_acceptable_use_policy">"Zásady prijateľného používania"</string>
   <string name="common_advanced_settings">"Pokročilé nastavenia"</string>
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index 638f4634e3..10d3bbd12e 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -95,6 +95,7 @@
   <string name="action_try_again">"Try again"</string>
   <string name="action_view_source">"View source"</string>
   <string name="action_yes">"Yes"</string>
+  <string name="action_load_more">"Load more"</string>
   <string name="common_about">"About"</string>
   <string name="common_acceptable_use_policy">"Acceptable use policy"</string>
   <string name="common_advanced_settings">"Advanced settings"</string>