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

Change-Id: I5a87a2372d508dc0bed9148e5b47ef87b8d4ee8d

49 files changed, 116 insertions, 57 deletions

diff --git a/res/values-af/cm_caf.xml b/res/values-af/cm_caf.xml
index e51a69078..c4cfa2b25 100644
--- a/res/values-af/cm_caf.xml
+++ b/res/values-af/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-ar/cm_caf.xml b/res/values-ar/cm_caf.xml
index 4237f17fa..c22c0b0e2 100644
--- a/res/values-ar/cm_caf.xml
+++ b/res/values-ar/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-ca/cm_caf.xml b/res/values-ca/cm_caf.xml
index b7e957229..b57f40324 100644
--- a/res/values-ca/cm_caf.xml
+++ b/res/values-ca/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-cs/cm_caf.xml b/res/values-cs/cm_caf.xml
index 9059bfe4d..0ce424527 100644
--- a/res/values-cs/cm_caf.xml
+++ b/res/values-cs/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-da/cm_caf.xml b/res/values-da/cm_caf.xml
index 9d917a9ca..d4be00a57 100644
--- a/res/values-da/cm_caf.xml
+++ b/res/values-da/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-de/cm_caf.xml b/res/values-de/cm_caf.xml
index 24574690b..5ca3499b2 100644
--- a/res/values-de/cm_caf.xml
+++ b/res/values-de/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-el/cm_caf.xml b/res/values-el/cm_caf.xml
index b6616f841..fde71328e 100644
--- a/res/values-el/cm_caf.xml
+++ b/res/values-el/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-es-rXA/cm_caf.xml b/res/values-es-rXA/cm_caf.xml
index ec82faabc..b2354ad71 100644
--- a/res/values-es-rXA/cm_caf.xml
+++ b/res/values-es-rXA/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-es-rXA/strings.xml b/res/values-es-rXA/strings.xml
index 0454c2325..65dd3f232 100644
--- a/res/values-es-rXA/strings.xml
+++ b/res/values-es-rXA/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!-- Copyright (C) 2007 The Android Open Source Project
      Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
 
diff --git a/res/values-es-rXA/strings_pbap.xml b/res/values-es-rXA/strings_pbap.xml
index fdc782b9d..722659087 100644
--- a/res/values-es-rXA/strings_pbap.xml
+++ b/res/values-es-rXA/strings_pbap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pbap_session_key_dialog_title">Escribi clave de sesión pa %1$s</string>
   <string name="pbap_session_key_dialog_header">Necesítase la clave de sesión de Bluetooth.</string>
diff --git a/res/values-es/cm_caf.xml b/res/values-es/cm_caf.xml
index dd62bc3fb..e9e1d1cfc 100644
--- a/res/values-es/cm_caf.xml
+++ b/res/values-es/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-et/cm_caf.xml b/res/values-et/cm_caf.xml
index c2f6eb0ef..f23436560 100644
--- a/res/values-et/cm_caf.xml
+++ b/res/values-et/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-eu/cm_caf.xml b/res/values-eu/cm_caf.xml
index 78138bb23..30782e13a 100644
--- a/res/values-eu/cm_caf.xml
+++ b/res/values-eu/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-fi/cm_caf.xml b/res/values-fi/cm_caf.xml
index 18f2b679c..751a8bc58 100644
--- a/res/values-fi/cm_caf.xml
+++ b/res/values-fi/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-fr/cm_caf.xml b/res/values-fr/cm_caf.xml
index 3281cc4a7..bb04332db 100644
--- a/res/values-fr/cm_caf.xml
+++ b/res/values-fr/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-hr/cm_caf.xml b/res/values-hr/cm_caf.xml
index c914bfe0b..e7f2cd3ff 100644
--- a/res/values-hr/cm_caf.xml
+++ b/res/values-hr/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-hu/cm_caf.xml b/res/values-hu/cm_caf.xml
index f15b7118c..f5ec7d598 100644
--- a/res/values-hu/cm_caf.xml
+++ b/res/values-hu/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-in/cm_caf.xml b/res/values-in/cm_caf.xml
index ed9e67485..cca39f0fd 100644
--- a/res/values-in/cm_caf.xml
+++ b/res/values-in/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-it/cm_caf.xml b/res/values-it/cm_caf.xml
index 4e8c439d4..79068b279 100644
--- a/res/values-it/cm_caf.xml
+++ b/res/values-it/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-iw/cm_caf.xml b/res/values-iw/cm_caf.xml
index e7c1a15a8..d1b2b96be 100644
--- a/res/values-iw/cm_caf.xml
+++ b/res/values-iw/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-ja/cm_caf.xml b/res/values-ja/cm_caf.xml
index 59296cf21..bb085977b 100644
--- a/res/values-ja/cm_caf.xml
+++ b/res/values-ja/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-ko/cm_caf.xml b/res/values-ko/cm_caf.xml
index acbe6eeb1..b6c9115a9 100644
--- a/res/values-ko/cm_caf.xml
+++ b/res/values-ko/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-ku/cm_caf.xml b/res/values-ku/cm_caf.xml
index a3f5a319b..305446afc 100644
--- a/res/values-ku/cm_caf.xml
+++ b/res/values-ku/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index ace7c1ad5..c2b4bc56e 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!-- Copyright (C) 2007 The Android Open Source Project
      Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
 
@@ -26,7 +26,7 @@
 
 دووپات كردن.</string>
   <string name="permlab_handoverStatus">گواستنەوەى گواستنەوەى بييتيى پەخش دەكات.</string>
-  <string name="permdesc_handoverStatus">وەرگرتنى حالەتى گواستنەوەى گواستنەوە ڕێ بدە بە
+  <string name="permdesc_handoverStatus">وەرگرتنى دۆخى گواستنەوەى گواستنەوە ڕێ بدە بە
 
 زانيارى لە بلوێتوثەوە.</string>
   <string name="bt_share_picker_label">بلوتوس</string>
@@ -35,7 +35,7 @@
   <string name="airplane_error_title">باری فڕۆکه‌</string>
   <string name="airplane_error_msg">ناتوانی بلوتوس بەکاربهێنی لە باری فڕۆکە.</string>
   <string name="bt_enable_line1">بۆ بەکارهێنانی خزمەتگوزاری بلوتوس ئەبێت بلوتوسەکە بکەیتەوە.</string>
-  <string name="bt_enable_line2">ئێستا چالاکردنی بلوتوس?</string>
+  <string name="bt_enable_line2">ئێستا چالاککردنی بلوتوس?</string>
   <string name="bt_enable_cancel">هەڵوەشاندنەوە</string>
   <string name="bt_enable_ok">کردنە کار</string>
   <string name="incoming_file_confirm_title">گواستنه‌وه‌ی په‌ڕگه‌</string>
@@ -83,7 +83,7 @@
   <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>
+  <string name="enabling_progress_content">چالاککردنی بلوتوس\u2026</string>
   <string name="bt_toast_1">فەیلەکە ئەگەیەت. پشکنینی تێبینی.</string>
   <string name="bt_toast_2">فایلەکە ناتوانرێت بنێردرێت.</string>
   <string name="bt_toast_3">گەیشتنی فایلەکە وەستا لە \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
@@ -92,7 +92,7 @@
   <string name="bt_toast_6">وەستاندنی فایل ناردن بۆ \u0022<xliff:g id="recipient">%1$s</xliff:g>\u0022</string>
   <string name="bt_sm_2_1" product="nosdcard">بیرگەی تەواو لەبەردەست نیە بۆ پاشەکەوتکردنی فایلەکە لە \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
   <string name="bt_sm_2_1" product="default">بیرگەی تەواو لەبەردەست نیە بۆ پاشەکەوتکردنی فایلەکە لە \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
-  <string name="bt_sm_2_2">بۆشای پێوستە: <xliff:g id="size">%1$s</xliff:g></string>
+  <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>
@@ -106,12 +106,12 @@
   <string name="status_connection_error">بەستنەوەکە سەرکەوتونەبو.</string>
   <string name="status_protocol_error">داواکردنەکە ناتوانرێت بەتەواوی بکرێت.</string>
   <string name="status_unknown_error">هه‌ڵه‌ی نه‌زانراو.</string>
-  <string name="btopp_live_folder">بلوتوسەکە گەیشت</string>
+  <string name="btopp_live_folder">وه‌رگیراوه‌کان</string>
   <string name="download_success"> <xliff:g id="file_size">%1$s</xliff:g> گەیشتنەکە تەواوبو.</string>
   <string name="upload_success"> <xliff:g id="file_size">%1$s</xliff:g> گەیشتنەکە تەواوبو.</string>
   <string name="inbound_history_title">نەبەستنەوەی گواستنەوە</string>
   <string name="outbound_history_title">گواستنەوەی بەرەودەرەوە</string>
-  <string name="no_transfers">گواستنەوەی مێژوو بەتاڵە.</string>
+  <string name="no_transfers">تۆماری وه‌رگیراوه‌کان به‌تاڵه‌.</string>
   <string name="transfer_clear_dlg_msg">هەموو ئامرازەکان پاک ئەکرێنەوە لە خشتەکە.</string>
   <string name="outbound_noti_title">بەشداری بلوتوس: فایلەکە نێردرا</string>
   <string name="inbound_noti_title">بەشداری بلوتوس: فایلەکە گەیشت</string>
@@ -119,6 +119,6 @@
   <string name="transfer_menu_clear_all">پاکردنەوەی خشتەکە</string>
   <string name="transfer_menu_open">کردنه‌وه‌</string>
   <string name="transfer_menu_clear">پاکردنەوە لە خشتەکە</string>
-  <string name="transfer_clear_dlg_title">پاچالاکردن</string>
+  <string name="transfer_clear_dlg_title">پاچالاککردن</string>
   <string name="bluetooth_share_file_name" translate="false">بەشداری_ناوەڕۆکی_بلوتوس</string>
 </resources>
diff --git a/res/values-ku/strings_pbap.xml b/res/values-ku/strings_pbap.xml
index 64c495a99..2235073a8 100644
--- a/res/values-ku/strings_pbap.xml
+++ b/res/values-ku/strings_pbap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pbap_session_key_dialog_title">کلیلی تر بنووسه‌ بۆ %1$s</string>
   <string name="pbap_session_key_dialog_header">کلیلێکی تر پێویستە بۆ بلوتوس</string>
diff --git a/res/values-lb/cm_caf.xml b/res/values-lb/cm_caf.xml
new file mode 100644
index 000000000..c97c26fcb
--- /dev/null
+++ b/res/values-lb/cm_caf.xml
@@ -0,0 +1,20 @@
+<?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 e67545e38..c6b3c9eb7 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!-- Copyright (C) 2007 The Android Open Source Project
      Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
 
@@ -16,14 +16,47 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="permlab_bluetoothShareManager">Zougrëff op den Download-Manager.</string>
   <string name="bt_share_picker_label">Bluetooth</string>
   <string name="unknown_device">Onbekannten Apparat</string>
+  <string name="unknownNumber">Onbekannt</string>
+  <string name="airplane_error_title">Fligermodus</string>
+  <string name="airplane_error_msg">Du kanns Bluetooth net am Fligermodus benotzen.</string>
+  <string name="bt_enable_line2">Bluetooth elo uschalten?</string>
   <string name="bt_enable_cancel">Ofbriechen</string>
+  <string name="bt_enable_ok">Uschalten</string>
+  <string name="incoming_file_confirm_title">Fichiersiwwerdroung</string>
+  <string name="incoming_file_confirm_content">\u0022<xliff:g id="sender">%1$s</xliff:g>\u0022 wëll dir <xliff:g id="file">%2$s</xliff:g> (<xliff:g id="size">%3$s</xliff:g>) schécken. \n\n De Fichier acceptéieren? </string>
+  <string name="incoming_file_confirm_cancel">Refuséieren</string>
+  <string name="incoming_file_confirm_ok">Acceptéieren</string>
   <string name="incoming_file_confirm_timeout_ok">OK</string>
+  <string name="incoming_file_confirm_Notification_caption">Wëlls du dëse Fichier emfänken?</string>
+  <string name="notification_receiving">Bluetooth-Fräigab: <xliff:g id="file">%1$s</xliff:g> gëtt emfaangen</string>
+  <string name="notification_sent_complete">100% ofgeschloss</string>
+  <string name="download_title">Fichiersiwwerdroung</string>
+  <string name="download_line2">Fichier: <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="download_cancel">Stoppen</string>
+  <string name="download_ok">Verstoppen</string>
+  <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_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>
+  <string name="upload_fail_ok">Probéier nees</string>
+  <string name="upload_fail_cancel">Zoumaachen</string>
   <string name="bt_error_btn_ok">OK</string>
+  <string name="unknown_file">Onbekannte Fichier</string>
+  <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="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>
+  <string name="status_no_sd_card" product="nosdcard">Keen USB-Späicher.</string>
+  <string name="status_unknown_error">Onbekannte Feeler.</string>
+  <string name="download_success"> <xliff:g id="file_size">%1$s</xliff:g> vollstänneg empfaangen.</string>
+  <string name="upload_success"> <xliff:g id="file_size">%1$s</xliff:g> vollstänneg geschéckt.</string>
   <string name="transfer_menu_open">Opmaachen</string>
   <string name="transfer_clear_dlg_title">Eidel maachen</string>
 </resources>
diff --git a/res/values-lb/strings_pbap.xml b/res/values-lb/strings_pbap.xml
index 2df070ef9..6a71063c5 100644
--- a/res/values-lb/strings_pbap.xml
+++ b/res/values-lb/strings_pbap.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pbap_session_key_dialog_title">Tipp de Sëtzungsschlëssel fir %1$s an</string>
   <string name="pbap_session_key_dialog_header">Bluetooth-Sëtzungsschlëssel néideg</string>
   <string name="pbap_acceptance_timeout_message">Beim Acceptéiere vun der Connectioun mat %1$s ass d\'Zäit ofgelaf</string>
+  <string name="pbap_authentication_timeout_message">Beim Agi vum Sëtzungsschlëssel mat %1$s ass d\'Zäit ofgelaf</string>
   <string name="auth_notif_ticker">Obex-Authentifizéierungs-Ufro</string>
   <string name="auth_notif_title">Sëtzungsschlëssel</string>
   <string name="auth_notif_message">Tipp de Sëtzungsschlëssel fir %1$s an</string>
diff --git a/res/values-lt/cm_caf.xml b/res/values-lt/cm_caf.xml
index 5f484f3fd..7429945a6 100644
--- a/res/values-lt/cm_caf.xml
+++ b/res/values-lt/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-nb/cm_caf.xml b/res/values-nb/cm_caf.xml
index bc3475d18..eeb15f612 100644
--- a/res/values-nb/cm_caf.xml
+++ b/res/values-nb/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-nl/cm_caf.xml b/res/values-nl/cm_caf.xml
index 24cad6180..dc9baf517 100644
--- a/res/values-nl/cm_caf.xml
+++ b/res/values-nl/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-pl/cm_caf.xml b/res/values-pl/cm_caf.xml
index 5544a37ac..ce6b52fca 100644
--- a/res/values-pl/cm_caf.xml
+++ b/res/values-pl/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-pt-rBR/cm_caf.xml b/res/values-pt-rBR/cm_caf.xml
index 0031731d8..39133f663 100644
--- a/res/values-pt-rBR/cm_caf.xml
+++ b/res/values-pt-rBR/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-pt-rPT/cm_caf.xml b/res/values-pt-rPT/cm_caf.xml
index 0031731d8..39133f663 100644
--- a/res/values-pt-rPT/cm_caf.xml
+++ b/res/values-pt-rPT/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-ro/cm_caf.xml b/res/values-ro/cm_caf.xml
index 16d8b0c3d..e856cf3a9 100644
--- a/res/values-ro/cm_caf.xml
+++ b/res/values-ro/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-ru/cm_caf.xml b/res/values-ru/cm_caf.xml
index db11783cb..c455e0d22 100644
--- a/res/values-ru/cm_caf.xml
+++ b/res/values-ru/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-si/cm_caf.xml b/res/values-si/cm_caf.xml
index 0412821b1..f5557199b 100644
--- a/res/values-si/cm_caf.xml
+++ b/res/values-si/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-sk/cm_caf.xml b/res/values-sk/cm_caf.xml
index 394b75fd1..58b6f085c 100644
--- a/res/values-sk/cm_caf.xml
+++ b/res/values-sk/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-sr/cm_caf.xml b/res/values-sr/cm_caf.xml
index c7cd9ebb1..7adb112a3 100644
--- a/res/values-sr/cm_caf.xml
+++ b/res/values-sr/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-sv/cm_caf.xml b/res/values-sv/cm_caf.xml
index c3b85fc1f..a49c2f01e 100644
--- a/res/values-sv/cm_caf.xml
+++ b/res/values-sv/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 887f407b9..89d4211e9 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!-- Copyright (C) 2007 The Android Open Source Project
      Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
 
diff --git a/res/values-ta/strings_pbap.xml b/res/values-ta/strings_pbap.xml
index 6c51ca49d..dcf1424ee 100644
--- a/res/values-ta/strings_pbap.xml
+++ b/res/values-ta/strings_pbap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pbap_session_key_dialog_title">%1$s அமர்வு குறியீட்டை தட்டச்சு செய்யவும்</string>
   <string name="auth_notif_message">%1$s அமர்வு குறியீட்டை தட்டச்சு செய்யவும்</string>
diff --git a/res/values-th/cm_caf.xml b/res/values-th/cm_caf.xml
index 7e7fb3232..0a46fe269 100644
--- a/res/values-th/cm_caf.xml
+++ b/res/values-th/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-tr/cm_caf.xml b/res/values-tr/cm_caf.xml
index 4c7d276d7..8f7c6ad64 100644
--- a/res/values-tr/cm_caf.xml
+++ b/res/values-tr/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-uk/cm_caf.xml b/res/values-uk/cm_caf.xml
index 7dc307971..4fcd69a47 100644
--- a/res/values-uk/cm_caf.xml
+++ b/res/values-uk/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-zh-rCN/cm_caf.xml b/res/values-zh-rCN/cm_caf.xml
index dea007268..199545320 100644
--- a/res/values-zh-rCN/cm_caf.xml
+++ b/res/values-zh-rCN/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/res/values-zh-rTW/cm_caf.xml b/res/values-zh-rTW/cm_caf.xml
index 43026904f..a5531cc18 100644
--- a/res/values-zh-rTW/cm_caf.xml
+++ b/res/values-zh-rTW/cm_caf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2014 The CyanogenMod Project
 
diff --git a/src/com/android/bluetooth/a2dp/Avrcp.java b/src/com/android/bluetooth/a2dp/Avrcp.java
index 6ad7d28b9..52c442b0d 100644
--- a/src/com/android/bluetooth/a2dp/Avrcp.java
+++ b/src/com/android/bluetooth/a2dp/Avrcp.java
@@ -572,8 +572,13 @@ final class Avrcp {
                         for (int i = 0; i < mPlayerSettings.attrIds.length; i++) {
                             values[i] = "";
                         }
-                        sendSettingsTextRspNative(mPlayerSettings.attrIds.length ,
-                                                    mPlayerSettings.attrIds, values.length,values);
+                        if (msg.arg1 == GET_ATTRIBUTE_TEXT) {
+                            sendSettingsTextRspNative(mPlayerSettings.attrIds.length,
+                                                    mPlayerSettings.attrIds, values.length, values);
+                        } else {
+                            sendValueTextRspNative(mPlayerSettings.attrIds.length,
+                                                   mPlayerSettings.attrIds, values.length, values);
+                        }
                     break;
                     default :
                     break;
@@ -1593,7 +1598,7 @@ private void updateLocalPlayerSettings( byte[] data) {
         mHandler.sendMessageDelayed(msg, 130);
    }
 
-    //PDU 0x15
+    //PDU 0x16
     private void getplayervalue_text(byte attr_id , byte num_value , byte [] value)
     {
         if(DEBUG) Log.d(TAG, "getplayervalue_text id" + attr_id +"num_value" + num_value
diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java
index 262ab70f4..3de618fcb 100644
--- a/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -821,6 +821,7 @@ public class BluetoothMapService extends ProfileService {
                         }
                      } else {
                         mConnectionManager.setWaitingForConfirmation(mMasId);
+                        isWaitingAuthorization = true;
                         Intent intent = new
                             Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST);
                         intent.setClassName(ACCESS_AUTHORITY_PACKAGE, ACCESS_AUTHORITY_CLASS);
@@ -828,7 +829,6 @@ public class BluetoothMapService extends ProfileService {
                                         BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS);
                         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mRemoteDevice);
                         sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);
-                        isWaitingAuthorization = true;
 
                         if (DEBUG) Log.d(TAG, "waiting for authorization for connection from: "
                                 + sRemoteDeviceName);