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

resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp

Browse Source 
Change-Id: I21a6ffe22c40c5c308487926d26d28dcae7f186d
This commit is contained in:
Elliott Hughes
2014-10-04 09:38:07 -07:00
parent 1713fe2524 3269c409eb
commit 22ea4c41ae
6 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values-fa/strings.xml
View File

@@ -1515,7 +1515,6 @@
<string name="awake" msgid="387122265874485088">"زمان بیداری دستگاه"</string>
<string name="wifi_on_time" msgid="3208518458663637035">"‏Wi-Fi به موقع"</string>
<string name="bluetooth_on_time" msgid="3056108148042308690">"‏Wi-Fi به موقع"</string>
<string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
<string name="history_details_title" msgid="3608240585315506067">"جزئیات سابقه"</string>
<string name="details_title" msgid="3792801565213935385">"جزئیات استفاده"</string>
<string name="details_subtitle" msgid="32593908269911734">"جزئیات استفاده"</string>