diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-06 16:09:04 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-09-06 16:09:04 -0700 |
| commit | 680c8c8e43804d9bf69568d4748b3bd3a4aea0ee (patch) | |
| tree | 50a8fc4af2f9ff7b241b780914a8555614149da5 /res/values-ja | |
| parent | c5fc6231312b21efb601367bae28d63f9b26ac52 (diff) | |
| parent | 33f8619677393d3d15fcb25784985009af5d7bbd (diff) | |
| download | packages_apps_settings-680c8c8e43804d9bf69568d4748b3bd3a4aea0ee.zip packages_apps_settings-680c8c8e43804d9bf69568d4748b3bd3a4aea0ee.tar.gz packages_apps_settings-680c8c8e43804d9bf69568d4748b3bd3a4aea0ee.tar.bz2 | |
resolved conflicts for merge of 33f86196 to stage-aosp-master
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
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 08f0a9d..4484304 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/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 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> |