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

Commit d8c29b8f authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-6.0.1_r22' of... 

Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Settings into cm-13.0

Android 6.0.1 release 22

Change-Id: Ided010bc125199d47ca59d10f0ed5032a26632ff
parents d35875e9 9738c9f6

res/values-af/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -2512,6 +2512,7 @@ 
    <string name="keywords_default_apps" msgid="3581727483175522599">"programme verstek"</string>

    <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignoreer optimerings sluimer programbystand"</string>

    <string name="keywords_color_mode" msgid="4670570451841540200">"lewendig rgb srgb kleur natuurlik standaard"</string>

    <string name="keywords_color_temperature" msgid="2688947724153266364">"kleur temperatuur D65 D73 wit geel blou warm koel"</string>

    <string name="keywords_lockscreen" msgid="4806191868723291541">"gly wagwoord patroon pin"</string>

    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Stel Wi-Fi-NFC-merker op"</string>

    <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
@@ -2900,4 +2901,10 @@ 
  </string-array>

    <string name="picture_color_mode" msgid="4560755008730283695">"Fotokleurmodus"</string>

    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gebruik sRGB"</string>

    <!-- no translation found for color_temperature (2070126836910615605) -->

    <skip />

    <!-- no translation found for color_temperature_desc (4793729830226404052) -->

    <skip />

    <!-- no translation found for color_temperature_toast (4974218172133854827) -->

    <skip />

</resources>

res/values-am/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2512,6 +2512,7 @@ 
    <string name="keywords_default_apps" msgid="3581727483175522599">"መተግበሪያዎች ነባሪ"</string>

    <string name="keywords_ignore_optimizations" msgid="946516741848647905">"የማትባቶችን መጠን መተግበሪያ ዝግጁነት ችላ ማለት"</string>

    <string name="keywords_color_mode" msgid="4670570451841540200">"ነዛሪ rgb srgb ቀለም ተፈጥሯዋዊ መደበኛ"</string>

    <string name="keywords_color_temperature" msgid="2688947724153266364">"የቀለም ሙቀት D65 D73 ነጭ ቢጫ ሰማያዊ ለብ ያለ ቀዝቃዛ"</string>

    <string name="keywords_lockscreen" msgid="4806191868723291541">"ማንሸራተት የይለፍ ቃል ስርዓተ-ጥለት ፒን"</string>

    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"የWi-Fi NFC መለያ ያዋቅሩ"</string>

    <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
@@ -2900,4 +2901,7 @@ 
  </string-array>

    <string name="picture_color_mode" msgid="4560755008730283695">"የስዕል ቀለም ሁነታ"</string>

    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ይጠቀሙ"</string>

    <string name="color_temperature" msgid="2070126836910615605">"ቀዝቀዝ ያለ የቀለም ሙቀት"</string>

    <string name="color_temperature_desc" msgid="4793729830226404052">"ቀዝቀዝ ያሉ የማሳያ ቀለሞችን ይጠቀሙ"</string>

    <string name="color_temperature_toast" msgid="4974218172133854827">"የቀለም ለውጥን ለመተግበር ማያ ገጹን ያጥፉት"</string>

</resources>

res/values-ar/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2548,6 +2548,7 @@ 
    <string name="keywords_default_apps" msgid="3581727483175522599">"التطبيقات الافتراضية"</string>

    <string name="keywords_ignore_optimizations" msgid="946516741848647905">"تجاهل تحسينات وضع استعداد تطبيقات الغفوة"</string>

    <string name="keywords_color_mode" msgid="4670570451841540200">"‏لون rgb srgb نابض بالحياة قياسي طبيعي"</string>

    <string name="keywords_color_temperature" msgid="2688947724153266364">"‏درجة حرارة الألوان D65 D73 أبيض أصفر أزرق دافئ بارد"</string>

    <string name="keywords_lockscreen" msgid="4806191868723291541">"التمرير، كلمة المرور، النمط، رقم التعريف الشخصي"</string>

    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة NFC عبر Wi-Fi"</string>

    <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
@@ -2972,4 +2973,7 @@ 
  </string-array>

    <string name="picture_color_mode" msgid="4560755008730283695">"نمط لون الصورة"</string>

    <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏استخدام sRGB"</string>

    <string name="color_temperature" msgid="2070126836910615605">"درجة حرارة لون رائعة"</string>

    <string name="color_temperature_desc" msgid="4793729830226404052">"استخدم ألوان أكثر روعة للشاشة"</string>

    <string name="color_temperature_toast" msgid="4974218172133854827">"لتطبيق التغيير في اللون، أوقف الشاشة."</string>

</resources>

res/values-az-rAZ/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2512,6 +2512,7 @@ 
    <string name="keywords_default_apps" msgid="3581727483175522599">"tətbiq defolt"</string>

    <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignore optimallaşdırılması app gözləmə doze"</string>

    <string name="keywords_color_mode" msgid="4670570451841540200">"təbii standart canlı rgb sRGB rəngi"</string>

    <string name="keywords_color_temperature" msgid="2688947724153266364">"rəng temperaturu D65 D73 ağ sarı mavi ilıq sərin"</string>

    <string name="keywords_lockscreen" msgid="4806191868723291541">"parol model pinini çəkin"</string>

    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Teqi quraşdırın"</string>

    <string name="write_tag" msgid="8571858602896222537">"Yazın"</string>
@@ -2900,4 +2901,7 @@ 
  </string-array>

    <string name="picture_color_mode" msgid="4560755008730283695">"Şəkil rəng rejimi"</string>

    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB istifadə edin"</string>

    <string name="color_temperature" msgid="2070126836910615605">"Sərin rəng temperaturu"</string>

    <string name="color_temperature_desc" msgid="4793729830226404052">"Serinləşdirici ekran rənglərini istifadə edin"</string>

    <string name="color_temperature_toast" msgid="4974218172133854827">"Rəng dəyişikliyini tətbiq etmək üçün ekranı söndürün"</string>

</resources>

res/values-bg/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2512,6 +2512,7 @@ 
    <string name="keywords_default_apps" msgid="3581727483175522599">"приложения, по подразбиране"</string>

    <string name="keywords_ignore_optimizations" msgid="946516741848647905">"пренебрегване на оптимизациите, отлагане, приложение, готовност"</string>

    <string name="keywords_color_mode" msgid="4670570451841540200">"ярък, rgb, srgb, цвят, естествен, стандартен"</string>

    <string name="keywords_color_temperature" msgid="2688947724153266364">"цветна температура D65 D73 бяло жълто синьо топло студено"</string>

    <string name="keywords_lockscreen" msgid="4806191868723291541">"плъзгане, парола, фигура, ПИН код"</string>

    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за Wi-Fi: Настр."</string>

    <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
@@ -2900,4 +2901,7 @@ 
  </string-array>

    <string name="picture_color_mode" msgid="4560755008730283695">"Цветови режим за снимките"</string>

    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Използване на sRGB"</string>

    <string name="color_temperature" msgid="2070126836910615605">"Студена цветова гама"</string>

    <string name="color_temperature_desc" msgid="4793729830226404052">"Използване на по-студени цветове за дисплея"</string>

    <string name="color_temperature_toast" msgid="4974218172133854827">"За да приложите промяната на цветовете, изключете екрана"</string>

</resources>