diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:31:49 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:31:49 +0100 |
| commit | 2179fd368b019e2f0f419fd0eada5e2b693c18bb (patch) | |
| tree | 0c217a7c8c5c4221e7883d714b8dd2ff5729a7fc /res/values-zh-rCN/strings.xml | |
| parent | 43c1153e4b31194a32b9be7febd5aa4a542cef3c (diff) | |
| parent | 36cf13f6279056792e154c3222041dc295d2f405 (diff) | |
| download | android_packages_apps_Nfc-2179fd368b019e2f0f419fd0eada5e2b693c18bb.tar.gz android_packages_apps_Nfc-2179fd368b019e2f0f419fd0eada5e2b693c18bb.tar.bz2 android_packages_apps_Nfc-2179fd368b019e2f0f419fd0eada5e2b693c18bb.zip | |
Merge tag 'android-4.3_r2.1' into cm-10.2
Android 4.3 release 2.1
Conflicts:
nxp/jni/com_android_nfc_NativeNfcManager.cpp
nxp/jni/com_android_nfc_NativeNfcTag.cpp
res/values-nl/strings.xml
Change-Id: I2e53f288cd65fc179d5c385971e703f6eda0c232
Diffstat (limited to 'res/values-zh-rCN/strings.xml')
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 2cd45ae5..19738329 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -10,12 +10,14 @@ <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC 已启用。"</string> <string name="touch" msgid="4727218133711188355">"触摸即可发送"</string> <string name="beam_progress" msgid="7453634884807323920">"正在接收 Beam 内容..."</string> + <string name="beam_outgoing" msgid="4679536649779123495">"正在用 Beam 传送信息..."</string> <string name="beam_complete" msgid="477026736424637435">"Beam 发送完毕"</string> <string name="beam_failed" msgid="5116241718189888630">"Beam 发送未完成"</string> <string name="beam_canceled" msgid="5425192751826544741">"Beam 发送已取消"</string> <string name="cancel" msgid="61873902552555096">"取消"</string> <string name="beam_touch_to_view" msgid="7853129156831642630">"触摸即可查看"</string> <string name="beam_handover_not_supported" msgid="4083165921751489015">"接收者的设备不支持通过 Beam 传输较大的文件。"</string> + <string name="beam_try_again" msgid="3364677301009783455">"再次让两台设备接触"</string> <string name="connecting_headset" msgid="3929250919225573008">"正在连接"</string> <string name="connected_headset" msgid="4047751837023241955">"已连接"</string> <string name="connect_headset_failed" msgid="7500801585498094863">"无法连接"</string> |