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

resolve merge conflicts of 94ab88228e to master.

Browse Source 
NB: packages/apps/Settings/res/values/arrays.xml new content
moves to frameworks/base/packages/SettingsLib/res/values/arrays.xml.

Bug: 26178938
Change-Id: Ib241baac7807914447d84b921994440bf627df29
This commit is contained in:
Mark Salyzyn
2015-12-28 11:08:01 -08:00
parent 25ac0502b0 94ab88228e
commit 87a3c6fee7
79 changed files with 271 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values-sl/arrays.xml
View File

@@ -392,6 +392,7 @@
<item msgid="7169235156349580064">"Po meri"</item>
</string-array>
<string-array name="select_logd_size_titles">
<item msgid="4663095428454779138">"Izklopljeno"</item>
<item msgid="3100534874529240291">"64 K"</item>
<item msgid="505611754508988476">"256 K"</item>
<item msgid="6361286924268716397">"1 M"</item>
@@ -399,11 +400,13 @@
<item msgid="3025431211013424097">"16 M"</item>
</string-array>
<string-array name="select_logd_size_lowram_titles">
<item msgid="4663095428454779138">"Izklopljeno"</item>
<item msgid="524799395770610154">"64 K"</item>
<item msgid="3534782711045262344">"256 K"</item>
<item msgid="8085867209202153403">"1 M"</item>
</string-array>
<string-array name="select_logd_size_summaries">
<item msgid="4663095428454779138">"Izklopljeno"</item>
<item msgid="7346595473588765019">"64 K/medpom. dnevn."</item>
<item msgid="2822309747675758628">"256 K/medpom. dnev."</item>
<item msgid="6699306198357496731">"1 M/medpom. dnevn."</item>