From 0c7727361d4626d8bbc9eaaf48db13aae5c1f086 Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Wed, 29 Oct 2014 08:56:08 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I28c31294e09a630df0938a4b16478ea1db70b5c9
Auto-generated-cl: translation import
---
 res/values-zh-rCN/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'res/values-zh-rCN/strings.xml')

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8b3de970..0aef9682 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -46,6 +46,8 @@
     <string name="unknown_apps_dlg_title" msgid="2855558586206583032">"禁止安装"</string>
     <string name="unknown_apps_dlg_text" product="tablet" msgid="7504186369474734767">"出于安全考虑，您的平板电脑已设置为禁止安装来源不明的应用。"</string>
     <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"出于安全考虑，您的手机已设置为禁止安装来源不明的应用。"</string>
+    <!-- no translation found for unknown_apps_admin_dlg_text (1189146324736698462) -->
+    <skip />
     <string name="ok" msgid="3468756155452870475">"确定"</string>
     <string name="settings" msgid="6743583734099755409">"设置"</string>
     <string name="allow_source_dlg_title" msgid="7568985073502399415">"新的应用来源"</string>
-- 
cgit v1.2.3


From b55d5898142172c07cf647642149b04b71d1c354 Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Mon, 3 Nov 2014 09:23:42 -0800
Subject: Import translations. DO NOT MERGE

Change-Id: I1e32bf27ae31313551d577ccbc4bdd7e579ea4ba
Auto-generated-cl: translation import
---
 res/values-zh-rCN/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'res/values-zh-rCN/strings.xml')

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0aef9682..8b3e0562 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -46,8 +46,7 @@
     <string name="unknown_apps_dlg_title" msgid="2855558586206583032">"禁止安装"</string>
     <string name="unknown_apps_dlg_text" product="tablet" msgid="7504186369474734767">"出于安全考虑，您的平板电脑已设置为禁止安装来源不明的应用。"</string>
     <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"出于安全考虑，您的手机已设置为禁止安装来源不明的应用。"</string>
-    <!-- no translation found for unknown_apps_admin_dlg_text (1189146324736698462) -->
-    <skip />
+    <string name="unknown_apps_admin_dlg_text" msgid="1189146324736698462">"您的管理员不允许安装来源不明的应用。"</string>
     <string name="ok" msgid="3468756155452870475">"确定"</string>
     <string name="settings" msgid="6743583734099755409">"设置"</string>
     <string name="allow_source_dlg_title" msgid="7568985073502399415">"新的应用来源"</string>
-- 
cgit v1.2.3


From dfbd7390eeeb07a658fbf121352e7fe7e3ac320c Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Wed, 12 Nov 2014 09:10:43 -0800
Subject: Import translations. DO NOT MERGE

Change-Id: I75b1e3677c60a5ea176d2c270612097bd877227b
Auto-generated-cl: translation import
---
 res/values-zh-rCN/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'res/values-zh-rCN/strings.xml')

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8b3e0562..b5b0123a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -36,15 +36,21 @@
     <string name="install_failed_inconsistent_certificates" msgid="1517751954440692054">"已安装了存在签名冲突的同名软件包。"</string>
     <string name="install_failed_older_sdk" msgid="7947925824732917665">"该软件包仅适用于更高版本的Android。"</string>
     <string name="install_failed_cpu_abi_incompatible" product="tablet" msgid="7098684468842750800">"此应用与您的平板电脑不兼容。"</string>
+    <!-- no translation found for install_failed_cpu_abi_incompatible (1309625657882930450) -->
+    <skip />
     <string name="install_failed_cpu_abi_incompatible" product="default" msgid="4433316303249711331">"此应用与您的手机不兼容。"</string>
     <string name="install_failed_file_not_found" msgid="1958430133396322619">"软件包已被删除，无法完成安装。"</string>
     <string name="install_failed_verify_failed" msgid="5567372439890440205">"该软件包未通过验证，无法安装。"</string>
     <string name="install_failed_verify_timeout" msgid="7083090219270140373">"尝试验证此软件包时发生超时。请稍后尝试重新安装。"</string>
     <string name="install_failed_msg" product="tablet" msgid="8368835262605608787">"无法在您的平板电脑上安装“<xliff:g id="APP_NAME">%1$s</xliff:g>”。"</string>
+    <!-- no translation found for install_failed_msg (3990457938384021566) -->
+    <skip />
     <string name="install_failed_msg" product="default" msgid="8554909560982962052">"无法在您的手机上安装“<xliff:g id="APP_NAME">%1$s</xliff:g>”。"</string>
     <string name="launch" msgid="4826921505917605463">"打开"</string>
     <string name="unknown_apps_dlg_title" msgid="2855558586206583032">"禁止安装"</string>
     <string name="unknown_apps_dlg_text" product="tablet" msgid="7504186369474734767">"出于安全考虑，您的平板电脑已设置为禁止安装来源不明的应用。"</string>
+    <!-- no translation found for unknown_apps_dlg_text (7195713985140602351) -->
+    <skip />
     <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"出于安全考虑，您的手机已设置为禁止安装来源不明的应用。"</string>
     <string name="unknown_apps_admin_dlg_text" msgid="1189146324736698462">"您的管理员不允许安装来源不明的应用。"</string>
     <string name="ok" msgid="3468756155452870475">"确定"</string>
-- 
cgit v1.2.3


From 0e3a048700d24ad600b8304f5e82605f1a1dce48 Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Mon, 24 Nov 2014 11:40:03 -0800
Subject: Import translations. DO NOT MERGE

Change-Id: Ifc26329868f32292437e347242f3f9b193661145
Auto-generated-cl: translation import
---
 res/values-zh-rCN/strings.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'res/values-zh-rCN/strings.xml')

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b5b0123a..65afc5c3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -36,21 +36,18 @@
     <string name="install_failed_inconsistent_certificates" msgid="1517751954440692054">"已安装了存在签名冲突的同名软件包。"</string>
     <string name="install_failed_older_sdk" msgid="7947925824732917665">"该软件包仅适用于更高版本的Android。"</string>
     <string name="install_failed_cpu_abi_incompatible" product="tablet" msgid="7098684468842750800">"此应用与您的平板电脑不兼容。"</string>
-    <!-- no translation found for install_failed_cpu_abi_incompatible (1309625657882930450) -->
-    <skip />
+    <string name="install_failed_cpu_abi_incompatible" product="tv" msgid="1309625657882930450">"此应用与您的电视不兼容。"</string>
     <string name="install_failed_cpu_abi_incompatible" product="default" msgid="4433316303249711331">"此应用与您的手机不兼容。"</string>
     <string name="install_failed_file_not_found" msgid="1958430133396322619">"软件包已被删除，无法完成安装。"</string>
     <string name="install_failed_verify_failed" msgid="5567372439890440205">"该软件包未通过验证，无法安装。"</string>
     <string name="install_failed_verify_timeout" msgid="7083090219270140373">"尝试验证此软件包时发生超时。请稍后尝试重新安装。"</string>
     <string name="install_failed_msg" product="tablet" msgid="8368835262605608787">"无法在您的平板电脑上安装“<xliff:g id="APP_NAME">%1$s</xliff:g>”。"</string>
-    <!-- no translation found for install_failed_msg (3990457938384021566) -->
-    <skip />
+    <string name="install_failed_msg" product="tv" msgid="3990457938384021566">"无法将<xliff:g id="APP_NAME">%1$s</xliff:g>安装到您的电视上。"</string>
     <string name="install_failed_msg" product="default" msgid="8554909560982962052">"无法在您的手机上安装“<xliff:g id="APP_NAME">%1$s</xliff:g>”。"</string>
     <string name="launch" msgid="4826921505917605463">"打开"</string>
     <string name="unknown_apps_dlg_title" msgid="2855558586206583032">"禁止安装"</string>
     <string name="unknown_apps_dlg_text" product="tablet" msgid="7504186369474734767">"出于安全考虑，您的平板电脑已设置为禁止安装来源不明的应用。"</string>
-    <!-- no translation found for unknown_apps_dlg_text (7195713985140602351) -->
-    <skip />
+    <string name="unknown_apps_dlg_text" product="TV" msgid="7195713985140602351">"出于安全考虑，您的电视已设置为禁止安装来源不明的应用。"</string>
     <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"出于安全考虑，您的手机已设置为禁止安装来源不明的应用。"</string>
     <string name="unknown_apps_admin_dlg_text" msgid="1189146324736698462">"您的管理员不允许安装来源不明的应用。"</string>
     <string name="ok" msgid="3468756155452870475">"确定"</string>
-- 
cgit v1.2.3


From 7cc82d52ecc11d0aad8d1bcdbee072e21931e58e Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Wed, 14 Jan 2015 06:42:22 -0800
Subject: Import translations. DO NOT MERGE

Change-Id: I05bbf8ce7b2cdec9effed9343a623d808e151460
Auto-generated-cl: translation import
---
 res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/values-zh-rCN/strings.xml')

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 65afc5c3..f71af885 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -47,7 +47,7 @@
     <string name="launch" msgid="4826921505917605463">"打开"</string>
     <string name="unknown_apps_dlg_title" msgid="2855558586206583032">"禁止安装"</string>
     <string name="unknown_apps_dlg_text" product="tablet" msgid="7504186369474734767">"出于安全考虑，您的平板电脑已设置为禁止安装来源不明的应用。"</string>
-    <string name="unknown_apps_dlg_text" product="TV" msgid="7195713985140602351">"出于安全考虑，您的电视已设置为禁止安装来源不明的应用。"</string>
+    <string name="unknown_apps_dlg_text" product="tv" msgid="7195713985140602351">"出于安全考虑，您的电视已设置为禁止安装来源不明的应用。"</string>
     <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"出于安全考虑，您的手机已设置为禁止安装来源不明的应用。"</string>
     <string name="unknown_apps_admin_dlg_text" msgid="1189146324736698462">"您的管理员不允许安装来源不明的应用。"</string>
     <string name="ok" msgid="3468756155452870475">"确定"</string>
-- 
cgit v1.2.3