summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-11-30 23:40:54 +0200
committerMichael Bestas <mikeioannina@gmail.com>2016-12-30 16:49:00 +0200
commitd77c6adc8895eda62d410d64b681d31b39fac232 (patch)
treeeacb2029584618ac73f953132e90bc01e777a28e /res/values
parentfdfd51a84f7181a9de84916c3b6d69b969a651ab (diff)
downloadandroid_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
Diffstat (limited to 'res/values')
-rw-r--r--res/values/cm_strings.xml21
-rw-r--r--res/values/strings.xml4
2 files changed, 22 insertions, 3 deletions
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>