diff options
author | Eric Fischer <enf@google.com> | 2011-01-27 14:56:29 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-27 14:56:29 -0800 |
commit | 3d73c4d386e5ae66aa5c472342207728ab4fbf3a (patch) | |
tree | 37a10f5ebff0a59d32d4095698db5c5ac61b5f05 /core | |
parent | 21d0a173f138563e2eaba286b0eb505f987918a9 (diff) | |
parent | f4323d8d6a33e4c16fa15afc4c2fc7369a63d0f3 (diff) | |
download | frameworks_base-3d73c4d386e5ae66aa5c472342207728ab4fbf3a.zip frameworks_base-3d73c4d386e5ae66aa5c472342207728ab4fbf3a.tar.gz frameworks_base-3d73c4d386e5ae66aa5c472342207728ab4fbf3a.tar.bz2 |
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Diffstat (limited to 'core')
-rw-r--r-- | core/res/res/values-es-rUS/strings.xml | 4 | ||||
-rw-r--r-- | core/res/res/values-es/strings.xml | 8 | ||||
-rw-r--r-- | core/res/res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | core/res/res/values-ja/strings.xml | 2 | ||||
-rw-r--r-- | core/res/res/values-ru/strings.xml | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 046bb4e..504b828 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -727,8 +727,8 @@ <string name="yes" msgid="5362982303337969312">"Aceptar"</string> <string name="no" msgid="5141531044935541497">"Cancelar"</string> <string name="dialog_alert_title" msgid="2049658708609043103">"Atención"</string> - <string name="capital_on" msgid="1544682755514494298">"Encendido"</string> - <string name="capital_off" msgid="6815870386972805832">"APAGADO"</string> + <string name="capital_on" msgid="1544682755514494298">"Sí"</string> + <string name="capital_off" msgid="6815870386972805832">"No"</string> <string name="whichApplication" msgid="4533185947064773386">"Completar la acción mediante"</string> <string name="alwaysUse" msgid="4583018368000610438">"Utilizar de manera predeterminada en esta acción."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Borrar la predeterminación en Configuración de la página principal > Aplicaciones > Administrar aplicaciones."</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 7485791..543b53e 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -450,7 +450,7 @@ <item msgid="9192514806975898961">"Personalizar"</item> </string-array> <string-array name="emailAddressTypes"> - <item msgid="8073994352956129127">"Personal"</item> + <item msgid="8073994352956129127">"Casa"</item> <item msgid="7084237356602625604">"Trabajo"</item> <item msgid="1112044410659011023">"Otra"</item> <item msgid="2374913952870110618">"Personalizar"</item> @@ -558,7 +558,7 @@ <string name="lockscreen_low_battery" msgid="1482873981919249740">"Conecta el cargador"</string> <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Falta la tarjeta SIM"</string> <string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"No se ha insertado ninguna tarjeta SIM en el teléfono."</string> - <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Inserta una tarjeta SIM."</string> + <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Inserta una tarjeta SIM"</string> <string name="emergency_calls_only" msgid="6733978304386365407">"Solo llamadas de emergencia"</string> <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Bloqueada para la red"</string> <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"La tarjeta SIM está bloqueada con el código PUK."</string> @@ -727,8 +727,8 @@ <string name="yes" msgid="5362982303337969312">"Aceptar"</string> <string name="no" msgid="5141531044935541497">"Cancelar"</string> <string name="dialog_alert_title" msgid="2049658708609043103">"Atención"</string> - <string name="capital_on" msgid="1544682755514494298">"Activado"</string> - <string name="capital_off" msgid="6815870386972805832">"Desconectado"</string> + <string name="capital_on" msgid="1544682755514494298">"SÍ"</string> + <string name="capital_off" msgid="6815870386972805832">"NO"</string> <string name="whichApplication" msgid="4533185947064773386">"Completar acción utilizando"</string> <string name="alwaysUse" msgid="4583018368000610438">"Utilizar de forma predeterminada para esta acción"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Borrar valores predeterminados en la página de configuración de la pantalla de inicio del teléfono > Aplicaciones > Administrar aplicaciones\"."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 9f3c8a8..8608b5b 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -589,7 +589,7 @@ <string name="factorytest_not_system" msgid="4435201656767276723">"L\'azione FACTORY_TEST è supportata soltanto per i pacchetti installati in /system/app."</string> <string name="factorytest_no_action" msgid="872991874799998561">"Nessun pacchetto trovato che fornisca l\'azione FACTORY_TEST."</string> <string name="factorytest_reboot" msgid="6320168203050791643">"Riavvia"</string> - <string name="js_dialog_title" msgid="8143918455087008109">"La pagina all\'indirizzo <xliff:g id="TITLE">%s</xliff:g> indica:"</string> + <string name="js_dialog_title" msgid="8143918455087008109">"Avviso relativo alla pagina <xliff:g id="TITLE">%s</xliff:g>:"</string> <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> <string name="js_dialog_before_unload" msgid="1901675448179653089">"Uscire da questa pagina?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Seleziona OK per continuare o Annulla per rimanere nella pagina corrente."</string> <string name="save_password_label" msgid="6860261758665825069">"Conferma"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 00ee365..3563cf8 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -883,7 +883,7 @@ <string name="reset" msgid="2448168080964209908">"リセット"</string> <string name="submit" msgid="1602335572089911941">"送信"</string> <string name="description_star" msgid="2654319874908576133">"お気に入り"</string> - <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"運転モードを有効にする"</string> + <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"運転モードになっています"</string> <string name="car_mode_disable_notification_message" msgid="668663626721675614">"運転モードを終了するには選択してください。"</string> <string name="tethered_notification_title" msgid="3146694234398202601">"テザリングまたはアクセスポイントが有効です"</string> <string name="tethered_notification_message" msgid="3067108323903048927">"タップして設定する"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 8de3d33..37f56ea 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -608,7 +608,7 @@ <string name="save_password_never" msgid="8274330296785855105">"Никогда"</string> <string name="open_permission_deny" msgid="5661861460947222274">"У вас нет разрешения на открытие этой страницы."</string> <string name="text_copied" msgid="4985729524670131385">"Текст скопирован в буфер обмена."</string> - <string name="more_item_label" msgid="4650918923083320495">"Дополнительно"</string> + <string name="more_item_label" msgid="4650918923083320495">"Ещё"</string> <string name="prepend_shortcut_label" msgid="2572214461676015642">"Меню+"</string> <string name="menu_space_shortcut_label" msgid="2410328639272162537">"пробел"</string> <string name="menu_enter_shortcut_label" msgid="2743362785111309668">"ввод"</string> |