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

Commit 94ab8822 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

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

Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00
parents 6556921a f3cc2352

res/values-af/arrays.xml

+3 −0
Original line number Diff line number Diff line
@@ -391,6 +391,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>
@@ -398,11 +399,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
@@ -391,6 +391,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>
@@ -398,11 +399,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
@@ -391,6 +391,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>
@@ -398,11 +399,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

+22 −0
Original line number Diff line number Diff line
@@ -332,6 +332,28 @@ 
    <item msgid="5131846588686178907">"ART istifadə edin"</item>

    <item msgid="4530003713865319928">"ART sazlama tərtibatından istifadə edin"</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>

    <item msgid="6405203239560695266">"4M"</item>

    <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>

    <item msgid="5748528643937500349">"hər jurnal buferinə 4M"</item>

    <item msgid="1978629051085111592">"hər jurnal buferinə 16M"</item>

  </string-array>

  <string-array name="hdcp_checking_titles">

    <item msgid="441827799230089869">"Heç vaxt yoxlama"</item>

    <item msgid="6042769699089883931">"Yalnız DRM kontent üçün yoxlayın"</item>

res/values-bg/arrays.xml

+3 −0
Original line number Diff line number Diff line
@@ -391,6 +391,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>
@@ -398,11 +399,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>