Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4

Change-Id: Ib2da547fc0b23c3b504e2fac9c635954fc03060f

3 files changed, 51 insertions, 27 deletions

diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 72fdf8ee..081ecc8b 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -22,25 +22,39 @@
     <item msgid="2533030282864800794">"Kamili"</item>
     <item msgid="8568284598210500589">"Kuza"</item>
   </string-array>
-  <string-array name="genre_labels">
-    <item msgid="3241959001790384341">"Vituo vyote"</item>
-    <item msgid="928298872841713530">"Familia/Watoto"</item>
-    <item msgid="2751606947569857164">"Michezo"</item>
-    <item msgid="7345749789651321496">"Ununuzi"</item>
-    <item msgid="167201149441442173">"Filamu"</item>
-    <item msgid="525966731464264290">"Vichekesho"</item>
-    <item msgid="6096710741527327836">"Usafiri"</item>
-    <item msgid="2851882187117833883">"Uigizaji"</item>
-    <item msgid="78492781188719038">"Elimu"</item>
-    <item msgid="7221999662426308394">"Wanyama/Wanyamapori"</item>
-    <item msgid="375300513250925001">"Habari"</item>
-    <item msgid="7746320336582330410">"Kamari"</item>
-    <item msgid="1255741860568329178">"Sanaa"</item>
-    <item msgid="7603949681065702867">"Burudani"</item>
-    <item msgid="4453821994746804366">"Mitindo ya maisha"</item>
-    <item msgid="3488534597567932843">"Muziki"</item>
-    <item msgid="7452153120614274095">"Zinazoongoza"</item>
-    <item msgid="8215762047341133299">"Teknolojia/Sayansi"</item>
+  <string-array name="genre_labels_l">
+    <item msgid="4730006281716266127">"Vituo vyote"</item>
+    <item msgid="6897460857821394118">"Familia/Watoto"</item>
+    <item msgid="551257741825778215">"Spoti"</item>
+    <item msgid="452133796804325879">"Ununuzi"</item>
+    <item msgid="3296058637230163031">"Filamu"</item>
+    <item msgid="1054540282883891201">"Vichekesho"</item>
+    <item msgid="7900158429062595471">"Usafiri"</item>
+    <item msgid="3768998587825611787">"Uigizaji"</item>
+    <item msgid="8340620094959282881">"Elimu"</item>
+    <item msgid="7396447839483867269">"Wanyama/Wanyamapori"</item>
+    <item msgid="4738043455148062673">"Habari"</item>
+    <item msgid="7405041316051047427">"Michezo ya video"</item>
+  </string-array>
+  <string-array name="genre_labels_l_mr1">
+    <item msgid="7173498629837517739">"Vituo vyote"</item>
+    <item msgid="7909003973960375395">"Familia/Watoto"</item>
+    <item msgid="3185279732911635789">"Spoti"</item>
+    <item msgid="4704858492065325964">"Ununuzi"</item>
+    <item msgid="6083795019290250078">"Filamu"</item>
+    <item msgid="8302638329222449550">"Vichekesho"</item>
+    <item msgid="3803709976021475052">"Usafiri"</item>
+    <item msgid="8116747365234169059">"Uigizaji"</item>
+    <item msgid="7356447541595315913">"Elimu"</item>
+    <item msgid="7511135485827589547">"Wanyama/Wanyamapori"</item>
+    <item msgid="6961248112238009967">"Habari"</item>
+    <item msgid="6484685553679698447">"Michezo ya video"</item>
+    <item msgid="2737158328243183190">"Sanaa"</item>
+    <item msgid="6577176952650166615">"Burudani"</item>
+    <item msgid="7886693831871777617">"Mitindo ya maisha"</item>
+    <item msgid="8145832312485577062">"Muziki"</item>
+    <item msgid="1345789204804308580">"Zinazoongoza"</item>
+    <item msgid="2736680312770771994">"Teknolojia/Sayansi"</item>
   </string-array>
   <string-array name="welcome_page_titles">
     <item msgid="8322900543391231769">"Televisheni Mtandaoni"</item>
diff --git a/res/values-sw/rating_system_strings.xml b/res/values-sw/rating_system_strings.xml
index 1893c5e2..ff3b0b2c 100644
--- a/res/values-sw/rating_system_strings.xml
+++ b/res/values-sw/rating_system_strings.xml
@@ -17,6 +17,22 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for description_fr_dvb_u (8232083238497153682) -->
+    <skip />
+    <!-- no translation found for description_es_dvb_all (4821183217465284547) -->
+    <skip />
+    <!-- no translation found for description_es_dvb_c (1367395312248365855) -->
+    <skip />
+    <!-- no translation found for description_es_dvb_x (438890727939582714) -->
+    <skip />
+    <!-- no translation found for description_kr_tv_all (3048365195196820853) -->
+    <skip />
+    <!-- no translation found for description_kr_tv_7 (5892929693766504059) -->
+    <skip />
+    <!-- no translation found for description_kr_tv_12 (1883893246941826597) -->
+    <skip />
+    <string name="description_kr_tv_15" msgid="5888141153573158322">"Huenda programu zikawa na maudhui ambayo hayafai hadhira ya watoto wa umri wa chini ya miaka 15. Kwa hivyo, hiari ya wazazi inahitajika."</string>
+    <string name="description_kr_tv_19" msgid="9197085158053054550">"Huenda programu zikawa na maudhui yasiyoruhusiwa kwa watazamaji wa umri wa chini ya miaka 19."</string>
     <string name="description_us_tv_d" msgid="12333789157204816">"Mazungumzo yanayochochea ngono"</string>
     <string name="description_us_tv_l" msgid="4105102855627964319">"Lugha ya matusi"</string>
     <string name="description_us_tv_s" msgid="7552447251273237176">"Maudhui ya ngono"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 64fd515c..146202f6 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -144,12 +144,6 @@
     <string name="settings_menu_licenses" msgid="1257646083838406103">"Leseni za programu huria"</string>
     <string name="dialog_title_licenses" msgid="4471754920475076623">"Leseni za programu huria"</string>
     <string name="settings_menu_version" msgid="2604030372029921403">"Toleo"</string>
-    <string name="side_panel_title_developer" msgid="7287627759979090359">"Chaguo za wasanidi programu"</string>
-    <string name="developer_menu_enable_usb_tv_tuner" msgid="8380174840125430895">"Washa kitafuta vituo cha TV cha USB"</string>
-    <string name="developer_menu_enable_usb_tv_tuner_description" msgid="7122833064850110134">"Ili kusikia sauti ya kitafuta vituo cha TV cha USB, TV yako inapaswa kutumia mawimbi ya AC3."</string>
-    <string name="developer_menu_ac3_support" msgid="8542930057443915670">"Uwezo wa sauti za faili za AC3"</string>
-    <string name="developer_menu_ac3_support_yes" msgid="8292133113564798078">"TV yako inatumia mawimbi ya AC3."</string>
-    <string name="developer_menu_ac3_support_no" msgid="6509302484099707809">"TV yako haitumii mawimbi ya AC3."</string>
     <string name="about_menu_improve" msgid="3712578027009311401">"Saidia kuboresha Vituo vya Moja kwa moja"</string>
     <string name="about_menu_improve_summary" msgid="7548489011760588571">"Shiriki data isiyokutambulisha ya matumizi na uchanganuzi wa matatizo kwa Google ili tuweze kuboresha programu ya Televisheni Mtandaoni na kuzuia matatizo ya kuacha kufanya kazi na kukwama."</string>
     <string name="tvview_channel_locked" msgid="6486375335718400728">"Ili uangalie kituo hiki, bonyeza Kulia na uweke PIN"</string>
@@ -161,9 +155,10 @@
     <string name="shrunken_tvview_content_locked" msgid="7686397981042364446">"Kipindi kimezuiwa"</string>
     <string name="shrunken_tvview_content_locked_format" msgid="3720284198877900916">"Kipindi hiki kimekadiriwa <xliff:g id="RATING">%1$s</xliff:g>"</string>
     <string name="tvview_msg_audio_only" msgid="1356866203687173329">"Sauti pekee"</string>
+    <string name="tvview_msg_weak_signal" msgid="1095050812622908976">"Mawimbi dhaifu"</string>
+    <string name="tvview_msg_no_internet_connection" msgid="7655994401188888231">"Hakuna muunganisho wa Intaneti"</string>
     <string name="channel_banner_no_title" msgid="8660301979190693176">"Kichwa hakijaongezwa"</string>
     <string name="channel_banner_locked_channel_title" msgid="2006564967318945980">"Kituo kimezuiwa"</string>
-    <string name="episode_format" msgid="4881195874563241096">"Msimu wa <xliff:g id="SEASON_NUMBER">%1$d</xliff:g>: Kipindi cha <xliff:g id="EPISODE_NUMBER">%2$d</xliff:g><xliff:g id="EPISODE_TITLE">%3$s</xliff:g>"</string>
     <string name="setup_category_new" msgid="2899355289563443627">"Vipya"</string>
     <string name="setup_category_done" msgid="4750902502852212319">"Vyanzo"</string>
     <plurals name="setup_input_channels" formatted="false" msgid="1695941684075602971">
@@ -190,7 +185,6 @@
     <string name="msg_tune_failed" msgid="3277419551849972252">"Haikuweza kurekebisha"</string>
     <string name="msg_missing_app" msgid="8291542072400042076">"Hakuna programu iliyopatikana inayoweza kushughulikia kitendo hiki."</string>
     <string name="msg_all_channels_hidden" msgid="777397634062471936">"Vituo chanzo vyote vimefichwa.\nChagua angalau kituo kimoja utazame."</string>
-    <string name="msg_channel_unavailable_weak_signal" msgid="3935601939459171709">"Haipatikani kutokana na mawimbi dhaifu ya video"</string>
     <string name="msg_channel_unavailable_unknown" msgid="765586450831081871">"Jambo lisilotarajiwa limetokea, video haipatikani"</string>
     <string name="msg_back_key_guide" msgid="7404682718828721924">"Kitufe cha NYUMA ni kwa ajili ya kifaa kilichounganishwa. Bonyeza kitufe cha MWANZO ili uondoe."</string>
     <string name="msg_not_supported_device" msgid="4469404625040284722">"Kipengele cha Vituo vya Moja kwa Moja hakiwezi kutumiwa kwenye kifaa hiki kwa kutumia Android Lollipop."</string>