Merge branch 'cm-11.0' into stable/cm-11.0

48 files changed, 79 insertions, 290 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 584a04eee..f47d70018 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -147,7 +147,6 @@
                 <data android:mimeType="application/zip" />
                 <data android:mimeType="application/vnd.ms-excel" />
                 <data android:mimeType="application/msword" />
-                <data android:mimeType="application/vnd.android.package-archive" />
                 <data android:mimeType="*/*" />
                 <data android:mimeType="application/vnd.ms-powerpoint" />
                 <data android:mimeType="application/pdf" />
diff --git a/jni/com_android_bluetooth_avrcp.cpp b/jni/com_android_bluetooth_avrcp.cpp
index 8aa4e7f8a..56a89b7f2 100644
--- a/jni/com_android_bluetooth_avrcp.cpp
+++ b/jni/com_android_bluetooth_avrcp.cpp
@@ -483,6 +483,7 @@ static jboolean getPlayerAppValueRspNative(JNIEnv *env ,jobject object , jbyte n
     }
     attr = env->GetByteArrayElements(value, NULL);
     if (!attr) {
+        delete[] pAttrs;
         jniThrowIOException(env, EINVAL);
         return JNI_FALSE;
     }
@@ -521,7 +522,7 @@ static jboolean SendCurrentPlayerValueRspNative(JNIEnv *env, jobject object ,
     }
     attr = env->GetByteArrayElements(value, NULL);
     if (!attr) {
-        delete[] pAttrs;
+        delete pAttrs;
         jniThrowIOException(env, EINVAL);
         return JNI_FALSE;
     }
@@ -535,7 +536,7 @@ static jboolean SendCurrentPlayerValueRspNative(JNIEnv *env, jobject object ,
                                                                      BT_STATUS_SUCCESS) {
         ALOGE("Failed get_player_app_value_rsp, status: %d", status);
     }
-    delete[] pAttrs;
+    delete pAttrs;
     env->ReleaseByteArrayElements(value, attr, 0);
     return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;
 }
@@ -570,6 +571,10 @@ static jboolean sendSettingsTextRspNative(JNIEnv *env, jobject object, jint num_
         return JNI_FALSE;
     }
     pAttrs = new btrc_player_setting_text_t[num_attr];
+    if (!pAttrs) {
+        ALOGE("sendSettingsTextRspNative: not have enough memeory");
+        return JNI_FALSE;
+    }
     arr = env->GetByteArrayElements(attr, NULL);
     if (!arr) {
         delete[] pAttrs;
@@ -623,6 +628,10 @@ static jboolean sendValueTextRspNative(JNIEnv *env, jobject object, jint num_att
         return JNI_FALSE;
     }
     pAttrs = new btrc_player_setting_text_t[num_attr];
+    if (!pAttrs) {
+        ALOGE("sendValueTextRspNative: not have enough memeory");
+        return JNI_FALSE;
+    }
     arr = env->GetByteArrayElements(attr, NULL);
     if (!arr) {
         delete[] pAttrs;
@@ -743,7 +752,7 @@ static jboolean registerNotificationPlayerAppRspNative(JNIEnv *env, jobject obje
     }
     attr = env->GetByteArrayElements(value, NULL);
     if (!attr) {
-        delete[] param;
+        delete param;
         jniThrowIOException(env, EINVAL);
         return JNI_FALSE;
     }
@@ -759,7 +768,7 @@ static jboolean registerNotificationPlayerAppRspNative(JNIEnv *env, jobject obje
                                                                     BT_STATUS_SUCCESS) {
         ALOGE("Failed register_notification_rsp, status: %d", status);
     }
-    delete[] param;
+    delete param;
     env->ReleaseByteArrayElements(value, attr, 0);
     return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;
 }
diff --git a/res/values-af/cm_caf.xml b/res/values-af/cm_strings.xml
index c4cfa2b25..5685d0618 100644
--- a/res/values-af/cm_caf.xml
+++ b/res/values-af/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-ca/cm_caf.xml b/res/values-ca/cm_strings.xml
index b57f40324..d9ed7c330 100644
--- a/res/values-ca/cm_caf.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-cs/cm_caf.xml b/res/values-cs/cm_strings.xml
index 0ce424527..e7cf4bf24 100644
--- a/res/values-cs/cm_caf.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-da/cm_caf.xml b/res/values-da/cm_strings.xml
index d4be00a57..420aae3fa 100644
--- a/res/values-da/cm_caf.xml
+++ b/res/values-da/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-de/cm_caf.xml b/res/values-de/cm_strings.xml
index 5ca3499b2..038f0509d 100644
--- a/res/values-de/cm_caf.xml
+++ b/res/values-de/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-el/cm_caf.xml b/res/values-el/cm_strings.xml
index fde71328e..f77c8fe47 100644
--- a/res/values-el/cm_caf.xml
+++ b/res/values-el/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-es-rXA/cm_caf.xml b/res/values-es-rXA/cm_strings.xml
index b2354ad71..dde657be5 100644
--- a/res/values-es-rXA/cm_caf.xml
+++ b/res/values-es-rXA/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-es-rXA/strings.xml b/res/values-es-rXA/strings.xml
index 65dd3f232..797c1dae2 100644
--- a/res/values-es-rXA/strings.xml
+++ b/res/values-es-rXA/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!-- 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.
diff --git a/res/values-es/cm_caf.xml b/res/values-es/cm_strings.xml
index e9e1d1cfc..01ad6e1db 100644
--- a/res/values-es/cm_caf.xml
+++ b/res/values-es/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-et/cm_caf.xml b/res/values-et/cm_strings.xml
index f23436560..a26d8d10b 100644
--- a/res/values-et/cm_caf.xml
+++ b/res/values-et/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
@@ -16,6 +17,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="empty_file_notification_sent">Bluetooth jagamine: null-suurusega fail hüljatud <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="empty_file_notification_sent">Bluetooth jagamine: Teine pool hülgas null suurusega faili <xliff:g id="file">%1$s</xliff:g></string>
   <string name="format_progress_text">%1$d%%</string>
 </resources>
diff --git a/res/values-eu/cm_caf.xml b/res/values-eu/cm_caf.xml
deleted file mode 100644
index 30782e13a..000000000
--- a/res/values-eu/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">Bluetooth: <xliff:g id="file">%1$s</xliff:g> fitxategi hutsa ukatua izan da</string>
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-fi/cm_caf.xml b/res/values-fi/cm_strings.xml
index 751a8bc58..dfbe8ed96 100644
--- a/res/values-fi/cm_caf.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-fr/cm_caf.xml b/res/values-fr/cm_strings.xml
index bb04332db..fa3506dc6 100644
--- a/res/values-fr/cm_caf.xml
+++ b/res/values-fr/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-hr/cm_caf.xml b/res/values-hr/cm_caf.xml
deleted file mode 100644
index e7f2cd3ff..000000000
--- a/res/values-hr/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">Bluetooth djeljenje: Odbijena prazna datoteka <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-hu/cm_caf.xml b/res/values-hu/cm_strings.xml
index f5ec7d598..7a7f552e4 100644
--- a/res/values-hu/cm_caf.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-in/cm_caf.xml b/res/values-in/cm_strings.xml
index cca39f0fd..6501fd253 100644
--- a/res/values-in/cm_caf.xml
+++ b/res/values-in/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
@@ -16,6 +17,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="empty_file_notification_sent">Berbagi Bluetooth: Remote menolak file dengan panjang nol <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="empty_file_notification_sent">Berbagi Bluetooth: Remote menolak berkas yang berukuran nol <xliff:g id="file">%1$s</xliff:g></string>
   <string name="format_progress_text">%1$d%%</string>
 </resources>
diff --git a/res/values-it/cm_caf.xml b/res/values-it/cm_strings.xml
index 79068b279..c1f9ac17e 100644
--- a/res/values-it/cm_caf.xml
+++ b/res/values-it/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-iw/cm_caf.xml b/res/values-iw/cm_caf.xml
deleted file mode 100644
index d1b2b96be..000000000
--- a/res/values-iw/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">שיתוף Bluetooth: דחה מרחוק קובץ עם אורך אפסי <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-ja/cm_caf.xml b/res/values-ja/cm_strings.xml
index bb085977b..d43698951 100644
--- a/res/values-ja/cm_caf.xml
+++ b/res/values-ja/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-ko/cm_caf.xml b/res/values-ko/cm_strings.xml
index b6c9115a9..50af68d15 100644
--- a/res/values-ko/cm_caf.xml
+++ b/res/values-ko/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
@@ -16,6 +17,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="empty_file_notification_sent">블루투스 공유: 상대가 길이가 0인 파일 <xliff:g id="file">%1$s</xliff:g>을(를) 거부하였습니다. </string>
+  <string name="empty_file_notification_sent">블루투스 공유: 길이가 0인 파일 <xliff:g id="file">%1$s</xliff:g>의 전송이 거부되었습니다.</string>
   <string name="format_progress_text">%1$d%%</string>
 </resources>
diff --git a/res/values-ku/cm_caf.xml b/res/values-ku/cm_caf.xml
deleted file mode 100644
index 305446afc..000000000
--- a/res/values-ku/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">بەشداریکردنی بلوتوس:کۆنترۆل سفر درێژی فایلەکە <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 5d9276836..58825beb3 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!-- 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.
@@ -18,7 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="permlab_bluetoothShareManager">ڕێگەدانی بەڕێوەبەرایەتی دابەزین.</string>
   <string name="permdesc_bluetoothShareManager">ڕێگەدان بە بەرنامەکە بۆ ڕێگە بەشداری
-بەڕێوەبەری بلوتوس و بەکارهێنانی ناردنی فایل.</string>
+بەڕێوەبەری بلوتوس و بەکارهێنانی ناردنی پەڕگە.</string>
   <string name="permlab_bluetoothWhitelist">ڕێگەکانی ئامێری بلوتوس.</string>
   <string name="permdesc_bluetoothWhitelist">بۆ بەرنامە بە شێوەيەكى كاتى ڕێ دەدات بە وهيتێليست
 
@@ -32,7 +31,7 @@
   <string name="bt_share_picker_label">بلوتوس</string>
   <string name="unknown_device">ئامێری نەناسراو</string>
   <string name="unknownNumber">نەناسراو</string>
-  <string name="airplane_error_title">باری فڕۆکه‌</string>
+  <string name="airplane_error_title">دۆخی فڕۆکە</string>
   <string name="airplane_error_msg">ناتوانی بلوتوس بەکاربهێنی لە باری فڕۆکە.</string>
   <string name="bt_enable_line1">بۆ بەکارهێنانی خزمەتگوزاری بلوتوس ئەبێت بلوتوسەکە بکەیتەوە.</string>
   <string name="bt_enable_line2">ئێستا چالاککردنی بلوتوس?</string>
@@ -54,33 +53,33 @@
   <string name="notification_sending">بەشداریکردنی بلوتوس: وەرگرتن<xliff:g id="file">%1$s</xliff:g></string>
   <string name="notification_sent">بەشداریکردنی بلوتوس: گەیشت<xliff:g id="file">%1$s</xliff:g></string>
   <string name="notification_sent_complete">100% تەواوبوو</string>
-  <string name="notification_sent_fail">بەشداری بلوتوس: فایل<xliff:g id="file">%1$s</xliff:g> نەگەیشت</string>
-  <string name="download_title">گواستنه‌وه‌ی فایل</string>
+  <string name="notification_sent_fail">بەشداری بلوتوس: پەڕگە<xliff:g id="file">%1$s</xliff:g> نەگەیشت</string>
+  <string name="download_title">گواستنه‌وه‌ی پەڕگە</string>
   <string name="download_line1">لە: \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
-  <string name="download_line2">فایل: <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="download_line2">پەڕگە: <xliff:g id="file">%1$s</xliff:g></string>
   <string name="download_line3">قەبارەی فایلەکە: <xliff:g id="size">%1$s</xliff:g></string>
-  <string name="download_line5">وەرگرتنی فایل\u2026</string>
+  <string name="download_line5">وەرگرتنی پەڕگە\u2026</string>
   <string name="download_cancel">وه‌ستاندن</string>
   <string name="download_ok">شاردنەوە</string>
   <string name="download_fail_line1">فایلەکە نەگەیشت</string>
-  <string name="download_fail_line2">فایل: <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="download_fail_line2">پەڕگە: <xliff:g id="file">%1$s</xliff:g></string>
   <string name="download_fail_line3">هۆکار: <xliff:g id="reason">%1$s</xliff:g></string>
   <string name="download_fail_ok">باشه‌</string>
   <string name="download_succ_line5">فایلەکە گەیشت</string>
   <string name="download_succ_ok">کردنه‌وه‌</string>
   <string name="upload_line1">بۆ: \u0022<xliff:g id="recipient">%1$s</xliff:g>\u0022</string>
-  <string name="upload_line3">جۆری فایل: <xliff:g id="type">%1$s</xliff:g> (<xliff:g id="size">%2$s</xliff:g>)</string>
-  <string name="upload_line5">ناردنی فایل\u2026</string>
+  <string name="upload_line3">جۆری پەڕگە: <xliff:g id="type">%1$s</xliff:g> (<xliff:g id="size">%2$s</xliff:g>)</string>
+  <string name="upload_line5">ناردنی پەڕگە\u2026</string>
   <string name="upload_succ_line5">فایلەکە نێردرا</string>
   <string name="upload_succ_ok">باشه‌</string>
   <string name="upload_fail_line1">فایلەکە نەنێردرا بۆ \u0022<xliff:g id="recipient">%1$s</xliff:g>\u0022.</string>
-  <string name="upload_fail_line1_2">فایل: <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="upload_fail_line1_2">پەڕگە: <xliff:g id="file">%1$s</xliff:g></string>
   <string name="upload_fail_ok">دوبارە هەوڵبدەرەوە</string>
   <string name="upload_fail_cancel">داخستن</string>
   <string name="bt_error_btn_ok">باشه‌</string>
   <string name="unknown_file">فایلی نەناسراو</string>
   <string name="unknown_file_desc">بەرنامەیەک نیە بۆ هەڵگرتنی ئەم جۆرە فایلە. \n</string>
-  <string name="not_exist_file">فایل نیە</string>
+  <string name="not_exist_file">پەڕگە نیە</string>
   <string name="not_exist_file_desc">فایلەکە بونی نیە. \n</string>
   <string name="enabling_progress_title">تکایە چاوەڕێبکە\u2026</string>
   <string name="enabling_progress_content">چالاککردنی بلوتوس\u2026</string>
@@ -95,7 +94,7 @@
   <string name="bt_sm_2_2">بۆشایی پێوستە: <xliff:g id="size">%1$s</xliff:g></string>
   <string name="ErrorTooManyRequests">داواکاریی زۆر خراوه‌ته‌ ڕوو. دواتر هه‌وڵبده‌وه‌.</string>
   <string name="status_pending">گواستنەوەی فایلەکە دەستی پێ نەکردوە هێشتا.</string>
-  <string name="status_running">ڕۆیشتنی فایل ناردنەکە.</string>
+  <string name="status_running">ڕۆیشتنی پەڕگە ناردنەکە.</string>
   <string name="status_success">گواستنەوەی فایلەکە بەسەرکەوتوی تەواوبوو.</string>
   <string name="status_not_accept">ناوەڕۆک پاڵپشتی ناکات.</string>
   <string name="status_forbidden">گواستنەوەکە قەدەغەکراوە لەلایەن ئامێری نیشانەوە.</string>
diff --git a/res/values-lb/cm_caf.xml b/res/values-lb/cm_caf.xml
deleted file mode 100644
index c97c26fcb..000000000
--- a/res/values-lb/cm_caf.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index c6b3c9eb7..c057e4cdc 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!-- 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.
@@ -40,6 +39,7 @@
   <string name="download_fail_line2">Fichier: <xliff:g id="file">%1$s</xliff:g></string>
   <string name="download_fail_line3">Grond: <xliff:g id="reason">%1$s</xliff:g></string>
   <string name="download_fail_ok">OK</string>
+  <string name="download_succ_line5">Fichier empfaangen</string>
   <string name="download_succ_ok">Opmaachen</string>
   <string name="upload_succ_ok">OK</string>
   <string name="upload_fail_line1_2">Fichier: <xliff:g id="file">%1$s</xliff:g></string>
@@ -50,6 +50,8 @@
   <string name="not_exist_file">Kee Fichier</string>
   <string name="not_exist_file_desc">De Fichier existéiert net. \n</string>
   <string name="enabling_progress_title">Waart w.e.g.\u2026</string>
+  <string name="enabling_progress_content">Bluetooth gëtt ugemaach\u2026</string>
+  <string name="bt_toast_2">De Fichier kann net empfaange ginn.</string>
   <string name="status_not_accept">Inhalt net ënnerstëtzt.</string>
   <string name="status_canceled">Iwwerdroung duerch de Benotzer ofgebrach.</string>
   <string name="status_file_error">Späicherproblem.</string>
diff --git a/res/values-lt/cm_caf.xml b/res/values-lt/cm_caf.xml
deleted file mode 100644
index 7429945a6..000000000
--- a/res/values-lt/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">„Bluetooth“ bendrinimas: gavėjas atmetė tuščią failą <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-nb/cm_caf.xml b/res/values-nb/cm_strings.xml
index eeb15f612..14b6353c9 100644
--- a/res/values-nb/cm_caf.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
@@ -16,6 +17,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="empty_file_notification_sent">Bluetooth-deling: Fjern avvist null lengdefil <xliff:g id="file"> %1$s </xliff:g></string>
+  <string name="empty_file_notification_sent">Bluetooth-deling:  Avviste null lengdefil <xliff:g id="file">%1$s</xliff:g></string>
   <string name="format_progress_text">%1$d%%</string>
 </resources>
diff --git a/res/values-nl/cm_caf.xml b/res/values-nl/cm_strings.xml
index dc9baf517..76b5e21b9 100644
--- a/res/values-nl/cm_caf.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-pl/cm_caf.xml b/res/values-pl/cm_caf.xml
deleted file mode 100644
index ce6b52fca..000000000
--- a/res/values-pl/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">Udostępnianie Bluetooth: Odrzucono plik o zerowej długości <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-pt-rBR/cm_caf.xml b/res/values-pt-rBR/cm_strings.xml
index 39133f663..ce3ec60d4 100644
--- a/res/values-pt-rBR/cm_caf.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
@@ -16,6 +17,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="empty_file_notification_sent">Compartilhamento Bluetooth: O dispositivo remoto rejeitou o arquivo <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="empty_file_notification_sent">Compartilhamento Bluetooth: O dispositivo remoto rejeitou o arquivo vazio <xliff:g id="file">%1$s</xliff:g></string>
   <string name="format_progress_text">%1$d%%</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_caf.xml b/res/values-pt-rPT/cm_caf.xml
deleted file mode 100644
index 39133f663..000000000
--- a/res/values-pt-rPT/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">Compartilhamento Bluetooth: O dispositivo remoto rejeitou o arquivo <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-ar/cm_caf.xml b/res/values-pt-rPT/cm_strings.xml
index c22c0b0e2..294a67181 100644
--- a/res/values-ar/cm_caf.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
@@ -16,6 +17,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="empty_file_notification_sent">مشاركة البلوتوث: رفض ملف عن بعد طول صفري <xliff:g id="file"> %1$s </xliff:g></string>
+  <string name="empty_file_notification_sent">Partilha bluetooth: O dispositivo remoto rejeitou o ficheiro <xliff:g id="file">%1$s</xliff:g></string>
   <string name="format_progress_text">%1$d%%</string>
 </resources>
diff --git a/res/values-ro/cm_caf.xml b/res/values-ro/cm_caf.xml
deleted file mode 100644
index e856cf3a9..000000000
--- a/res/values-ro/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">Partajare Bluetooth: Dispozitivul îndepărtat a respins fișierul de lungime zero <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d %%</string>
-</resources>
diff --git a/res/values-ru/cm_caf.xml b/res/values-ru/cm_strings.xml
index c455e0d22..6dfb6f202 100644
--- a/res/values-ru/cm_caf.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-si/cm_caf.xml b/res/values-si/cm_strings.xml
index f5557199b..68078b93a 100644
--- a/res/values-si/cm_caf.xml
+++ b/res/values-si/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-sk/cm_caf.xml b/res/values-sk/cm_strings.xml
index 58b6f085c..bb1fe1ebf 100644
--- a/res/values-sk/cm_caf.xml
+++ b/res/values-sk/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-sr/cm_caf.xml b/res/values-sr/cm_strings.xml
index 7adb112a3..c2cdb0f46 100644
--- a/res/values-sr/cm_caf.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 89d4211e9..55347fc89 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!-- 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.
diff --git a/res/values-th/cm_caf.xml b/res/values-th/cm_strings.xml
index 0a46fe269..20aad5830 100644
--- a/res/values-th/cm_caf.xml
+++ b/res/values-th/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-tr/cm_caf.xml b/res/values-tr/cm_strings.xml
index 8f7c6ad64..d841537c1 100644
--- a/res/values-tr/cm_caf.xml
+++ b/res/values-tr/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-uk/cm_caf.xml b/res/values-uk/cm_caf.xml
deleted file mode 100644
index 4fcd69a47..000000000
--- a/res/values-uk/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">Надсилання по Bluetooth: пристрій не приймає файл <xliff:g id="file">%1$s</xliff:g> нульової довжини</string>
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-zh-rCN/cm_caf.xml b/res/values-zh-rCN/cm_strings.xml
index 199545320..12cc393a7 100644
--- a/res/values-zh-rCN/cm_caf.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
+     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");
diff --git a/res/values-zh-rHK/cm_caf.xml b/res/values-zh-rHK/cm_caf.xml
deleted file mode 100644
index 688ea2b3f..000000000
--- a/res/values-zh-rHK/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">藍牙共享： 遠端拒絕了零長度檔 <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d%%</string>
-</resources>
diff --git a/res/values-zh-rTW/cm_caf.xml b/res/values-zh-rTW/cm_caf.xml
deleted file mode 100644
index 50669bb64..000000000
--- a/res/values-zh-rTW/cm_caf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     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">
-  <string name="empty_file_notification_sent">藍牙共享：遠端拒絕了零長度檔 <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d</string>
-</resources>
diff --git a/res/values-sv/cm_caf.xml b/res/values/cm_strings.xml
index a49c2f01e..00354bd40 100644
--- a/res/values-sv/cm_caf.xml
+++ b/res/values/cm_strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
+     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");
@@ -16,6 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="empty_file_notification_sent">Bluetoothdelning: Fjärrpart nekade nollängdsfilen <xliff:g id="file">%1$s</xliff:g></string>
-  <string name="format_progress_text">%1$d%%</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>
+
+    <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>
diff --git a/src/com/android/bluetooth/a2dp/Avrcp.java b/src/com/android/bluetooth/a2dp/Avrcp.java
index 52c442b0d..86edf737a 100644
--- a/src/com/android/bluetooth/a2dp/Avrcp.java
+++ b/src/com/android/bluetooth/a2dp/Avrcp.java
@@ -828,6 +828,11 @@ final class Avrcp {
             mCurrentPosMs = getPlayPosition();
         }
 
+        if ((state == RemoteControlClient.PLAYSTATE_PLAYING) && (mCurrentPlayState != state)) {
+            mPlayStartTimeMs = SystemClock.elapsedRealtime();
+            Log.d(TAG, "Update mPlayStartTimeMs to " + mPlayStartTimeMs);
+        }
+
         mCurrentPlayState = state;
 
         if (mMediaPlayers.size() > 0) {
@@ -852,11 +857,14 @@ final class Avrcp {
             }
         }
 
-        if (currentPosMs != RemoteControlClient.PLAYBACK_POSITION_INVALID) {
-            mCurrentPosMs = currentPosMs;
-        }
-        if (state == RemoteControlClient.PLAYSTATE_PLAYING) {
-            mPlayStartTimeMs = SystemClock.elapsedRealtime();
+        if (!(RemoteControlClient.PLAYSTATE_PLAYING == mCurrentPlayState &&
+              mCurrentPlayState == state && mCurrentPosMs == currentPosMs)) {
+            if (currentPosMs != RemoteControlClient.PLAYBACK_POSITION_INVALID) {
+                mCurrentPosMs = currentPosMs;
+                mPlayStartTimeMs = SystemClock.elapsedRealtime();
+                Log.d(TAG, "Update mPlayStartTimeMs: " + mPlayStartTimeMs + " mCurrentPosMs: "
+                                                                                + mCurrentPosMs);
+            }
         }
 
         boolean newPosValid = (mCurrentPosMs !=