diff options
| author | Marie Janssen <jamuraa@google.com> | 2017-01-10 17:55:28 -0800 |
|---|---|---|
| committer | Marie Janssen <jamuraa@google.com> | 2017-01-10 17:55:28 -0800 |
| commit | 2bd1db8c4e1c44e9474eecd45a127a9aeac18150 (patch) | |
| tree | fb26aac7ec43f47e9790fb69ab321ccb0cb14068 /res/values-zh-rCN | |
| parent | 4eacbdb6ea1e86c7741e6e80a054e8331eca5560 (diff) | |
| parent | ed3da4c780e8bf8adb230fd2e54a3f115a729993 (diff) | |
| download | android_packages_apps_Bluetooth-2bd1db8c4e1c44e9474eecd45a127a9aeac18150.tar.gz android_packages_apps_Bluetooth-2bd1db8c4e1c44e9474eecd45a127a9aeac18150.tar.bz2 android_packages_apps_Bluetooth-2bd1db8c4e1c44e9474eecd45a127a9aeac18150.zip | |
resolve merge conflicts of ed3da4c78 to nyc-mr1-dev-plus-aosp
Change-Id: I4244c7ae08a182332985bffdac31ec30a5813e5c
Diffstat (limited to 'res/values-zh-rCN')
| -rw-r--r-- | res/values-zh-rCN/strings_map.xml | 15 | ||||
| -rw-r--r-- | res/values-zh-rCN/test_strings.xml | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/res/values-zh-rCN/strings_map.xml b/res/values-zh-rCN/strings_map.xml deleted file mode 100644 index 72ab0d07c..000000000 --- a/res/values-zh-rCN/strings_map.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?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="map_session_key_dialog_title" msgid="4357431314165953502">"输入“%1$s”的会话密钥"</string> - <string name="map_session_key_dialog_header" msgid="1858363785687455516">"需要提供蓝牙会话密钥"</string> - <string name="map_acceptance_timeout_message" msgid="2247454902690565876">"接受与“%1$s”的连接时超时"</string> - <string name="map_authentication_timeout_message" msgid="2151423397615327066">"输入“%1$s”的会话密钥时超时"</string> - <string name="map_auth_notif_ticker" msgid="8840174807927327119">"OBEX 身份验证请求"</string> - <string name="map_auth_notif_title" msgid="301767019364765129">"会话密钥"</string> - <string name="map_auth_notif_message" msgid="1510095655064214863">"输入“%1$s”的会话密钥"</string> - <string name="map_defaultname" msgid="3805234816465216759">"车用套件"</string> - <string name="map_unknownName" msgid="4985352365863687360">"未知名称"</string> - <string name="map_localPhoneName" msgid="6264496105941797768">"我的名字"</string> - <string name="map_defaultnumber" msgid="3838264444043503815">"000000"</string> -</resources> diff --git a/res/values-zh-rCN/test_strings.xml b/res/values-zh-rCN/test_strings.xml index fd0a0fc78..a947739d0 100644 --- a/res/values-zh-rCN/test_strings.xml +++ b/res/values-zh-rCN/test_strings.xml @@ -1,7 +1,6 @@ <?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="hello" msgid="1740533743008967039">"世界，你好，测试活动"</string> <string name="app_name" msgid="1203877025577761792">"蓝牙共享"</string> <string name="insert_record" msgid="1450997173838378132">"插入记录"</string> <string name="update_record" msgid="2480425402384910635">"确认记录"</string> |