diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 66638e5d62..b37e7fd729 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2298,4 +2298,43 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <string name="auth_invalid_login_param_space_in_password">Incorrect username and/or password. The entered password starts or ends with spaces, please check it.</string>
 
+    <string name="room_message_placeholder">Message…</string>
+
+    <string name="upgrade_security">Encryption upgrade available</string>
+    <string name="security_prompt_text">Verify yourself &amp; others to keep your chats safe</string>
+
+    <!-- %s will be replaced by recovery_key -->
+    <string name="bootstrap_enter_recovery">Enter your %s to continue</string>
+    <string name="use_file">Use File</string>
+
+    <!-- %s will be replaced by recovery_passphrase -->
+    <!--    <string name="upgrade_account_desc">Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.</string>-->
+    <string name="enter_backup_passphrase">Enter %s</string>
+    <string name="backup_recovery_passphrase">Recovery Passphrase</string>
+    <string name="bootstrap_invalid_recovery_key">"It's not a valid recovery key"</string>
+    <string name="recovery_key_empty_error_message">Please enter a recovery key</string>
+
+    <string name="bootstrap_progress_checking_backup">Checking backup Key</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Checking backup Key (%s)</string>
+    <string name="bootstrap_progress_compute_curve_key">Getting curve key</string>
+    <string name="bootstrap_progress_generating_ssss">Generating SSSS key from passphrase</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Generating SSSS key from passphrase (%s)</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Generating SSSS key from recovery key</string>
+    <string name="bootstrap_progress_storing_in_sss">Storing keybackup secret in SSSS</string>
+    <!-- To produce things like 'RiotX Android (IQDHUVJTTV)' -->
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="bootstrap_migration_enter_backup_password">Enter your Key Backup Passphrase to continue.</string>
+    <string name="bootstrap_migration_use_recovery_key">use your Key Backup recovery key</string>
+    <!-- %s will be replaced by the value of bootstrap_migration_use_recovery_key  -->
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Don’t know your Key Backup Passphrase, you can %s.</string>
+    <string name="bootstrap_migration_backup_recovery_key">Key Backup recovery key</string>
+
+    <string name="settings_security_prevent_screenshots_title">Prevent screenshots of the application</string>
+    <string name="settings_security_prevent_screenshots_summary">Enabling this setting adds the FLAG_SECURE to all Activities. Restart the application for the change to take effect.</string>
+
+    <string name="media_file_added_to_gallery">Media file added to the Gallery</string>
+    <string name="error_adding_media_file_to_gallery">Could not add media file to the Gallery</string>
+    <string name="change_password_summary">Set a new account password…</string>
+
 </resources>
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 5eae9f226f..3e23f61acf 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -3,40 +3,9 @@
 
     <!-- Strings not defined in Riot -->
 
-    <!-- Sections has been created to avoid merge conflict. Let's see if it's better -->
+    <!-- Sections has been created to limit merge conflicts. -->
 
     <!-- BEGIN Strings added by Valere -->
-    <string name="room_message_placeholder">Message…</string>
-
-    <string name="upgrade_security">Encryption upgrade available</string>
-    <string name="security_prompt_text">Verify yourself &amp; others to keep your chats safe</string>
-
-    <!-- %s will be replaced by recovery_key -->
-    <string name="bootstrap_enter_recovery">Enter your %s to continue</string>
-    <string name="use_file">Use File</string>
-
-    <!-- %s will be replaced by recovery_passphrase -->
-    <!--    <string name="upgrade_account_desc">Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.</string>-->
-    <string name="enter_backup_passphrase">Enter %s</string>
-    <string name="backup_recovery_passphrase">Recovery Passphrase</string>
-    <string name="bootstrap_invalid_recovery_key">"It's not a valid recovery key"</string>
-    <string name="recovery_key_empty_error_message">Please enter a recovery key</string>
-
-    <string name="bootstrap_progress_checking_backup">Checking backup Key</string>
-    <string name="bootstrap_progress_checking_backup_with_info">Checking backup Key (%s)</string>
-    <string name="bootstrap_progress_compute_curve_key">Getting curve key</string>
-    <string name="bootstrap_progress_generating_ssss">Generating SSSS key from passphrase</string>
-    <string name="bootstrap_progress_generating_ssss_with_info">Generating SSSS key from passphrase (%s)</string>
-    <string name="bootstrap_progress_generating_ssss_recovery">Generating SSSS key from recovery key</string>
-    <string name="bootstrap_progress_storing_in_sss">Storing keybackup secret in SSSS</string>
-    <!-- To produce things like 'RiotX Android (IQDHUVJTTV)' -->
-    <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
-    <string name="bootstrap_migration_enter_backup_password">Enter your Key Backup Passphrase to continue.</string>
-    <string name="bootstrap_migration_use_recovery_key">use your Key Backup recovery key</string>
-    <!-- %s will be replaced by the value of bootstrap_migration_use_recovery_key  -->
-    <string name="bootstrap_migration_with_passphrase_helper_with_link">Don’t know your Key Backup Passphrase, you can %s.</string>
-    <string name="bootstrap_migration_backup_recovery_key">Key Backup recovery key</string>
 
     <!-- END Strings added by Valere -->
 
@@ -45,12 +14,6 @@
 
     <!-- END Strings added by Benoit -->
 
-    <!-- BEGIN Strings added by Benoit2 -->
-    <string name="settings_security_prevent_screenshots_title">Prevent screenshots of the application</string>
-    <string name="settings_security_prevent_screenshots_summary">Enabling this setting adds the FLAG_SECURE to all Activities. Restart the application for the change to take effect.</string>
-
-    <!-- END Strings added by Benoit2 -->
-
 
     <!-- BEGIN Strings added by Ganfra -->
 
@@ -58,8 +21,7 @@
 
 
     <!-- BEGIN Strings added by Onuray -->
-    <string name="media_file_added_to_gallery">Media file added to the Gallery</string>
-    <string name="error_adding_media_file_to_gallery">Could not add media file to the Gallery</string>
+
     <!-- END Strings added by Onuray -->
 
 
@@ -67,7 +29,4 @@
 
     <!-- END Strings added by Others -->
 
-    <!-- BEGIN Strings added by Benoit -->
-    <string name="change_password_summary">Set a new account password…</string>
-    <!---->
 </resources>