Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev

commit: 7db037a989ea9c106ea404681cfe22a1fd2a2973 [log] [tgz]
author: Alexandra Gherghina <alexgherghina@google.com> Wed Nov 05 10:06:35 2014 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Wed Nov 05 10:06:36 2014 +0000
tree: 639dc52f129869ed24f0c79fb413d45d8d6ac583
parent: b153181c9c597085769d69796ecf07ec6d4433d2 [diff]
parent: 6911af1cbe3d08e5cb1403c064d154c6b9558e41 [diff]
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index cb36898..862babe 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Gekas (aktiwiteitkliënt)"</item>
     <item msgid="6652164677254579050">"Gekas (leeg)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blougroen"</item>
+    <item msgid="8332294763632946560">"Blou"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Pers"</item>
+    <item msgid="4608643045752965568">"Pienk"</item>
+    <item msgid="6131821495505931173">"Rooi"</item>
+  </string-array>
 </resources>

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 61ad831..102d82a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Onderskrifte sal so lyk"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Verstek"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Kleur"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Verstek"</string>
     <string name="color_none" msgid="3475640044925814795">"Geen"</string>
     <string name="color_white" msgid="8045195170201590239">"Wit"</string>

diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index b1b2e75..28f1e1d 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"የተሸጎጠ (የእንቅስቃሴ ደንበኛ)"</item>
     <item msgid="6652164677254579050">"የተሸጎጠ (ባዶ)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ጥቁር አረንጓዴ-ሰማያዊ"</item>
+    <item msgid="8332294763632946560">"ሰማያዊ"</item>
+    <item msgid="2023216417616991392">"ወይን ጠጅ"</item>
+    <item msgid="3170497246594232819">"ሐምራዊ"</item>
+    <item msgid="4608643045752965568">"ሮዝ"</item>
+    <item msgid="6131821495505931173">"ቀይ"</item>
+  </string-array>
 </resources>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 762ae8e..31bb9e6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"መግለጫ ጽሑፎች እንዲህ ነው የሚመስሉት"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ነባሪ"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"ቀለም"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ነባሪ"</string>
     <string name="color_none" msgid="3475640044925814795">"ምንም የለም"</string>
     <string name="color_white" msgid="8045195170201590239">"ነጭ"</string>

diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 3f83e0c..de81138 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"تخزين مؤقت (برنامج النشاط)"</item>
     <item msgid="6652164677254579050">"تخزين مؤقت (فارغ)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"أزرق مخضر"</item>
+    <item msgid="8332294763632946560">"أزرق"</item>
+    <item msgid="2023216417616991392">"نيلي"</item>
+    <item msgid="3170497246594232819">"أرجواني"</item>
+    <item msgid="4608643045752965568">"قرنفلي"</item>
+    <item msgid="6131821495505931173">"أحمر"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5deadd6..f811649 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ستبدو التسميات التوضيحية بالشكل التالي"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"افتراضي"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"اللون"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"الافتراضية"</string>
     <string name="color_none" msgid="3475640044925814795">"بدون"</string>
     <string name="color_white" msgid="8045195170201590239">"أبيض"</string>

diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 84e2a40..14f9114 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Кеширано (клиентска програма за активността)"</item>
     <item msgid="6652164677254579050">"Кеширано (празно)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"синьо-зелено"</item>
+    <item msgid="8332294763632946560">"синьо"</item>
+    <item msgid="2023216417616991392">"индиго"</item>
+    <item msgid="3170497246594232819">"лилаво"</item>
+    <item msgid="4608643045752965568">"розово"</item>
+    <item msgid="6131821495505931173">"червено"</item>
+  </string-array>
 </resources>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f378dd8..b205fcd 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Надписите ще изглеждат така"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"По подразбиране"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Цвят"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Стандартно"</string>
     <string name="color_none" msgid="3475640044925814795">"Без"</string>
     <string name="color_white" msgid="8045195170201590239">"Бял"</string>

diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn-rBD/arrays.xml
index dc5f3df..2c95367 100644
--- a/res/values-bn-rBD/arrays.xml
+++ b/res/values-bn-rBD/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"ব্যবহৃত ক্যাশে (কার্যকলাপ ক্লায়েন্ট)"</item>
     <item msgid="6652164677254579050">"ব্যবহৃত ক্যাশে (খালি)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"টিল"</item>
+    <item msgid="8332294763632946560">"নীল"</item>
+    <item msgid="2023216417616991392">"বেগুনি নীলবর্ণ"</item>
+    <item msgid="3170497246594232819">"বেগুনি"</item>
+    <item msgid="4608643045752965568">"গোলাপী"</item>
+    <item msgid="6131821495505931173">"লাল"</item>
+  </string-array>
 </resources>

diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 77574b8..2b61e0a 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ক্যাপশান দেওয়া থাকলে এমন দেখায়"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ডিফল্ট"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"রঙ"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ডিফল্ট"</string>
     <string name="color_none" msgid="3475640044925814795">"কোনো কিছুই নয়"</string>
     <string name="color_white" msgid="8045195170201590239">"সাদা"</string>

diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 108f5ad..ad501bc 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"A la memòria cau (client de l\'activitat)"</item>
     <item msgid="6652164677254579050">"A la memòria cau (buit)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verd blavós"</item>
+    <item msgid="8332294763632946560">"Blau"</item>
+    <item msgid="2023216417616991392">"Anyil"</item>
+    <item msgid="3170497246594232819">"Porpra"</item>
+    <item msgid="4608643045752965568">"Rosa"</item>
+    <item msgid="6131821495505931173">"Vermell"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0bebfff..8671591 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Els subtítols es mostraran així"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predeterminat"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Color"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predeterminat"</string>
     <string name="color_none" msgid="3475640044925814795">"Cap"</string>
     <string name="color_white" msgid="8045195170201590239">"Blanc"</string>

diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 86db65d..31ff237 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Cachelagret (aktivitetsklient)"</item>
     <item msgid="6652164677254579050">"Cachelagret (tom)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turkis"</item>
+    <item msgid="8332294763632946560">"Blå"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lilla"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Rød"</item>
+  </string-array>
 </resources>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 88fb354..8328888 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Underteksterne vil se sådan ud"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Standard"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Farve"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Standard"</string>
     <string name="color_none" msgid="3475640044925814795">"Ingen"</string>
     <string name="color_white" msgid="8045195170201590239">"Hvid"</string>

diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 5efc016..3491ad7 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Cached (activity client)"</item>
     <item msgid="6652164677254579050">"Cached (empty)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Blue"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purple"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Red"</item>
+  </string-array>
 </resources>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 83d860c..b8fd254 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Captions will look like this"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Default"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Colour"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Default"</string>
     <string name="color_none" msgid="3475640044925814795">"None"</string>
     <string name="color_white" msgid="8045195170201590239">"White"</string>

diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 5efc016..3491ad7 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Cached (activity client)"</item>
     <item msgid="6652164677254579050">"Cached (empty)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Blue"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purple"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Red"</item>
+  </string-array>
 </resources>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 83d860c..b8fd254 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Captions will look like this"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Default"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Colour"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Default"</string>
     <string name="color_none" msgid="3475640044925814795">"None"</string>
     <string name="color_white" msgid="8045195170201590239">"White"</string>

diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 50c6f7b..f0c5445 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"En caché (cliente de actividad)"</item>
     <item msgid="6652164677254579050">"En caché (vacío)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verde azulado"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Púrpura"</item>
+    <item msgid="4608643045752965568">"Rosado"</item>
+    <item msgid="6131821495505931173">"Rojo"</item>
+  </string-array>
 </resources>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ac06340..5ba9f42 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Los subtítulos quedarán así:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predeterminado"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Color"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predeterminado"</string>
     <string name="color_none" msgid="3475640044925814795">"Ninguno"</string>
     <string name="color_white" msgid="8045195170201590239">"Blanco"</string>

diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu-rES/arrays.xml
index e47fa33..2bceb45 100644
--- a/res/values-eu-rES/arrays.xml
+++ b/res/values-eu-rES/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Cachean gordetakoa (jardueren bezeroa)"</item>
     <item msgid="6652164677254579050">"Cachean gordetakoa (hutsik)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Anila"</item>
+    <item msgid="8332294763632946560">"Urdina"</item>
+    <item msgid="2023216417616991392">"Indigoa"</item>
+    <item msgid="3170497246594232819">"Morea"</item>
+    <item msgid="4608643045752965568">"Arrosa"</item>
+    <item msgid="6131821495505931173">"Gorria"</item>
+  </string-array>
 </resources>

diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index a544777..66d1ff4 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Bideo-oinek itxura hau izango dute:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Lehenetsia"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Koloreak"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Lehenetsia"</string>
     <string name="color_none" msgid="3475640044925814795">"Bat ere ez"</string>
     <string name="color_white" msgid="8045195170201590239">"Zuria"</string>

diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 3787a5d..a5cfce4 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"قرار داده شده در حافظه پنهان (کلاینت فعالیت)"</item>
     <item msgid="6652164677254579050">"قرار داده شده در حافظه پنهان (خالی)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"فیروزه‌ای"</item>
+    <item msgid="8332294763632946560">"آبی"</item>
+    <item msgid="2023216417616991392">"نیلی"</item>
+    <item msgid="3170497246594232819">"بنفش"</item>
+    <item msgid="4608643045752965568">"صورتی"</item>
+    <item msgid="6131821495505931173">"قرمز"</item>
+  </string-array>
 </resources>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1abf998..ce9c5ad 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"زیرنویس‌ها شبیه به این هستند"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"پیش‌فرض"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"رنگی"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"پیش‌فرض"</string>
     <string name="color_none" msgid="3475640044925814795">"هیچ‌کدام"</string>
     <string name="color_white" msgid="8045195170201590239">"سفید"</string>

diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 874a895..3d8a413 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Välimuistissa (toiminnan suorittaja)"</item>
     <item msgid="6652164677254579050">"Välimuistissa (tyhjä)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turkoosi"</item>
+    <item msgid="8332294763632946560">"Sininen"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violetti"</item>
+    <item msgid="4608643045752965568">"Vaaleanpunainen"</item>
+    <item msgid="6131821495505931173">"Punainen"</item>
+  </string-array>
 </resources>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f2f0f4b..e1cb468 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Tekstitys näyttää tältä"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Oletus"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Väri"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Oletusarvo"</string>
     <string name="color_none" msgid="3475640044925814795">"Ei mitään"</string>
     <string name="color_white" msgid="8045195170201590239">"Valkoinen"</string>

diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 267c135..a3e83c1 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Mise en cache (client d\'activité)"</item>
     <item msgid="6652164677254579050">"Mise en cache (vide)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turquoise"</item>
+    <item msgid="8332294763632946560">"Bleu"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Mauve"</item>
+    <item msgid="4608643045752965568">"Rose"</item>
+    <item msgid="6131821495505931173">"Rouge"</item>
+  </string-array>
 </resources>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c3ea77e..1a40d2f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Les sous-titres ressembleront à ceci"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Par défaut"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Couleur"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Par défaut"</string>
     <string name="color_none" msgid="3475640044925814795">"Aucun"</string>
     <string name="color_white" msgid="8045195170201590239">"Blanc"</string>

diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 3973877..9a8811f 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Mise en cache (client d\'activité)"</item>
     <item msgid="6652164677254579050">"Mise en cache (vide)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turquoise"</item>
+    <item msgid="8332294763632946560">"Bleu"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violet"</item>
+    <item msgid="4608643045752965568">"Rose"</item>
+    <item msgid="6131821495505931173">"Rouge"</item>
+  </string-array>
 </resources>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0a654bf..a8c7722 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Aperçu des sous-titres"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Par défaut"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Couleur"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Par défaut"</string>
     <string name="color_none" msgid="3475640044925814795">"Aucune"</string>
     <string name="color_white" msgid="8045195170201590239">"Blanc"</string>

diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl-rES/arrays.xml
index 313b2fa..c513957 100644
--- a/res/values-gl-rES/arrays.xml
+++ b/res/values-gl-rES/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Na caché (cliente de actividade)"</item>
     <item msgid="6652164677254579050">"Na caché (en branco)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verde azulado"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Violeta"</item>
+    <item msgid="4608643045752965568">"Rosa"</item>
+    <item msgid="6131821495505931173">"Vermello"</item>
+  </string-array>
 </resources>

diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index cfd6e07..c84951b 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Os subtítulos terán un aspecto similar ao seguinte"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predeterminada"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Cor"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predeterminado"</string>
     <string name="color_none" msgid="3475640044925814795">"Ningún"</string>
     <string name="color_white" msgid="8045195170201590239">"Branco"</string>

diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 3e72688..57cb420 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"संचित (गतिविधि क्लाइंट)"</item>
     <item msgid="6652164677254579050">"संचित (खाली)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"हरा-नीला"</item>
+    <item msgid="8332294763632946560">"नीला"</item>
+    <item msgid="2023216417616991392">"गहरा नीला"</item>
+    <item msgid="3170497246594232819">"बैंगनी"</item>
+    <item msgid="4608643045752965568">"गुलाबी"</item>
+    <item msgid="6131821495505931173">"लाल"</item>
+  </string-array>
 </resources>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c01037a..aa8aa6a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"कैप्‍शन इस तरह दिखाई देंगे"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"सामान्य"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"रंग"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"डिफ़ॉल्ट"</string>
     <string name="color_none" msgid="3475640044925814795">"कोई नहीं"</string>
     <string name="color_white" msgid="8045195170201590239">"सफ़ेद"</string>

diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 28f2c92..fbbf535 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Predmemorija (klijent aktivnosti)"</item>
     <item msgid="6652164677254579050">"Predmemorija (prazna)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Tirkiznoplava"</item>
+    <item msgid="8332294763632946560">"Plava"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Ljubičasta"</item>
+    <item msgid="4608643045752965568">"Ružičasta"</item>
+    <item msgid="6131821495505931173">"Crvena"</item>
+  </string-array>
 </resources>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 54d4b5a..d0e976d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Opisi će izgledati ovako"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Zadano"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Boja"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Zadano"</string>
     <string name="color_none" msgid="3475640044925814795">"Ništa"</string>
     <string name="color_white" msgid="8045195170201590239">"Bijela"</string>

diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
index eb9713a..221314a 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Քեշավորված (սպասառուի գործողությունը)"</item>
     <item msgid="6652164677254579050">"Քեշավորված (դատարկ)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Փիրուզագույն"</item>
+    <item msgid="8332294763632946560">"Կապույտ"</item>
+    <item msgid="2023216417616991392">"Ինդիգո"</item>
+    <item msgid="3170497246594232819">"Մանուշակագույն"</item>
+    <item msgid="4608643045752965568">"Վարդագույն"</item>
+    <item msgid="6131821495505931173">"Կարմիր"</item>
+  </string-array>
 </resources>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index a513267..4feb882 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Խորագրերն այսպիսին կլինեն"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Լռելյայն"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Գույնը"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Կանխադրված"</string>
     <string name="color_none" msgid="3475640044925814795">"Ոչինչ"</string>
     <string name="color_white" msgid="8045195170201590239">"Սպիտակ"</string>

diff --git a/res/values-is-rIS/arrays.xml b/res/values-is-rIS/arrays.xml
index 6d3c393..dd0af19 100644
--- a/res/values-is-rIS/arrays.xml
+++ b/res/values-is-rIS/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Í skyndiminni (virknibiðlari)"</item>
     <item msgid="6652164677254579050">"Í skyndiminni (autt)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blágrænn"</item>
+    <item msgid="8332294763632946560">"Blár"</item>
+    <item msgid="2023216417616991392">"Dimmfjólublár"</item>
+    <item msgid="3170497246594232819">"Fjólublár"</item>
+    <item msgid="4608643045752965568">"Bleikur"</item>
+    <item msgid="6131821495505931173">"Rauður"</item>
+  </string-array>
 </resources>

diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 91d7541..edc2107 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Skjátextarnir munu líta svona út"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Sjálfgefið"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Litur"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Sjálfgefið"</string>
     <string name="color_none" msgid="3475640044925814795">"Enginn"</string>
     <string name="color_white" msgid="8045195170201590239">"Hvítur"</string>

diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 10bd630..cac7959 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"キャッシュ済み（アクティビティクライアント）"</item>
     <item msgid="6652164677254579050">"キャッシュ済み（空）"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ティール"</item>
+    <item msgid="8332294763632946560">"ブルー"</item>
+    <item msgid="2023216417616991392">"インディゴ"</item>
+    <item msgid="3170497246594232819">"パープル"</item>
+    <item msgid="4608643045752965568">"ピンク"</item>
+    <item msgid="6131821495505931173">"レッド"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9926df8..05a6b1f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -1539,8 +1539,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"字幕サンプル"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aあ"</string>
     <string name="locale_default" msgid="2593883646136326969">"デフォルト"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"カラー"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"デフォルト"</string>
     <string name="color_none" msgid="3475640044925814795">"なし"</string>
     <string name="color_white" msgid="8045195170201590239">"白"</string>

diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
index 9f667a8..1a4f75f 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"ქეშირებულია (აქტივობის კლიენტი)"</item>
     <item msgid="6652164677254579050">"ქეშირებული (ცარიელი)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ზურმუხტისფერი"</item>
+    <item msgid="8332294763632946560">"ლურჯი"</item>
+    <item msgid="2023216417616991392">"მუქი ლურჯი"</item>
+    <item msgid="3170497246594232819">"მეწამული"</item>
+    <item msgid="4608643045752965568">"ვარდისფერი"</item>
+    <item msgid="6131821495505931173">"წითელი"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index a6deb28..211e34f 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ტიტრები გამოჩნდება ასე"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ნაგულისხმევი"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"ფერი"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ნაგულისხმევი"</string>
     <string name="color_none" msgid="3475640044925814795">"არცერთი"</string>
     <string name="color_white" msgid="8045195170201590239">"თეთრი"</string>

diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
index e347b96..bb6ed9c 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Кэштелген (белсенділік клиенті)"</item>
     <item msgid="6652164677254579050">"Кэштелген (бос)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Көгілдір"</item>
+    <item msgid="8332294763632946560">"Көк"</item>
+    <item msgid="2023216417616991392">"Индиго түсі"</item>
+    <item msgid="3170497246594232819">"Қызылкүрең"</item>
+    <item msgid="4608643045752965568">"Қызғылт"</item>
+    <item msgid="6131821495505931173">"Қызыл"</item>
+  </string-array>
 </resources>

diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 5865621..3140c4e 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Айдары осындай болады"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Бастапқы"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Түс"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Әдепкі"</string>
     <string name="color_none" msgid="3475640044925814795">"Ешқандай"</string>
     <string name="color_white" msgid="8045195170201590239">"Ақ"</string>

diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 8b83add..8c7ae9f 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"캐시됨(활동 클라이언트)"</item>
     <item msgid="6652164677254579050">"캐시됨(비어 있음)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"청록색"</item>
+    <item msgid="8332294763632946560">"파란색"</item>
+    <item msgid="2023216417616991392">"남색"</item>
+    <item msgid="3170497246594232819">"보라색"</item>
+    <item msgid="4608643045752965568">"분홍색"</item>
+    <item msgid="6131821495505931173">"빨간색"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5ad201f..7572e72 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"자막이 다음과 같이 표시됩니다."</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"기본값"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"색상"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"기본값"</string>
     <string name="color_none" msgid="3475640044925814795">"없음"</string>
     <string name="color_white" msgid="8045195170201590239">"흰색"</string>

diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky-rKG/arrays.xml
index ffbd623..f77cba9 100644
--- a/res/values-ky-rKG/arrays.xml
+++ b/res/values-ky-rKG/arrays.xml

@@ -454,10 +454,12 @@
     <item msgid="4338089220026248848">"Кештелген (иш-аракет кардары)"</item>
     <item msgid="6652164677254579050">"Кештелген (бош)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Жашыл көгүш"</item>
+    <item msgid="8332294763632946560">"Көк"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Кызгылт көгүш"</item>
+    <item msgid="4608643045752965568">"Кызгылтым"</item>
+    <item msgid="6131821495505931173">"Кызыл"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index b53e4dd..8344a61 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml

@@ -2223,8 +2223,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Субтитрлер мындай көрүнөт"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Өө"</string>
     <string name="locale_default" msgid="2593883646136326969">"Абалкы"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Түс"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Демейки"</string>
     <string name="color_none" msgid="3475640044925814795">"Эчтеке жок"</string>
     <string name="color_white" msgid="8045195170201590239">"Ак"</string>

diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
index 32aed96..0209d96 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Cached (ການເຄື່ອນໄຫວລູກຂ່າຍ)"</item>
     <item msgid="6652164677254579050">"Cached (ຫວ່າງເປົ່າ)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ສີຂຽວອົມຟ້າ"</item>
+    <item msgid="8332294763632946560">"ຟ້າ"</item>
+    <item msgid="2023216417616991392">"ສີມ່ວງເຂັ້ມ"</item>
+    <item msgid="3170497246594232819">"ສີມ່ວງ"</item>
+    <item msgid="4608643045752965568">"ບົວ"</item>
+    <item msgid="6131821495505931173">"ແດງ"</item>
+  </string-array>
 </resources>

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 959124e..7bc25e8 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"ຄຳບັນຍາຍຈະເປັນແບບນີ້"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ຄ່າເລີ່ມຕົ້ນ"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"ສີ"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="color_none" msgid="3475640044925814795">"ບໍ່ມີ"</string>
     <string name="color_white" msgid="8045195170201590239">"ຂາວ"</string>

diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index fac84d2..5f75f6a 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Saglabāts kešatmiņā (darbības klients)"</item>
     <item msgid="6652164677254579050">"Saglabāts kešatmiņā (tukša)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Zilganzaļa"</item>
+    <item msgid="8332294763632946560">"Zila"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violeta"</item>
+    <item msgid="4608643045752965568">"Rozā"</item>
+    <item msgid="6131821495505931173">"Sarkana"</item>
+  </string-array>
 </resources>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 99acde7..5061001 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Paraksti izskatīsies šādi:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Noklusējums"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Krāsa"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Noklusējuma"</string>
     <string name="color_none" msgid="3475640044925814795">"Nav"</string>
     <string name="color_white" msgid="8045195170201590239">"Balta"</string>

diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml-rIN/arrays.xml
index 6e2e6e8..f99d2d3 100644
--- a/res/values-ml-rIN/arrays.xml
+++ b/res/values-ml-rIN/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"കാഷെചെയ്‌തു (പ്രവർത്തന ക്ലയന്റ്)"</item>
     <item msgid="6652164677254579050">"കാഷെചെയ്‌തു (ശൂന്യം)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ടീല്‍"</item>
+    <item msgid="8332294763632946560">"നീല"</item>
+    <item msgid="2023216417616991392">"ഇൻഡിഗോ"</item>
+    <item msgid="3170497246594232819">"പര്‍പ്പിള്‍"</item>
+    <item msgid="4608643045752965568">"പിങ്ക്"</item>
+    <item msgid="6131821495505931173">"ചുവപ്പ്"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 87bd398..162bebc 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"അടിക്കുറിപ്പുകൾ ഇതുപോലെ കാണപ്പെടും"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"സ്ഥിരമായത്"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"വർണ്ണം"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"സ്ഥിരമായത്"</string>
     <string name="color_none" msgid="3475640044925814795">"ഒന്നുമില്ല"</string>
     <string name="color_white" msgid="8045195170201590239">"വെളുപ്പ്"</string>

diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr-rIN/arrays.xml
index 721fc4a..69eb913 100644
--- a/res/values-mr-rIN/arrays.xml
+++ b/res/values-mr-rIN/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"कॅशे केलेला (क्रियाकलाप क्लायंट)"</item>
     <item msgid="6652164677254579050">"कॅशे केलेला (रिक्त)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"हिरवट निळा"</item>
+    <item msgid="8332294763632946560">"निळा"</item>
+    <item msgid="2023216417616991392">"नीळ"</item>
+    <item msgid="3170497246594232819">"जांभळा"</item>
+    <item msgid="4608643045752965568">"गुलाबी"</item>
+    <item msgid="6131821495505931173">"लाल"</item>
+  </string-array>
 </resources>

diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 359aad7..a640536 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"मथळे यासारखे दिसतील"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"डीफॉल्ट"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"रंग"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"डीफॉल्ट"</string>
     <string name="color_none" msgid="3475640044925814795">"काहीही नाही"</string>
     <string name="color_white" msgid="8045195170201590239">"पांढरा"</string>

diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index 851e917..f4d49d9 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Cache (klien aktiviti)"</item>
     <item msgid="6652164677254579050">"Cache (kosong)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Hijau kebiruan"</item>
+    <item msgid="8332294763632946560">"Biru"</item>
+    <item msgid="2023216417616991392">"Biru nila"</item>
+    <item msgid="3170497246594232819">"Ungu"</item>
+    <item msgid="4608643045752965568">"Merah jambu"</item>
+    <item msgid="6131821495505931173">"Merah"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index a3d81a8..e0618c6 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Kapsyen akan kelihatan seperti ini"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Lalai"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Warna"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Lalai"</string>
     <string name="color_none" msgid="3475640044925814795">"Tiada"</string>
     <string name="color_white" msgid="8045195170201590239">"Putih"</string>

diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
index 4bb31e8..3c29b0b 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my-rMM/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"ကက်ရှ လုပ်ထား (အသုံးပြုသူ ဖောက်သည်)"</item>
     <item msgid="6652164677254579050">"ကက်ရှ် လုပ်ထား (ဗလာ)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"စိမ်းပြာ"</item>
+    <item msgid="8332294763632946560">"အပြာ"</item>
+    <item msgid="2023216417616991392">"မဲနယ်"</item>
+    <item msgid="3170497246594232819">"ခရမ်း"</item>
+    <item msgid="4608643045752965568">"ပန်းရောင်"</item>
+    <item msgid="6131821495505931173">"အနီ"</item>
+  </string-array>
 </resources>

diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 4958689..a12ac58 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml

@@ -1538,8 +1538,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"စာတန်းများကို ဤသို့ မြင်ရမည်"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"မူရင်းအတိုင်း"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"အရောင်"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ပုံသေ"</string>
     <string name="color_none" msgid="3475640044925814795">"တစ်ခုမှမဟုတ်ပါ"</string>
     <string name="color_white" msgid="8045195170201590239">"အဖြူ"</string>

diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne-rNP/arrays.xml
index dba9054..32cdb7f 100644
--- a/res/values-ne-rNP/arrays.xml
+++ b/res/values-ne-rNP/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"क्यास (गतिविधि ग्राहक)"</item>
     <item msgid="6652164677254579050">"क्यास (खाली)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"टिल"</item>
+    <item msgid="8332294763632946560">"नीलो"</item>
+    <item msgid="2023216417616991392">"इन्डिगो"</item>
+    <item msgid="3170497246594232819">"बैजनी"</item>
+    <item msgid="4608643045752965568">"गुलाबी"</item>
+    <item msgid="6131821495505931173">"रातो"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 0b49410..bde9c92 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"क्याप्सन यस्तो देखिने छ"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"पूर्वनिर्धारित"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"रङ्ग"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"पूर्वनिर्धारित"</string>
     <string name="color_none" msgid="3475640044925814795">"कुनै पनि होइन"</string>
     <string name="color_white" msgid="8045195170201590239">"सेतो"</string>
@@ -2457,7 +2456,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"खुल्ला गर्नुहोस्"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"बन्द गर्नुहोस्"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"पर्दा पिन गर्दै"</string>
-    <string name="screen_pinning_description" msgid="7091642350452605379">"जब चालु हुन्छ, तपाईंले अनपिन नगरे सम्म हालैको पर्दा दृश्यमा राख्न पर्दा पिन गरि प्रयोग गर्न सक्छन्।\n\nपर्दा पिन गरि प्रयोग गर्न:\n\n१. पर्दा पिन खुलै छ भनि निश्चित गर्नुहोस्.\n\n२. तपाईंले पिन गर्न चाहनु भएको पर्दा खोल्नुहोस्।.\n\n३. अवलोकन छुनुहोस्।\n\n४. पिन प्रतिमा छुनुहोस्।"</string>
+    <string name="screen_pinning_description" msgid="7091642350452605379">"चालु हुने समय, तपाईँले अनपिन नगर्नु भएसम्म हालको पर्दालाई दृश्यमा राखी राख्न तपाईँले पर्दालाई पिन गरी प्रयोग गर्न सक्नुहुन्छ।\n\nपर्दा पिन गरी प्रयोग गर्न:\n\n1. पर्दा पिन चालु रहेको कुराको सु:निश्चित गर्नुहोस्।\n\n2. तपाईँले पिन गर्न चाहनु भएको पर्दा खोल्नुहोस्।\n\n3. सारांशमा छुनुहोस्।\n\n4. पिन आइकनमा छुनुहोस्। Translation help"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफाइल"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रयोगात्मक)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"जब उपकरण घुमाइन्छ"</string>

diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index adee6d1..eaa1154 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"În cache (client de activitate)"</item>
     <item msgid="6652164677254579050">"În cache (gol)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turcoaz"</item>
+    <item msgid="8332294763632946560">"Albastru"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violet"</item>
+    <item msgid="4608643045752965568">"Roz"</item>
+    <item msgid="6131821495505931173">"Roşu"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index eb74575..bd6aaed 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -1538,8 +1538,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Subtitrările vor arăta așa"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Prestabilit"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Culoare"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Prestabilită"</string>
     <string name="color_none" msgid="3475640044925814795">"Niciuna"</string>
     <string name="color_white" msgid="8045195170201590239">"Alb"</string>

diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 823432b..3830fda 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Кешировано (клиент)"</item>
     <item msgid="6652164677254579050">"Кешировано (пусто)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Сине-зеленый"</item>
+    <item msgid="8332294763632946560">"Синий"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Фиолетовый"</item>
+    <item msgid="4608643045752965568">"Розовый"</item>
+    <item msgid="6131821495505931173">"Красный"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8d55299..6b06ed2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Титры будут выглядеть так"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Аа"</string>
     <string name="locale_default" msgid="2593883646136326969">"По умолчанию"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Цвет"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"По умолчанию"</string>
     <string name="color_none" msgid="3475640044925814795">"Нет"</string>
     <string name="color_white" msgid="8045195170201590239">"Белый"</string>

diff --git a/res/values-si-rLK/arrays.xml b/res/values-si-rLK/arrays.xml
index 1455fb6..ab5408e 100644
--- a/res/values-si-rLK/arrays.xml
+++ b/res/values-si-rLK/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"හැඹිලි ගත කළ (ක්‍රියාකාරකම් සේවාලාභියා)"</item>
     <item msgid="6652164677254579050">"හැඹිලි ගත කළ (හිස්)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"සේරා"</item>
+    <item msgid="8332294763632946560">"නිල්"</item>
+    <item msgid="2023216417616991392">"ඉන්ඩිගෝ"</item>
+    <item msgid="3170497246594232819">"දම්"</item>
+    <item msgid="4608643045752965568">"රෝස"</item>
+    <item msgid="6131821495505931173">"රතු"</item>
+  </string-array>
 </resources>

diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 362bbe9..7951dbe 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml

@@ -1539,8 +1539,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"සිරස්තල මෙවැනි ආකාරයට පෙනේ"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"සුපුරුදු"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"වර්ණය"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"සුපුරුදු"</string>
     <string name="color_none" msgid="3475640044925814795">"කිසිවක් නැත"</string>
     <string name="color_white" msgid="8045195170201590239">"සුදු"</string>

diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index a8070a5..68a2252 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Vo vyrovnávacej pamäti (klient aktivity)"</item>
     <item msgid="6652164677254579050">"Vo vyrovnávacej pamäti (prázdne)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Modrozelená"</item>
+    <item msgid="8332294763632946560">"Modrá"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purpurová"</item>
+    <item msgid="4608643045752965568">"Ružová"</item>
+    <item msgid="6131821495505931173">"Červená"</item>
+  </string-array>
 </resources>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7832bc0..e1c6e17 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Titulky budú vyzerať takto."</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Predvolené"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Farba"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predvolené"</string>
     <string name="color_none" msgid="3475640044925814795">"Žiadna"</string>
     <string name="color_white" msgid="8045195170201590239">"Biela"</string>

diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 54498f6..471e2ed 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Predpomnjeno (odjemalec dejavnosti)"</item>
     <item msgid="6652164677254579050">"Predpomnjeno (prazno)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Zelenomodra"</item>
+    <item msgid="8332294763632946560">"Modra"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Vijolična"</item>
+    <item msgid="4608643045752965568">"Rožnata"</item>
+    <item msgid="6131821495505931173">"Rdeča"</item>
+  </string-array>
 </resources>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 92bd9f8..beced03 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Napisi bodo videti tako:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Privzeto"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Barva"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Privzeto"</string>
     <string name="color_none" msgid="3475640044925814795">"Brez"</string>
     <string name="color_white" msgid="8045195170201590239">"Bela"</string>

diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 4b0dde1..2c19fc6 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Кеширана (клијент активности)"</item>
     <item msgid="6652164677254579050">"Кеширана (празно)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Плавозелена"</item>
+    <item msgid="8332294763632946560">"Плава"</item>
+    <item msgid="2023216417616991392">"Тамноплава"</item>
+    <item msgid="3170497246594232819">"Љубичаста"</item>
+    <item msgid="4608643045752965568">"Розе"</item>
+    <item msgid="6131821495505931173">"Црвена"</item>
+  </string-array>
 </resources>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b0f78bd..edb6d1e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Титл ће изгледати овако"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Подразумевано"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Боја"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Подразумевана"</string>
     <string name="color_none" msgid="3475640044925814795">"Ништа"</string>
     <string name="color_white" msgid="8045195170201590239">"Бела"</string>

diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 3b1ac79..2ef1f02 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Imewekwa akiba (kiteja cha shughuli)"</item>
     <item msgid="6652164677254579050">"Imewekwa akiba (tupu)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Samawati"</item>
+    <item msgid="2023216417616991392">"Bluu"</item>
+    <item msgid="3170497246594232819">"Zambarau"</item>
+    <item msgid="4608643045752965568">"Waridi"</item>
+    <item msgid="6131821495505931173">"Nyekundu"</item>
+  </string-array>
 </resources>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6fd0261..2870f63 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -1531,8 +1531,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Manukuu yataonekana hivi"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Chaguo-msingi"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Rangi"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Chaguo-msingi"</string>
     <string name="color_none" msgid="3475640044925814795">"Hakuna"</string>
     <string name="color_white" msgid="8045195170201590239">"Nyeupe"</string>

diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
index 4e91727..ac6f5b5 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta-rIN/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"தற்காலிகச் சேமிப்பு (செயல்பாட்டு கிளையன்ட்)"</item>
     <item msgid="6652164677254579050">"தற்காலிகச் சேமிப்பு (காலி)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"பசும் நீலம்"</item>
+    <item msgid="8332294763632946560">"நீலம்"</item>
+    <item msgid="2023216417616991392">"அடர் நீலம்"</item>
+    <item msgid="3170497246594232819">"ஊதா"</item>
+    <item msgid="4608643045752965568">"பிங்க்"</item>
+    <item msgid="6131821495505931173">"சிவப்பு"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index ed6d9a7..81b635c 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"தலைப்புகள் இப்படி இருக்கும்"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"இயல்புநிலை"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"நிறம்"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"இயல்புநிலை"</string>
     <string name="color_none" msgid="3475640044925814795">"ஏதுமில்லை"</string>
     <string name="color_white" msgid="8045195170201590239">"வெள்ளை"</string>

diff --git a/res/values-te-rIN/arrays.xml b/res/values-te-rIN/arrays.xml
index e6ccf62..cb09f6f 100644
--- a/res/values-te-rIN/arrays.xml
+++ b/res/values-te-rIN/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"కాష్ చేసినవి (కార్యాచరణ క్లయింట్)"</item>
     <item msgid="6652164677254579050">"కాష్ చేసినవి (ఖాళీ)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"నీలి ఆకుపచ్చ"</item>
+    <item msgid="8332294763632946560">"నీలం"</item>
+    <item msgid="2023216417616991392">"నీలిరంగు"</item>
+    <item msgid="3170497246594232819">"ఊదా"</item>
+    <item msgid="4608643045752965568">"గులాబీ"</item>
+    <item msgid="6131821495505931173">"ఎరుపు"</item>
+  </string-array>
 </resources>

diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 14f41ef..36c9a86 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"శీర్షికలు ఈ విధంగా కనిపిస్తాయి"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"డిఫాల్ట్"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"రంగు"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"డిఫాల్ట్"</string>
     <string name="color_none" msgid="3475640044925814795">"ఏదీ కాదు"</string>
     <string name="color_white" msgid="8045195170201590239">"తెలుపు రంగు"</string>

diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index fce764d..48af783 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"แคชไว้ (ไคลเอ็นต์กิจกรรม)"</item>
     <item msgid="6652164677254579050">"แคชไว้ (ว่างเปล่า)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"น้ำเงินอมเขียว"</item>
+    <item msgid="8332294763632946560">"น้ำเงิน"</item>
+    <item msgid="2023216417616991392">"น้ำเงินอมม่วง"</item>
+    <item msgid="3170497246594232819">"ม่วง"</item>
+    <item msgid="4608643045752965568">"ชมพู"</item>
+    <item msgid="6131821495505931173">"แดง"</item>
+  </string-array>
 </resources>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2cd7e28..e6778b5 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"คำอธิบายภาพจะมีหน้าตาแบบนี้"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ค่าเริ่มต้น"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"สี"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ค่าเริ่มต้น"</string>
     <string name="color_none" msgid="3475640044925814795">"ไม่มีสี"</string>
     <string name="color_white" msgid="8045195170201590239">"ขาว"</string>

diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 773cd95..bdc7b38 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Naka-cache (client ng gawain)"</item>
     <item msgid="6652164677254579050">"Naka-cache (walang laman)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Asul"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lila"</item>
+    <item msgid="4608643045752965568">"Pink"</item>
+    <item msgid="6131821495505931173">"Pula"</item>
+  </string-array>
 </resources>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 71fa8d5..5f01a1c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Ganito ang magiging hitsura ng mga caption"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Default"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Kulay"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Default"</string>
     <string name="color_none" msgid="3475640044925814795">"Wala"</string>
     <string name="color_white" msgid="8045195170201590239">"Puti"</string>

diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 31fff4a..411b277 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Önbelleğe alındı (etkinlik istemcisi)"</item>
     <item msgid="6652164677254579050">"Önbelleğe alındı (boş)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turkuaz"</item>
+    <item msgid="8332294763632946560">"Mavi"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Mor"</item>
+    <item msgid="4608643045752965568">"Pembe"</item>
+    <item msgid="6131821495505931173">"Kırmızı"</item>
+  </string-array>
 </resources>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index aa06797..016bbcd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Altyazılar şöyle görünecek"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Varsayılan"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Renk"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Varsayılan"</string>
     <string name="color_none" msgid="3475640044925814795">"Hiçbiri"</string>
     <string name="color_white" msgid="8045195170201590239">"Beyaz"</string>

diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 75ad598..b32c0ac 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Кеш (дії клієнта)"</item>
     <item msgid="6652164677254579050">"Кеш (порожньо)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Бірюзовий"</item>
+    <item msgid="8332294763632946560">"Синій"</item>
+    <item msgid="2023216417616991392">"Індиго"</item>
+    <item msgid="3170497246594232819">"Пурпуровий"</item>
+    <item msgid="4608643045752965568">"Рожевий"</item>
+    <item msgid="6131821495505931173">"Червоний"</item>
+  </string-array>
 </resources>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2a061cc..7f68e90 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -817,7 +817,7 @@
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимізація рівня яскравості з урахуванням умов освітлення"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Режим сну"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Вимикати екран"</string>
-    <string name="screen_timeout_summary" msgid="327761329263064327">"Клои минає <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Коли минає <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Фоновий малюнок"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Вибрати фоновий малюнок з"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Заставка"</string>
@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Субтитри виглядатимуть так:"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Аа"</string>
     <string name="locale_default" msgid="2593883646136326969">"За умовчанням"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Колір"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"За умовчанням"</string>
     <string name="color_none" msgid="3475640044925814795">"Немає"</string>
     <string name="color_white" msgid="8045195170201590239">"Білий"</string>

diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml
index ff90a9c..159504b 100644
--- a/res/values-ur-rPK/arrays.xml
+++ b/res/values-ur-rPK/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"کیش کی ہوئی (سرگرمی کلائنٹ)"</item>
     <item msgid="6652164677254579050">"کیش کی ہوئی (خالی)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"نیلگوں سبز"</item>
+    <item msgid="8332294763632946560">"نیلا"</item>
+    <item msgid="2023216417616991392">"گہرا نیلا"</item>
+    <item msgid="3170497246594232819">"جامنی"</item>
+    <item msgid="4608643045752965568">"گلابی"</item>
+    <item msgid="6131821495505931173">"سرخ"</item>
+  </string-array>
 </resources>

diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 376042b..8299f86 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"کیپشنز اس طرح دکھائی دیں گی"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ڈیفالٹ"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"رنگ"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"ڈیفالٹ"</string>
     <string name="color_none" msgid="3475640044925814795">"کوئی نہیں"</string>
     <string name="color_white" msgid="8045195170201590239">"سفید"</string>

diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index 4eba687..924dae8 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Keshlangan (harakat mijozi)"</item>
     <item msgid="6652164677254579050">"Keshlangan (bo‘sh)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Moviy"</item>
+    <item msgid="8332294763632946560">"Havorang"</item>
+    <item msgid="2023216417616991392">"To‘q ko‘k"</item>
+    <item msgid="3170497246594232819">"Binafsharang"</item>
+    <item msgid="4608643045752965568">"Pushti"</item>
+    <item msgid="6131821495505931173">"Qizil"</item>
+  </string-array>
 </resources>

diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 1eb5ece..c88be12 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Sarlavlahar quyidagicha ko‘rinadi"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Standart bo‘yicha"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Rang"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Birlamchi"</string>
     <string name="color_none" msgid="3475640044925814795">"Hech biri"</string>
     <string name="color_white" msgid="8045195170201590239">"Oq"</string>

diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 14cb8be..3bbd6c5 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"Được lưu trong bộ nhớ cache (máy khách hoạt động)"</item>
     <item msgid="6652164677254579050">"Được lưu trong bộ nhớ cache (trống)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Xanh két"</item>
+    <item msgid="8332294763632946560">"Màu lam"</item>
+    <item msgid="2023216417616991392">"Màu chàm"</item>
+    <item msgid="3170497246594232819">"Tía"</item>
+    <item msgid="4608643045752965568">"Hồng"</item>
+    <item msgid="6131821495505931173">"Đỏ"</item>
+  </string-array>
 </resources>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9fdea5b..5e63473 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -1349,7 +1349,7 @@
     <string name="auto_caps" msgid="6379232078052591265">"Tự động viết hoa"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Viết hoa chữ cái đầu tiên trong câu"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Tự động chấm câu"</string>
-    <string name="hardkeyboard_category" msgid="5957168411305769899">"Cài đặt bàn phím vật lý"</string>
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"Cài đặt bàn phím thực"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Nhấn phím Cách hai lần để chèn \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Hiển thị mật khẩu"</string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Phương thức nhập này có thể thu thập tất cả văn bản bạn nhập, bao gồm dữ liệu cá nhân như mật khẩu và số thẻ tín dụng. Phương thức nhập này đến từ ứng dụng <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Sử dụng phương thức nhập này?"</string>
@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"Phụ đề sẽ trông như thế này"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Mặc định"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"Màu"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Mặc định"</string>
     <string name="color_none" msgid="3475640044925814795">"Không có"</string>
     <string name="color_white" msgid="8045195170201590239">"Trắng"</string>

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 208cf9a..c53a0e9 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"已缓存（活动客户端）"</item>
     <item msgid="6652164677254579050">"已缓存（空）"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"青色"</item>
+    <item msgid="8332294763632946560">"蓝色"</item>
+    <item msgid="2023216417616991392">"靛青色"</item>
+    <item msgid="3170497246594232819">"紫色"</item>
+    <item msgid="4608643045752965568">"粉红色"</item>
+    <item msgid="6131821495505931173">"红色"</item>
+  </string-array>
 </resources>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 47db15f..ab6834a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"字幕外观示例"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"默认"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"颜色"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"默认"</string>
     <string name="color_none" msgid="3475640044925814795">"无"</string>
     <string name="color_white" msgid="8045195170201590239">"白色"</string>

diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 6ef1176..64e3bf7 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"快取 (活動使用者端)"</item>
     <item msgid="6652164677254579050">"快取 (清空)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"藍綠色"</item>
+    <item msgid="8332294763632946560">"藍色"</item>
+    <item msgid="2023216417616991392">"靛藍色"</item>
+    <item msgid="3170497246594232819">"紫色"</item>
+    <item msgid="4608643045752965568">"粉紅色"</item>
+    <item msgid="6131821495505931173">"紅色"</item>
+  </string-array>
 </resources>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 191814f..469d48b 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"字幕將會是這樣："</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"預設"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"顏色"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"預設"</string>
     <string name="color_none" msgid="3475640044925814795">"無"</string>
     <string name="color_white" msgid="8045195170201590239">"白色"</string>

diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 8a48b46..6677d8c 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml

@@ -527,10 +527,12 @@
     <item msgid="4338089220026248848">"快取 (活動用戶端)"</item>
     <item msgid="6652164677254579050">"快取 (清空)"</item>
   </string-array>
-    <!-- no translation found for color_picker:0 (7631642672260600032) -->
-    <!-- no translation found for color_picker:1 (8332294763632946560) -->
-    <!-- no translation found for color_picker:2 (2023216417616991392) -->
-    <!-- no translation found for color_picker:3 (3170497246594232819) -->
-    <!-- no translation found for color_picker:4 (4608643045752965568) -->
-    <!-- no translation found for color_picker:5 (6131821495505931173) -->
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"藍綠色"</item>
+    <item msgid="8332294763632946560">"藍色"</item>
+    <item msgid="2023216417616991392">"靛藍色"</item>
+    <item msgid="3170497246594232819">"紫色"</item>
+    <item msgid="4608643045752965568">"粉紅色"</item>
+    <item msgid="6131821495505931173">"紅色"</item>
+  </string-array>
 </resources>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5d967f2..e02b4e6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -290,7 +290,7 @@
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線與網路"</string>
     <string name="radio_controls_summary" msgid="2837395036275123133">"管理 Wi-Fi、藍牙、飛航模式、行動網路和 VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"行動數據"</string>
-    <string name="calls_title" msgid="3544471959217176768">"通話"</string>
+    <string name="calls_title" msgid="3544471959217176768">"來電"</string>
     <string name="sms_messages_title" msgid="3188611825992624879">"簡訊"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"允許在行動網路中使用數據服務"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"允許在漫遊時使用數據服務"</string>
@@ -1537,8 +1537,7 @@
     <string name="captioning_preview_text" msgid="4067935959797375065">"字幕外觀範例"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"預設"</string>
-    <!-- no translation found for color_title (4258931051732243983) -->
-    <skip />
+    <string name="color_title" msgid="4258931051732243983">"顏色"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"預設"</string>
     <string name="color_none" msgid="3475640044925814795">"無"</string>
     <string name="color_white" msgid="8045195170201590239">"白色"</string>
@@ -2027,7 +2026,7 @@
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"應用程式資訊"</string>
     <string name="data_usage_cellular_data" msgid="4859424346276043677">"行動數據"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"設定數據上限"</string>
-    <string name="data_usage_cycle" msgid="5652529796195787949">"資料用量週期"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"數據用量週期"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"應用程式數據傳輸量"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"漫遊服務"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"限制背景資料"</string>
@@ -2045,8 +2044,8 @@
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"自動同步處理個人資料"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"自動同步處理工作資料"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"變更週期…"</string>
-    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"資料用量週期的重設日期："</string>
-    <string name="data_usage_empty" msgid="8621855507876539282">"沒有任何應用程式在這段期間產生資料用量。"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"數據用量週期的重設日期："</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"沒有任何應用程式在這段期間產生數據用量。"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"前景"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"背景"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"限制"</string>
@@ -2078,13 +2077,13 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"您在網路上對帳戶進行的所有變更都會自動複製到您的平板電腦。\n\n有些帳戶還可以自動將您在平板電腦上進行的所有變更複製到網路上，Google 帳戶即是按照這種方式運作。"</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"您在網路上對帳戶進行的所有變更都會自動複製到您的手機。\n\n有些帳戶還可以自動將您在手機上進行的所有變更複製到網路上，Google 帳戶即是按照這種方式運作。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"關閉資料自動同步功能？"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"這樣可以節省資料用量和電池用量，但您必須手動同步處理每個帳戶才能收集最新資訊。此外，系統進行更新時不會通知您。"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"這樣可以節省數據用量和電池用量，但您必須手動同步處理每個帳戶才能收集最新資訊。此外，系統進行更新時不會通知您。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"用量週期重設日期"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"每月固定日期："</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"儲存設定"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"設定數據用量警告"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"設定數據用量上限"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"限制資料用量"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"限制數據用量"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5788774061143636263">"一旦平板電腦達到指定的行動數據上限，將關閉行動數據功能。\n\n由於數據用量是由平板電腦自行計算，而行動通訊業者對用量的計算方式可能有所不同，建議您在設定上限時保留一些空間。"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3511301596446820549">"一旦手機達到指定的行動數據上限，將關閉行動數據功能。\n\n由於數據用量是由手機自行計算，而行動通訊業者對用量的計算方式可能有所不同，建議您在設定上限時保留一些空間。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制背景資料？"</string>
@@ -2097,8 +2096,8 @@
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"已移除的應用程式和使用者"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"已接收 <xliff:g id="RECEIVED">%1$s</xliff:g>，已傳送 <xliff:g id="SENT">%2$s</xliff:g>"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。"</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>：根據平板電腦計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於資料用量的計算方式可能會有所不同。"</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>：根據手機計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於資料用量的計算方式可能會有所不同。"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>：根據平板電腦計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於數據用量的計算方式可能會有所不同。"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>：根據手機計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於數據用量的計算方式可能會有所不同。"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"網路限制"</string>
     <string name="data_usage_metered_body" msgid="3262343834446126044">"計量付費網路在背景資料受限時等同行動網路。使用這類網路下載大量資料前，應用程式可能會顯示警告訊息。"</string>
     <string name="data_usage_metered_mobile" msgid="2326986339431119372">"行動網路"</string>
@@ -2374,7 +2373,7 @@
     <string name="ring_volume_option_title" msgid="6767101703671248309">"鈴聲音量"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</string>
     <string name="zen_mode_settings_title" msgid="7014915558669122902">"干擾"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"來電和收到通知時"</string>
+    <string name="zen_mode_option_title" msgid="5061978632306007914">"收到來電和通知時"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"一律允許干擾"</string>
     <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"僅允許優先干擾"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"不允許干擾"</string>
@@ -2439,7 +2438,7 @@
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動開啟"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">"、 "</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永遠不要"</string>
-    <string name="zen_mode_calls" msgid="7051492091133751208">"通話"</string>
+    <string name="zen_mode_calls" msgid="7051492091133751208">"來電"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
     <string name="zen_mode_from" msgid="1033337300289871697">"來電者/訊息傳送者"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"所有人"</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f8721c3..7afec0b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -1598,12 +1598,16 @@
     <!-- Status for networks disabled for unknown reason -->
     <string name="wifi_disabled_generic">Disabled</string>
     <!-- Status for networked disabled from a DNS or DHCP failure -->
-    <string name="wifi_disabled_network_failure">Avoided poor Internet connection</string>
+    <string name="wifi_disabled_network_failure">IP Configuration Failure</string>
+    <!-- Status for networked disabled from a wifi association failure -->
+    <string name="wifi_disabled_wifi_failure">WiFi Connection Failure</string>
     <!-- Status for networks disabled from authentication failure (wrong password
          or certificate). -->
     <string name="wifi_disabled_password_failure">Authentication problem</string>
     <!-- Summary for the remembered network but currently not in range. -->
     <string name="wifi_not_in_range">Not in range</string>
+    <!-- Summary for the remembered network but no internet connection was detected. -->
+    <string name="wifi_no_internet">No Internet Access Detected, won\'t automatically reconnect.</string>
     <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
          string is listed first [CHAR LIMIT=20]-->
     <string name="wifi_wps_available_first_item">WPS available</string>
@@ -2114,6 +2118,10 @@
     <string name="sim_multi_sims_title">Multiple SIMs found</string>
     <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
     <string name="sim_multi_sims_summary">Choose the SIM you prefer for cellular data.</string>
+    <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
+    <string name="sim_change_data_title">Change data SIM?</string>
+    <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
+    <string name="sim_change_data_message">Use <xliff:g id="new_sim">%1$s</xliff:g> instead of <xliff:g id="old_sim">%2$s</xliff:g> for cellular data?</string>
 
     <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
          Displayed in a dialog box.  [CHAR LIMIT=100] -->
@@ -5177,8 +5185,6 @@
     <string name="user_add_user_menu">Add user</string>
     <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
     <string name="user_summary_restricted_profile">Restricted profile</string>
-    <!-- User settings summary for a work profile [CHAR LIMIT=50] -->
-    <string name="user_summary_managed_profile">Work profile</string>
     <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
     <string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string>
     <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
@@ -5903,6 +5909,14 @@
     <string name="screen_pinning_title">Screen pinning</string>
     <!-- [CHAR LIMIT=300] Screen pinning description -->
     <string name="screen_pinning_description">When turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure screen pinning is turned on.\n\n2. Open the screen you want to pin.\n\n3. Touch Overview.\n\n4. Touch the pin icon.</string>
+    <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_pattern">Ask for unlock pattern before unpinning</string>
+    <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_pin">Ask for PIN before unpinning</string>
+    <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_password">Ask for password before unpinning</string>
+    <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+    <string name="screen_pinning_unlock_none">Lock device when unpinning</string>
 
     <!-- Title for a work profile. [CHAR LIMIT=25] -->
     <string name="managed_user_title">Work profile</string>

diff --git a/res/xml/screen_pinning_settings.xml b/res/xml/screen_pinning_settings.xml
new file mode 100644
index 0000000..6727687
--- /dev/null
+++ b/res/xml/screen_pinning_settings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/screen_pinning_title">
+
+        <SwitchPreference
+                android:key="use_screen_lock"
+                android:title="@string/screen_pinning_unlock_none"
+                android:persistent="false" />
+
+</PreferenceScreen>

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 6ee0ef0..08de3b7 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java

@@ -710,7 +710,7 @@
     /**
      * Build {@link TabSpec} with thin indicator, and empty content.
      */
-    private TabSpec buildTabSpec(String tag, String title) {
+    private TabSpec buildTabSpec(String tag, CharSequence title) {
         return mTabHost.newTabSpec(tag).setIndicator(title).setContent(
                 mEmptyTabContent);
     }
@@ -1112,7 +1112,12 @@
             final String currentTab = mCurrentTab;
             if (isMobileTab(currentTab)) {
                 if (dataEnabled) {
-                    setMobileDataEnabled(true);
+                    // If we are showing the Sim Card tile then we are a Multi-Sim device.
+                    if (Utils.showSimCardTile(getActivity())) {
+                        handleMultiSimDataDialog();
+                    } else {
+                        setMobileDataEnabled(true);
+                    }
                 } else {
                     // disabling data; show confirmation dialog which eventually
                     // calls setMobileDataEnabled() once user confirms.
@@ -1124,6 +1129,36 @@
         }
     };
 
+    private void handleMultiSimDataDialog() {
+        final SubInfoRecord currentSir = getCurrentTabSubInfo(getActivity());
+        final SubInfoRecord nextSir = SubscriptionManager.getSubInfoForSubscriber(
+                SubscriptionManager.getDefaultDataSubId());
+
+        if (currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
+            setMobileDataEnabled(true);
+            updateBody();
+            return;
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+        builder.setTitle(R.string.sim_change_data_title);
+        builder.setMessage(getActivity().getResources().getString(R.string.sim_change_data_message,
+                    currentSir.getDisplayName(), nextSir.getDisplayName()));
+
+        builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int id) {
+                SubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId());
+                setMobileDataEnabled(true);
+                updateBody();
+            }
+        });
+        builder.setNegativeButton(R.string.cancel, null);
+
+        builder.create().show();
+    }
+
     private View.OnClickListener mDisableAtLimitListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -2312,7 +2347,7 @@
         // require both supported network and ready SIM
         boolean isReady = true;
         for (SubInfoRecord subInfo : subInfoList) {
-            isReady = isReady & tele.getSimState(subInfo.slotId) == SIM_STATE_READY;
+            isReady = isReady & tele.getSimState(subInfo.getSimSlotIndex()) == SIM_STATE_READY;
         }
         return conn.isNetworkSupported(TYPE_MOBILE) && isReady;
     }
@@ -2553,14 +2588,29 @@
         private void addMobileTab(Context context, List<SubInfoRecord> subInfoList) {
             if (subInfoList != null) {
                 for (SubInfoRecord subInfo : mSubInfoList) {
-                    if (hasReadyMobileRadio(context,subInfo.subId)) {
-                        mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.subId),
-                                subInfo.displayName));
+                    if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
+                        mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
+                                subInfo.getDisplayName()));
                     }
                 }
             }
         }
 
+        private SubInfoRecord getCurrentTabSubInfo(Context context) {
+            if (mSubInfoList != null && mTabHost != null) {
+                final int currentTagIndex = mTabHost.getCurrentTab();
+                int i = 0;
+                for (SubInfoRecord subInfo : mSubInfoList) {
+                    if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
+                        if (i++ == currentTagIndex) {
+                            return subInfo;
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+
         /**
          * Init a map with subId key and mobile tag name
          * @param subInfoList The subscription Info List
@@ -2572,8 +2622,8 @@
                 String mobileTag;
                 map = new HashMap<Integer, String>();
                 for (SubInfoRecord subInfo : subInfoList) {
-                    mobileTag = TAB_MOBILE + String.valueOf(subInfo.subId);
-                    map.put(subInfo.subId,mobileTag);
+                    mobileTag = TAB_MOBILE + String.valueOf(subInfo.getSubscriptionId());
+                    map.put(subInfo.getSubscriptionId(), mobileTag);
                 }
             }
             return map;

diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index b0a4a53..378221c 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java

@@ -876,7 +876,7 @@
             // other than the Dialer process, which causes a lot of stuff to
             // break.
             intent.setClassName("com.android.phone",
-                    "com.android.phone.FdnList");
+                    "com.android.phone.settings.fdn.FdnList");
             startActivity(intent);
             return true;
         }

diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index ada5b17..3f39088 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java

@@ -15,42 +15,59 @@
  */
 package com.android.settings;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Switch;
 
+import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.widget.SwitchBar;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Screen pinning settings.
  */
 public class ScreenPinningSettings extends SettingsPreferenceFragment
         implements SwitchBar.OnSwitchChangeListener, Indexable {
 
+    private static final CharSequence KEY_USE_SCREEN_LOCK = "use_screen_lock";
+    private static final int CHANGE_LOCK_METHOD_REQUEST = 43;
+
     private SwitchBar mSwitchBar;
+    private SwitchPreference mUseScreenLock;
+    private LockPatternUtils mLockPatternUtils;
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         final SettingsActivity activity = (SettingsActivity) getActivity();
+        mLockPatternUtils = new LockPatternUtils(activity);
+
+        View emptyView = LayoutInflater.from(activity)
+                .inflate(R.layout.screen_pinning_instructions, null);
+        ((ViewGroup) getListView().getParent()).addView(emptyView);
+        getListView().setEmptyView(emptyView);
 
         mSwitchBar = activity.getSwitchBar();
         mSwitchBar.addOnSwitchChangeListener(this);
         mSwitchBar.show();
-        mSwitchBar.setChecked(isLockToAppEnabled());
+        mSwitchBar.setChecked(isLockToAppEnabled(getActivity()));
     }
 
     @Override
@@ -61,19 +78,9 @@
         mSwitchBar.hide();
     }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.screen_pinning_instructions, null);
-    }
-
-    private boolean isLockToAppEnabled() {
-        try {
-            return Settings.System.getInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED)
-                != 0;
-        } catch (SettingNotFoundException e) {
-            return false;
-        }
+    private static boolean isLockToAppEnabled(Context context) {
+        return Settings.System.getInt(context.getContentResolver(),
+                Settings.System.LOCK_TO_APP_ENABLED, 0) != 0;
     }
 
     private void setLockToAppEnabled(boolean isEnabled) {
@@ -81,12 +88,89 @@
                 isEnabled ? 1 : 0);
     }
 
+    private boolean isScreenLockUsed() {
+        int def = getCurrentSecurityTitle() != R.string.screen_pinning_unlock_none ? 1 : 0;
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, def) != 0;
+    }
+
+    private boolean setScreenLockUsed(boolean isEnabled) {
+        if (isEnabled) {
+            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+            if (lockPatternUtils.getKeyguardStoredPasswordQuality()
+                    == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
+                Intent chooseLockIntent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+                chooseLockIntent.putExtra(
+                        ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+                startActivityForResult(chooseLockIntent, CHANGE_LOCK_METHOD_REQUEST);
+                return false;
+            }
+        }
+        Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
+                isEnabled ? 1 : 0);
+        return true;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == CHANGE_LOCK_METHOD_REQUEST) {
+            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+            boolean validPassQuality = lockPatternUtils.getKeyguardStoredPasswordQuality()
+                    != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+            setScreenLockUsed(validPassQuality);
+            // Make sure the screen updates.
+            mUseScreenLock.setChecked(validPassQuality);
+        }
+    }
+
+    private int getCurrentSecurityTitle() {
+        int quality = mLockPatternUtils.getKeyguardStoredPasswordQuality();
+        switch (quality) {
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                return R.string.screen_pinning_unlock_pin;
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+                return R.string.screen_pinning_unlock_password;
+            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                if (mLockPatternUtils.isLockPatternEnabled()) {
+                    return R.string.screen_pinning_unlock_pattern;
+                }
+        }
+        return R.string.screen_pinning_unlock_none;
+    }
+
     /**
      * Listens to the state change of the lock-to-app master switch.
      */
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         setLockToAppEnabled(isChecked);
+        updateDisplay();
+    }
+
+    public void updateDisplay() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        if (isLockToAppEnabled(getActivity())) {
+            addPreferencesFromResource(R.xml.screen_pinning_settings);
+            root = getPreferenceScreen();
+
+            mUseScreenLock = (SwitchPreference) root.findPreference(KEY_USE_SCREEN_LOCK);
+            mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    return setScreenLockUsed((boolean) newValue);
+                }
+            });
+            mUseScreenLock.setChecked(isScreenLockUsed());
+            mUseScreenLock.setTitle(getCurrentSecurityTitle());
+        }
     }
 
     /**
@@ -106,11 +190,19 @@
                 data.screenTitle = res.getString(R.string.screen_pinning_title);
                 result.add(data);
 
-                // Screen pinning description.
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(R.string.screen_pinning_description);
-                data.screenTitle = res.getString(R.string.screen_pinning_title);
-                result.add(data);
+                if (isLockToAppEnabled(context)) {
+                    // Screen lock option
+                    data = new SearchIndexableRaw(context);
+                    data.title = res.getString(R.string.screen_pinning_unlock_none);
+                    data.screenTitle = res.getString(R.string.screen_pinning_title);
+                    result.add(data);
+                } else {
+                    // Screen pinning description.
+                    data = new SearchIndexableRaw(context);
+                    data.title = res.getString(R.string.screen_pinning_description);
+                    data.screenTitle = res.getString(R.string.screen_pinning_title);
+                    result.add(data);
+                }
 
                 return result;
             }

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 6576163..aa27e3b 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java

@@ -374,7 +374,7 @@
         final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
         if (subInfoList != null) {
             for (SubInfoRecord subInfo : subInfoList) {
-                simState = TelephonyManager.getDefault().getSimState(subInfo.slotId);
+                simState = TelephonyManager.getDefault().getSimState(subInfo.getSimSlotIndex());
                 if((simState != TelephonyManager.SIM_STATE_ABSENT) &&
                             (simState != TelephonyManager.SIM_STATE_UNKNOWN)){
                     return true;

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 88536c4..8d6e55c 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java

@@ -61,8 +61,6 @@
 import android.provider.ContactsContract.RawContacts;
 import android.service.persistentdata.PersistentDataBlockManager;
 import android.telephony.TelephonyManager;
-import android.text.BidiFormatter;
-import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -70,10 +68,8 @@
 import android.widget.ListView;
 import android.widget.TabWidget;
 
-import com.android.internal.util.ImageUtils;
 import com.android.internal.util.UserIcons;
 import com.android.settings.UserSpinnerAdapter.UserDetails;
-import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardTile;
 import com.android.settings.drawable.CircleFramedDrawable;
 
@@ -858,6 +854,12 @@
      * Returns a circular icon for a user.
      */
     public static Drawable getUserIcon(Context context, UserManager um, UserInfo user) {
+        if (user.isManagedProfile()) {
+            // We use predefined values for managed profiles
+            Bitmap b = BitmapFactory.decodeResource(context.getResources(),
+                    com.android.internal.R.drawable.ic_corp_icon);
+            return CircleFramedDrawable.getInstance(context, b);
+        }
         if (user.iconPath != null) {
             Bitmap icon = um.getUserIcon(user.id);
             if (icon != null) {
@@ -868,6 +870,23 @@
     }
 
     /**
+     * Returns a label for the user, in the form of "User: user name" or "Work profile".
+     */
+    public static String getUserLabel(Context context, UserInfo info) {
+        if (info.isManagedProfile()) {
+            // We use predefined values for managed profiles
+            return context.getString(R.string.managed_user_title);
+        }
+        String name = info != null ? info.name : null;
+        if (name == null && info != null) {
+            name = Integer.toString(info.id);
+        } else if (info == null) {
+            name = context.getString(R.string.unknown);
+        }
+        return context.getResources().getString(R.string.running_process_item_user_label, name);
+    }
+
+    /**
      * Return whether or not the user should have a SIM Cards option in Settings.
      * TODO: Change back to returning true if count is greater than one after testing.
      * TODO: See bug 16533525.

diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 1d24148..e0ac56c 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java

@@ -16,9 +16,6 @@
 
 package com.android.settings.applications;
 
-import com.android.settings.R;
-import com.android.settings.Utils;
-
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
 import android.app.ActivityThread;
@@ -31,6 +28,8 @@
 import android.content.pm.ServiceInfo;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable.ConstantState;
 import android.os.Handler;
@@ -44,6 +43,10 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.drawable.CircleFramedDrawable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -77,6 +80,7 @@
     final PackageManager mPm;
     final UserManager mUm;
     final int mMyUserId;
+    final boolean mHideManagedProfiles;
 
     OnRefreshUiListener mRefreshUiListener;
 
@@ -741,6 +745,7 @@
         mPm = mApplicationContext.getPackageManager();
         mUm = (UserManager)mApplicationContext.getSystemService(Context.USER_SERVICE);
         mMyUserId = UserHandle.myUserId();
+        mHideManagedProfiles = mMyUserId != UserHandle.USER_OWNER;
         mResumed = false;
         mBackgroundThread = new HandlerThread("RunningState:Background");
         mBackgroundThread.start();
@@ -825,6 +830,12 @@
         MergedItem userItem = userItems.get(newItem.mUserId);
         boolean first = userItem == null || userItem.mCurSeq != mSequence;
         if (first) {
+            UserState userState = mUsers.get(newItem.mUserId);
+            UserInfo info = userState != null
+                    ? userState.mInfo : mUm.getUserInfo(newItem.mUserId);
+            if (mHideManagedProfiles && info.isManagedProfile()) {
+                return;
+            }
             if (userItem == null) {
                 userItem = new MergedItem(newItem.mUserId);
                 userItems.put(newItem.mUserId, userItem);
@@ -832,21 +843,11 @@
                 userItem.mChildren.clear();
             }
             userItem.mCurSeq = mSequence;
-            if ((userItem.mUser=mUsers.get(newItem.mUserId)) == null) {
+            if (userState == null) {
                 userItem.mUser = new UserState();
-                UserInfo info = mUm.getUserInfo(newItem.mUserId);
                 userItem.mUser.mInfo = info;
-                if (info != null) {
-                    userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
-                }
-                String name = info != null ? info.name : null;
-                if (name == null && info != null) {
-                    name = Integer.toString(info.id);
-                } else if (info == null) {
-                    name = context.getString(R.string.unknown);
-                }
-                userItem.mUser.mLabel = context.getResources().getString(
-                        R.string.running_process_item_user_label, name);
+                userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
+                userItem.mUser.mLabel = Utils.getUserLabel(context, info);
             }
             newMergedItems.add(userItem);
         }

diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index 9ac2eac..4a3cef3 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java

@@ -110,7 +110,7 @@
         final Phone[] phones = PhoneFactory.getPhones();
         for (int i = 0; i < phones.length; i++) {
             // Currently we only operate with the first subscription of a SIM.
-            if (phones[i].getSubId() == subInfos.get(0).subId) {
+            if (phones[i].getSubId() == subInfos.get(0).getSubscriptionId()) {
                 return phones[i];
             }
         }

diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index 0dfd5c9..be7c657 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java

@@ -167,12 +167,7 @@
                 UserInfo info = um.getUserInfo(sipper.userId);
                 if (info != null) {
                     icon = Utils.getUserIcon(context, um, info);
-                    name = info != null ? info.name : null;
-                    if (name == null) {
-                        name = Integer.toString(info.id);
-                    }
-                    name = context.getResources().getString(
-                            R.string.running_process_item_user_label, name);
+                    name = Utils.getUserLabel(context, info);
                 } else {
                     icon = null;
                     name = context.getResources().getString(

diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index b6160fd..a08c7de 100644
--- a/src/com/android/settings/net/UidDetailProvider.java
+++ b/src/com/android/settings/net/UidDetailProvider.java

@@ -136,15 +136,8 @@
             final int userHandle = getUserIdForKey(uid);
             final UserInfo info = um.getUserInfo(userHandle);
             if (info != null) {
-                if (info.isManagedProfile()) {
-                    detail.label = res.getString(R.string.managed_user_title);
-                    detail.icon = mContext.getDrawable(
-                            com.android.internal.R.drawable.ic_corp_icon);
-                } else {
-                    detail.label = res.getString(R.string.running_process_item_user_label,
-                            info.name);
-                    detail.icon = Utils.getUserIcon(mContext, um, info);
-                }
+                detail.label = Utils.getUserLabel(mContext, info);
+                detail.icon = Utils.getUserIcon(mContext, um, info);
                 return detail;
             }
         }

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 4e90b4f..2d5fdc5 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java

@@ -232,7 +232,7 @@
 
         for (int i = 0; i < availableSubInfoLength; ++i) {
             final SubInfoRecord sir = mAvailableSubInfos.get(i);
-            if (sir != null && sir.subId == subId) {
+            if (sir != null && sir.getSubscriptionId() == subId) {
                 return sir;
             }
         }
@@ -250,7 +250,7 @@
 
             for (int i = 0; i < availableSubInfoLength; ++i) {
                 final SubInfoRecord sir = mSubInfoList.get(i);
-                if (sir.slotId == slotId) {
+                if (sir.getSimSlotIndex() == slotId) {
                     //Right now we take the first subscription on a SIM.
                     return sir;
                 }
@@ -265,9 +265,9 @@
         final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultSmsSubId());
         simPref.setTitle(R.string.sms_messages_title);
         if (mSubInfoList.size() == 1) {
-            simPref.setSummary(mSubInfoList.get(0).displayName);
+            simPref.setSummary(mSubInfoList.get(0).getDisplayName());
         } else if (sir != null) {
-            simPref.setSummary(sir.displayName);
+            simPref.setSummary(sir.getDisplayName());
         } else if (sir == null) {
             simPref.setSummary(R.string.sim_selection_required_pref);
         }
@@ -279,9 +279,9 @@
         final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultDataSubId());
         simPref.setTitle(R.string.cellular_data_title);
         if (mSubInfoList.size() == 1) {
-            simPref.setSummary(mSubInfoList.get(0).displayName);
+            simPref.setSummary(mSubInfoList.get(0).getDisplayName());
         } else if (sir != null) {
-            simPref.setSummary(sir.displayName);
+            simPref.setSummary(sir.getDisplayName());
         } else if (sir == null) {
             simPref.setSummary(R.string.sim_selection_required_pref);
         }
@@ -339,7 +339,7 @@
 
                         if (id == DATA_PICK) {
                             sir = mSelectableSubInfos.get(value);
-                            SubscriptionManager.setDefaultDataSubId(sir.subId);
+                            SubscriptionManager.setDefaultDataSubId(sir.getSubscriptionId());
                         } else if (id == CALLS_PICK) {
                             final TelecomManager telecomManager =
                                     TelecomManager.from(getActivity());
@@ -349,7 +349,7 @@
                                     value < 1 ? null : phoneAccountsList.get(value - 1));
                         } else if (id == SMS_PICK) {
                             sir = mSelectableSubInfos.get(value);
-                            SubscriptionManager.setDefaultSmsSubId(sir.subId);
+                            SubscriptionManager.setDefaultSmsSubId(sir.getSubscriptionId());
                         }
 
                         updateActivitesCategory();
@@ -370,7 +370,11 @@
         } else {
             for (int i = 0; i < selectableSubInfoLength; ++i) {
                 final SubInfoRecord sir = mSelectableSubInfos.get(i);
-                list.add(sir.displayName);
+                CharSequence displayName = sir.getDisplayName();
+                if (displayName == null) {
+                    displayName = "";
+                }
+                list.add(displayName.toString());
             }
         }
 
@@ -472,14 +476,16 @@
             final Resources res = getResources();
 
             if (mSubInfoRecord != null) {
-                if(TextUtils.isEmpty(mSubInfoRecord.displayName)) {
+                if(TextUtils.isEmpty(mSubInfoRecord.getDisplayName())) {
                     setTitle(getCarrierName());
-                    mSubInfoRecord.displayName = getCarrierName();
-                    SubscriptionManager.setDisplayName(getCarrierName(), mSubInfoRecord.subId);
+                    String displayName = getCarrierName();
+                    mSubInfoRecord.setDisplayName(displayName);
+                    SubscriptionManager.setDisplayName(displayName,
+                            mSubInfoRecord.getSubscriptionId());
                 } else {
-                    setTitle(mSubInfoRecord.displayName);
+                    setTitle(mSubInfoRecord.getDisplayName());
                 }
-                setSummary(mSubInfoRecord.number.toString());
+                setSummary(mSubInfoRecord.getNumber().toString());
                 setEnabled(true);
             } else {
                 setSummary(R.string.sim_slot_empty);
@@ -489,7 +495,8 @@
         }
 
         public String getCarrierName() {
-            Uri mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, mSubInfoRecord.subId);
+            Uri mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI,
+                    mSubInfoRecord.getSubscriptionId());
             Cursor mCursor = getActivity().managedQuery(mUri, sProjection, null, null);
             mCursor.moveToFirst();
             return mCursor.getString(1);
@@ -523,7 +530,7 @@
             builder.setView(dialogLayout);
 
             EditText nameText = (EditText)dialogLayout.findViewById(R.id.sim_name);
-            nameText.setText(mSubInfoRecord.displayName);
+            nameText.setText(mSubInfoRecord.getDisplayName());
 
             final Spinner colorSpinner = (Spinner) dialogLayout.findViewById(R.id.spinner);
             ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getContext(),
@@ -532,7 +539,7 @@
             colorSpinner.setAdapter(adapter);
 
             for (int i = 0; i < colorArr.length; i++) {
-                if (colorArr[i] == mSubInfoRecord.color) {
+                if (colorArr[i] == mSubInfoRecord.getColor()) {
                     colorSpinner.setSelection(i);
                     break;
                 }
@@ -557,23 +564,25 @@
             carrierView.setText(getCarrierName());
 
             builder.setTitle(String.format(res.getString(R.string.sim_editor_title),
-                    (mSubInfoRecord.slotId + 1)));
+                    (mSubInfoRecord.getSimSlotIndex() + 1)));
 
             builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int whichButton) {
                     final EditText nameText = (EditText)dialogLayout.findViewById(R.id.sim_name);
 
-                    mSubInfoRecord.displayName = nameText.getText().toString();
-                    SubscriptionManager.setDisplayName(mSubInfoRecord.displayName,
-                        mSubInfoRecord.subId);
-                    findRecordBySubId(mSubInfoRecord.subId).displayName =
-                        nameText.getText().toString();
+                    String displayName = nameText.getText().toString();
+                    int subId = mSubInfoRecord.getSubscriptionId();
+                    mSubInfoRecord.setDisplayName(displayName);
+                    SubscriptionManager.setDisplayName(displayName, subId);
+                    findRecordBySubId(subId).setDisplayName(displayName);
 
                     final int colorSelected = colorSpinner.getSelectedItemPosition();
-                    mSubInfoRecord.color = colorArr[colorSelected];
-                    SubscriptionManager.setColor(colorArr[colorSelected], mSubInfoRecord.subId);
-                    findRecordBySubId(mSubInfoRecord.subId).color = colorArr[colorSelected];
+                    int subscriptionId = mSubInfoRecord.getSubscriptionId();
+                    int color = colorArr[colorSelected];
+                    mSubInfoRecord.setColor(color);
+                    SubscriptionManager.setColor(color, subscriptionId);
+                    findRecordBySubId(subscriptionId).setColor(color);
 
                     updateAllOptions();
                     update();
@@ -603,9 +612,9 @@
 
                 @Override
                 public int compare(SubInfoRecord arg0, SubInfoRecord arg1) {
-                    int flag = arg0.slotId - arg1.slotId;
+                    int flag = arg0.getSimSlotIndex() - arg1.getSimSlotIndex();
                     if (flag == 0) {
-                        return (int) (arg0.subId - arg1.subId);
+                        return (int) (arg0.getSubscriptionId() - arg1.getSubscriptionId());
                     }
                     return flag;
                 }

diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index 9afab4b..ffd4bf3 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java

@@ -299,7 +299,6 @@
         // Reachable one goes before unreachable one.
         if (mRssi != Integer.MAX_VALUE && other.mRssi == Integer.MAX_VALUE) return -1;
         if (mRssi == Integer.MAX_VALUE && other.mRssi != Integer.MAX_VALUE) return 1;
-        if (mRssi == Integer.MAX_VALUE && other.mRssi != Integer.MAX_VALUE) return 1;
 
         // Configured one goes before unconfigured one.
         if (networkId != WifiConfiguration.INVALID_NETWORK_ID
@@ -447,7 +446,7 @@
             visibility.append(" rssi=").append(mInfo.getRssi());
             visibility.append(" ");
             visibility.append(" score=").append(mInfo.score);
-            visibility.append(String.format("tx=%.1f,", mInfo.txSuccessRate));
+            visibility.append(String.format(" tx=%.1f,", mInfo.txSuccessRate));
             visibility.append(String.format("%.1f,", mInfo.txRetriesRate));
             visibility.append(String.format("%.1f ", mInfo.txBadRate));
             visibility.append(String.format("rx=%.1f", mInfo.rxSuccessRate));
@@ -588,6 +587,8 @@
 
         if (mState != null) { // This is the active connection
             summary.append(Summary.get(context, mState));
+        } else if (mConfig != null && mConfig.noInternetAccess) {
+            summary.append(context.getString(R.string.wifi_no_internet));
         } else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED &&
                 mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON)
                || mConfig.autoJoinStatus
@@ -596,8 +597,10 @@
                     >= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE) {
                 if (mConfig.disableReason == WifiConfiguration.DISABLED_DHCP_FAILURE) {
                     summary.append(context.getString(R.string.wifi_disabled_network_failure));
-                } else {
+                } else if (mConfig.disableReason == WifiConfiguration.DISABLED_AUTH_FAILURE) {
                     summary.append(context.getString(R.string.wifi_disabled_password_failure));
+                } else {
+                    summary.append(context.getString(R.string.wifi_disabled_wifi_failure));
                 }
             } else {
                 switch (mConfig.disableReason) {
@@ -626,7 +629,7 @@
             //add RSSI/band information for this config, what was seen up to 6 seconds ago
             //verbose WiFi Logging is only turned on thru developers settings
             if (mInfo != null && mState != null) { // This is the active connection
-                summary.append(" (f=" + Integer.toString(mInfo.getFrequency()) + ")");
+                summary.append(" f=" + Integer.toString(mInfo.getFrequency()));
             }
             summary.append(" " + getVisibilityStatus());
             if (mConfig != null && mConfig.autoJoinStatus > 0) {
@@ -644,6 +647,15 @@
                 }
                 summary.append(")");
             }
+            if (mConfig != null && mConfig.numIpConfigFailures > 0) {
+                summary.append(" ipf=").append(mConfig.numIpConfigFailures);
+            }
+            if (mConfig != null && mConfig.numConnectionFailures > 0) {
+                summary.append(" cf=").append(mConfig.numConnectionFailures);
+            }
+            if (mConfig != null && mConfig.numAuthFailures > 0) {
+                summary.append(" authf=").append(mConfig.numAuthFailures);
+            }
         }
 
         if (summary.length() > 0) {
commit	7db037a989ea9c106ea404681cfe22a1fd2a2973	[log] [tgz]
author	Alexandra Gherghina <alexgherghina@google.com>	Wed Nov 05 10:06:35 2014 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed Nov 05 10:06:36 2014 +0000
tree	639dc52f129869ed24f0c79fb413d45d8d6ac583
parent	b153181c9c597085769d69796ecf07ec6d4433d2 [diff]
parent	6911af1cbe3d08e5cb1403c064d154c6b9558e41 [diff]