Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4

Change-Id: Ib2da547fc0b23c3b504e2fac9c635954fc03060f

4 files changed, 79 insertions, 27 deletions

diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index da945d72..cdf412c8 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -22,25 +22,39 @@
     <item msgid="2533030282864800794">"전체"</item>
     <item msgid="8568284598210500589">"확대/축소"</item>
   </string-array>
-  <string-array name="genre_labels">
-    <item msgid="3241959001790384341">"모든 채널"</item>
-    <item msgid="928298872841713530">"가족/어린이"</item>
-    <item msgid="2751606947569857164">"스포츠"</item>
-    <item msgid="7345749789651321496">"쇼핑"</item>
-    <item msgid="167201149441442173">"영화"</item>
-    <item msgid="525966731464264290">"코미디"</item>
-    <item msgid="6096710741527327836">"여행"</item>
-    <item msgid="2851882187117833883">"드라마"</item>
-    <item msgid="78492781188719038">"교육"</item>
-    <item msgid="7221999662426308394">"동물/야생 생물"</item>
-    <item msgid="375300513250925001">"뉴스"</item>
-    <item msgid="7746320336582330410">"게임"</item>
-    <item msgid="1255741860568329178">"예술"</item>
-    <item msgid="7603949681065702867">"예능"</item>
-    <item msgid="4453821994746804366">"라이프스타일"</item>
-    <item msgid="3488534597567932843">"음악"</item>
-    <item msgid="7452153120614274095">"프리미엄"</item>
-    <item msgid="8215762047341133299">"기술/과학"</item>
+  <string-array name="genre_labels_l">
+    <item msgid="4730006281716266127">"모든 채널"</item>
+    <item msgid="6897460857821394118">"가족/어린이"</item>
+    <item msgid="551257741825778215">"스포츠"</item>
+    <item msgid="452133796804325879">"쇼핑"</item>
+    <item msgid="3296058637230163031">"영화"</item>
+    <item msgid="1054540282883891201">"코미디"</item>
+    <item msgid="7900158429062595471">"여행"</item>
+    <item msgid="3768998587825611787">"드라마"</item>
+    <item msgid="8340620094959282881">"교육"</item>
+    <item msgid="7396447839483867269">"동물/야생 생물"</item>
+    <item msgid="4738043455148062673">"뉴스"</item>
+    <item msgid="7405041316051047427">"게임"</item>
+  </string-array>
+  <string-array name="genre_labels_l_mr1">
+    <item msgid="7173498629837517739">"모든 채널"</item>
+    <item msgid="7909003973960375395">"가족/어린이"</item>
+    <item msgid="3185279732911635789">"스포츠"</item>
+    <item msgid="4704858492065325964">"쇼핑"</item>
+    <item msgid="6083795019290250078">"영화"</item>
+    <item msgid="8302638329222449550">"코미디"</item>
+    <item msgid="3803709976021475052">"여행"</item>
+    <item msgid="8116747365234169059">"드라마"</item>
+    <item msgid="7356447541595315913">"교육"</item>
+    <item msgid="7511135485827589547">"동물/야생 생물"</item>
+    <item msgid="6961248112238009967">"뉴스"</item>
+    <item msgid="6484685553679698447">"게임"</item>
+    <item msgid="2737158328243183190">"예술"</item>
+    <item msgid="6577176952650166615">"예능"</item>
+    <item msgid="7886693831871777617">"라이프스타일"</item>
+    <item msgid="8145832312485577062">"음악"</item>
+    <item msgid="1345789204804308580">"프리미엄"</item>
+    <item msgid="2736680312770771994">"기술/과학"</item>
   </string-array>
   <string-array name="welcome_page_titles">
     <item msgid="8322900543391231769">"실시간 채널"</item>
diff --git a/res/values-ko/rating_system_strings.xml b/res/values-ko/rating_system_strings.xml
index c6af92a6..8ce3d58c 100644
--- a/res/values-ko/rating_system_strings.xml
+++ b/res/values-ko/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">"프로그램에 만 15세 미만의 잠재고객에게 부적합한 콘텐츠가 포함되어 있을 수 있기 때문에 부모님의 신중한 판단이 필요합니다."</string>
+    <string name="description_kr_tv_19" msgid="9197085158053054550">"프로그램에 만 19세 미만의 잠재고객에게 부적합한 콘텐츠가 포함되어 있을 수 있기 때문에 만 19세 미만의 청소년에게 적합하지 않습니다."</string>
     <string name="description_us_tv_d" msgid="12333789157204816">"외설적인 대화"</string>
     <string name="description_us_tv_l" msgid="4105102855627964319">"거친 욕설"</string>
     <string name="description_us_tv_s" msgid="7552447251273237176">"성적인 콘텐츠"</string>
diff --git a/res/values-ko/rating_system_strings_ko.xml b/res/values-ko/rating_system_strings_ko.xml
new file mode 100644
index 00000000..891d55e9
--- /dev/null
+++ b/res/values-ko/rating_system_strings_ko.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2016 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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- TV content rating system strings for KR TV. These strings are from
+         http://www.law.go.kr/admRulLsInfoP.do?admRulSeq=2000000118507
+         This resources are tranlated only for Korean. -->
+    <string name="title_kr_tv_all">모든연령시청가</string>
+    <string name="title_kr_tv_7">7세이상시청가</string>
+    <string name="title_kr_tv_12">12세이상시청가</string>
+    <string name="title_kr_tv_15">15세이상시청가</string>
+    <string name="title_kr_tv_19">19세이상시청가</string>
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 75983308..aa2a124a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -146,12 +146,6 @@
     <string name="settings_menu_licenses" msgid="1257646083838406103">"오픈소스 라이선스"</string>
     <string name="dialog_title_licenses" msgid="4471754920475076623">"오픈소스 라이선스"</string>
     <string name="settings_menu_version" msgid="2604030372029921403">"버전"</string>
-    <string name="side_panel_title_developer" msgid="7287627759979090359">"개발자 옵션"</string>
-    <string name="developer_menu_enable_usb_tv_tuner" msgid="8380174840125430895">"USB TV 튜너 사용"</string>
-    <string name="developer_menu_enable_usb_tv_tuner_description" msgid="7122833064850110134">"USB TV 튜너 소리를 들으려면 TV에서 AC3 패스 스루를 지원해야 합니다."</string>
-    <string name="developer_menu_ac3_support" msgid="8542930057443915670">"AC3 오디오 기능"</string>
-    <string name="developer_menu_ac3_support_yes" msgid="8292133113564798078">"TV에서 AC3 패스 스루를 지원합니다."</string>
-    <string name="developer_menu_ac3_support_no" msgid="6509302484099707809">"TV에서 AC3 패스 스루를 지원하지 않습니다."</string>
     <string name="about_menu_improve" msgid="3712578027009311401">"실시간 채널 개선에 도움 주기"</string>
     <string name="about_menu_improve_summary" msgid="7548489011760588571">"Google에서 실시간 채널을 향상하고 다운과 정지 등의 문제를 방지할 수 있도록 익명의 사용 및 진단 데이터를 공유합니다."</string>
     <string name="tvview_channel_locked" msgid="6486375335718400728">"이 채널을 보려면 오른쪽을 누르고 PIN을 입력하세요."</string>
@@ -163,9 +157,10 @@
     <string name="shrunken_tvview_content_locked" msgid="7686397981042364446">"차단된 프로그램입니다."</string>
     <string name="shrunken_tvview_content_locked_format" msgid="3720284198877900916">"이 프로그램의 시청 등급은 <xliff:g id="RATING">%1$s</xliff:g>입니다."</string>
     <string name="tvview_msg_audio_only" msgid="1356866203687173329">"오디오 전용"</string>
+    <string name="tvview_msg_weak_signal" msgid="1095050812622908976">"신호 약함"</string>
+    <string name="tvview_msg_no_internet_connection" msgid="7655994401188888231">"인터넷에 연결되지 않았습니다."</string>
     <string name="channel_banner_no_title" msgid="8660301979190693176">"제목 없음"</string>
     <string name="channel_banner_locked_channel_title" msgid="2006564967318945980">"차단된 채널"</string>
-    <string name="episode_format" msgid="4881195874563241096">"시즌 <xliff:g id="SEASON_NUMBER">%1$d</xliff:g>: 에피소드 <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">"새 소스"</string>
     <string name="setup_category_done" msgid="4750902502852212319">"소스"</string>
     <plurals name="setup_input_channels" formatted="false" msgid="1695941684075602971">
@@ -192,7 +187,6 @@
     <string name="msg_tune_failed" msgid="3277419551849972252">"조정에 실패했습니다."</string>
     <string name="msg_missing_app" msgid="8291542072400042076">"이 작업을 처리하는 앱을 찾을 수 없습니다."</string>
     <string name="msg_all_channels_hidden" msgid="777397634062471936">"모든 소스 채널이 숨겨져 있습니다.\n시청할 채널을 하나 이상 선택하세요."</string>
-    <string name="msg_channel_unavailable_weak_signal" msgid="3935601939459171709">"동영상 신호가 약해서 사용할 수 없습니다."</string>
     <string name="msg_channel_unavailable_unknown" msgid="765586450831081871">"예기치 않게 동영상을 사용할 수 없습니다."</string>
     <string name="msg_back_key_guide" msgid="7404682718828721924">"뒤로 키는 연결된 기기에 사용됩니다. 종료하려면 홈 버튼을 누르세요."</string>
     <string name="msg_not_supported_device" msgid="4469404625040284722">"실시간 채널은 이 Android Lollipop 기기에서 지원되지 않습니다."</string>