Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87a3c6fe authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

resolve merge conflicts of 94ab8822 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
parents 25ac0502 94ab8822

res/values-af/arrays.xml

+3 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ 
    <item msgid="7169235156349580064">"Pasgemaak"</item>

  </string-array>

  <string-array name="select_logd_size_titles">

    <item msgid="4663095428454779138">"Af"</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">"Af"</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">"Af"</item>

    <item msgid="7346595473588765019">"64 K per logbuffer"</item>

    <item msgid="2822309747675758628">"256 K per logbuffer"</item>

    <item msgid="6699306198357496731">"1 M per logbuffer"</item>

res/values-am/arrays.xml

+3 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ 
    <item msgid="7169235156349580064">"ብጁ"</item>

  </string-array>

  <string-array name="select_logd_size_titles">

    <item msgid="4663095428454779138">"ጠፍቷል"</item>

    <item msgid="3100534874529240291">"64 ኪባ"</item>

    <item msgid="505611754508988476">"256 ኪባ"</item>

    <item msgid="6361286924268716397">"1 ሜባ"</item>
@@ -399,11 +400,13 @@ 
    <item msgid="3025431211013424097">"16 ሜባ"</item>

  </string-array>

  <string-array name="select_logd_size_lowram_titles">

    <item msgid="4663095428454779138">"ጠፍቷል"</item>

    <item msgid="524799395770610154">"64 ኪባ"</item>

    <item msgid="3534782711045262344">"256 ኪባ"</item>

    <item msgid="8085867209202153403">"1 ሜባ"</item>

  </string-array>

  <string-array name="select_logd_size_summaries">

    <item msgid="4663095428454779138">"ጠፍቷል"</item>

    <item msgid="7346595473588765019">"64 ኪባ በምዝግብ ማስታወሻ ቋጥ"</item>

    <item msgid="2822309747675758628">"256 ኪባ በምዝግብ ማስታወሻ ቋጥ"</item>

    <item msgid="6699306198357496731">"1 ሜ በምዝግብ ማስታወሻ ቋጥ"</item>

res/values-ar/arrays.xml

+3 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ 
    <item msgid="7169235156349580064">"مخصص"</item>

  </string-array>

  <string-array name="select_logd_size_titles">

    <item msgid="4663095428454779138">"إيقاف"</item>

    <item msgid="3100534874529240291">"64 كيلوبايت"</item>

    <item msgid="505611754508988476">"256 كيلوبايت"</item>

    <item msgid="6361286924268716397">"1 ميغابايت"</item>
@@ -399,11 +400,13 @@ 
    <item msgid="3025431211013424097">"16 ميغابايت"</item>

  </string-array>

  <string-array name="select_logd_size_lowram_titles">

    <item msgid="4663095428454779138">"إيقاف"</item>

    <item msgid="524799395770610154">"64 كيلوبايت"</item>

    <item msgid="3534782711045262344">"256 كيلوبايت"</item>

    <item msgid="8085867209202153403">"1 ميغابايت"</item>

  </string-array>

  <string-array name="select_logd_size_summaries">

    <item msgid="4663095428454779138">"إيقاف"</item>

    <item msgid="7346595473588765019">"64 كيلوبايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>

    <item msgid="2822309747675758628">"256 كيلوبايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>

    <item msgid="6699306198357496731">"1 ميغابايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>

res/values-az-rAZ/arrays.xml

+3 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ 
    <item msgid="7169235156349580064">"Fərd"</item>

  </string-array>

  <string-array name="select_logd_size_titles">

    <item msgid="4663095428454779138">"Qapalı"</item>

    <item msgid="3100534874529240291">"64K"</item>

    <item msgid="505611754508988476">"256K"</item>

    <item msgid="6361286924268716397">"1M"</item>
@@ -399,11 +400,13 @@ 
    <item msgid="3025431211013424097">"16M"</item>

  </string-array>

  <string-array name="select_logd_size_lowram_titles">

    <item msgid="4663095428454779138">"Qapalı"</item>

    <item msgid="524799395770610154">"64K"</item>

    <item msgid="3534782711045262344">"256K"</item>

    <item msgid="8085867209202153403">"1M"</item>

  </string-array>

  <string-array name="select_logd_size_summaries">

    <item msgid="4663095428454779138">"Qapalı"</item>

    <item msgid="7346595473588765019">"hər jurnal buferinə 64K"</item>

    <item msgid="2822309747675758628">"hər jurnal buferinə 256K"</item>

    <item msgid="6699306198357496731">"hər jurnal buferinə 1M"</item>

res/values-bg/arrays.xml

+3 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ 
    <item msgid="7169235156349580064">"Персонализиран"</item>

  </string-array>

  <string-array name="select_logd_size_titles">

    <item msgid="4663095428454779138">"Изключено"</item>

    <item msgid="3100534874529240291">"64 КБ"</item>

    <item msgid="505611754508988476">"256 КБ"</item>

    <item msgid="6361286924268716397">"1 МБ"</item>
@@ -399,11 +400,13 @@ 
    <item msgid="3025431211013424097">"16 МБ"</item>

  </string-array>

  <string-array name="select_logd_size_lowram_titles">

    <item msgid="4663095428454779138">"Изключено"</item>

    <item msgid="524799395770610154">"64 КБ"</item>

    <item msgid="3534782711045262344">"256 КБ"</item>

    <item msgid="8085867209202153403">"1 МБ"</item>

  </string-array>

  <string-array name="select_logd_size_summaries">

    <item msgid="4663095428454779138">"Изключено"</item>

    <item msgid="7346595473588765019">"Рег. буфер – 64 КБ"</item>

    <item msgid="2822309747675758628">"Рег. буфер – 256 КБ"</item>

    <item msgid="6699306198357496731">"Рег. буфер – 1 МБ"</item>