Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

I18n Cleanup #20

Merged
merged 2 commits into from
Jan 3, 2015
Merged

I18n Cleanup #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f479e58
i18n cleanup
zumbrunnen Jan 3, 2015
54438a5
Added missing newlines at EOF
zumbrunnen Jan 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ClientLib/mobile/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="install_service_dialog_title">3DR Services installieren!</string>
<string name="update_service_dialog_message">Ihre Version von 3DR Services muss aktualisiert werden, um fortfahren zu können.</string>
<string name="update_service_dialog_title">3DR Services aktualisieren!</string>
<string name="update_service_dialog_update_button">Aktualisieren</string>
<string name="install_service_dialog_message">3DR Services muss auf diesem Gerät installiert sein, um diese App verwenden zu können.</string>
<string name="install_service_dialog_install_button">Installieren</string>
</resources>
1 change: 0 additions & 1 deletion ClientLib/mobile/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<resources>

<string name="install_service_dialog_title">Install 3DR Services!</string>
<string name="install_service_dialog_message">3DR Services must be installed on the device to use this app.</string>
<string name="install_service_dialog_install_button">Install</string>
Expand Down
443 changes: 7 additions & 436 deletions ServiceApp/res/values-de/strings.xml
View file
Open in desktop

Large diffs are not rendered by default.

310 changes: 1 addition & 309 deletions ServiceApp/res/values-it/strings.xml
View file
Open in desktop

Large diffs are not rendered by default.

532 changes: 4 additions & 528 deletions ServiceApp/res/values-zh-rCN/strings.xml
View file
Open in desktop

Large diffs are not rendered by default.

469 changes: 3 additions & 466 deletions ServiceApp/res/values-zh-rTW/strings.xml
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 1 addition & 30 deletions ServiceApp/res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@
<item name="UDP">UDP</item>
<item name="BLUETOOTH">BLUETOOTH</item>
</string-array>
<string-array name="MapTypes">
<item>@string/menu_map_type_satellite</item>
<item>@string/menu_map_type_hybrid</item>
<item>@string/menu_map_type_normal</item>
<item>@string/menu_map_type_terrain</item>
</string-array>
<string-array name="TelemetryBaudTypes">
<item name="38400">38400</item>
<item name="57600">57600</item>
Expand Down Expand Up @@ -86,16 +80,6 @@
<item>Land</item>
<item>EPM</item>
</string-array>
<string-array name="Setup_Radio_Menu">
<item>@string/setup_radio_title</item>
<item>@string/setup_fm_title</item>
<item>@string/setup_ch_title</item>
<item>@string/setup_sf_title</item>
</string-array>
<string-array name="Setup_Sensor_Menu">
<item>@string/setup_imu_title</item>
<item>@string/setup_mag_title</item>
</string-array>
<string-array name="VehicleType">
<item>ArduCopter</item>
<item>ArduPlane</item>
Expand Down Expand Up @@ -204,13 +188,6 @@
</string-array>

<!-- Selectable values for the period of the speech output. -->
<string-array name="tts_periodic_period">
<item>@string/pref_tts_off</item>
<item>15 sec.</item>
<item>30 sec.</item>
<item>45 sec.</item>
<item>60 sec.</item>
</string-array>
<string-array name="tts_periodic_period_values">
<item>0</item>
<item>15</item>
Expand All @@ -223,10 +200,4 @@
<item>No cameras Available</item>
</string-array>

<string-array name="preference_dialog_entry">
<item>@string/pref_dialog_entry_always</item>
<item>@string/pref_dialog_entry_never</item>
<item>@string/pref_dialog_entry_ask</item>
</string-array>

</resources>
</resources>
23 changes: 11 additions & 12 deletions ServiceApp/res/values/preferences_keys.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@ This file is used to store the preferences keys so that it's accessible and modi
NOTE: NE TRANSLATER PAS LE CONTENU DANS CETTE FICHE!! (la seule translation permit est cette notification)
-->
<resources>
<string name="pref_connection_type_key">pref_connection_type</string>
<string name="pref_baud_type_key">pref_baud_type</string>
<string name="pref_server_ip_key">pref_server_ip</string>
<string name="pref_server_port_key">pref_server_port</string>
<string name="pref_udp_server_port_key">pref_udp_server_port</string>
<string name="pref_bluetooth_device_address_key">pref_bluetooth_device_address</string>
<string name="pref_vehicle_type_key">pref_vehicle_type</string>
<string name="pref_storage_key">pref_storage</string>
<string name="pref_usage_statistics_key">pref_usage_statistics</string>
<string name="pref_version_key">pref_version</string>
<string name="pref_permanent_notification_key">pref_permanent_notification</string>

<string name="pref_connection_type_key" translatable="false">pref_connection_type</string>
<string name="pref_baud_type_key" translatable="false">pref_baud_type</string>
<string name="pref_server_ip_key" translatable="false">pref_server_ip</string>
<string name="pref_server_port_key" translatable="false">pref_server_port</string>
<string name="pref_udp_server_port_key" translatable="false">pref_udp_server_port</string>
<string name="pref_bluetooth_device_address_key" translatable="false">pref_bluetooth_device_address</string>
<string name="pref_vehicle_type_key" translatable="false">pref_vehicle_type</string>
<string name="pref_storage_key" translatable="false">pref_storage</string>
<string name="pref_usage_statistics_key" translatable="false">pref_usage_statistics</string>
<string name="pref_version_key" translatable="false">pref_version</string>
<string name="pref_permanent_notification_key" translatable="false">pref_permanent_notification</string>
</resources>
Loading