PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master

Browse Source 
* commit '0c0d605231e78c3a883b88b4abbc46ee29a7a194':
  Stop hard-coding sample 12- and 24-hour times.
This commit is contained in:
Elliott Hughes
2012-09-06 16:43:46 -07:00
committed by Android Git Automerger
parent 2ec3622a99 0c0d605231
commit 001d145610
52 changed files with 4 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values-ja/strings.xml
View File

@@ -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>