diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-06 16:37:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-06 16:37:44 -0700 |
| commit | 98d9380a5c3c6a6bfa5687af993ea43c882226b9 (patch) | |
| tree | 50a8fc4af2f9ff7b241b780914a8555614149da5 /res/values-es-rUS/strings.xml | |
| parent | c53ce26836eccfe9c0bb315d965bc73a9bd7b214 (diff) | |
| parent | 680c8c8e43804d9bf69568d4748b3bd3a4aea0ee (diff) | |
| download | packages_apps_settings-98d9380a5c3c6a6bfa5687af993ea43c882226b9.zip packages_apps_settings-98d9380a5c3c6a6bfa5687af993ea43c882226b9.tar.gz packages_apps_settings-98d9380a5c3c6a6bfa5687af993ea43c882226b9.tar.bz2 | |
am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
* commit '680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
Stop hard-coding sample 12- and 24-hour times.
Diffstat (limited to 'res/values-es-rUS/strings.xml')
| -rw-r--r-- | res/values-es-rUS/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index b4e50dd..ac7cfde 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -160,8 +160,6 @@ <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s desea acceder a tus contactos y a tu historial de llamadas. ¿Deseas darle acceso a %2$s?"</string> <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No volver a preguntar"</string> <string name="date_and_time" msgid="4114084177056654663">"Configuración de fecha y hora"</string> - <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 p. m."</string> - <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string> <string name="choose_timezone" msgid="1362834506479536274">"Elige la zona horaria"</string> <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string> <string name="display_preview_label" msgid="1127597250917274792">"Vista previa:"</string> |