Bluetooth: Move & improve caf strings
Change-Id: Ie852ed4d7b9038f6b51d8ada58c3a562feb5e2c9
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3c4eb8b..8fa1830 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -127,7 +127,6 @@
<string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"选中您要通过蓝牙共享的帐户。建立连接后，您仍需接受对这些帐户的所有访问请求。"</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>
</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
new file mode 100644
index 0000000..a32703d
--- /dev/null
+++ b/res/values/cm_strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 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>
+ <!--
+ This is the short description of a permission associated with the
+ Bluetooth Avrcp Data Manager. It is displayed as part of the description of
+ any application that was granted that permission. This specific
+ permission controls access to the Bluetooth Avrcp Data Manager.
+ -->
+ <string name="permlab_bluetoothAvrcpDataManager">Access AVRCP metadata.</string>
+ <!--
+ This is the long description of a permission associated with the
+ Bluetooth Avrcp Data Manager. It is displayed as part of the description of
+ any application that was granted that permission. This specific
+ permission controls access to the Bluetooth Avrcp Data Manager.
+ -->
+ <string name="permdesc_bluetoothAvrcpDataManager">Allows the app to access the BluetoothAvrcpData manager and use it to display on UI.</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 19d54ae..c47aaf2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,13 +23,6 @@
-->
<string name="permlab_bluetoothShareManager">Access download manager.</string>
<!--
- This is the short description of a permission associated with the
- Bluetooth Avrcp Data Manager. It is displayed as part of the description of
- any application that was granted that permission. This specific
- permission controls access to the Bluetooth Avrcp Data Manager.
- -->
- <string name="permlab_bluetoothAvrcpDataManager">Access avrcp metadata.</string>
- <!--
This is the long description of a permission associated with the
Android Download Manager. It is displayed as part of the description
of any application that was granted that permission. This specific
@@ -38,14 +31,6 @@
-->
<string name="permdesc_bluetoothShareManager">Allows the app to access the
BluetoothShare manager and use it to transfer files. </string>
- <!--
- This is the long description of a permission associated with the
- Bluetooth Avrcp Data Manager. It is displayed as part of the description of
- any application that was granted that permission. This specific
- permission controls access to the Bluetooth Avrcp Data Manager.
- -->
- <string name="permdesc_bluetoothAvrcpDataManager">Allows the app to access the
- BluetoothAvrcpData manager and use it to display on UI. </string>
<string name="permlab_bluetoothWhitelist">Whitelist bluetooth device access.</string>
@@ -260,5 +245,4 @@
<string name="bluetooth_map_settings_app_icon">Application Icon</string>
<string name="bluetooth_map_settings_title">Bluetooth Message Sharing Settings</string>
<string name="bluetooth_map_settings_no_account_slots_left">Cannot select account. 0 slots left</string>
- <string name="upload_fail_waiting">Ongoing send file preparation, automatic retransmission later</string>
</resources>