diff options
author | Eric Erfanian <erfanian@google.com> | 2017-03-24 09:31:16 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-03-27 08:56:19 -0700 |
commit | 9050823ccf6f512e06ad65c8a741cb17cbc4a833 (patch) | |
tree | e454c9e0fa20b8384fa87d4e6309bb8b9e3aa2a4 /java/com/android/dialer/app/voicemail/error/res/values-zh-rCN | |
parent | dd9d50805f1b49dff1fe3787740393d726124cdb (diff) |
Update AOSP Dialer source from internal google3 repository at
cl/151128062
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/150756069 (3/21/2017) to cl/151128062 (3/24/2017).
Notable this release:
- Explicitly enumerate host and target dependencies.
- Update proguard flag references.
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.
Bug: 33210202 36511925
Addresses
33210202 - Proguard support
36511925 - Compiler warnings when building against platform sdk
Change-Id: I448ec3b3f2358886859cf7a4ef76a8fcef3244ae
Diffstat (limited to 'java/com/android/dialer/app/voicemail/error/res/values-zh-rCN')
-rw-r--r-- | java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml index 7826676f5..4efebc588 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml @@ -44,14 +44,10 @@ <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"如果收件箱已满,您将无法接收新的语音邮件。"</string> <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"无法接收新的语音邮件"</string> <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"您的收件箱已满。请尝试删除部分邮件,以便接收新的语音邮件。"</string> - <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) --> - <skip /> - <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) --> - <skip /> - <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) --> - <skip /> - <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) --> - <skip /> + <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="3083779676549536189">"[试验性功能] 启用额外存储空间和备份功能"</string> + <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="4236256841748725792">"您的邮箱已满。要释放空间,请启用额外存储空间,以便 Google 管理和备份您的语音邮件。"<b><i>"此功能目前正处于测试阶段"</i></b>"并且可能会将语音邮件从您的语音邮件服务器上删除。我们不保证将来会支持此功能,但希望能收到您的反馈。"</string> + <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="6118464905488477869">"[试验性功能] 启用额外存储空间和备份功能"</string> + <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="7289015622668426730">"您的邮箱已满。要释放空间,请启用额外存储空间,以便 Google 管理和备份您的语音邮件。"<b><i>"此功能目前正处于测试阶段"</i></b>"并且可能会将语音邮件从您的语音邮件服务器上删除。我们不保证将来会支持此功能,但希望能收到您的反馈。"</string> <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"设置语音信箱 PIN 码"</string> <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"您必须使用语音信箱 PIN 码,才能访问您的语音信箱。"</string> <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"未知错误"</string> |