diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-12-28 11:08:01 -0800 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2015-12-28 11:20:58 -0800 |
| commit | 87a3c6fee755f2c75be4fe6ad11b67b82bbb7605 (patch) | |
| tree | fee6c2c8bf9151b1c39ac7ae2c6802b52aea2d02 /res/values-pt/arrays.xml | |
| parent | 25ac0502b063fdace9b01645a0c3867d276d7aaa (diff) | |
| parent | 94ab88228e15b0554179d476f05c0febe4da218d (diff) | |
| download | packages_apps_Settings-87a3c6fee755f2c75be4fe6ad11b67b82bbb7605.tar.gz packages_apps_Settings-87a3c6fee755f2c75be4fe6ad11b67b82bbb7605.tar.bz2 packages_apps_Settings-87a3c6fee755f2c75be4fe6ad11b67b82bbb7605.zip | |
resolve merge conflicts of 94ab88228e to master.
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
Diffstat (limited to 'res/values-pt/arrays.xml')
| -rw-r--r-- | res/values-pt/arrays.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml index 0ad7256fc5..6b56211f56 100644 --- a/res/values-pt/arrays.xml +++ b/res/values-pt/arrays.xml @@ -392,6 +392,7 @@ <item msgid="7169235156349580064">"Personalizado"</item> </string-array> <string-array name="select_logd_size_titles"> + <item msgid="4663095428454779138">"Desativado"</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">"Desativado"</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">"Desativado"</item> <item msgid="7346595473588765019">"64K/buffer de log"</item> <item msgid="2822309747675758628">"256K/buffer de log"</item> <item msgid="6699306198357496731">"1M/buffer de log"</item> |