From 77d82f14c5c98db05f97e12e919ddac53e83b564 Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Mon, 14 Mar 2016 09:53:45 +0100
Subject: [PATCH] Removed untranslatable strings from translated files.

---
 .../freeRDPCore/src/main/res/values-de/strings.xml | 29 --------------------
 .../freeRDPCore/src/main/res/values-es/strings.xml | 31 ----------------------
 .../freeRDPCore/src/main/res/values-fr/strings.xml | 31 ----------------------
 .../freeRDPCore/src/main/res/values-nl/strings.xml | 31 ----------------------
 .../freeRDPCore/src/main/res/values-zh/strings.xml | 29 --------------------
 .../freeRDPCore/src/main/res/values/strings.xml    |  8 ++++++
 6 files changed, 8 insertions(+), 151 deletions(-)

diff --git a/client/Android/Studio/freeRDPCore/src/main/res/values-de/strings.xml b/client/Android/Studio/freeRDPCore/src/main/res/values-de/strings.xml
index 2e9e835..8854e42 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/values-de/strings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/values-de/strings.xml
@@ -57,11 +57,6 @@
         <item>True Color (24 Bit)</item>
         <item>Highest Quality (32 Bit)</item>
     </string-array>
-    <string-array name="colors_values_array">
-        <item>16</item>
-        <item>24</item>
-        <item>32</item>
-    </string-array>
     <string name="settings_resolution">Auflösung</string>
     <string name="resolution_automatic">automatisch</string>
     <string name="resolution_fit">an Bildschirm anpassen</string>
@@ -79,19 +74,6 @@
         <item>1920x1080</item>
         <item>1920x1200</item>
     </string-array>
-    <string-array name="resolutions_values_array">
-        <item>automatic</item>
-        <item>fitscreen</item>
-        <item>custom</item>
-        <item>640x480</item>
-        <item>720x480</item>
-        <item>800x600</item>
-        <item>1024x768</item>
-        <item>1280x1024</item>
-        <item>1440x900</item>
-        <item>1920x1080</item>
-        <item>1920x1200</item>
-    </string-array>
     <string name="settings_width">Breite</string>
     <string name="settings_height">Höhe</string>
     <string name="settings_performance">Leistung</string>
@@ -118,11 +100,6 @@
         <item>Auf Server abspielen</item>
         <item>Auf Client abspielen</item>
     </string-array>
-    <string-array name="redirect_sound_values_array">
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
-    </string-array>
     <string name="settings_redirect_microphone">Mikrophon umleiten</string>
     <string name="settings_security">Sicherheit</string>
     <string-array name="security_array">
@@ -131,12 +108,6 @@
         <item>TLS</item>
         <item>NLA</item>
     </string-array>
-    <string-array name="security_values_array">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
     <string name="settings_remote_program">Remote Program</string>
     <string name="settings_work_dir">Arbeitsverzeichnis</string>
     <string name="settings_async_channel">Async channel</string>
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/values-es/strings.xml b/client/Android/Studio/freeRDPCore/src/main/res/values-es/strings.xml
index 74ef6fe..6fa6479 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/values-es/strings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/values-es/strings.xml
@@ -57,11 +57,6 @@
         <item>Calidad Optima (24 Bit)</item>
         <item>Calidad maxima (32 Bit)</item>
     </string-array>
-    <string-array name="colors_values_array">
-        <item>16</item>
-        <item>24</item>
-        <item>32</item>
-    </string-array>
     <string name="settings_resolution">Resolucion</string>
     <string name="resolution_automatic">Automatico</string>
     <string name="resolution_fit">Pantalla</string>
@@ -79,21 +74,6 @@
         <item>1920x1080</item>
         <item>1920x1200</item>
     </string-array>
-    <!-- The strings in resolutions_values_array should not be localized -->
-    <!-- They are used for text comparison and must remain in english -->
-    <string-array name="resolutions_values_array">
-        <item>automatic</item>
-        <item>fitscreen</item>
-        <item>custom</item>
-        <item>640x480</item>
-        <item>720x480</item>
-        <item>800x600</item>
-        <item>1024x768</item>
-        <item>1280x1024</item>
-        <item>1440x900</item>
-        <item>1920x1080</item>
-        <item>1920x1200</item>
-    </string-array>
     <!-- end protected string section -->
     <string name="settings_width">Ancho</string>
     <string name="settings_height">Altura</string>
@@ -121,11 +101,6 @@
         <item>Play on Server</item>
         <item>Play on Device</item>
     </string-array>
-    <string-array name="redirect_sound_values_array">
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
-    </string-array>
     <string name="settings_redirect_microphone">Redirect Microphone</string>
     <string name="settings_security">Seguridad</string>
     <string-array name="security_array">
@@ -134,12 +109,6 @@
         <item>TLS</item>
         <item>NLA</item>
     </string-array>
-    <string-array name="security_values_array">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
     <string name="settings_remote_program">Programa Remoto</string>
     <string name="settings_work_dir">Directorio de trabajo</string>
     <string name="settings_async_channel">Async channel</string>
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/values-fr/strings.xml b/client/Android/Studio/freeRDPCore/src/main/res/values-fr/strings.xml
index abb6636..cc998bb 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/values-fr/strings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/values-fr/strings.xml
@@ -56,11 +56,6 @@
         <item>"Couleurs vraies (24 bits)"</item>
         <item>"Haute qualité (32 bits)"</item>
     </string-array>
-    <string-array name="colors_values_array">
-        <item>"16"</item>
-        <item>"24"</item>
-        <item>"32"</item>
-    </string-array>
     <string name="settings_resolution">"Résolution"</string>
     <string name="resolution_automatic">"Automatique"</string>
     <string name="resolution_fit">"Agrandir la fenêtre"</string>
@@ -78,21 +73,6 @@
         <item>"1920x1080"</item>
         <item>"1920x1200"</item>
     </string-array>
-    <!-- The strings in resolutions_values_array should not be localized -->
-    <!-- They are used for text comparison and must remain in english -->
-    <string-array name="resolutions_values_array">
-        <item>automatic</item>
-        <item>fitscreen</item>
-        <item>custom</item>
-        <item>640x480</item>
-        <item>720x480</item>
-        <item>800x600</item>
-        <item>1024x768</item>
-        <item>1280x1024</item>
-        <item>1440x900</item>
-        <item>1920x1080</item>
-        <item>1920x1200</item>
-    </string-array>
     <!-- end protected string section -->
     <string name="settings_width">"Largeur"</string>
     <string name="settings_height">"Hauteur"</string>
@@ -120,11 +100,6 @@
         <item>Play on Server</item>
         <item>Play on Device</item>
     </string-array>
-    <string-array name="redirect_sound_values_array">
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
-    </string-array>
     <string name="settings_redirect_microphone">Redirect Microphone</string>
     <string name="settings_security">"Securité"</string>
     <string-array name="security_array">
@@ -133,12 +108,6 @@
         <item>"TLS"</item>
         <item>"NLA"</item>
     </string-array>
-    <string-array name="security_values_array">
-        <item>"0"</item>
-        <item>"1"</item>
-        <item>"2"</item>
-        <item>"3"</item>
-    </string-array>
     <string name="settings_remote_program">"Lancement de programme"</string>
     <string name="settings_work_dir">"Répertoire de travail"</string>
     <string name="settings_async_channel">Async channel</string>
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/values-nl/strings.xml b/client/Android/Studio/freeRDPCore/src/main/res/values-nl/strings.xml
index 3f23c0e..3c653a2 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/values-nl/strings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/values-nl/strings.xml
@@ -57,11 +57,6 @@
         <item>Ware kleuren (24 Bit)</item>
         <item>Hoogste kwaliteit (32 Bit)</item>
     </string-array>
-    <string-array name="colors_values_array">
-        <item>16</item>
-        <item>24</item>
-        <item>32</item>
-    </string-array>
     <string name="settings_resolution">Resolutie</string>
     <string name="resolution_automatic">Automatisch</string>
     <string name="resolution_fit">Schermvullend</string>
@@ -79,21 +74,6 @@
         <item>1920x1080</item>
         <item>1920x1200</item>
     </string-array>
-    <!-- The strings in resolutions_values_array should not be localized -->
-    <!-- They are used for text comparison and must remain in english -->
-    <string-array name="resolutions_values_array">
-        <item>automatic</item>
-        <item>fitscreen</item>
-        <item>custom</item>
-        <item>640x480</item>
-        <item>720x480</item>
-        <item>800x600</item>
-        <item>1024x768</item>
-        <item>1280x1024</item>
-        <item>1440x900</item>
-        <item>1920x1080</item>
-        <item>1920x1200</item>
-    </string-array>
     <!-- end protected string section -->
     <string name="settings_width">Breedte</string>
     <string name="settings_height">Hoogte</string>
@@ -121,11 +101,6 @@
         <item>Play on Server</item>
         <item>Play on Device</item>
     </string-array>
-    <string-array name="redirect_sound_values_array">
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
-    </string-array>
     <string name="settings_redirect_microphone">Redirect Microphone</string>
     <string name="settings_security">Beveiliging</string>
     <string-array name="security_array">
@@ -134,12 +109,6 @@
         <item>TLS</item>
         <item>NLA</item>
     </string-array>
-    <string-array name="security_values_array">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
     <string name="settings_remote_program">Extern programma</string>
     <string name="settings_work_dir">Werkmap</string>
     <string name="settings_async_channel">Async channel</string>
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/values-zh/strings.xml b/client/Android/Studio/freeRDPCore/src/main/res/values-zh/strings.xml
index 1b4773f..79a7f9f 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/values-zh/strings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/values-zh/strings.xml
@@ -57,11 +57,6 @@
         <item>True Color (24 Bit)</item>
         <item>Highest Quality (32 Bit)</item>
     </string-array>
-    <string-array name="colors_values_array">
-        <item>16</item>
-        <item>24</item>
-        <item>32</item>
-    </string-array>
     <string name="settings_resolution">分辨率</string>
     <string name="resolution_automatic">自动</string>
     <string name="resolution_fit">全屏</string>
@@ -79,19 +74,6 @@
         <item>1920x1080</item>
         <item>1920x1200</item>
     </string-array>
-    <string-array name="resolutions_values_array">
-        <item>automatic</item>
-        <item>fitscreen</item>
-        <item>custom</item>
-        <item>640x480</item>
-        <item>720x480</item>
-        <item>800x600</item>
-        <item>1024x768</item>
-        <item>1280x1024</item>
-        <item>1440x900</item>
-        <item>1920x1080</item>
-        <item>1920x1200</item>
-    </string-array>
     <string name="settings_width">宽度</string>
     <string name="settings_height">高度</string>
     <string name="settings_performance">连接性能</string>
@@ -118,11 +100,6 @@
         <item>在远程主机播放</item>
         <item>在此设备上播放</item>
     </string-array>
-    <string-array name="redirect_sound_values_array">
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
-    </string-array>
     <string name="settings_redirect_microphone">麦克风重定向</string>
     <string name="settings_security">连接协议</string>
     <string-array name="security_array">
@@ -131,12 +108,6 @@
         <item>TLS</item>
         <item>NLA</item>
     </string-array>
-    <string-array name="security_values_array">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
     <string name="settings_remote_program">远程程序</string>
     <string name="settings_work_dir">工作目录</string>
     <string name="settings_async_channel">Async channel</string>
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/values/strings.xml b/client/Android/Studio/freeRDPCore/src/main/res/values/strings.xml
index d62aeb9..52ceda8 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/values/strings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/values/strings.xml
@@ -58,6 +58,8 @@
         <item>True Color (24 Bit)</item>
         <item>Highest Quality (32 Bit)</item>
     </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
     <string-array name="colors_values_array"
                   translatable="false">
         <item>16</item>
@@ -81,6 +83,8 @@
         <item>1920x1080</item>
         <item>1920x1200</item>
     </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
     <string-array name="resolutions_values_array"
                   translatable="false">
         <item>automatic</item>
@@ -123,6 +127,8 @@
         <item>Play on Server</item>
         <item>Play on Device</item>
     </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
     <string-array name="redirect_sound_values_array"
                   translatable="false">
         <item>2</item>
@@ -137,6 +143,8 @@
         <item>TLS</item>
         <item>NLA</item>
     </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
     <string-array name="security_values_array"
                   translatable="false">
         <item>0</item>
-- 
2.7.4