diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2015-11-30 23:40:54 +0200 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 16:49:00 +0200 |
commit | d77c6adc8895eda62d410d64b681d31b39fac232 (patch) | |
tree | eacb2029584618ac73f953132e90bc01e777a28e | |
parent | fdfd51a84f7181a9de84916c3b6d69b969a651ab (diff) | |
download | android_packages_apps_Bluetooth-d77c6adc8895eda62d410d64b681d31b39fac232.tar.gz android_packages_apps_Bluetooth-d77c6adc8895eda62d410d64b681d31b39fac232.tar.bz2 android_packages_apps_Bluetooth-d77c6adc8895eda62d410d64b681d31b39fac232.zip |
Bluetooth: Move & improve caf strings
Change-Id: Ie852ed4d7b9038f6b51d8ada58c3a562feb5e2c9
-rw-r--r-- | res/values-zh-rCN/strings.xml | 2 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 21 | ||||
-rw-r--r-- | res/values/strings.xml | 4 |
3 files changed, 22 insertions, 5 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index d11de9c95..5e81da69a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -38,7 +38,6 @@ <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> @@ -127,7 +126,6 @@ <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"选择您要通过蓝牙共享的帐号。连接时,您仍必须接受所有帐号访问请求。"</string> <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"剩余空档数:"</string> <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"应用图标"</string> - <string name="upload_fail_waiting">正在进行数据准备,稍后自动重发</string> <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"蓝牙消息共享设置"</string> <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"无法选择帐号,目前没有任何空档"</string> <string name="bluetooth_connected" msgid="6718623220072656906">"蓝牙音频已连接"</string> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml new file mode 100644 index 000000000..daeb40f1f --- /dev/null +++ b/res/values/cm_strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015-2016 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <string name="incoming_file_toast_msg">Incoming file from another device. Confirm you want to receive this file.</string> + + <string name="upload_fail_waiting">Unable to send file, retrying\u2026</string> +</resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6cb494d9a..c03034b29 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -81,8 +81,7 @@ <!-- Bluetooth File Transfer Acceptance Notification item --> <string name="incoming_file_confirm_Notification_title">Incoming file</string> <string name="incoming_file_confirm_Notification_content"><xliff:g id="sender">%1$s</xliff:g> is ready to send <xliff:g id="file">%2$s</xliff:g></string> - <string name="incoming_file_toast_msg">Incoming file from another device. - Confirm you want to receive this file.</string> + <!-- Inbound File Transfer Progress Notification item --> <!-- label for the notification item of receiving file --> <string name="notification_receiving">Bluetooth share: Receiving <xliff:g id="file">%1$s</xliff:g></string> @@ -246,5 +245,4 @@ <string name="bluetooth_map_settings_no_account_slots_left">Cannot select account. 0 slots left</string> <string name="bluetooth_connected">Bluetooth audio connected</string> <string name="bluetooth_disconnected">Bluetooth audio disconnected"</string> - <string name="upload_fail_waiting">Ongoing send file preparation, automatic retransmission later</string> </resources> |