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

resolved conflicts for merge of 33f86196 to stage-aosp-master

Browse Source 
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
This commit is contained in:
Elliott Hughes
2012-09-06 16:09:04 -07:00
parent c5fc623131 33f8619677
commit 680c8c8e43
52 changed files with 4 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,8 +162,6 @@
<skip />
<string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Usiniulize tena"</string>
<string name="date_and_time" msgid="4114084177056654663">"Mipangilio ya tarehe na saa"</string>
<string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 mchana"</string>
<string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Chagua ukanda wa saa"</string>
<string name="normal_date_format" msgid="7636406984925498359">"Mkoa ( <xliff:g id="DATE">%s</xliff:g> )"</string>
<string name="display_preview_label" msgid="1127597250917274792">"Hakiki:"</string>