diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-05 13:35:02 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-06-07 20:44:54 +0000 |
| commit | 91ce7d2a476bd04fe525049a37a2f8b2824e9724 (patch) | |
| tree | b9bbc285430ffb5363a70eb27e382c38f5a85b7a /java/com/android/incallui/answer/impl/res/values-zh-rCN | |
| parent | 75233ff03785f24789b32039ac2c208805b7e506 (diff) | |
Update AOSP Dialer source from internal google3 repository at
cl/158012278.
Test: make, treehugger
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 cl/152373142 (4/06/2017) to cl/158012278 (6/05/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: I4d3f14b5140e2e51bead9497bc118a205b3ebe76
Diffstat (limited to 'java/com/android/incallui/answer/impl/res/values-zh-rCN')
| -rw-r--r-- | java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml index fc7ce6409..9698aa06d 100644 --- a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2017 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"> <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"滑动图标即可拒接来电并发送信息"</string> @@ -20,5 +36,5 @@ <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接听并结束当前通话"</string> <string name="call_incoming_video_is_off" msgid="3216603035158629403">"摄像头处于关闭状态"</string> <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"双指向上滑动即可接听，向下滑动则可拒接。"</string> - <string name="call_incoming_important" msgid="4090408168895243702">"紧急"</string> + <string name="call_incoming_important" msgid="3762352743365137090">"重要"</string> </resources> |