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

resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp.

Browse Source 
Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00
This commit is contained in:
Mark Salyzyn
2015-12-28 10:49:04 -08:00
parent 6556921a1e f3cc23524f
commit 94ab88228e
80 changed files with 1952 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,6 +391,7 @@
<item msgid="7169235156349580064">"Vlastní"</item>
</string-array>
<string-array name="select_logd_size_titles">
<item msgid="4663095428454779138">"Vypnuto"</item>
<item msgid="3100534874529240291">"64 kB"</item>
<item msgid="505611754508988476">"256 kB"</item>
<item msgid="6361286924268716397">"1 MB"</item>
@@ -398,11 +399,13 @@
<item msgid="3025431211013424097">"16 MB"</item>
</string-array>
<string-array name="select_logd_size_lowram_titles">
<item msgid="4663095428454779138">"Vypnuto"</item>
<item msgid="524799395770610154">"64 kB"</item>
<item msgid="3534782711045262344">"256 kB"</item>
<item msgid="8085867209202153403">"1 MB"</item>
</string-array>
<string-array name="select_logd_size_summaries">
<item msgid="4663095428454779138">"Vypnuto"</item>
<item msgid="7346595473588765019">"64 kB na vyrovnávací paměť protokolů"</item>
<item msgid="2822309747675758628">"256 kB na vyrovnávací paměť protokolů"</item>
<item msgid="6699306198357496731">"1 MB na vyrovnávací paměť protokolů"</item>