summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2014-09-18 01:31:26 +0300
committerMichael Bestas <mikeioannina@gmail.com>2014-09-22 20:47:14 +0000
commit290b69758b7c86cc2eafc65f5cf5797e6c331731 (patch)
tree152bba72abcbaf282ec75f26d474ba708b12ecde
parent7605d967abc70c70a43388cfc7e3459798f3adaa (diff)
downloadandroid_packages_apps_Bluetooth-290b69758b7c86cc2eafc65f5cf5797e6c331731.tar.gz
android_packages_apps_Bluetooth-290b69758b7c86cc2eafc65f5cf5797e6c331731.tar.bz2
android_packages_apps_Bluetooth-290b69758b7c86cc2eafc65f5cf5797e6c331731.zip
Bluetooth: Move CAF strings
Change-Id: If0166e83efba37441f271bcd2afd303880af4ceb
-rw-r--r--res/values/cm_strings.xml23
-rw-r--r--res/values/strings.xml4
2 files changed, 23 insertions, 4 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
new file mode 100644
index 000000000..00354bd40
--- /dev/null
+++ b/res/values/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
+ Copyright (C) 2014 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- label for the notification if the zero length file is rejected by the remote device -->
+ <string name="empty_file_notification_sent">Bluetooth share: Remote rejected zero length file <xliff:g id="file">%1$s</xliff:g></string>
+
+ <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b06474dcf..f58543b4c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
- Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -103,8 +102,6 @@
<string name="notification_sending">Bluetooth share: Sending <xliff:g id="file">%1$s</xliff:g></string>
<!-- label for the notification item of sent file -->
<string name="notification_sent">Bluetooth share: Sent <xliff:g id="file">%1$s</xliff:g></string>
- <!-- label for the notification if the zero length file is rejected by the remote device -->
- <string name="empty_file_notification_sent">Bluetooth share: Remote rejected zero length file <xliff:g id="file">%1$s</xliff:g></string>
<!-- label for the notification item of sent file -status -->
<string name="notification_sent_complete">100% complete</string>
<!-- label for the notification item of failed sending file -->
@@ -173,7 +170,6 @@
<string name="enabling_progress_title">Please wait\u2026</string>
<string name="enabling_progress_content">Turning on Bluetooth\u2026</string>
-<string name="format_progress_text">%1$d%%</string>
<!-- Bluetooth Toast Message -->
<string name="bt_toast_1">The file will be received. Check progress in the Notifications panel.</string>
<string name="bt_toast_2">The file can\'t be received.</string>