From 9a090c89e7a0c43a668bd6e2ac5e5e680f323aed Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 16 Mar 2017 19:22:24 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/150392808

Test: Treehugger

Notable this release:
* Reintroduce localization.

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from 3/15/2017 to cl/150392808 (3/16/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.

See the Android.mk file for list of modifications.

Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: Ia16d68469c2ca1ff42c7fa31d922bdb78c4e244a
---
 .../incallui/commontheme/res/values-zh-rCN/strings.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml

(limited to 'java/com/android/incallui/commontheme/res/values-zh-rCN')

diff --git a/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml
new file mode 100644
index 000000000..0f57120e2
--- /dev/null
+++ b/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_content_description_end_call" msgid="8232796487777787200">"结束通话"</string>
+    <string name="incall_content_description_muted" msgid="2130133443150389474">"已静音"</string>
+    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"已取消静音"</string>
+    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"切换通话"</string>
+    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"合并通话"</string>
+    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"手机听筒"</string>
+    <string name="incall_content_description_speaker" msgid="7837829930201265549">"免提"</string>
+    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"蓝牙"</string>
+    <string name="incall_content_description_headset" msgid="3170439802944346719">"有线耳机"</string>
+    <string name="incall_content_description_hold" msgid="3335508251734906019">"保持通话"</string>
+    <string name="incall_content_description_unhold" msgid="3862584118869933593">"恢复通话"</string>
+    <string name="incall_content_description_video_on" msgid="899266487647420613">"视频已开启"</string>
+    <string name="incall_content_description_video_off" msgid="762985912616707076">"视频已关闭"</string>
+    <string name="incall_content_description_swap_video" msgid="297943299827908998">"切换视频"</string>
+</resources>
-- 
cgit v1.2.3