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

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

Browse Source 
* commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9':
  Stop hard-coding sample 12- and 24-hour times.
This commit is contained in:
Elliott Hughes
2012-09-06 16:39:41 -07:00
committed by Android Git Automerger
parent d4e216bc9e 98d9380a5c
commit 105d879cce
52 changed files with 4 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,8 +162,6 @@
<string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"A(z) %1$s szeretne hozzáférni névjegyeihez és a híváselőzményekhez. Megadja a hozzáférést a(z) %2$s eszköznek?"</string>
<string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne jelenjen meg többé"</string>
<string name="date_and_time" msgid="4114084177056654663">"Dátum és idő beállításai"</string>
<string name="date_time_12_hour_sample" msgid="3259617262618020574">"du. 1:00"</string>
<string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Válasszon időzónát"</string>
<string name="normal_date_format" msgid="7636406984925498359">"Regionális (<xliff:g id="DATE">%s</xliff:g>)"</string>
<string name="display_preview_label" msgid="1127597250917274792">"Előnézet:"</string>