diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-06 16:39:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-06 16:39:41 -0700 |
| commit | 105d879ccef2517a07a15f29b956be739504fa73 (patch) | |
| tree | 580839c1603e5ea4675e148dde980af03b95e167 /res/values-am | |
| parent | d4e216bc9eb9b8aecd031a5f3c2a412857333a99 (diff) | |
| parent | 98d9380a5c3c6a6bfa5687af993ea43c882226b9 (diff) | |
| download | packages_apps_settings-105d879ccef2517a07a15f29b956be739504fa73.zip packages_apps_settings-105d879ccef2517a07a15f29b956be739504fa73.tar.gz packages_apps_settings-105d879ccef2517a07a15f29b956be739504fa73.tar.bz2 | |
am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
* commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9':
Stop hard-coding sample 12- and 24-hour times.
Diffstat (limited to 'res/values-am')
| -rw-r--r-- | res/values-am/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 9392e14..02145fa 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -162,8 +162,6 @@ <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s የአንተን ዕውቂያዎች እና የጥሪ ታሪኮች ለመድረስ ይፈልጋል ። ለ%2$s መድረስ ይሰጥ?"</string> <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ዳግመኛ አትጠይቅ"</string> <string name="date_and_time" msgid="4114084177056654663">"ቀን& የሰዓትቅንብሮች"</string> - <string name="date_time_12_hour_sample" msgid="3259617262618020574">"ከሰዓት በኃላ1:00"</string> - <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string> <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string> <string name="normal_date_format" msgid="7636406984925498359">"የአካባቢው (<xliff:g id="DATE">%s</xliff:g>)"</string> <string name="display_preview_label" msgid="1127597250917274792">"ቅድመ-ዕይታ"</string> |