am a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE
* commit 'a9aa8aa3341b164a54213a3b27fa0a1dd9ef9e70':
Import revised translations. DO NOT MERGE
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 13bcf66..7780185 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -753,7 +753,7 @@
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:"\n</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"لمسح الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يلزم محو "<b>"وحدة تخزين USB"</b>"."</string>
- <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@5dccce3c) -->
+ <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@66388993) -->
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"محو وحدة تخزين USB"</string>
<string name="erase_external_storage" product="default" msgid="1397239046334307625">"محو بطاقة SD"</string>
<string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4cd2e5d..926a48e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -781,7 +781,7 @@
<string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar l\'emmagatzematge USB."</string>
<string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar la targeta SD."</string>
<string name="call_settings_title" msgid="5188713413939232801">"Configuració de trucada"</string>
- <string name="call_settings_summary" msgid="7291195704801002886">"Configura el correu de veu, el desviament de trucades, les trucades en espera i la identificació de trucada"</string>
+ <string name="call_settings_summary" msgid="7291195704801002886">"Configura la bústia, la desviació de trucades, les trucades en espera i l\'identificador"</string>
<string name="tether_settings_title_usb" msgid="6688416425801386511">"Connexió compart. per USB"</string>
<string name="tether_settings_title_wifi" msgid="3277144155960302049">"Punt de connexió portàtil"</string>
<string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Connex. compar. Bluetooth"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 842393c..50cf361 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -675,7 +675,7 @@
<string name="memory_available" msgid="5052397223077021181">"Verfügbar"</string>
<string name="memory_size" msgid="6629067715017232195">"Gesamtspeicher"</string>
<string name="memory_calculating_size" msgid="2188358544203768588">"Wird berechnet..."</string>
- <string name="memory_apps_usage" msgid="9079237985722858506">"Anwendungen"</string>
+ <string name="memory_apps_usage" msgid="9079237985722858506">"Apps"</string>
<string name="memory_media_usage" msgid="3738830697707880405">"Medien"</string>
<string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
<string name="memory_dcim_usage" msgid="6679615808140067136">"Bilder, Videos"</string>
@@ -899,7 +899,7 @@
<string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Schützen Sie Ihr Telefon vor unerlaubter Verwendung, indem Sie ein persönliches Entsperrungsmuster erstellen. "\n<font height="17">\n</font><b>"1"</b>" Auf dem nächsten Bildschirm sehen Sie, wie ein Beispielmuster gezeichnet wird. "\n<font height="17">\n</font><b>"2"</b>" Anschließend können Sie Ihr eigenes Entsperrungsmuster zeichnen. Sie können verschiedene Muster ausprobieren, müssen jedoch immer mindestens vier Punkte miteinander verbinden. "\n<font height="17">\n</font><b>"3"</b>" Zeichnen Sie Ihr Muster zur Bestätigung erneut. "\n<font height="17">\n</font><b>"Bereit? Wählen Sie “Weiter”"</b>". "\n<font height="3">\n</font>"Wählen Sie “Abbrechen”, wenn Sie Ihr Telefon nicht schützen möchten."</font></string>
<string name="manageapplications_settings_title" msgid="5712405848153426706">"Anwendungen verwalten"</string>
<string name="manageapplications_settings_summary" msgid="6097117021500651232">"Installierte Anwendungen verwalten und entfernen"</string>
- <string name="applications_settings" msgid="3736173521008476946">"Anwendungen"</string>
+ <string name="applications_settings" msgid="3736173521008476946">"Apps"</string>
<string name="applications_settings_summary" msgid="2714215108369119717">"Anwendungen verwalten, Tastenkombinationen für Schnellstart"</string>
<string name="applications_settings_header" msgid="6018266337275422250">"Anwendungen"</string>
<string name="install_applications" msgid="4872012136210802181">"Unbekannte Herkunft"</string>
@@ -916,7 +916,7 @@
<string name="controls_label" msgid="7611113077086853799">"Steuerung"</string>
<string name="force_stop" msgid="7435006169872876756">"Stoppen erzwingen"</string>
<string name="total_size_label" msgid="1048676419552557254">"Insgesamt"</string>
- <string name="application_size_label" msgid="5055196275624686382">"Anwendung"</string>
+ <string name="application_size_label" msgid="5055196275624686382">"App"</string>
<string name="data_size_label" msgid="8679376373625710107">"Daten"</string>
<string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB-Speicher"</string>
<string name="external_size_label" product="default" msgid="2107155737635944440">"SD-Karte"</string>
@@ -1055,7 +1055,7 @@
<string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Die Verknüpfung für <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) wird gelöscht."</string>
<string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
<string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Abbrechen"</string>
- <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Anwendungen"</string>
+ <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Apps"</string>
<string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Tastenkombinationen"</string>
<string name="input_methods_settings_title" msgid="6800066636850553887">"Texteingabe"</string>
<string name="input_method" msgid="5434026103176856164">"Eingabemethode"</string>
@@ -1092,7 +1092,7 @@
<string name="usage_stats_label" msgid="5890846333487083609">"Nutzungsstatistik"</string>
<string name="testing_usage_stats" msgid="7823048598893937339">"Nutzungsstatistik"</string>
<string name="display_order_text" msgid="8592776965827565271">"Sortieren nach:"</string>
- <string name="app_name_label" msgid="2000949925256858308">"Anwendung"</string>
+ <string name="app_name_label" msgid="2000949925256858308">"App"</string>
<string name="launch_count_label" msgid="4019444833263957024">"Anzahl"</string>
<string name="usage_time_label" msgid="295954901452833058">"Nutzungszeit"</string>
<string name="accessibility_settings" msgid="3975902491934816215">"Eingabehilfen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 012f387..6cbfd84 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -321,7 +321,7 @@
<string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Inhabilitado por administrador/política encriptación"</string>
<string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desactivado"</string>
<string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Sin seguridad"</string>
- <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protección con patrón"</string>
+ <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegida con patrón"</string>
<string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protegida con PIN"</string>
<string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegida con contraseña"</string>
<string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueo pantalla"</string>
@@ -694,7 +694,7 @@
<string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Borrar almacenamiento USB"</string>
<string name="sd_format" product="default" msgid="2576054280507119870">"Borrar tarjeta SD"</string>
<string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Permite borrar los datos del almacenamiento USB interno, como música y fotos."</string>
- <string name="sd_format_summary" product="default" msgid="212703692181793109">"Borra todos los datos de la tarjeta SD como, por ejemplo, la música y las fotos."</string>
+ <string name="sd_format_summary" product="default" msgid="212703692181793109">"Borra todos los datos de la tarjeta SD, como la música y las fotos."</string>
<string name="sd_unavailable" msgid="8580107589533213904">"No disponible"</string>
<string name="read_only" msgid="6702420168629076340">" (Sólo lectura)"</string>
<string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desactivar USB"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f23f092..d868a94 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1433,7 +1433,7 @@
<string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Неке апликације захтевају овај налог. Можете да га уклоните само ако вратите таблет на фабричка подешавања (чиме бришете све личне податке). То можете да урадите у апликацији Подешавања, опција Приватност."</string>
<string name="remove_account_failed" product="default" msgid="9174390193652391412">"Неке апликације захтевају овај налог. Можете да га уклоните само ако вратите телефон на фабричка подешавања (чиме бришете све личне податке). То можете да урадите у апликацији Подешавања, опција Приватност."</string>
<string name="provider_label" msgid="7724593781904508866">"Пријаве за Push"</string>
- <string name="sync_item_title" msgid="1931551540462877488">"Синхронизација апликације <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+ <string name="sync_item_title" msgid="1931551540462877488">"Синхр. <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
<string name="cant_sync_dialog_title" msgid="7185199796123573317">"Ручно синхронизовање није могуће"</string>
<string name="cant_sync_dialog_message" msgid="2372359241135295930">"Синхронизација за ову ставку је тренутно онемогућена. Да бисте променили подешавање, привремено укључите позадинске податке и аутоматско синхронизовање."</string>
<string name="enter_password" msgid="3268224850821675915">"Унесите лозинку да бисте дешифровали меморију"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 39dcf8f..347f0d8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1089,8 +1089,8 @@
<string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
<string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
<string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
- <string name="usage_stats_label" msgid="5890846333487083609">"使用統計資料"</string>
- <string name="testing_usage_stats" msgid="7823048598893937339">"使用統計資料"</string>
+ <string name="usage_stats_label" msgid="5890846333487083609">"使用情形統計資料"</string>
+ <string name="testing_usage_stats" msgid="7823048598893937339">"使用情形統計資料"</string>
<string name="display_order_text" msgid="8592776965827565271">"排序依據："</string>
<string name="app_name_label" msgid="2000949925256858308">"應用程式"</string>
<string name="launch_count_label" msgid="4019444833263957024">"計數"</string>