From 7322144dc8a2427d990de1d5c1d801d4df9e8a9e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 30 Apr 2020 12:15:26 +0200
Subject: [PATCH] Remove duplicated strings

---
 .../src/main/res/values/strings_RiotX.xml     | 28 ++++++++++++
 vector/src/main/res/values/strings.xml        |  5 +++
 vector/src/main/res/values/strings_riotX.xml  | 45 ++++++++++++-------
 3 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values/strings_RiotX.xml b/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
index d781ec5f1e..6eb46fd7df 100644
--- a/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
+++ b/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
@@ -1,4 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!--
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ PLEASE DO NOT ADD NEW STRINGS HERE, THE FILE WILL BE DELETED, ONCE ALL PR WILL BE MERGED
+
+
+
+
+
+
+
+
+
+
+
+  -->
+
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 8023451a93..700b852fd2 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2350,6 +2350,11 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="keys_backup_recovery_key_error_decrypt">Backup could not be decrypted with this Recovery Key: please verify that you entered the correct Recovery Key.</string>
     <string name="failed_to_access_secure_storage">Failed to access secure storage</string>
 
+    <string name="unencrypted">Unencrypted</string>
+    <string name="encrypted_unverified">Encrypted by an unverified device</string>
+    <string name="review_logins">Review where you’re logged in</string>
+    <string name="verify_other_sessions">Verify all your sessions to ensure your account &amp; messages are safe</string>
+
     <string name="cross_signing_verify_by_text">Manually Verify by Text</string>
     <string name="crosssigning_verify_session">Verify login</string>
     <string name="cross_signing_verify_by_emoji">Interactively Verify by Emoji</string>
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 470b7be875..585102d46a 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -1,29 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!--
+
+
+
+
+
+
+
+
+
+
+
+
+
+     PLEASE DO NOT ADD NEW STRINGS HERE, THE FILE WILL BE DELETED, ONCE ALL PR WILL BE MERGED
+
+
+
+
+
+
+
+
+
+
+
+      -->
+
     <!-- Strings not defined in Riot -->
 
     <!-- Sections has been created to limit merge conflicts. -->
 
     <!-- BEGIN Strings added by Valere -->
-    <string name="use_other_session_content_description">Use the latest Riot on your other devices, Riot Web, Riot Desktop, Riot iOS, RiotX for Android, or another cross-signing capable Matrix client</string>
-    <string name="riot_desktop_web">Riot Web\nRiot Desktop</string>
-    <string name="riot_ios_android">Riot iOS\nRiot X for Android</string>
-    <string name="or_other_mx_capabale_client">or another cross-signing capable Matrix client</string>
-    <string name="use_latest_riot">Use the latest Riot on your other devices:</string>
-    <string name="command_description_discard_session">Forces the current outbound group session in an encrypted room to be discarded</string>
-    <string name="command_description_discard_session_not_handled">Only supported in encrypted rooms</string>
-    <!-- first will be replaced by recovery_passphrase, second will be replaced by recovery_key-->
-    <string name="enter_secret_storage_passphrase_or_key">Use your %1$s or use your %2$s to continue.</string>
-    <string name="use_recovery_key">Use Recovery Key</string>
-    <string name="enter_secret_storage_input_key">Select your Recovery Key, or input it manually by typing it or pasting from your clipboard</string>
-    <string name="keys_backup_recovery_key_error_decrypt">Backup could not be decrypted with this Recovery Key: please verify that you entered the correct Recovery Key.</string>
-    <string name="failed_to_access_secure_storage">Failed to access secure storage</string>
 
-    <string name="unencrypted">Unencrypted</string>
-    <string name="encrypted_unverified">Encrypted by an unverified device</string>
-    <string name="review_logins">Review where you’re logged in</string>
-    <string name="verify_other_sessions">Verify all your sessions to ensure your account &amp; messages are safe</string>
     <!-- END Strings added by Valere -->