diff options
| author | Baligh Uddin <baligh@google.com> | 2012-10-24 12:11:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-24 12:11:09 -0700 |
| commit | c1afd56898cf41692f128329a1d104650791daf2 (patch) | |
| tree | 52a73c44950e833c1dae026977b1608c7a2495d0 | |
| parent | a656971e73a09c8aa01f8a2922865ea00df43758 (diff) | |
| parent | af185e7dbfd3d0658d14671a56898189de9f45df (diff) | |
| download | frameworks_base-c1afd56898cf41692f128329a1d104650791daf2.zip frameworks_base-c1afd56898cf41692f128329a1d104650791daf2.tar.gz frameworks_base-c1afd56898cf41692f128329a1d104650791daf2.tar.bz2 | |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
| -rw-r--r-- | core/res/res/values-es-rUS/strings.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values-ru/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-zh-rCN/strings.xml | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index a333187..9389579 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1381,12 +1381,9 @@ <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Pantalla HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Superposición #<xliff:g id="ID">%1$d</xliff:g>"</string> <string name="display_manager_overlay_display_title" msgid="652124517672257172">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="WIDTH">%2$d</xliff:g> x <xliff:g id="HEIGHT">%3$d</xliff:g>, <xliff:g id="DPI">%4$d</xliff:g> ppp"</string> - <!-- no translation found for wifi_display_notification_title (2223050649240326557) --> - <skip /> - <!-- no translation found for wifi_display_notification_message (4498802012464170685) --> - <skip /> - <!-- no translation found for wifi_display_notification_disconnect (6183754463561153372) --> - <skip /> + <string name="wifi_display_notification_title" msgid="2223050649240326557">"Se conectó la pantalla inalámbrica"</string> + <string name="wifi_display_notification_message" msgid="4498802012464170685">"Esta pantalla se muestra en otro dispositivo."</string> + <string name="wifi_display_notification_disconnect" msgid="6183754463561153372">"Desconectar"</string> <string name="kg_emergency_call_label" msgid="684946192523830531">"Llamada de emergencia"</string> <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"¿Olvidaste el patrón?"</string> <string name="kg_wrong_pattern" msgid="1850806070801358830">"Patrón incorrecto"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 4d24fcb..855f461 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1382,7 +1382,7 @@ <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Наложение № <xliff:g id="ID">%1$d</xliff:g>"</string> <string name="display_manager_overlay_display_title" msgid="652124517672257172">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="WIDTH">%2$d</xliff:g> х <xliff:g id="HEIGHT">%3$d</xliff:g>, <xliff:g id="DPI">%4$d</xliff:g> тчк/дюйм"</string> <string name="wifi_display_notification_title" msgid="2223050649240326557">"Беспроводной проектор подключен"</string> - <string name="wifi_display_notification_message" msgid="4498802012464170685">"Изображение проецируется на другое устройство"</string> + <string name="wifi_display_notification_message" msgid="4498802012464170685">"Изображение передается на другое устройство"</string> <string name="wifi_display_notification_disconnect" msgid="6183754463561153372">"Отключить"</string> <string name="kg_emergency_call_label" msgid="684946192523830531">"Экстренный вызов"</string> <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Забыли графический ключ?"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 8783b0b..b0c363b 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1381,8 +1381,8 @@ <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI 屏幕"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"叠加视图 #<xliff:g id="ID">%1$d</xliff:g>"</string> <string name="display_manager_overlay_display_title" msgid="652124517672257172">"<xliff:g id="NAME">%1$s</xliff:g>：<xliff:g id="WIDTH">%2$d</xliff:g>x<xliff:g id="HEIGHT">%3$d</xliff:g>，<xliff:g id="DPI">%4$d</xliff:g> dpi"</string> - <string name="wifi_display_notification_title" msgid="2223050649240326557">"无线显示设备已连接"</string> - <string name="wifi_display_notification_message" msgid="4498802012464170685">"此屏幕显示在另一台设备上"</string> + <string name="wifi_display_notification_title" msgid="2223050649240326557">"已连接到无线显示设备"</string> + <string name="wifi_display_notification_message" msgid="4498802012464170685">"此屏幕的内容正显示在另一台设备上"</string> <string name="wifi_display_notification_disconnect" msgid="6183754463561153372">"断开连接"</string> <string name="kg_emergency_call_label" msgid="684946192523830531">"紧急呼救"</string> <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"忘记了图案"</string> |