diff options
| author | Paul Westbrook <pwestbro@google.com> | 2014-11-02 11:44:17 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2014-11-02 11:44:17 -0800 |
| commit | 7acc700b50d3c2d1b8181595f0365dc369bf0789 (patch) | |
| tree | d0da18a4f8ba3cb1a1eece92d196fafe731932a2 /res/values-zh-rCN | |
| parent | 378b5200a5a1ed8599f4b0303be1721c69570e71 (diff) | |
| parent | 7bcf66fb986cdf7d2e38d956f04c0239436dedd7 (diff) | |
| download | android_packages_apps_UnifiedEmail-7acc700b50d3c2d1b8181595f0365dc369bf0789.tar.gz android_packages_apps_UnifiedEmail-7acc700b50d3c2d1b8181595f0365dc369bf0789.tar.bz2 android_packages_apps_UnifiedEmail-7acc700b50d3c2d1b8181595f0365dc369bf0789.zip | |
resolved conflicts for merge of 7bcf66fb to lmp-mr1-dev-plus-aosp
Change-Id: Ic0a58a80f26b25b6aeb0aa8f817d67a8ee53bf51
Diffstat (limited to 'res/values-zh-rCN')
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 706336d8e..6a20fb1bd 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -387,11 +387,6 @@ <string name="folder_icon_desc" msgid="6272938864914794739">"文件夹图标"</string> <string name="add_account" msgid="5905863370226612377">"添加帐户"</string> <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"忽略提示"</string> - <string name="auto_sync_off" msgid="3664082916022670831">"自动同步功能已关闭。"</string> - <string name="tap_to_enable_sync" msgid="30588010316606899">"触摸即可开启。"</string> - <string name="account_sync_off" msgid="1351286883806741348">"帐户同步功能已关闭。"</string> - <string name="enable_sync_in_account_settings" msgid="2596841920743507047">"在“<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>”中开启。"</string> - <string name="account_settings_param" msgid="3649244241101156660">"帐户设置"</string> <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>中有<xliff:g id="NUMBER">%1$s</xliff:g>封未发送的邮件"</string> <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"要开启自动同步功能吗？"</string> <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"您对所有应用和帐户（不只是 Gmail）所做的更改都会在网络、您的其他设备和您的<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>之间同步。"</string> |