mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3209 from akallabeth/android_translation_fix

Browse Source 
Reverted translation of internal VALUE arrays.
This commit is contained in:
Bernhard Miklautz 2016-03-14 13:00:52 +01:00
commit 6ebf452513
7 changed files with 21 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/BookmarkActivity.java
View File

@ -472,8 +472,8 @@ public class BookmarkActivity extends PreferenceActivity implements
ListPreference listPreference = (ListPreference) findPreference(key);
listPreference.setSummary(listPreference.getEntry());
boolean enabled = listPreference.getValue().equalsIgnoreCase(
getResources().getString(R.string.resolution_custom));
String value = listPreference.getValue();
boolean enabled = value.equalsIgnoreCase("custom");
if (key.equals("bookmark.resolution")) {
findPreference("bookmark.width").setEnabled(enabled);
findPreference("bookmark.height").setEnabled(enabled);

29
client/Android/Studio/freeRDPCore/src/main/res/values-de/strings.xml
View File

@ -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>automatisch</item>
<item>an Bildschirm anpassen</item>
<item>Benutzerdefiniert</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>

31
client/Android/Studio/freeRDPCore/src/main/res/values-es/strings.xml
View File

@ -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>

31
client/Android/Studio/freeRDPCore/src/main/res/values-fr/strings.xml
View File

@ -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>

31
client/Android/Studio/freeRDPCore/src/main/res/values-nl/strings.xml
View File

@ -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>

29
client/Android/Studio/freeRDPCore/src/main/res/values-zh/strings.xml
View File

@ -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>自动</item>
<item>全屏</item>
<item>自定义</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>

26
client/Android/Studio/freeRDPCore/src/main/res/values/strings.xml
View File

@ -29,7 +29,7 @@
<string name="section_active_sessions">Active Sessions</string>
<string name="action_settings">foobar</string>
<!-- Search strings -->
<string name="search_hint">Connect to Computer</string>
<string name="search_hint">Connect to Computer</string>
<!-- List placeholder labels -->
<string name="list_placeholder_login">Login</string>
<string name="list_placeholder_no_servers">No Servers</string>
@ -58,7 +58,10 @@
<item>True Color (24 Bit)</item>
<item>Highest Quality (32 Bit)</item>
</string-array>
<string-array name="colors_values_array">
<!-- This array is used as is in code,
do not translate! -->
<string-array name="colors_values_array"
translatable="false">
<item>16</item>
<item>24</item>
<item>32</item>
@ -80,7 +83,10 @@
<item>1920x1080</item>
<item>1920x1200</item>
</string-array>
<string-array name="resolutions_values_array">
<!-- This array is used as is in code,
do not translate! -->
<string-array name="resolutions_values_array"
translatable="false">
<item>automatic</item>
<item>fitscreen</item>
<item>custom</item>
@ -113,15 +119,18 @@
<string name="settings_performance_3g">3G Performance</string>
<string name="settings_cat_gateway">Gateway</string>
<string name="settings_enable_gateway_settings">Enable Gateway</string>
<string name="settings_gateway_settings">Gateway Settings</string>
<string name="settings_gateway_settings">Gateway Settings</string>
<string name="settings_redirect_sdcard">Redirect SDCard</string>
<string name="settings_redirect_sound">Redirect Sound</string>
<string name="settings_redirect_sound">Redirect Sound</string>
<string-array name="redirect_sound_array">
<item>Do not play</item>
<item>Play on Server</item>
<item>Play on Device</item>
</string-array>
<string-array name="redirect_sound_values_array">
<!-- This array is used as is in code,
do not translate! -->
<string-array name="redirect_sound_values_array"
translatable="false">
<item>2</item>
<item>1</item>
<item>0</item>
@ -134,7 +143,10 @@
<item>TLS</item>
<item>NLA</item>
</string-array>
<string-array name="security_values_array">
<!-- This array is used as is in code,
do not translate! -->
<string-array name="security_values_array"
translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>