summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN
diff options
context:
space:
mode:
authorSravan Kumar V <sravankumar@codeaurora.org>2016-06-14 17:30:21 +0530
committerLinux Build Service Account <lnxbuild@localhost>2016-08-24 08:17:25 -0600
commit44c4f14bb9305f289928ed245e8ef0aae2aae549 (patch)
treef59a7c38f6cce63dfd1cc7849fa3cb75ab7decd8 /res/values-zh-rCN
parente1e83dc2af04c694914503d3c9d7eeb47ae57252 (diff)
downloadandroid_packages_apps_Bluetooth-44c4f14bb9305f289928ed245e8ef0aae2aae549.tar.gz
android_packages_apps_Bluetooth-44c4f14bb9305f289928ed245e8ef0aae2aae549.tar.bz2
android_packages_apps_Bluetooth-44c4f14bb9305f289928ed245e8ef0aae2aae549.zip
OPP: Squashed commit of the following:
OPP: Replace deprecated api with new API Remove unnecessary variable and avoid using deprecated api [Internal]. Change-Id: Ice9314d599d0c0f4d7cc0e1ed70c7e87fa41e937 Bluetooth: Extra debug prints to track ANR Add extra logs in PBAP and OPP profiles to track ANR during SNS test. Change-Id: If676ca59134105a423e42c23f767fbe1c7524e44 OPP: Show debug msg when receive incoming request In automation, many times UIAutomator is not able to accept the files saying PoP menu has not come. So to confirm added debug msg (Internal). Change-Id: If55765891e3465bf7f1715d7c02c4a7e39db05bd Change-Id: Ib315359f29b7f27b2dd6dccbd07946f2f97a978c
Diffstat (limited to 'res/values-zh-rCN')
-rw-r--r--res/values-zh-rCN/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c1d4af1e5..d11de9c95 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -38,6 +38,7 @@
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"接受来自“<xliff:g id="SENDER">%1$s</xliff:g>”的文件时发生超时"</string>
<string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"有人发送文件给您"</string>
<string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g>已准备好发送<xliff:g id="FILE">%2$s</xliff:g>"</string>
+ <string name="incoming_file_toast_msg" msgid="1733710749992901811">"从其他设备传入了文件,请确认是否要接收。"</string>
<string name="notification_receiving" msgid="4674648179652543984">"蓝牙共享:正在接收“<xliff:g id="FILE">%1$s</xliff:g>”"</string>
<string name="notification_received" msgid="3324588019186687985">"蓝牙共享:已接收“<xliff:g id="FILE">%1$s</xliff:g>”"</string>
<string name="notification_received_fail" msgid="3619350997285714746">"蓝牙共享:未收到文件“<xliff:g id="FILE">%1$s</xliff:g>”"</string>