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

2 files changed, 28 insertions, 24 deletions

diff --git a/res/values-sq-rAL/arrays.xml b/res/values-sq-rAL/arrays.xml
index 45d827e..d025061 100644
--- a/res/values-sq-rAL/arrays.xml
+++ b/res/values-sq-rAL/arrays.xml
@@ -30,34 +30,34 @@
     <item msgid="8392017019801393511">"Të gjitha"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 sekonda"</item>
-    <item msgid="8881760709354815449">"30 sekonda"</item>
-    <item msgid="7589406073232279088">"1 minutë"</item>
-    <item msgid="7001195990902244174">"2 minuta"</item>
-    <item msgid="7489864775127957179">"5 minuta"</item>
-    <item msgid="2314124409517439288">"10 minuta"</item>
-    <item msgid="6864027152847611413">"30 minuta"</item>
+    <item msgid="3342301044271143016">"15 sek."</item>
+    <item msgid="8881760709354815449">"30 sek."</item>
+    <item msgid="7589406073232279088">"1 min."</item>
+    <item msgid="7001195990902244174">"2 min."</item>
+    <item msgid="7489864775127957179">"5 min."</item>
+    <item msgid="2314124409517439288">"10 min."</item>
+    <item msgid="6864027152847611413">"30 min."</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"Asnjëherë"</item>
-    <item msgid="2194151041885903260">"15 sekonda"</item>
-    <item msgid="5892295237131074341">"30 sekonda"</item>
-    <item msgid="3538441365970038213">"1 minutë"</item>
-    <item msgid="412343871668955639">"2 minuta"</item>
-    <item msgid="5076853889688991690">"5 minuta"</item>
-    <item msgid="1903860996174927898">"10 minuta"</item>
-    <item msgid="6415509612413178727">"30 minuta"</item>
+    <item msgid="2194151041885903260">"15 sek."</item>
+    <item msgid="5892295237131074341">"30 sek."</item>
+    <item msgid="3538441365970038213">"1 min."</item>
+    <item msgid="412343871668955639">"2 min."</item>
+    <item msgid="5076853889688991690">"5 min."</item>
+    <item msgid="1903860996174927898">"10 min."</item>
+    <item msgid="6415509612413178727">"30 min."</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Menjëherë"</item>
-    <item msgid="6736512735606834431">"5 sekonda"</item>
-    <item msgid="8044619388267891375">"15 sekonda"</item>
-    <item msgid="1822002388249545488">"30 sekonda"</item>
-    <item msgid="8538071621211916519">"1 minutë"</item>
-    <item msgid="5663439580228932882">"2 minuta"</item>
-    <item msgid="49888496216106852">"5 minuta"</item>
-    <item msgid="9002737361305019353">"10 minuta"</item>
-    <item msgid="4322676235684793329">"30 minuta"</item>
+    <item msgid="6736512735606834431">"5 sek."</item>
+    <item msgid="8044619388267891375">"15 sek."</item>
+    <item msgid="1822002388249545488">"30 sek."</item>
+    <item msgid="8538071621211916519">"1 min."</item>
+    <item msgid="5663439580228932882">"2 min."</item>
+    <item msgid="49888496216106852">"5 min."</item>
+    <item msgid="9002737361305019353">"10 min."</item>
+    <item msgid="4322676235684793329">"30 min."</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"E vogël"</item>
@@ -151,8 +151,8 @@
     <item msgid="2330782789550628803">"Jashtë rrezes"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 minuta"</item>
-    <item msgid="8675215713017289017">"5 minuta"</item>
+    <item msgid="8151962652413645395">"2 min."</item>
+    <item msgid="8675215713017289017">"5 min."</item>
     <item msgid="477015974247590543">"1 orë"</item>
     <item msgid="5198271470953124739">"Skadim të kohës së veprimit, asnjëherë!"</item>
   </string-array>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 4c98ac2..85fd666 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -2512,6 +2512,7 @@
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplikacionet e parazgjedhura"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"sasia e shpërfilljes së optimizimeve aplikacioni në modalitet gatishmërie"</string>
     <string name="keywords_color_mode" msgid="4670570451841540200">"ngjyrë e gjallë rgb srgb natyrale standarde"</string>
+    <string name="keywords_color_temperature" msgid="2688947724153266364">"temperaturë e ftohtë D65 D73 e bardhë e verdhë blu e ngrohtë e ftohtë"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"rrëshqit fjalëkalim motiv pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Cakto një etiketë NFC për Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Shkruaj"</string>
@@ -2900,4 +2901,7 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modalitti i ngjyrave të figurës"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Përdor sRGB"</string>
+    <string name="color_temperature" msgid="2070126836910615605">"Temperatura e ftohtë e ngjyrës"</string>
+    <string name="color_temperature_desc" msgid="4793729830226404052">"Përdor ngjyra të ftohta të ekranit"</string>
+    <string name="color_temperature_toast" msgid="4974218172133854827">"Për të zbatuar ndryshimin e ngjyrës, çaktivizoje ekranin"</string>
 </resources>