diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-06 16:43:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-06 16:43:46 -0700 |
| commit | 001d14561088a542a5cee605ecff217b180f908b (patch) | |
| tree | 22700eb7c335acaa15344b9276eda5356abc9bf8 /res/values-ja | |
| parent | 2ec3622a9927681aa90a4ef61cb965354d388790 (diff) | |
| parent | 0c0d605231e78c3a883b88b4abbc46ee29a7a194 (diff) | |
| download | packages_apps_settings-001d14561088a542a5cee605ecff217b180f908b.zip packages_apps_settings-001d14561088a542a5cee605ecff217b180f908b.tar.gz packages_apps_settings-001d14561088a542a5cee605ecff217b180f908b.tar.bz2 | |
am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
* commit '0c0d605231e78c3a883b88b4abbc46ee29a7a194':
Stop hard-coding sample 12- and 24-hour times.
Diffstat (limited to 'res/values-ja')
| -rw-r--r-- | res/values-ja/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 31a8eb2..fb378c9 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -164,8 +164,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 PM"</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> |