summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xjni/com_android_bluetooth_btservice_AdapterService.cpp7
-rw-r--r--res/values-af/strings.xml9
-rw-r--r--res/values-am/strings.xml9
-rw-r--r--res/values-ar/strings.xml19
-rw-r--r--res/values-az-rAZ/strings.xml9
-rw-r--r--res/values-bg/strings.xml11
-rw-r--r--res/values-bn-rBD/strings.xml47
-rw-r--r--res/values-bn-rBD/strings_pbap.xml2
-rw-r--r--res/values-bn-rBD/strings_sap.xml4
-rw-r--r--res/values-bn-rBD/test_strings.xml2
-rw-r--r--res/values-ca/strings.xml35
-rw-r--r--res/values-ca/test_strings.xml2
-rw-r--r--res/values-cs/strings.xml19
-rw-r--r--res/values-da/strings.xml33
-rw-r--r--res/values-da/test_strings.xml2
-rw-r--r--res/values-de/strings.xml25
-rw-r--r--res/values-el/strings.xml23
-rw-r--r--res/values-en-rAU/strings.xml11
-rw-r--r--res/values-en-rGB/strings.xml11
-rw-r--r--res/values-en-rIN/strings.xml11
-rw-r--r--res/values-es-rUS/strings.xml25
-rw-r--r--res/values-es/strings.xml11
-rw-r--r--res/values-et-rEE/strings.xml9
-rw-r--r--res/values-eu-rES/strings.xml27
-rw-r--r--res/values-fa/strings.xml27
-rw-r--r--res/values-fa/strings_pbap.xml2
-rw-r--r--res/values-fa/test_strings.xml2
-rw-r--r--res/values-fi/strings.xml11
-rw-r--r--res/values-fr-rCA/strings.xml9
-rw-r--r--res/values-fr/strings.xml11
-rw-r--r--res/values-gl-rES/strings.xml9
-rw-r--r--res/values-gu-rIN/strings.xml21
-rw-r--r--res/values-gu-rIN/test_strings.xml2
-rw-r--r--res/values-hi/strings.xml13
-rw-r--r--res/values-hr/strings.xml19
-rw-r--r--res/values-hu/strings.xml19
-rw-r--r--res/values-hy-rAM/strings.xml13
-rw-r--r--res/values-in/strings.xml21
-rw-r--r--res/values-in/test_strings.xml2
-rw-r--r--res/values-is-rIS/strings.xml9
-rw-r--r--res/values-it/strings.xml27
-rw-r--r--res/values-iw/strings.xml13
-rw-r--r--res/values-ja/strings.xml13
-rw-r--r--res/values-ka-rGE/strings.xml9
-rw-r--r--res/values-kk-rKZ/strings.xml11
-rw-r--r--res/values-km-rKH/strings.xml9
-rw-r--r--res/values-kn-rIN/strings.xml19
-rw-r--r--res/values-ko/strings.xml9
-rw-r--r--res/values-ky-rKG/strings.xml9
-rw-r--r--res/values-lo-rLA/strings.xml9
-rw-r--r--res/values-lt/strings.xml19
-rw-r--r--res/values-lv/strings.xml11
-rw-r--r--res/values-mk-rMK/strings.xml9
-rw-r--r--res/values-ml-rIN/strings.xml13
-rw-r--r--res/values-mn-rMN/strings.xml19
-rw-r--r--res/values-mn-rMN/test_strings.xml2
-rw-r--r--res/values-mr-rIN/strings.xml41
-rw-r--r--res/values-mr-rIN/strings_pbap.xml2
-rw-r--r--res/values-mr-rIN/test_strings.xml2
-rw-r--r--res/values-ms-rMY/strings.xml9
-rw-r--r--res/values-my-rMM/strings.xml31
-rw-r--r--res/values-my-rMM/test_strings.xml2
-rw-r--r--res/values-nb/strings.xml19
-rw-r--r--res/values-ne-rNP/strings.xml9
-rw-r--r--res/values-ne-rNP/strings_pbap.xml2
-rw-r--r--res/values-nl/strings.xml29
-rw-r--r--res/values-pa-rIN/strings.xml21
-rw-r--r--res/values-pa-rIN/test_strings.xml2
-rw-r--r--res/values-pl/strings.xml21
-rw-r--r--res/values-pt-rPT/strings.xml9
-rw-r--r--res/values-pt/strings.xml9
-rw-r--r--res/values-ro/strings.xml137
-rw-r--r--res/values-ro/strings_pbap.xml6
-rw-r--r--res/values-ro/test_strings.xml12
-rw-r--r--res/values-ru/strings.xml13
-rw-r--r--res/values-si-rLK/strings.xml9
-rw-r--r--res/values-sk/strings.xml43
-rw-r--r--res/values-sl/strings.xml29
-rw-r--r--res/values-sl/test_strings.xml2
-rw-r--r--res/values-sq-rAL/strings.xml27
-rw-r--r--res/values-sr/strings.xml15
-rw-r--r--res/values-sv/strings.xml13
-rw-r--r--res/values-sw/strings.xml9
-rw-r--r--res/values-ta-rIN/strings.xml13
-rw-r--r--res/values-te-rIN/strings.xml11
-rw-r--r--res/values-th/strings.xml11
-rw-r--r--res/values-tl/strings.xml15
-rw-r--r--res/values-tl/test_strings.xml4
-rw-r--r--res/values-tr/strings.xml9
-rw-r--r--res/values-uk/strings.xml35
-rw-r--r--res/values-ur-rPK/strings.xml9
-rw-r--r--res/values-uz-rUZ/strings.xml29
-rw-r--r--res/values-uz-rUZ/test_strings.xml2
-rw-r--r--res/values-vi/strings.xml9
-rw-r--r--res/values-zh-rCN/strings.xml13
-rw-r--r--res/values-zh-rHK/strings.xml9
-rw-r--r--res/values-zh-rTW/strings.xml19
-rw-r--r--res/values-zu/strings.xml9
-rw-r--r--res/values/config.xml24
-rwxr-xr-xsrc/com/android/bluetooth/a2dp/A2dpService.java4
-rwxr-xr-xsrc/com/android/bluetooth/avrcp/Avrcp.java269
-rw-r--r--src/com/android/bluetooth/btservice/AdapterService.java26
-rw-r--r--src/com/android/bluetooth/btservice/AdapterState.java4
-rw-r--r--src/com/android/bluetooth/btservice/BondStateMachine.java4
-rw-r--r--src/com/android/bluetooth/btservice/Config.java67
-rw-r--r--src/com/android/bluetooth/btservice/ProfileObserver.java69
-rw-r--r--src/com/android/bluetooth/gatt/GattService.java27
-rwxr-xr-xsrc/com/android/bluetooth/hfp/HeadsetService.java23
-rw-r--r--src/com/android/bluetooth/hfp/HeadsetStateMachine.java13
-rw-r--r--src/com/android/bluetooth/hfpclient/HeadsetClientService.java30
-rw-r--r--src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java92
-rwxr-xr-xsrc/com/android/bluetooth/map/BluetoothMapUtils.java7
112 files changed, 780 insertions, 1353 deletions
diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index ad5288eff..b8e9a97b3 100755
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -702,12 +702,13 @@ static bool cleanupNative(JNIEnv *env, jobject obj) {
return JNI_TRUE;
}
-static jboolean enableNative(JNIEnv* env, jobject obj, jboolean isGuest) {
+static jboolean enableNative(JNIEnv* env, jobject obj) {
ALOGV("%s:",__FUNCTION__);
jboolean result = JNI_FALSE;
if (!sBluetoothInterface) return result;
- int ret = sBluetoothInterface->enable(isGuest == JNI_TRUE ? 1 : 0);
+
+ int ret = sBluetoothInterface->enable();
result = (ret == BT_STATUS_SUCCESS || ret == BT_STATUS_DONE) ? JNI_TRUE : JNI_FALSE;
return result;
}
@@ -1155,7 +1156,7 @@ static JNINativeMethod sMethods[] = {
{"classInitNative", "()V", (void *) classInitNative},
{"initNative", "()Z", (void *) initNative},
{"cleanupNative", "()V", (void*) cleanupNative},
- {"enableNative", "(Z)Z", (void*) enableNative},
+ {"enableNative", "()Z", (void*) enableNative},
{"disableNative", "()Z", (void*) disableNative},
{"setAdapterPropertyNative", "(I[B)Z", (void*) setAdapterPropertyNative},
{"getAdapterPropertiesNative", "()Z", (void*) getAdapterPropertiesNative},
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 41953a180..d5192a9bd 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle items sal uit die lys verwyder word."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-deling: Gestuurde lêers"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-deling: Ontvangde lêers"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> onsuksesvol.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> onsuksesvol.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> suksesvol, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> suksesvol, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> suksesvol, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> onsuksesvol."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Vee lys uit"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Open"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Verwyder uit lys"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index bae6be9b3..14bca2a07 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"ሁሉም ዓይነቶች ከዝርዝር ውስጥ ይሰረዛሉ።"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"ብሉቱዝ ማጋሪያ፡ የተላኩ ፋይሎች"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"ብሉቱዝ ማጋሪያ፡ የደረሱ ፋይሎች"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> አልተሳኩም።</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> አልተሳኩም።</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ተሳክተዋል፣ %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ተሳክተዋል፣ %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> የተሳካ፣ <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ያልተሳካ።"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"ዝርዝር አጽዳ"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"ክፈት"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"ከዝርዝር አጽዳ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 36353b01c..d3e61097b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -110,22 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"سيتم محو جميع العناصر من القائمة."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"مشاركة البلوتوث: الملفات المرسلة"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"مشاركة البلوتوث: الملفات المستلمة"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="zero">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> من العناصر.</item>
- <item quantity="two">أخفق إرسال عنصرين (<xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>).</item>
- <item quantity="few">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> عناصر.</item>
- <item quantity="many">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> عنصرًا.</item>
- <item quantity="other">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> من العناصر.</item>
- <item quantity="one">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> عنصر.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="zero">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> من العناصر، %2$s</item>
- <item quantity="two">‏نجح إرسال عنصرين (<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>)، %2$s</item>
- <item quantity="few">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> عناصر، %2$s</item>
- <item quantity="many">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> عنصرًا، %2$s</item>
- <item quantity="other">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> من العناصر، %2$s</item>
- <item quantity="one">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> عنصر، %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"تم <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> بنجاح وأخفق <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"محو القائمة"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"فتح"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"محو من القائمة"</string>
@@ -136,5 +121,5 @@
<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"المنافذ المتبقية:"</string>
<string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"رمز التطبيق"</string>
<string name="bluetooth_map_settings_title" msgid="7420332483392851321">"إعدادات مشاركة الرسائل عبر بلوتوث"</string>
- <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"يتعذر تحديد الحساب. عدد المنافذ المتبقية: ۰"</string>
+ <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"يتعذر تحديد الحساب. عدد المنافذ المتبقية: 0"</string>
</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 2f9d291d7..0ed5aba52 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Bütün məlumatlar siyahıdan silinəcək."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth paylaşım: Göndərilmiş fayllar"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth paylaşım: Qəbul edilən fayllar"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> uğursuz.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> uğursuz.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> uğurlu, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> uğurlu, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> uğurlu, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> uğursuz."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Siyahını silin"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Açın"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Siyahıdan silin"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c55c49a07..645d48356 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -68,7 +68,7 @@
<string name="upload_line5" msgid="7759322537674229752">"Файлът се изпраща..."</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"Файлът е изпратен"</string>
<string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"Файлът не бе изпратен до <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"Файлът не бе изпратен до „<xliff:g id="RECIPIENT">%1$s</xliff:g>“."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"Файл: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"Опитайте отново"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"Затваряне"</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Всички елементи ще бъдат премахнати от списъка."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Споделяне чрез Bluetooth: Изпратени файлове"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Споделяне чрез Bluetooth: Получени файлове"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other">Неуспешно: <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>.</item>
- <item quantity="one">Неуспешно: <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other">Успешно: <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> – %2$s</item>
- <item quantity="one">Успешно: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> – %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"Успешно: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>. Неуспешно: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Изчистване на списъка"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Отваряне"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Изчистване от списъка"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 3501004ad..2b6a1e5a2 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -18,16 +18,16 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ডাউনলোড ম্যানেজার অ্যাক্সেস করুন।"</string>
<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"অ্যাপ্লিকেশানটিকে BluetoothShare ম্যানেজার অ্যাক্সেস করতে ও ফাইলগুলি স্থানান্তর করতে এটি ব্যবহার করার অনুমতি দেয়।"</string>
- <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"শ্বেততালিকাভুক্ত ব্লুটুথ ডিভাইসের অ্যাক্সেস।"</string>
- <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"অ্যাপ্লিকেশানটিকে অস্থায়ীভাবে কোনো ব্লুটুথ ডিভাইসকে শ্বেততালিকায় অন্তর্ভুক্ত করার অনুমতি দেয়, যা সেই ডিভাইসটিকে এই ডিভাইসে ব্যবহারকারীর নিশ্চিতকরণ ছাড়া ফাইল পাঠানোর অনুমতি দেয়।"</string>
- <string name="bt_share_picker_label" msgid="6268100924487046932">"ব্লুটুথ"</string>
+ <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"শ্বেততালিকাভুক্ত Bluetooth ডিভাইসের অ্যাক্সেস।"</string>
+ <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"অ্যাপ্লিকেশানটিকে অস্থায়ীভাবে কোনো Bluetooth ডিভাইসকে শ্বেততালিকায় অন্তর্ভুক্ত করার অনুমতি দেয়, যা সেই ডিভাইসটিকে এই ডিভাইসে ব্যবহারকারীর নিশ্চিতকরণ ছাড়া ফাইল পাঠানোর অনুমতি দেয়।"</string>
+ <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
<string name="unknown_device" msgid="9221903979877041009">"অজানা ডিভাইস"</string>
<string name="unknownNumber" msgid="4994750948072751566">"অজানা"</string>
<string name="airplane_error_title" msgid="2683839635115739939">"বিমান মোড"</string>
- <string name="airplane_error_msg" msgid="8698965595254137230">"আপনি বিমান মোডে ব্লুটুথ ব্যবহার করতে পারবেন না।"</string>
+ <string name="airplane_error_msg" msgid="8698965595254137230">"আপনি বিমান মোডে Bluetooth ব্যবহার করতে পারবেন না।"</string>
<string name="bt_enable_title" msgid="8657832550503456572"></string>
- <string name="bt_enable_line1" msgid="7203551583048149">"ব্লুটুথ পরিষেবাগুলি ব্যবহার করার জন্য আপনাকে অবশ্যই প্রথমে ব্লুটুথ চালু করতে হবে।"</string>
- <string name="bt_enable_line2" msgid="4341936569415937994">"এখন ব্লুটুথ চালু করবেন?"</string>
+ <string name="bt_enable_line1" msgid="7203551583048149">"Bluetooth পরিষেবাগুলি ব্যবহার করার জন্য আপনাকে অবশ্যই প্রথমে Bluetooth চালু করতে হবে।"</string>
+ <string name="bt_enable_line2" msgid="4341936569415937994">"এখন Bluetooth চালু করবেন?"</string>
<string name="bt_enable_cancel" msgid="1988832367505151727">"বাতিল করুন"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"চালু করুন"</string>
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"ফাইল স্থানান্তর"</string>
@@ -36,16 +36,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"স্বীকার করুন"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"ঠিক আছে"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" এর থেকে ইনকামিং ফাইল গ্রহণ করার সময় অতিবাহিত হয়ে গেছে।"</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"ব্লুটুথ share: ইনকামিং ফাইল"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth share: ইনকামিং ফাইল"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"আপনি কি এই ফাইলটি পেতে চান?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"অন্য ডিভাইস থেকে ইনকামিং ফাইল। আপনি যে ফাইলটি পেতে চান তা নিশ্চিত করুন।"</string>
- <string name="notification_receiving" msgid="4674648179652543984">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> প্রাপ্ত করা হচ্ছে"</string>
- <string name="notification_received" msgid="3324588019186687985">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> প্রাপ্ত করা হয়েছে"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> ফাইল প্রাপ্ত করা হয়নি"</string>
- <string name="notification_sending" msgid="3035748958534983833">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> পাঠানো হচ্ছে"</string>
- <string name="notification_sent" msgid="9218710861333027778">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> পাঠানো হয়েছে"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> প্রাপ্ত করা হচ্ছে"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> প্রাপ্ত করা হয়েছে"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> ফাইল প্রাপ্ত করা হয়নি"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> পাঠানো হচ্ছে"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> পাঠানো হয়েছে"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"১০০% সম্পূর্ণ"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> ফাইল পাঠানো হয়নি"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> ফাইল পাঠানো হয়নি"</string>
<string name="download_title" msgid="3353228219772092586">"ফাইল স্থানান্তর"</string>
<string name="download_line1" msgid="4926604799202134144">"প্রেরক: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"ফাইল: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -78,7 +78,7 @@
<string name="not_exist_file" msgid="3489434189599716133">"কোনো ফাইল নেই"</string>
<string name="not_exist_file_desc" msgid="4059531573790529229">"ফাইলটির অস্তিত্ব নেই। \n"</string>
<string name="enabling_progress_title" msgid="436157952334723406">"দয়া করে অপেক্ষা করুন..."</string>
- <string name="enabling_progress_content" msgid="4601542238119927904">"ব্লুটুথ চালু করা হচ্ছে..."</string>
+ <string name="enabling_progress_content" msgid="4601542238119927904">"Bluetooth চালু করা হচ্ছে..."</string>
<string name="bt_toast_1" msgid="972182708034353383">"ফাইল প্রাপ্ত করা হবে। বিজ্ঞপ্তি প্যানেলে প্রগতি চেক করুন।"</string>
<string name="bt_toast_2" msgid="8602553334099066582">"ফাইল প্রাপ্ত করা যাবে না।"</string>
<string name="bt_toast_3" msgid="6707884165086862518">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" এর থেকে ফাইল পাওয়া বন্ধ করা হয়েছে"</string>
@@ -101,32 +101,25 @@
<string name="status_connection_error" msgid="947681831523219891">"সংযোগ অসফল।"</string>
<string name="status_protocol_error" msgid="3245444473429269539">"অনুরোধ সঠিকভাবে পরিচালনা করা যাবে না।"</string>
<string name="status_unknown_error" msgid="8156660554237824912">"অজানা ত্রুটি৷"</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"ব্লুটুথ প্রাপ্তি"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth প্রাপ্তি"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> প্রাপ্ত করা সম্পূর্ণ।"</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> পাঠানো সম্পূর্ণ।"</string>
<string name="inbound_history_title" msgid="6940914942271327563">"অন্তরমূখী স্থানান্তরগুলি"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"বহির্গামী স্থানান্তরগুলি"</string>
<string name="no_transfers" msgid="3482965619151865672">"স্থানান্তরের ইতিহাস খালি।"</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"তালিকা থেকে সমস্ত আইটেম সাফ করা হবে।"</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"ব্লুটুথ share: পাঠানো ফাইলগুলি"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"ব্লুটুথ share: প্রাপ্ত করা ফাইলগুলি"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>টি অসফল হয়েছে৷</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>টি অসফল হয়েছে৷</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>টি সফল হয়েছে, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>টি সফল হয়েছে, %2$s</item>
- </plurals>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth share: পাঠানো ফাইলগুলি"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth share: প্রাপ্ত করা ফাইলগুলি"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>টি সফল, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>টি অসফল।"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"তালিকা সাফ করুন"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"খুলুন"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"তালিকা থেকে সাফ করুন"</string>
<string name="transfer_clear_dlg_title" msgid="2953444575556460386">"সাফ করুন"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"সংরক্ষণ করুন"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"বাতিল করুন"</string>
- <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"আপনি ব্লুটুথ এর মাধ্যমে যেই অ্যাকাউন্টগুলি শেয়ার করতে চান সেগুলি নির্বাচন করুন। সংযোগের সময়ে আপনাকে এখনও পর্যন্ত অ্যাকাউন্টের যে কোনো অ্যাক্সেস গ্রহণ করতে হবে।"</string>
+ <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"আপনি Bluetooth এর মাধ্যমে যেই অ্যাকাউন্টগুলি ভাগ করতে চান সেগুলি নির্বাচন করুন। সংযোগের সময়ে আপনাকে এখনও পর্যন্ত অ্যাকাউন্টের যে কোনো অ্যাক্সেস গ্রহণ করতে হবে।"</string>
<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"যে স্লটগুলি বাকি আছে:"</string>
<string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"অ্যাপ্লিকেশান আইকন"</string>
- <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ব্লুটুথ মারফত বার্তা শেয়ার করার সেটিংস"</string>
+ <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth মারফত বার্তা ভাগ করার সেটিংস"</string>
<string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"অ্যাকাউন্ট নির্বাচন করা যাচ্ছে না। ০টি স্লট বাকি আছে"</string>
</resources>
diff --git a/res/values-bn-rBD/strings_pbap.xml b/res/values-bn-rBD/strings_pbap.xml
index 741173313..3b3a06171 100644
--- a/res/values-bn-rBD/strings_pbap.xml
+++ b/res/values-bn-rBD/strings_pbap.xml
@@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"%1$s এর জন্য সেশন কী টাইপ করুন"</string>
- <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"ব্লুটুথ সেশন কী প্রয়োজন"</string>
+ <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth সেশন কী প্রয়োজন"</string>
<string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"%1$s এর মাধ্যমে সংযোগ স্বীকার করার সময় অতিবাহিত হয়ে গেছে"</string>
<string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"%1$s এর মাধ্যেমে সেশন কী ইনপুট করার সময় অতিবাহিত হয়ে গেছে"</string>
<string name="auth_notif_ticker" msgid="1575825798053163744">"Obex প্রমাণীকরণ অনুরোধ"</string>
diff --git a/res/values-bn-rBD/strings_sap.xml b/res/values-bn-rBD/strings_sap.xml
index 23def2a6e..274998f17 100644
--- a/res/values-bn-rBD/strings_sap.xml
+++ b/res/values-bn-rBD/strings_sap.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="bluetooth_sap_notif_title" msgid="6877860822993195074">"ব্লুটুথ SIM -এ অ্যাক্সেস করুন"</string>
- <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"ব্লুটুথ SIM -এ অ্যাক্সেস করুন"</string>
+ <string name="bluetooth_sap_notif_title" msgid="6877860822993195074">"Bluetooth SIM -এ অ্যাক্সেস করুন"</string>
+ <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"Bluetooth SIM -এ অ্যাক্সেস করুন"</string>
<string name="bluetooth_sap_notif_message" msgid="7138657801087500690">"ক্লায়েন্ট সংযোগ বিচ্ছিন্ন করার অনুরোধ জানাবেন?"</string>
<string name="bluetooth_sap_notif_disconnecting" msgid="819150843490233288">"সংযোগ বিচ্ছিন্ন করতে ক্লায়েন্টের জন্য অপেক্ষা করা"</string>
<string name="bluetooth_sap_notif_disconnect_button" msgid="3678476872583356919">"সংযোগ বিচ্ছিন্ন করুন"</string>
diff --git a/res/values-bn-rBD/test_strings.xml b/res/values-bn-rBD/test_strings.xml
index 46b34708f..1e9145f5b 100644
--- a/res/values-bn-rBD/test_strings.xml
+++ b/res/values-bn-rBD/test_strings.xml
@@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hello" msgid="1740533743008967039">"হ্যালো ওয়ার্ল্ড, TestActivity"</string>
- <string name="app_name" msgid="1203877025577761792">"ব্লুটুথ শেয়ার করা"</string>
+ <string name="app_name" msgid="1203877025577761792">"Bluetooth ভাগ করা"</string>
<string name="insert_record" msgid="1450997173838378132">"রেকর্ড ঢোকান"</string>
<string name="update_record" msgid="2480425402384910635">"রেকর্ড নিশ্চিত করুন"</string>
<string name="ack_record" msgid="6716152390978472184">"Ack রেকর্ড"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 564687d17..cb30beacf 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -27,7 +27,7 @@
<string name="airplane_error_msg" msgid="8698965595254137230">"No pots utilitzar Bluetooth en mode d\'avió."</string>
<string name="bt_enable_title" msgid="8657832550503456572"></string>
<string name="bt_enable_line1" msgid="7203551583048149">"Per utilitzar serveis Bluetooth, primer cal que activeu el Bluetooth."</string>
- <string name="bt_enable_line2" msgid="4341936569415937994">"Vols activar el Bluetooth ara?"</string>
+ <string name="bt_enable_line2" msgid="4341936569415937994">"Voleu activar el Bluetooth ara?"</string>
<string name="bt_enable_cancel" msgid="1988832367505151727">"Cancel·la"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"Activa"</string>
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferència del fitxer"</string>
@@ -36,16 +36,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accepta"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"D\'acord"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"S\'ha esgotat el temps d\'espera mentre s\'acceptava un fitxer entrant de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth: fitxer entrant"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Ús compartit de Bluetooth: fitxer entrant"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Vols rebre aquest fitxer?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"Està entrant un fitxer d\'un altre dispositiu. Confirma que vols rebre el fitxer."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth: s\'està rebent <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received" msgid="3324588019186687985">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> rebut"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> no rebut"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Bluetooth: s\'està enviant <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviat"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Ús compartit de Bluetooth: s\'està rebent <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Compartir amb Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> rebut"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth compartit: fitxer <xliff:g id="FILE">%1$s</xliff:g> no rebut"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Ús compartit de Bluetooth: s\'està enviant <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Ús compartit de Bluetooth: s\'ha enviat <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100% complet"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> no enviat"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Ús compartit de Bluetooth: no s\'ha enviat el fitxer <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="download_title" msgid="3353228219772092586">"Transferència del fitxer"</string>
<string name="download_line1" msgid="4926604799202134144">"De: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"Fitxer: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -93,7 +93,7 @@
<string name="status_running" msgid="6562808920311008696">"S\'està duent a terme la transferència de fitxers."</string>
<string name="status_success" msgid="239573225847565868">"La transferència de fitxers s\'ha completat correctament."</string>
<string name="status_not_accept" msgid="1695082417193780738">"El contingut no és compatible."</string>
- <string name="status_forbidden" msgid="613956401054050725">"El dispositiu de destinació no permet la transferència."</string>
+ <string name="status_forbidden" msgid="613956401054050725">"El dispositiu de destinació ha prohibit la transferència."</string>
<string name="status_canceled" msgid="6664490318773098285">"L\'usuari ha cancel·lat la transferència."</string>
<string name="status_file_error" msgid="3671917770630165299">"Problema d\'emmagatzematge."</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Sense emmagatzematge USB."</string>
@@ -102,23 +102,16 @@
<string name="status_protocol_error" msgid="3245444473429269539">"La sol·licitud no es pot processar correctament."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Error desconegut."</string>
<string name="btopp_live_folder" msgid="7967791481444474554">"Rebut per Bluetooth"</string>
- <string name="download_success" msgid="7036160438766730871">"Recepció completada (<xliff:g id="FILE_SIZE">%1$s</xliff:g>)"</string>
+ <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g>: recepció completa."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g>: enviament complet."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Transferències d\'entrada"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Transferències de sortida"</string>
<string name="no_transfers" msgid="3482965619151865672">"L\'historial de transferències és buit."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"S\'esborraran tots els elements de la llista."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth: fitxers enviats"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: fitxers rebuts"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other">Incorrectes: <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>.</item>
- <item quantity="one">Incorrectes: <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other">Correctes: <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>, %2$s</item>
- <item quantity="one">Correctes: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g>, %2$s</item>
- </plurals>
- <string name="transfer_menu_clear_all" msgid="790017462957873132">"Esborra la llista"</string>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Ús compartit de Bluetooth: fitxers enviats"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Ús compartit de Bluetooth: fitxers rebuts"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> correctes, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> incorrectes."</string>
+ <string name="transfer_menu_clear_all" msgid="790017462957873132">"Buida la llista"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Obre"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Esborra de la llista"</string>
<string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Esborra"</string>
diff --git a/res/values-ca/test_strings.xml b/res/values-ca/test_strings.xml
index 34ce2cb58..ddf1fbd45 100644
--- a/res/values-ca/test_strings.xml
+++ b/res/values-ca/test_strings.xml
@@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hello" msgid="1740533743008967039">"Hola, món; ActivitatDeProva"</string>
- <string name="app_name" msgid="1203877025577761792">"Compartir amb Bluetooth"</string>
+ <string name="app_name" msgid="1203877025577761792">"Ús compartit de Bluetooth"</string>
<string name="insert_record" msgid="1450997173838378132">"Insereix un registre"</string>
<string name="update_record" msgid="2480425402384910635">"Confirma el registre"</string>
<string name="ack_record" msgid="6716152390978472184">"Registre de notificacions"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 07b92ce2d..51fa25f98 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -54,7 +54,7 @@
<string name="download_line5" msgid="3069560415845295386">"Přijímání souboru..."</string>
<string name="download_cancel" msgid="9177305996747500768">"Zastavit"</string>
<string name="download_ok" msgid="5000360731674466039">"Skrýt"</string>
- <string name="incoming_line1" msgid="2127419875681087545">"Od"</string>
+ <string name="incoming_line1" msgid="2127419875681087545">"Z"</string>
<string name="incoming_line2" msgid="3348994249285315873">"Název souboru"</string>
<string name="incoming_line3" msgid="7954237069667474024">"Velikost"</string>
<string name="download_fail_line1" msgid="3846450148862894552">"Soubor nebyl přijat"</string>
@@ -68,7 +68,7 @@
<string name="upload_line5" msgid="7759322537674229752">"Odesílání souboru..."</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"Soubor byl odeslán"</string>
<string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"Soubor nebyl odeslán zařízení <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"Soubor nebyl odeslán uživateli <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"Soubor: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"Zkuste to znovu"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"Zavřít"</string>
@@ -110,19 +110,8 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Ze seznamu budou vymazány všechny položky."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Sdílení Bluetooth: Odeslané soubory"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Sdílení Bluetooth: Přijaté soubory"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="few"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neúspěšné.</item>
- <item quantity="many"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neúspěšného.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neúspěšných.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> neúspěšné.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="few"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> úspěšné, %2$s</item>
- <item quantity="many"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> úspěšného, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> úspěšných, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> úspěšné, %2$s</item>
- </plurals>
- <string name="transfer_menu_clear_all" msgid="790017462957873132">"Vymazat obsah seznamu"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"Úspěšné: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, neúspěšné: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
+ <string name="transfer_menu_clear_all" msgid="790017462957873132">"Vymazat seznam"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Otevřít"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Vymazat ze seznamu"</string>
<string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Vymazat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ea8c200b9..5ba6939ff 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -36,16 +36,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accepter"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Der opstod timeout ved modtagelse af indgående fil fra \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth-deling: indgående fil"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Deling med Bluetooth: indgående fil"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"VIl du modtage denne fil?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"Indgående fil fra en anden enhed. Bekræft, at du vil modtage denne fil."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth-deling: Modtager <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received" msgid="3324588019186687985">"Bluetooth-deling: Modtog <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth-deling: Filen <xliff:g id="FILE">%1$s</xliff:g> blev ikke modtaget"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Bluetooth-deling: Sender <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Bluetooth-deling: Sendt <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Deling med Bluetooth: Modtager <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Deling med Bluetooth: Modtog <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Deling med Bluetooth: Filen <xliff:g id="FILE">%1$s</xliff:g> blev ikke modtaget"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Deling med Bluetooth: Sender <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Deling med Bluetooth: Sendt <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100 % fuldført"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth-deling: Filen <xliff:g id="FILE">%1$s</xliff:g> blev ikke sendt"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Deling med Bluetooth: Filen <xliff:g id="FILE">%1$s</xliff:g> blev ikke sendt"</string>
<string name="download_title" msgid="3353228219772092586">"Filoverførsel"</string>
<string name="download_line1" msgid="4926604799202134144">"Fra: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -101,23 +101,16 @@
<string name="status_connection_error" msgid="947681831523219891">"Forbindelsen mislykkedes."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"Anmodningen kan ikke håndteres korrekt."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Ukendt fejl."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Modtaget via Bluetooth"</string>
- <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Modtaget."</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth modtaget"</string>
+ <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Modtagelse fuldført."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Afsendelse fuldført."</string>
- <string name="inbound_history_title" msgid="6940914942271327563">"Indgående overførsler"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"Udgående overførsler"</string>
- <string name="no_transfers" msgid="3482965619151865672">"Overførselshistorikken er tom."</string>
+ <string name="inbound_history_title" msgid="6940914942271327563">"Overførsler hertil"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"Overførsler herfra"</string>
+ <string name="no_transfers" msgid="3482965619151865672">"Overførselsoversigten er tom."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle elementer vil blive fjernet fra listen."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-deling: Sendte filer"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-deling: Modtagne filer"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> mislykkedes.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> mislykkedes.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> lykkedes, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> lykkedes, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> vellykket, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> mislykket."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Ryd liste"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Åbn"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Fjern fra listen"</string>
diff --git a/res/values-da/test_strings.xml b/res/values-da/test_strings.xml
index d28938c29..ed5a70709 100644
--- a/res/values-da/test_strings.xml
+++ b/res/values-da/test_strings.xml
@@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hello" msgid="1740533743008967039">"Hello World, TestActivity"</string>
- <string name="app_name" msgid="1203877025577761792">"Bluetooth-deling"</string>
+ <string name="app_name" msgid="1203877025577761792">"Deling med Bluetooth"</string>
<string name="insert_record" msgid="1450997173838378132">"Indsæt post"</string>
<string name="update_record" msgid="2480425402384910635">"Bekræft post"</string>
<string name="ack_record" msgid="6716152390978472184">"Ack-post"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 288a776fb..ddf279b07 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -24,9 +24,9 @@
<string name="unknown_device" msgid="9221903979877041009">"Unbekanntes Gerät"</string>
<string name="unknownNumber" msgid="4994750948072751566">"Unbekannter Anrufer"</string>
<string name="airplane_error_title" msgid="2683839635115739939">"Flugmodus"</string>
- <string name="airplane_error_msg" msgid="8698965595254137230">"Du kannst Bluetooth im Flugmodus nicht verwenden."</string>
+ <string name="airplane_error_msg" msgid="8698965595254137230">"Sie können Bluetooth im Flugmodus nicht verwenden."</string>
<string name="bt_enable_title" msgid="8657832550503456572"></string>
- <string name="bt_enable_line1" msgid="7203551583048149">"Damit du Bluetooth-Dienste nutzen kannst, musst du Bluetooth zuerst aktivieren."</string>
+ <string name="bt_enable_line1" msgid="7203551583048149">"Damit Sie Bluetooth-Dienste nutzen können, müssen Sie Bluetooth zuerst aktivieren."</string>
<string name="bt_enable_line2" msgid="4341936569415937994">"Bluetooth jetzt aktivieren?"</string>
<string name="bt_enable_cancel" msgid="1988832367505151727">"Abbrechen"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"Aktivieren"</string>
@@ -37,8 +37,8 @@
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Die Zeit zum Empfang der eingehenden Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\" ist abgelaufen."</string>
<string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth-Freigabe: Eingehende Datei"</string>
- <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Möchtest du diese Datei empfangen?"</string>
- <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Ein anderes Gerät versucht, eine Datei zu übertragen. Bestätige, dass du diese Datei empfangen möchtest."</string>
+ <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Möchten Sie diese Datei empfangen?"</string>
+ <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Ein anderes Gerät versucht, eine Datei zu übertragen. Bestätigen Sie, dass Sie diese Datei empfangen möchten."</string>
<string name="notification_receiving" msgid="4674648179652543984">"Bluetooth-Freigabe: <xliff:g id="FILE">%1$s</xliff:g> wird empfangen"</string>
<string name="notification_received" msgid="3324588019186687985">"Bluetooth-Freigabe: <xliff:g id="FILE">%1$s</xliff:g> wurde empfangen"</string>
<string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth-Freigabe: <xliff:g id="FILE">%1$s</xliff:g> wurde nicht empfangen"</string>
@@ -79,7 +79,7 @@
<string name="not_exist_file_desc" msgid="4059531573790529229">"Die Datei ist nicht vorhanden. \n"</string>
<string name="enabling_progress_title" msgid="436157952334723406">"Bitte warten..."</string>
<string name="enabling_progress_content" msgid="4601542238119927904">"Bluetooth wird aktiviert..."</string>
- <string name="bt_toast_1" msgid="972182708034353383">"Die Datei wird empfangen. Überprüfe den Fortschritt in der Benachrichtigungskonsole."</string>
+ <string name="bt_toast_1" msgid="972182708034353383">"Die Datei wird empfangen. Überprüfen Sie den Fortschritt in der Benachrichtigungskonsole."</string>
<string name="bt_toast_2" msgid="8602553334099066582">"Die Datei kann nicht empfangen werden."</string>
<string name="bt_toast_3" msgid="6707884165086862518">"Der Empfang der Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\" wurde angehalten."</string>
<string name="bt_toast_4" msgid="4678812947604395649">"Datei wird an \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" gesendet..."</string>
@@ -88,7 +88,7 @@
<string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"Der USB-Speicher verfügt nicht über genügend Speicherplatz, um die Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\" zu speichern."</string>
<string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Die SD-Karte verfügt über zu wenig Speicherplatz für die Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\"."</string>
<string name="bt_sm_2_2" msgid="2965243265852680543">"Erforderlicher Speicherplatz: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Es werden zurzeit zu viele Anfragen verarbeitet. Versuche es später erneut."</string>
+ <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Es werden zurzeit zu viele Anfragen verarbeitet. Versuchen Sie es später erneut."</string>
<string name="status_pending" msgid="2503691772030877944">"Die Dateiübertragung wurde noch nicht gestartet."</string>
<string name="status_running" msgid="6562808920311008696">"Dateiübertragung läuft."</string>
<string name="status_success" msgid="239573225847565868">"Die Dateiübertragung wurde abgeschlossen."</string>
@@ -97,7 +97,7 @@
<string name="status_canceled" msgid="6664490318773098285">"Übertragung wurde vom Nutzer abgebrochen."</string>
<string name="status_file_error" msgid="3671917770630165299">"Speicherproblem"</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Kein USB-Speicher"</string>
- <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Keine SD-Karte. Lege eine SD-Karte ein, um die übertragenen Dateien zu speichern."</string>
+ <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Keine SD-Karte. Legen Sie eine SD-Karte ein, um die übertragenen Dateien zu speichern."</string>
<string name="status_connection_error" msgid="947681831523219891">"Verbindung fehlgeschlagen"</string>
<string name="status_protocol_error" msgid="3245444473429269539">"Die Anfrage kann nicht richtig verarbeitet werden."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Unbekannter Fehler"</string>
@@ -110,21 +110,14 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle Elemente werden aus der Liste gelöscht."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-Freigabe: Gesendete Dateien"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-Freigabe: Empfangene Dateien"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other">Fehler bei <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> aufgetreten</item>
- <item quantity="one">Fehler bei <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> aufgetreten</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> erfolgreich, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> erfolgreich, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> erfolgreich, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> fehlgeschlagen"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Liste löschen"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Öffnen"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Aus Liste löschen"</string>
<string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Löschen"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Speichern"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Abbrechen"</string>
- <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Wähle die Konten aus, die du über Bluetooth freigeben möchtest. Du musst jedoch weiterhin jedem Zugriff auf die Konten zustimmen, wenn eine Verbindung hergestellt wird."</string>
+ <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Wählen Sie die Konten aus, die Sie über Bluetooth freigeben möchten. Sie müssen jedoch weiterhin jedem Zugriff auf die Konten zustimmen, wenn eine Verbindung hergestellt wird."</string>
<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Plätze frei:"</string>
<string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"App-Symbol"</string>
<string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Einstellungen zur Bluetooth-Nachrichtenfreigabe"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2c4de33b2..e5952104d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Πρόσβαση στη διαχείριση λήψεων."</string>
+ <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Πρόσβαση στο πρόγραμμα διαχείρισης λήψεων."</string>
<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Επιτρέπει στην εφαρμογή να αποκτά πρόσβαση στο πρόγραμμα διαχείρισης BluetoothShare και να το χρησιμοποιεί για τη μεταφορά αρχείων."</string>
<string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Πρόσβαση συσκευής Bluetooth επιτρεπόμενης λίστας."</string>
<string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Επιτρέπει στην εφαρμογή να προσθέσει μια συσκευή Bluetooth σε μια λίστα επιτρεπόμενων συσκευών, δίνοντας τη δυνατότητα στη συγκεκριμένη εφαρμογή να αποστέλλει αρχεία σε αυτήν τη συσκευή χωρίς επιβεβαίωση χρήστη."</string>
@@ -95,8 +95,8 @@
<string name="status_not_accept" msgid="1695082417193780738">"Το περιεχόμενο δεν υποστηρίζεται."</string>
<string name="status_forbidden" msgid="613956401054050725">"Δεν επιτρέπεται αυτή η μεταφορά από τη συσκευή προορισμού."</string>
<string name="status_canceled" msgid="6664490318773098285">"Η μεταφορά ακυρώθηκε από τον χρήστη."</string>
- <string name="status_file_error" msgid="3671917770630165299">"Πρόβλημα αποθηκευτικού χώρου."</string>
- <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Δεν υπάρχει αποθηκευτικός χώρος USB."</string>
+ <string name="status_file_error" msgid="3671917770630165299">"Πρόβλημα χώρου αποθήκευσης."</string>
+ <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Δεν υπάρχει χώρος αποθήκευσης USB."</string>
<string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Δεν υπάρχει κάρτα SD card. Εισαγάγετε μια κάρτα SD για να αποθηκεύετε τα μεταφερόμενα αρχεία."</string>
<string name="status_connection_error" msgid="947681831523219891">"Η σύνδεση δεν ήταν επιτυχής."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"Δεν μπορεί να γίνει σωστός χειρισμός του αιτήματος."</string>
@@ -107,21 +107,14 @@
<string name="inbound_history_title" msgid="6940914942271327563">"Εισερχόμενες μεταφορές"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Εξερχόμενες μεταφορές"</string>
<string name="no_transfers" msgid="3482965619151865672">"Το ιστορικό μεταφορών είναι κενό."</string>
- <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Όλα τα στοιχεία από τη λίστα θα διαγραφούν."</string>
+ <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Θα γίνει εκκαθάριση όλων των στοιχείων από τη λίστα."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Κοινή χρήση Bluetooth: Απεσταλμένα αρχεία"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Κοινή χρήση Bluetooth: Ληφθέντα αρχεία"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ανεπιτυχή.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> ανεπιτυχές.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> επιτυχή, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> επιτυχές, %2$s</item>
- </plurals>
- <string name="transfer_menu_clear_all" msgid="790017462957873132">"Διαγραφή λίστας"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> επιτυχίες, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> αποτυχίες."</string>
+ <string name="transfer_menu_clear_all" msgid="790017462957873132">"Εκκαθάριση λίστας"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Άνοιγμα"</string>
- <string name="transfer_menu_clear" msgid="5854038118831427492">"Διαγραφή από τη λίστα"</string>
- <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Διαγραφή"</string>
+ <string name="transfer_menu_clear" msgid="5854038118831427492">"Εκκαθάριση από τη λίστα"</string>
+ <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Εκκαθάριση"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Αποθήκευση"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Ακύρωση"</string>
<string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Επιλέξτε τους λογαριασμούς που θέλετε να μοιραστείτε μέσω Bluetooth. Θα πρέπει ακόμη να αποδεχτείτε τυχόν αιτήματα πρόσβασης στους λογαριασμούς κατά τη σύνδεση."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index e200e4aa2..719fb5879 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -106,18 +106,11 @@
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Sent complete."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Inbound transfers"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Outbound transfers"</string>
- <string name="no_transfers" msgid="3482965619151865672">"Transfer history is empty."</string>
+ <string name="no_transfers" msgid="3482965619151865672">"Browser history is empty."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"All items will be cleared from the list."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth share: Sent files"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth share: Received files"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> unsuccessful.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> unsuccessful.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> successful, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> successful, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> successful, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> unsuccessful."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Clear list"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Open"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Clear from list"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e200e4aa2..719fb5879 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -106,18 +106,11 @@
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Sent complete."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Inbound transfers"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Outbound transfers"</string>
- <string name="no_transfers" msgid="3482965619151865672">"Transfer history is empty."</string>
+ <string name="no_transfers" msgid="3482965619151865672">"Browser history is empty."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"All items will be cleared from the list."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth share: Sent files"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth share: Received files"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> unsuccessful.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> unsuccessful.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> successful, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> successful, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> successful, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> unsuccessful."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Clear list"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Open"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Clear from list"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index e200e4aa2..719fb5879 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -106,18 +106,11 @@
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Sent complete."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Inbound transfers"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Outbound transfers"</string>
- <string name="no_transfers" msgid="3482965619151865672">"Transfer history is empty."</string>
+ <string name="no_transfers" msgid="3482965619151865672">"Browser history is empty."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"All items will be cleared from the list."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth share: Sent files"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth share: Received files"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> unsuccessful.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> unsuccessful.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> successful, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> successful, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> successful, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> unsuccessful."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Clear list"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Open"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Clear from list"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7bd205a76..54b886b78 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -39,13 +39,13 @@
<string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Compartir por Bluetooth: Archivo entrante"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"¿Quieres recibir este archivo?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"Hay un archivo entrante de otro dispositivo. Confirma que quieres recibirlo."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth: recibiendo <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received" msgid="3324588019186687985">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> recibido"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth: no se recibió el archivo <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Bluetooth: enviando <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviado"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Compartir por Bluetooth: Recibiendo <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Compartir por Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> Recibido"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Compartir por Bluetooth: No se recibió el archivo <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Compartir por Bluetooth: Enviando <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Compartir por Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviado"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"Completado el 100%"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth: no se envió el archivo <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Compartir por Bluetooth: No se envió el archivo <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="download_title" msgid="3353228219772092586">"Transferencia de archivo"</string>
<string name="download_line1" msgid="4926604799202134144">"De: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"Archivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -108,16 +108,9 @@
<string name="outbound_history_title" msgid="4279418703178140526">"Transferencias de salida"</string>
<string name="no_transfers" msgid="3482965619151865672">"El historial de transferencias está vacío."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Se borrarán todos los elementos de la lista."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth: archivos enviados"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: archivos recibidos"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> con error</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> con error</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> correctos, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> correcto, %2$s</item>
- </plurals>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Compartir con Bluetooth: Archivos enviados"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Compartir con Bluetooth: Archivos recibidos"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> correcto, error en <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Eliminar lista"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Eliminar de la lista"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b9d08b83c..b9fd34ea0 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -55,7 +55,7 @@
<string name="download_cancel" msgid="9177305996747500768">"Detener"</string>
<string name="download_ok" msgid="5000360731674466039">"Ocultar"</string>
<string name="incoming_line1" msgid="2127419875681087545">"De"</string>
- <string name="incoming_line2" msgid="3348994249285315873">"Nombre del archivo"</string>
+ <string name="incoming_line2" msgid="3348994249285315873">"Nombre de archivo"</string>
<string name="incoming_line3" msgid="7954237069667474024">"Tamaño"</string>
<string name="download_fail_line1" msgid="3846450148862894552">"Archivo no recibido"</string>
<string name="download_fail_line2" msgid="8950394574689971071">"Archivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Se borrarán todos los elementos de la lista."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth: archivos enviados"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: archivos recibidos"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> incorrectamente.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> incorrectamente.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> correctamente, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> correctamente, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"Correctos: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>; error en <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Borrar lista"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Borrar de la lista"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index a60d4b866..736ebde16 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Kõik üksused eemaldatakse loendist."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetoothi jagamine: saadetud failid"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetoothi jagamine: vastuvõetud failid"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ebaõnnestus.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> ebaõnnestus.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> õnnestus, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> õnnestus, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> õnnestus, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ebaõnnestus."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Tühjendage loend"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Ava"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Eemaldage loendist"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 5755d9317..580e10a4c 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -36,16 +36,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Onartu"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"Ados"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" igorlearen sarrerako fitxategia onartzeko denbora-muga gainditu da"</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth bidez partekatzea: fitxategi bat jaso da"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth bidezko partekatzea: sarrerako fitxategia"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Fitxategi hau jaso nahi duzu?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"Sarrerako fitxategi bat bidali dizute beste gailu batetik. Berretsi fitxategia jaso nahi duzun."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth bidez partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia jasotzen"</string>
- <string name="notification_received" msgid="3324588019186687985">"Bluetooth bidez partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia jaso da"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth bidez partekatzea: ez da jaso <xliff:g id="FILE">%1$s</xliff:g> fitxategia"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Bluetooth bidez partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidaltzen"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Bluetooth bidez partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidali da"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth bidezko partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia jasotzen"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Bluetooth bidezko partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia jaso da"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth bidezko partekatzea: ez da <xliff:g id="FILE">%1$s</xliff:g> fitxategia jaso"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Bluetooth bidezko partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidaltzen"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Bluetooth bidezko partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidali da"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"% 100ean osatuta"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth bidez partekatzea: ez da bidali <xliff:g id="FILE">%1$s</xliff:g> fitxategia"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth bidezko partekatzea: ez da <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidali"</string>
<string name="download_title" msgid="3353228219772092586">"Fitxategi-transferentzia"</string>
<string name="download_line1" msgid="4926604799202134144">"Igorlea: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"Fitxategia: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -108,16 +108,9 @@
<string name="outbound_history_title" msgid="4279418703178140526">"Irteerako transferentziak"</string>
<string name="no_transfers" msgid="3482965619151865672">"Transferentzia-historia hutsik dago."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Elementu guztiak zerrendatik garbituko dira."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth bidez partekatzea: fitxategiak bidali dira"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth bidez partekatzea: fitxategiak jaso dira"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> hutsegite.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> hutsegite.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ongi, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> ongi, %2$s</item>
- </plurals>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth bidezko partekatzea: fitxategiak bidali dira"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth bidezko partekatzea: jasotako fitxategiak"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> osatu dira, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ezin izan dira osatu."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Garbitu zerrenda"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Ireki"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Garbitu zerrendatik"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6082072c2..dc1c051ca 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,8 +18,8 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="permlab_bluetoothShareManager" msgid="311492132450338925">"‏دسترسی به Download Manager."</string>
<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"‏به برنامه برای دسترسی به مدیر BluetoothShare و استفاده از آن برای انتقال فایل‌ها اجازه می‌دهد."</string>
- <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"دسترسی دستگاه موجود در فهرست سفید بلوتوث."</string>
- <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"به برنامه اجازه می‌دهد تا موقتاً یک دستگاه بلوتوث را در فهرست سفید وارد کند، و به آن دستگاه اجازه می‌دهد بدون تأیید کاربر به این دستگاه فایل ارسال کند."</string>
+ <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"دسترسی دستگاه موجود در لیست سفید بلوتوث."</string>
+ <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"به برنامه اجازه می‌دهد تا موقتاً یک دستگاه بلوتوث را در لیست سفید وارد کند، و به آن دستگاه اجازه می‌دهد بدون تأیید کاربر به این دستگاه فایل ارسال کند."</string>
<string name="bt_share_picker_label" msgid="6268100924487046932">"بلوتوث"</string>
<string name="unknown_device" msgid="9221903979877041009">"دستگاه ناشناس"</string>
<string name="unknownNumber" msgid="4994750948072751566">"ناشناس"</string>
@@ -32,8 +32,8 @@
<string name="bt_enable_ok" msgid="3432462749994538265">"روشن کردن"</string>
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"انتقال فایل"</string>
<string name="incoming_file_confirm_content" msgid="2752605552743148036">"فایل ورودی پذیرفته شود؟"</string>
- <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"نپذیرفتن"</string>
- <string name="incoming_file_confirm_ok" msgid="281462442932231475">"پذیرفتن"</string>
+ <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"عدم پذیرش"</string>
+ <string name="incoming_file_confirm_ok" msgid="281462442932231475">"پذیرش"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"تأیید"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"هنگام پذیرش یک فایل ورودی از \"<xliff:g id="SENDER">%1$s</xliff:g>\" وقفه زمانی پیش آمد"</string>
<string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"اشتراک بلوتوث: فایل ورودی"</string>
@@ -62,7 +62,7 @@
<string name="download_fail_line3" msgid="3451040656154861722">"دلیل: <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="download_fail_ok" msgid="1521733664438320300">"تأیید"</string>
<string name="download_succ_line5" msgid="4509944688281573595">"فایل دریافت شد"</string>
- <string name="download_succ_ok" msgid="7053688246357050216">"باز کردن"</string>
+ <string name="download_succ_ok" msgid="7053688246357050216">"باز شود"</string>
<string name="upload_line1" msgid="2055952074059709052">"به: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
<string name="upload_line3" msgid="4920689672457037437">"نوع فایل: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
<string name="upload_line5" msgid="7759322537674229752">"در حال ارسال فایل..."</string>
@@ -100,27 +100,20 @@
<string name="status_no_sd_card" product="default" msgid="5760944071743325592">"‏هیچ کارت SD موجود نیست. برای ذخیره فایل‌های منتقل شده، یک کارت SD در گوشی قرار دهید."</string>
<string name="status_connection_error" msgid="947681831523219891">"اتصال ناموفق بود."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"درخواست به درستی انجام نمی‌شود."</string>
- <string name="status_unknown_error" msgid="8156660554237824912">"خطای ناشناس."</string>
+ <string name="status_unknown_error" msgid="8156660554237824912">"خطای ناشناخته."</string>
<string name="btopp_live_folder" msgid="7967791481444474554">"بلوتوث دریافت شد"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> دریافت کامل شد."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> ارسال کامل شد."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"انتقال های ورودی"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"انتقال های خروجی"</string>
<string name="no_transfers" msgid="3482965619151865672">"سابقه انتقال خالی است."</string>
- <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"همهٔ موارد از فهرست پاک می‌شوند."</string>
+ <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"همهٔ موارد از لیست پاک می‌شوند."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"اشتراک بلوتوث: فایل‌های ارسال شده"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"اشتراک بلوتوث: فایل‌های دریافت شده"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> مورد ناموفق.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> مورد ناموفق.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one">‏<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> مورد موفق، %2$s</item>
- <item quantity="other">‏<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> مورد موفق، %2$s</item>
- </plurals>
- <string name="transfer_menu_clear_all" msgid="790017462957873132">"پاک کردن فهرست"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> موفق، <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ناموفق."</string>
+ <string name="transfer_menu_clear_all" msgid="790017462957873132">"پاک کردن لیست"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"باز کردن"</string>
- <string name="transfer_menu_clear" msgid="5854038118831427492">"پاک کردن از فهرست"</string>
+ <string name="transfer_menu_clear" msgid="5854038118831427492">"پاک کردن از لیست"</string>
<string name="transfer_clear_dlg_title" msgid="2953444575556460386">"پاک کردن"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"ذخیره‌"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"لغو"</string>
diff --git a/res/values-fa/strings_pbap.xml b/res/values-fa/strings_pbap.xml
index 0667ebbee..bc68a8924 100644
--- a/res/values-fa/strings_pbap.xml
+++ b/res/values-fa/strings_pbap.xml
@@ -5,7 +5,7 @@
<string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"به کلید جلسه بلوتوث نیاز است"</string>
<string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"‏هنگام پذیرش اتصال به %1$s وقفه زمانی ایجاد شده است"</string>
<string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"‏هنگام ورود کلید جلسه با %1$s وقفه زمانی ایجاد شده است"</string>
- <string name="auth_notif_ticker" msgid="1575825798053163744">"‏درخواست احراز هویت Obex"</string>
+ <string name="auth_notif_ticker" msgid="1575825798053163744">"‏درخواست تأیید اعتبار Obex"</string>
<string name="auth_notif_title" msgid="7599854855681573258">"کلید جلسه"</string>
<string name="auth_notif_message" msgid="6667218116427605038">"‏تایپ کلید جلسه برای %1$s"</string>
<string name="defaultname" msgid="4821590500649090078">"کیت خودرو"</string>
diff --git a/res/values-fa/test_strings.xml b/res/values-fa/test_strings.xml
index 0db14baeb..000f3f7bb 100644
--- a/res/values-fa/test_strings.xml
+++ b/res/values-fa/test_strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="hello" msgid="1740533743008967039">"سلام به همه، تست فعالیت"</string>
+ <string name="hello" msgid="1740533743008967039">"سلام بر دنیا، تست فعالیت"</string>
<string name="app_name" msgid="1203877025577761792">"اشتراک بلوتوث"</string>
<string name="insert_record" msgid="1450997173838378132">"درج سابقه"</string>
<string name="update_record" msgid="2480425402384910635">"تأیید سابقه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 3aa452752..768fcd3fa 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -99,7 +99,7 @@
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Ei USB-tallennustilaa."</string>
<string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Ei SD-korttia. Aseta SD-kortti, niin voit tallentaa siirrettyjä tiedostoja."</string>
<string name="status_connection_error" msgid="947681831523219891">"Yhteys epäonnistui."</string>
- <string name="status_protocol_error" msgid="3245444473429269539">"Pyyntö ei ole käsiteltävissä."</string>
+ <string name="status_protocol_error" msgid="3245444473429269539">"Pyyntöä ei voi käsitellä oikein."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Tuntematon virhe."</string>
<string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth, vastaanotettu"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> vastaanotto valmis."</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Koko luettelo tyhjennetään."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-jako: Lähetetyt tiedostot"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-jako: Vastaanotetut tiedostot"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> epäonnistui.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> epäonnistui.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> onnistui, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> onnistui, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> onnistui, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> epäonnistui."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Tyhjennä luettelo"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Avaa"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Poista luettelosta"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 629574928..7f2660cac 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Tous les éléments de la liste seront effacés."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Partage Bluetooth : fichiers envoyés"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Partage Bluetooth : fichiers reçus"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one">Échec de <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> élément.</item>
- <item quantity="other">Échec de <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> éléments.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one">Réussite de <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> élément, %2$s</item>
- <item quantity="other">Réussite de <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> éléments, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> succès, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> échoué."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Effacer la liste"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"ouvrir"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Effacer de la liste"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 53c87fbc6..fc2cbb1be 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -94,7 +94,7 @@
<string name="status_success" msgid="239573225847565868">"Le transfert de fichiers s\'est déroulé correctement."</string>
<string name="status_not_accept" msgid="1695082417193780738">"Le contenu n\'est pas compatible."</string>
<string name="status_forbidden" msgid="613956401054050725">"L\'appareil cible n\'autorise pas le transfert."</string>
- <string name="status_canceled" msgid="6664490318773098285">"le transfert a été annulé par l\'utilisateur."</string>
+ <string name="status_canceled" msgid="6664490318773098285">"Le transfert a été annulé par l\'utilisateur."</string>
<string name="status_file_error" msgid="3671917770630165299">"Problème de mémoire."</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Aucune mémoire de stockage USB"</string>
<string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Carte SD absente. Insérez une carte SD pour enregistrer les fichiers transférés."</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Tous les éléments de la liste seront effacés."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Partage Bluetooth : fichiers envoyés"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Partage Bluetooth : fichiers reçus"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one">Échec de <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> élément</item>
- <item quantity="other">Échec de <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> éléments</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one">Réussite de <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> élément, %2$s</item>
- <item quantity="other">Réussite de <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> éléments, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"Réussite : <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, échec : <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Effacer la liste"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Ouvrir"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Effacer de la liste"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index bb57651c7..c1b3794e7 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Borraranse todos os elementos da lista."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Uso compartido por Bluetooth: ficheiros enviados"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Uso compartido por Bluetooth: ficheiros recibidos"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> incorrectos.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> incorrecto.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> correctos, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> correcto, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> correcto, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> incorrecto."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Borrar lista"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Borrar da lista"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index da41080f4..86de24fe9 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -34,7 +34,7 @@
<string name="incoming_file_confirm_content" msgid="2752605552743148036">"આવનારી ફાઇલ સ્વીકારીએ?"</string>
<string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"નકારો"</string>
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"સ્વીકારો"</string>
- <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"ઓકે"</string>
+ <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"ઑકે"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" તરફની એક આવનારી ફાઇલ સ્વીકારતી વખતે સમયસમાપ્તિ થઈ હતી"</string>
<string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth શેર: આવનરી ફાઇલો"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"શું તમે આ ફાઇલ પ્રાપ્ત કરવા માંગો છો?"</string>
@@ -60,21 +60,21 @@
<string name="download_fail_line1" msgid="3846450148862894552">"ફાઇલ પ્રાપ્ત થઈ નથી"</string>
<string name="download_fail_line2" msgid="8950394574689971071">"ફાઇલ: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="download_fail_line3" msgid="3451040656154861722">"કારણ: <xliff:g id="REASON">%1$s</xliff:g>"</string>
- <string name="download_fail_ok" msgid="1521733664438320300">"ઓકે"</string>
+ <string name="download_fail_ok" msgid="1521733664438320300">"ઑકે"</string>
<string name="download_succ_line5" msgid="4509944688281573595">"ફાઇલ પ્રાપ્ત"</string>
<string name="download_succ_ok" msgid="7053688246357050216">"ખોલો"</string>
<string name="upload_line1" msgid="2055952074059709052">"પ્રતિ: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
<string name="upload_line3" msgid="4920689672457037437">"ફાઇલ પ્રકાર: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
<string name="upload_line5" msgid="7759322537674229752">"ફાઇલ મોકલી રહ્યું છે…"</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"ફાઇલ મોકલી"</string>
- <string name="upload_succ_ok" msgid="7705428476405478828">"ઓકે"</string>
+ <string name="upload_succ_ok" msgid="7705428476405478828">"ઑકે"</string>
<string name="upload_fail_line1" msgid="7899394672421491701">"ફાઇલ \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" ને મોકલાઈ નહોતી."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"ફાઇલ: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"ફરી પ્રયાસ કરો"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"બંધ કરો"</string>
- <string name="bt_error_btn_ok" msgid="5965151173011534240">"ઓકે"</string>
+ <string name="bt_error_btn_ok" msgid="5965151173011534240">"ઑકે"</string>
<string name="unknown_file" msgid="6092727753965095366">"અજાણી ફાઇલ"</string>
- <string name="unknown_file_desc" msgid="480434281415453287">"આ પ્રકારની ફાઇલ હેન્ડલ કરવા માટે કોઈ ઍપ્લિકેશન નથી. \n"</string>
+ <string name="unknown_file_desc" msgid="480434281415453287">"આ પ્રકારની ફાઇલ હેન્ડલ કરવા માટે કોઈ એપ્લિકેશન નથી. \n"</string>
<string name="not_exist_file" msgid="3489434189599716133">"કોઈ ફાઇલ નથી"</string>
<string name="not_exist_file_desc" msgid="4059531573790529229">"આ ફાઇલ અસ્તિત્વમાં નથી. \n"</string>
<string name="enabling_progress_title" msgid="436157952334723406">"કૃપા કરીને રાહ જુઓ..."</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"સૂચિમાંથી તમામ આઇટમ્સ સાફ કરવામાં આવશે."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth શેર: મોકલેલી ફાઇલો"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth શેર: પ્રાપ્ત ફાઇલો"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> અસફળ.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> અસફળ.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> સફળ, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> સફળ, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> સફળ, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> અસફળ."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"સૂચિ સાફ કરો"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"ખોલો"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"સૂચિમાંથી સાફ કરો"</string>
@@ -126,7 +119,7 @@
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"રદ કરો"</string>
<string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"તમે Bluetooth મારફતે શેર કરવા માગતા હો તે એકાઉન્ટ્સ પસંદ કરો. તમારે હજી પણ કનેક્ટ કરતી વખતે એકાઉન્ટ્સ પરની કોઈપણ અ‍ૅક્સેસ સ્વીકારવી પડશે."</string>
<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"સ્લોટ્સ બાકી:"</string>
- <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ઍપ્લિકેશન આયકન"</string>
+ <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"એપ્લિકેશન આયકન"</string>
<string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth સંદેશ શેરિંગ સેટિંગ્સ"</string>
<string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"એકાઉન્ટ પસંદ કરી શકાતું નથી. 0 સ્લોટ્સ બાકી"</string>
</resources>
diff --git a/res/values-gu-rIN/test_strings.xml b/res/values-gu-rIN/test_strings.xml
index 63d58cc58..7ca72cca6 100644
--- a/res/values-gu-rIN/test_strings.xml
+++ b/res/values-gu-rIN/test_strings.xml
@@ -7,7 +7,7 @@
<string name="update_record" msgid="2480425402384910635">"રેકોર્ડની પુષ્ટિ કરો"</string>
<string name="ack_record" msgid="6716152390978472184">"Ack રેકોર્ડ"</string>
<string name="deleteAll_record" msgid="4383349788485210582">"તમામ રેકોર્ડ કાઢી નાખો"</string>
- <string name="ok_button" msgid="6519033415223065454">"ઓકે"</string>
+ <string name="ok_button" msgid="6519033415223065454">"ઑકે"</string>
<string name="delete_record" msgid="4645040331967533724">"રેકોર્ડ કાઢી નાખો"</string>
<string name="start_server" msgid="9034821924409165795">"TCP સર્વર પ્રારંભ કરો"</string>
<string name="notify_server" msgid="4369106744022969655">"TCP સર્વરને સૂચિત કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 585fc5a54..61560483e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -104,20 +104,13 @@
<string name="btopp_live_folder" msgid="7967791481444474554">"ब्लूटूथ प्राप्त"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> प्राप्ति पूर्ण."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> भेजना पूर्ण."</string>
- <string name="inbound_history_title" msgid="6940914942271327563">"इनबाउंड स्थानांतरण"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"आउटबाउंड स्थानांतरण"</string>
+ <string name="inbound_history_title" msgid="6940914942271327563">"अंतर्गामी स्थानांतरण"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"बहिर्गामी स्थानांतरण"</string>
<string name="no_transfers" msgid="3482965619151865672">"स्थानांतरण इतिहास खाली है."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"सूची से सभी आइटम साफ़ कर दिए जाएंगे."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"ब्लूटूथ शेयर: भेजी गई फ़ाइलें"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"ब्लूटूथ शेयर: प्राप्त फ़ाइलें"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> असफल.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> असफल.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> सफल, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> सफल, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> सफल, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> विफल."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"सूची साफ़ करें"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"खोलें"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"सूची से साफ़ करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2bff6d3c7..402130848 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -102,7 +102,7 @@
<string name="status_protocol_error" msgid="3245444473429269539">"Zahtjev nije moguće ispravno obraditi."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Nepoznata pogreška."</string>
<string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth primljen"</string>
- <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> primljeno u cijelosti."</string>
+ <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Primljeno u potpunosti."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Poslano u potpunosti."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Dolazni prijenosi"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Odlazni prijenosi"</string>
@@ -110,20 +110,11 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"S popisa će biti izbrisane sve stavke."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth dijeljenje: poslane datoteke"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth dijeljenje: primljene datoteke"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> bez uspjeha.</item>
- <item quantity="few"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> bez uspjeha.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> bez uspjeha.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> s uspjehom, %2$s</item>
- <item quantity="few"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> s uspjehom, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> s uspjehom, %2$s</item>
- </plurals>
- <string name="transfer_menu_clear_all" msgid="790017462957873132">"Izbriši popis"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> uspjelo, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> nije uspjelo."</string>
+ <string name="transfer_menu_clear_all" msgid="790017462957873132">"Očisti popis"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Otvori"</string>
- <string name="transfer_menu_clear" msgid="5854038118831427492">"Izbriši s popisa"</string>
- <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Brisanje"</string>
+ <string name="transfer_menu_clear" msgid="5854038118831427492">"Očisti s popisa"</string>
+ <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Očisti"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Spremi"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Odustani"</string>
<string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Odaberite račune koje želite dijeliti putem Bluetootha. I dalje morate prihvatiti svako pristupanje računima prilikom povezivanja."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7b7585993..5c76be4ef 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -33,7 +33,7 @@
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"Fájlátvitel"</string>
<string name="incoming_file_confirm_content" msgid="2752605552743148036">"Fogadja a bejövő fájlt?"</string>
<string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Elutasítás"</string>
- <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Fogadás"</string>
+ <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Elfogadás"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Időtúllépés történt \"<xliff:g id="SENDER">%1$s</xliff:g>\" feladótól érkező fájl fogadása során"</string>
<string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth-megosztás: beérkező fájl"</string>
@@ -57,9 +57,9 @@
<string name="incoming_line1" msgid="2127419875681087545">"Küldő"</string>
<string name="incoming_line2" msgid="3348994249285315873">"Fájlnév"</string>
<string name="incoming_line3" msgid="7954237069667474024">"Méret"</string>
- <string name="download_fail_line1" msgid="3846450148862894552">"Nem sikerült fogadni a fájlt"</string>
+ <string name="download_fail_line1" msgid="3846450148862894552">"A fájl fogadása nem sikerült"</string>
<string name="download_fail_line2" msgid="8950394574689971071">"Fájl: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="download_fail_line3" msgid="3451040656154861722">"Indok: <xliff:g id="REASON">%1$s</xliff:g>"</string>
+ <string name="download_fail_line3" msgid="3451040656154861722">"Indoklás: <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="download_fail_ok" msgid="1521733664438320300">"OK"</string>
<string name="download_succ_line5" msgid="4509944688281573595">"A fájl megérkezett"</string>
<string name="download_succ_ok" msgid="7053688246357050216">"Megnyitás"</string>
@@ -94,7 +94,7 @@
<string name="status_success" msgid="239573225847565868">"A fájlátvitel sikeresen befejeződött."</string>
<string name="status_not_accept" msgid="1695082417193780738">"A tartalom nem támogatott."</string>
<string name="status_forbidden" msgid="613956401054050725">"A céleszköz letiltotta az átvitelt."</string>
- <string name="status_canceled" msgid="6664490318773098285">"A felhasználó megszakította."</string>
+ <string name="status_canceled" msgid="6664490318773098285">"A felhasználó visszavonta az átvitelt."</string>
<string name="status_file_error" msgid="3671917770630165299">"Tárolási probléma."</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Nem található USB-tár."</string>
<string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Nincs SD-kártya. A küldött fájlok mentéséhez helyezzen be SD-kártyát."</string>
@@ -107,17 +107,10 @@
<string name="inbound_history_title" msgid="6940914942271327563">"Bejövő átvitelek"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Kimenő átvitelek"</string>
<string name="no_transfers" msgid="3482965619151865672">"Az átvitelek előzménye üres."</string>
- <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Minden elemet töröl a listáról."</string>
+ <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Minden elem törlésre kerül a listáról."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-megosztás: elküldött fájlok"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-megosztás: fogadott fájlok"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> sikertelen.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> sikertelen.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> sikeres, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> sikeres, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> sikeres, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> sikertelen."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Lista törlése"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Megnyitás"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Törlés a listáról"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index fcb332bda..287bc9fab 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -23,8 +23,8 @@
<string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
<string name="unknown_device" msgid="9221903979877041009">"Անհայտ սարք"</string>
<string name="unknownNumber" msgid="4994750948072751566">"Անհայտ"</string>
- <string name="airplane_error_title" msgid="2683839635115739939">"Ինքնաթիռի ռեժիմ"</string>
- <string name="airplane_error_msg" msgid="8698965595254137230">"Դուք չեք կարող օգտվել Bluetooth-ից Ինքնաթիռի ռեժիմում:"</string>
+ <string name="airplane_error_title" msgid="2683839635115739939">"Ինքնաթիռային ռեժիմ"</string>
+ <string name="airplane_error_msg" msgid="8698965595254137230">"Դուք չեք կարող օգտվել Bluetooth-ից ինքնաթիռային ռեժիմում:"</string>
<string name="bt_enable_title" msgid="8657832550503456572"></string>
<string name="bt_enable_line1" msgid="7203551583048149">"Bluetooth ծառայություններից օգտվելու համար նախ պետք է միացնեք Bluetooth-ը:"</string>
<string name="bt_enable_line2" msgid="4341936569415937994">"Միացնե՞լ Bluetooth-ը հիմա:"</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Ցուցակի բոլոր տվյալները կջնջվեն:"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth համօգտագործում՝ ֆայլերն ուղարկված են"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth համօգտագործում՝ ֆայլերը ստացված են"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> չհաջողված:</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> չհաջողված:</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> հաջողված, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> հաջողված, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> հաջողված, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> չհաջողված:"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Ջնջել ցուցակը"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Բաց"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Ջնջել ցուցակից"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a44f10051..cd04e5453 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -36,7 +36,7 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Terima"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"Oke"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Terjadi waktu tunggu saat menerima file masuk dari \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Berbagi bluetooth: File masuk"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Berbagi-pakai bluetooth: File masuk"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Apakah Anda ingin menerima file ini?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"File masuk dari perangkat lain. Konfirmasikan bahwa Anda ingin menerima file ini."</string>
<string name="notification_receiving" msgid="4674648179652543984">"Berbagi Bluetooth: Menerima <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -104,24 +104,17 @@
<string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth diterima"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Telah selesai diterima."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Telah selesai dikirim."</string>
- <string name="inbound_history_title" msgid="6940914942271327563">"Transfer masuk"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"Transfer keluar"</string>
+ <string name="inbound_history_title" msgid="6940914942271327563">"Transfer inbound"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"Transfer outbound"</string>
<string name="no_transfers" msgid="3482965619151865672">"Riwayat transfer kosong."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Semua item akan dihapus dari daftar."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Berbagi bluetooth: Telah mengirimkan file"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Berbagi Bluetooth: File yang diterima"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> gagal.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> gagal.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> berhasil, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> berhasil, %2$s</item>
- </plurals>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Berbagi-pakai bluetooth: Telah mengirimkan file"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Berbagi-pakai Bluetooth: File yang diterima"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> berhasil, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> tidak berhasil."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Hapus daftar"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Buka"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Hapus dari daftar"</string>
- <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Hapus"</string>
+ <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Bersihkan"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Simpan"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Batal"</string>
<string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Pilih akun yang ingin Anda bagikan melalui Bluetooth. Anda harus menerima akses apa pun ke akun saat menyambungkan."</string>
diff --git a/res/values-in/test_strings.xml b/res/values-in/test_strings.xml
index eb129e258..edd433023 100644
--- a/res/values-in/test_strings.xml
+++ b/res/values-in/test_strings.xml
@@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hello" msgid="1740533743008967039">"Halo Dunia, TestActivity"</string>
- <string name="app_name" msgid="1203877025577761792">"Berbagi Bluetooth"</string>
+ <string name="app_name" msgid="1203877025577761792">"Berbagi-Pakai Bluetooth"</string>
<string name="insert_record" msgid="1450997173838378132">"Masukkan catatan"</string>
<string name="update_record" msgid="2480425402384910635">"Konfirmasi catatan"</string>
<string name="ack_record" msgid="6716152390978472184">"Akui catatan"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 86116ea97..d7190423c 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Öll atriði verða hreinsuð af listanum."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-deiling: Sendar skrár"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-deiling: Mótteknar skrár"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> mistókst.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> mistókust.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> tókst, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> tókust, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> tókust, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> tókust ekki."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Hreinsa lista"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Opna"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Hreinsa af lista"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d141c5116..1e72c71e7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -36,16 +36,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accetta"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Si è verificato un timeout durante l\'accettazione di un file in arrivo da \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth: file in arrivo"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Condivisione Bluetooth: file in arrivo"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Vuoi ricevere questo file?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"File in arrivo da un altro dispositivo. Conferma che vuoi ricevere il file."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth: ricezione <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received" msgid="3324588019186687985">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> ricevuto"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> non ricevuto"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Bluetooth: invio <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> inviato"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Condivisione Bluetooth: ricezione file <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Condivisione Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> ricevuto"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Condivisione Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> non ricevuto"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Condivisione Bluetooth: invio file <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Condivisione Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> inviato"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100% completato"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> non inviato"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Condivisione Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> non inviato"</string>
<string name="download_title" msgid="3353228219772092586">"Trasferimento file"</string>
<string name="download_line1" msgid="4926604799202134144">"Da: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -108,16 +108,9 @@
<string name="outbound_history_title" msgid="4279418703178140526">"Trasferimenti in uscita"</string>
<string name="no_transfers" msgid="3482965619151865672">"La cronologia dei trasferimenti è vuota."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Tutti gli elementi verranno cancellati dall\'elenco."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth: file inviati"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: file ricevuti"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other">Operazioni non riuscite: <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>.</item>
- <item quantity="one">Operazione non riuscita: <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other">Operazioni riuscite: <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>, %2$s</item>
- <item quantity="one">Operazione riuscita: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g>, %2$s</item>
- </plurals>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Condivisione Bluetooth: file inviati"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Condivisione Bluetooth: file ricevuti"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> operazioni riuscite, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> operazioni non riuscite."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Cancella elenco"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Apri"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Cancella da elenco"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0da2b693c..ce9c9bfd0 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -110,18 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"כל הפריטים ינוקו מהרשימה."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"‏שיתוף Bluetooth: נשלחו קבצים"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"‏שיתוף Bluetooth: התקבלו קבצים"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="two"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> לא הצליחו.</item>
- <item quantity="many"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> לא הצליחו.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> לא הצליחו.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> לא הצליח.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="two">‏<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> הצליחו, %2$s</item>
- <item quantity="many">‏<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> הצליחו, %2$s</item>
- <item quantity="other">‏<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> הצליחו, %2$s</item>
- <item quantity="one">‏<xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> הצליח, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> הושלמו בהצלחה, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> לא הושלמו בהצלחה."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"נקה רשימה"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"פתח"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"נקה מהרשימה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 85cef9393..9aba7ea79 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
<string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth端末によるアクセスを許可します。"</string>
<string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Bluetooth端末によるアクセスを一時的に許可して、ユーザーの確認を受けずにその端末からこの端末にファイルを送信することをアプリに許可します。"</string>
<string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
- <string name="unknown_device" msgid="9221903979877041009">"不明なモバイル端末"</string>
+ <string name="unknown_device" msgid="9221903979877041009">"不明な携帯端末"</string>
<string name="unknownNumber" msgid="4994750948072751566">"不明"</string>
<string name="airplane_error_title" msgid="2683839635115739939">"機内モード"</string>
<string name="airplane_error_msg" msgid="8698965595254137230">"機内モードではBluetoothを使用できません。"</string>
@@ -57,7 +57,7 @@
<string name="incoming_line1" msgid="2127419875681087545">"送信元"</string>
<string name="incoming_line2" msgid="3348994249285315873">"ファイル名"</string>
<string name="incoming_line3" msgid="7954237069667474024">"サイズ"</string>
- <string name="download_fail_line1" msgid="3846450148862894552">"ファイルの受信に失敗"</string>
+ <string name="download_fail_line1" msgid="3846450148862894552">"ファイルを受信していません"</string>
<string name="download_fail_line2" msgid="8950394574689971071">"ファイル: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="download_fail_line3" msgid="3451040656154861722">"理由: <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="download_fail_ok" msgid="1521733664438320300">"OK"</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"すべてのアイテムがリストから消去されます。"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth共有: 送信したファイル"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth共有: 受信したファイル"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>件失敗しました。</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g>件失敗しました。</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>件成功しました(%2$s)</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g>件成功しました(%2$s)</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"成功したファイル<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>個、失敗したファイル<xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>個。"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"リストを消去"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"開く"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"リストから消去"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 7067f388a..a31cdbd0e 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"სიიდან ყველა ერთეული ამოიშლება."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth გაზიარება: გაგზავნილი ფაილები"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth გაზიარება: მიღებული ფაილები"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> წარუმატებელი.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> წარუმატებელი.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> წარმატებული, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> წარმატებული, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> წარმატებით გადაიწერა, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ვერ განხორციელდა."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"სიის გასუფთავება"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"გახსნა"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"სიიდან ამოშლა"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 102620b55..6ab3d5c53 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -28,7 +28,7 @@
<string name="bt_enable_title" msgid="8657832550503456572"></string>
<string name="bt_enable_line1" msgid="7203551583048149">"Bluetooth қызметтерін қолдану үшін, алдымен Bluetooth байланысын қосу қажет."</string>
<string name="bt_enable_line2" msgid="4341936569415937994">"Bluetooth байланысы қазір қосылсын ба?"</string>
- <string name="bt_enable_cancel" msgid="1988832367505151727">"Жабу"</string>
+ <string name="bt_enable_cancel" msgid="1988832367505151727">"Өшіру"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"Қосу"</string>
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"Файл жіберу"</string>
<string name="incoming_file_confirm_content" msgid="2752605552743148036">"Кіріс файлды қабылдау керек пе?"</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Тізімнен барлық элементтер алынады."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth бөлісу: Жіберілген файлдар"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth бөлісу: Қабылданған файлдар"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> сәтсіз.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> сәтсіз.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> сәтті, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> сәтті, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> сәтті, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> сәтсіз."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Тізімді өшіру"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Ашу"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Тізімнен өшіру."</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 1198c124f..f94b2a50b 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"នឹង​សម្អាត​ធាតុ​ទាំងអស់​ពី​បញ្ជី។"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"ការ​ចែក​រំលែក​ប៊្លូ​ធូ​ស៖ បាន​ផ្ញើ​ឯកសារ"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"ការ​ចែក​រំលែក​ប៊្លូ​ធូ​ស៖ បាន​ទទួល​​​ឯកសារ"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other">មិនបានជោគជ័យ <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>។</item>
- <item quantity="one">មិនបានជោគជ័យ <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g>។</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other">បានជោគជ័យ <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> , %2$s</item>
- <item quantity="one">បានជោគជ័យ <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> , %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"ជោគជ័យ <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> បរាជ័យ <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ។"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"សម្អាត​បញ្ជី"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"បើក"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"សម្អាត​ពី​បញ្ជី"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 0a0845116..77e756e28 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -70,10 +70,10 @@
<string name="upload_succ_ok" msgid="7705428476405478828">"ಸರಿ"</string>
<string name="upload_fail_line1" msgid="7899394672421491701">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" ಇವರಿಗೆ ಫೈಲ್‌ ಕಳುಹಿಸಲಾಗಲಿಲ್ಲ."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"ಫೈಲ್‌: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="upload_fail_ok" msgid="5807702461606714296">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string>
+ <string name="upload_fail_ok" msgid="5807702461606714296">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸು"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"ಮುಚ್ಚು"</string>
<string name="bt_error_btn_ok" msgid="5965151173011534240">"ಸರಿ"</string>
- <string name="unknown_file" msgid="6092727753965095366">"ಅಪರಿಚಿತ ಫೈಲ್"</string>
+ <string name="unknown_file" msgid="6092727753965095366">"ಅಜ್ಞಾತ ಫೈಲ್"</string>
<string name="unknown_file_desc" msgid="480434281415453287">"ಈ ಪ್ರಕಾರದ ಫೈಲ್ ನಿರ್ವಹಿಸಲು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಇಲ್ಲ. \n"</string>
<string name="not_exist_file" msgid="3489434189599716133">"ಫೈಲ್ ಇಲ್ಲ"</string>
<string name="not_exist_file_desc" msgid="4059531573790529229">"ಫೈಲ್‌ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ. \n"</string>
@@ -93,7 +93,7 @@
<string name="status_running" msgid="6562808920311008696">"ಫೈಲ್‌‌ ವರ್ಗಾವಣೆಯು ಚಾಲ್ತಿಯಲ್ಲಿದೆ."</string>
<string name="status_success" msgid="239573225847565868">"ಫೈಲ್‌ ವರ್ಗಾವಣೆಯು ಸಂಪೂರ್ಣವಾಗಿ ಯಶಸ್ವಿಯಾಗಿದೆ."</string>
<string name="status_not_accept" msgid="1695082417193780738">"ವಿಷಯ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ."</string>
- <string name="status_forbidden" msgid="613956401054050725">"ಉದ್ದೇಶಿತ ಸಾಧನದಿಂದ ವರ್ಗಾವಣೆಯನ್ನು ನಿಷೇಧಿಸಲಾಗಿದೆ."</string>
+ <string name="status_forbidden" msgid="613956401054050725">"ಗುರಿಯ ಸಾಧನದಿಂದ ವರ್ಗಾವಣೆಯನ್ನು ನಿಷೇಧಿಸಲಾಗಿದೆ."</string>
<string name="status_canceled" msgid="6664490318773098285">"ಬಳಕೆದಾರರ ಮೂಲಕ ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಪಡಿಸಲಾಗಿದೆ."</string>
<string name="status_file_error" msgid="3671917770630165299">"ಸಂಗ್ರಹಣೆಯ ಸಮಸ್ಯೆ."</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"ಯಾವುದೇ USB ಸಂಗ್ರಹಣೆಯಿಲ್ಲ."</string>
@@ -104,20 +104,13 @@
<string name="btopp_live_folder" msgid="7967791481444474554">"ಬ್ಲೂಟೂತ್‌ ಸ್ವೀಕರಿಸಲಾಗಿದೆ"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> ಸ್ವೀಕರಿಸುವುದು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> ಕಳುಹಿಸುವುದು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
- <string name="inbound_history_title" msgid="6940914942271327563">"ಇನ್‌ಬೌಂಡ್‌ ವರ್ಗಾವಣೆಗಳು"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"ಔಟ್‌ಬೌಂಡ್‌ ವರ್ಗಾವಣೆಗಳು"</string>
+ <string name="inbound_history_title" msgid="6940914942271327563">"ಆಗಮಿಸುವ ವರ್ಗಾವಣೆಗಳು"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"ಹೊರಹೋಗುವ ವರ್ಗಾವಣೆಗಳು"</string>
<string name="no_transfers" msgid="3482965619151865672">"ವರ್ಗಾವಣೆಯ ಇತಿಹಾಸವು ಖಾಲಿಯಾಗಿದೆ."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"ಪಟ್ಟಿಯಿಂದ ಎಲ್ಲ ಐಟಂಗಳನ್ನು ತೆರವುಗೊಳಿಸಲಾಗುವುದು."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"ಬ್ಲೂಟೂತ್‌ ಹಂಚಿಕೆ: ಕಳುಹಿಸಲಾಗಿರುವ ಫೈಲ್‌‌ಗಳು"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"ಬ್ಲೂಟೂತ್‌ ಹಂಚಿಕೆ: ಫೈಲ್‌ಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ಯಶಸ್ವಿಯಾಗಿಲ್ಲ.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ಯಶಸ್ವಿಯಾಗಿಲ್ಲ.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ಯಶಸ್ವಿಯಾಗಿದೆ, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ಯಶಸ್ವಿಯಾಗಿದೆ, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> ಯಶಸ್ವಿಯಾಗಿದೆ, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ಯಶಸ್ವಿಯಾಗಿಲ್ಲ."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"ಪಟ್ಟಿಯನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"ತೆರೆಯಿರಿ"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"ಪಟ್ಟಿಯಿಂದ ತೆರವುಗೊಳಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1cd8ee29f..ef9ec3d0b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"목록에서 모든 항목이 삭제됩니다."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"블루투스 공유: 파일 보냄"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"블루투스 공유: 파일 받음"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>개 실패</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g>개 실패</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>개 성공 %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g>개 성공 %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"성공 <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>개, 실패 <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>개"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"목록 지우기"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"열기"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"목록에서 지우기"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 36689c41c..bc33fea7b 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Тизмек толугу менен тазаланат."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth бөлүшүү: Файлдар жөнөтүлдү"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth бөлүшүү: Алынган файлдар"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ийгиликсиз болду.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> ийгиликсиз болду.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ийгиликтүү бүттү, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> ийгиликтүү бүттү, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> ийгиликтүү, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ийгиликсиз."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Тизмекти тазалоо"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Ачуу"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Тизмектен алып салуу"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index e91d85343..f384bb3d0 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"ລາຍການທັງໝົດຈະຖືກລຶບອອກຈາກລາຍການດັ່ງກ່າວ."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"ແບ່ງປັນໃນ Bluetooth: ໄຟລ໌ສົ່ງແລ້ວ"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"ແບ່ງປັນໃນ Bluetooth: ໄຟລ໌ໄດ້ຮັບແລ້ວ"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ບໍ່​ສຳ​ເລັດ.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> ບໍ່​ສຳ​ເລັດ.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ສຳ​ເລັດ, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> ສຳ​ເລັດ, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> ສຳເລັດແລ້ວ, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ບໍ່ສຳເລັດ."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"ລຶບລາຍການ"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"ເປີດ"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"ລຶບອອກຈາກລາຍການ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a29992153..037412547 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Pasiekti atsisiuntimo tvarkytuvę."</string>
+ <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Pasiekti atsisiuntimo tvarkyklę."</string>
<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Leidžiama programai pasiekti „BluetoothShare“ tvarkyklę ir naudoti ją failams perkelti."</string>
<string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Į baltąjį sąrašą įtraukto „Bluetooth“ įrenginio prieiga."</string>
<string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Leidžiama programai laikinai į baltąjį sąrašą įtraukti „Bluetooth“ įrenginį, suteikiant jam galimybę siųsti failus į šį įrenginį be naudotojo patvirtinimo."</string>
@@ -54,7 +54,7 @@
<string name="download_line5" msgid="3069560415845295386">"Gaunamas failas..."</string>
<string name="download_cancel" msgid="9177305996747500768">"Sustabdyti"</string>
<string name="download_ok" msgid="5000360731674466039">"Slėpti"</string>
- <string name="incoming_line1" msgid="2127419875681087545">"Iš"</string>
+ <string name="incoming_line1" msgid="2127419875681087545">"Nuo"</string>
<string name="incoming_line2" msgid="3348994249285315873">"Failo pavadinimas"</string>
<string name="incoming_line3" msgid="7954237069667474024">"Dydis"</string>
<string name="download_fail_line1" msgid="3846450148862894552">"Failas negautas"</string>
@@ -68,7 +68,7 @@
<string name="upload_line5" msgid="7759322537674229752">"Siunčiamas failas..."</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"Failas išsiųstas"</string>
<string name="upload_succ_ok" msgid="7705428476405478828">"Gerai"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"Failas neišsiųstas į „<xliff:g id="RECIPIENT">%1$s</xliff:g>“."</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"Failas neišsiųstas „<xliff:g id="RECIPIENT">%1$s</xliff:g>“."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"Failas: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"Bandyti dar kartą"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"Uždaryti"</string>
@@ -110,18 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Visi sąrašo elementai bus išvalyti."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"„Bluetooth“ bendrinimas: išsiųsti failai"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"„Bluetooth“ bendrinimas: gauti failai"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> nesėkmingas.</item>
- <item quantity="few"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> nesėkmingi.</item>
- <item quantity="many"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> nesėkmingo.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> nesėkmingų.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> sėkmingas, %2$s</item>
- <item quantity="few"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> sėkmingi, %2$s</item>
- <item quantity="many"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> sėkmingo, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> sėkmingų, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> sėkming., <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> nepavyk."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Išvalyti sąrašą"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Atidaryti"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Išvalyti iš sąrašo"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b1e99e8d8..3f2dcfb16 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -110,16 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"No saraksta tiks notīrīti visi vienumi."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth Share: nosūtītie faili"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth Share: saņemtie faili"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="zero"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neveiksmīgu.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neveiksmīgs.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neveiksmīgi.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="zero"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> veiksmīgu, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> veiksmīgs, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> veiksmīgi, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> tika veiksmīgi pabeigti, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> neizdevās."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Notīrīt sarakstu"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Atvērt"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Notīrīt no saraksta"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index ae817ccf6..ab896c40c 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Сите ставки ќе бидат избришани од списокот."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Сподели преку Bluetooth: Пратени датотеки"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Сподели преку Bluetooth: Примени датотеки"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> неуспешен.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> неуспешни.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> успешен, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> успешни, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> успешни, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> неуспешни."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Исчисти список"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Отвори"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Исчисти од списокот"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 3ca842df1..36611d110 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -31,7 +31,7 @@
<string name="bt_enable_cancel" msgid="1988832367505151727">"റദ്ദാക്കുക"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"ഓൺ ചെയ്യുക"</string>
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"ഫയൽ കൈമാറൽ"</string>
- <string name="incoming_file_confirm_content" msgid="2752605552743148036">"ഇൻകമിംഗ് ഫയൽ സ്വീകരിക്കണോ?"</string>
+ <string name="incoming_file_confirm_content" msgid="2752605552743148036">"ഇൻകമിംഗ് ഫയൽ അംഗീകരിക്കണോ?"</string>
<string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"നിരസിക്കുക"</string>
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"സ്വീകരിക്കുക"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"ശരി"</string>
@@ -54,7 +54,7 @@
<string name="download_line5" msgid="3069560415845295386">"ഫയൽ നേടുന്നു…"</string>
<string name="download_cancel" msgid="9177305996747500768">"നിര്‍ത്തുക"</string>
<string name="download_ok" msgid="5000360731674466039">"മറയ്‌ക്കുക"</string>
- <string name="incoming_line1" msgid="2127419875681087545">"അയച്ചത്"</string>
+ <string name="incoming_line1" msgid="2127419875681087545">"അയച്ചയാൾ"</string>
<string name="incoming_line2" msgid="3348994249285315873">"ഫയല്‍നാമം"</string>
<string name="incoming_line3" msgid="7954237069667474024">"വലുപ്പം"</string>
<string name="download_fail_line1" msgid="3846450148862894552">"ഫയൽ ലഭിച്ചില്ല"</string>
@@ -68,7 +68,7 @@
<string name="upload_line5" msgid="7759322537674229752">"ഫയൽ അയയ്‌ക്കുന്നു…"</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"ഫയൽ അയച്ചു"</string>
<string name="upload_succ_ok" msgid="7705428476405478828">"ശരി"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"ഈ ഫയൽ \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" -ലേക്ക് അയച്ചില്ല."</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"ഈ ഫയൽ \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" എന്നയാൾക്ക് അയച്ചില്ല."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"ഫയൽ: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"വീണ്ടും ശ്രമിക്കുക"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"അടയ്‌ക്കുക"</string>
@@ -110,12 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"ലിസ്റ്റിൽ നിന്നും എല്ലാ ഇനങ്ങളും മായ്‌ക്കും."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"ബ്ലൂടൂത്ത് പങ്കിടൽ: അയച്ച ഫയലുകൾ"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"ബ്ലൂടൂത്ത് പങ്കിടൽ: ലഭിച്ച ഫയലുകൾ"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> പരാജയം.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> പരാജയം.</item>
- </plurals>
- <!-- String.format failed for translation -->
- <!-- no translation found for noti_caption_success (1572472450257645181) -->
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> എണ്ണം വിജയകരം, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> എണ്ണം പരാജയപ്പെട്ടു."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"ലിസ്റ്റ് മായ്‌ക്കുക"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"തുറക്കുക"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"ലിസ്റ്റിൽ നിന്നും മായ്‌ക്കുക"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index ab5e3dc4f..65ca56ce1 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -34,7 +34,7 @@
<string name="incoming_file_confirm_content" msgid="2752605552743148036">"Ирж байгаа файлыг авах уу?"</string>
<string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Татгалзах"</string>
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Зөвшөөрөх"</string>
- <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
+ <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"Тийм"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\"-с ирж байгаа файлыг зөвшөөрөх явцад хугацаа хэтэрсэн байна"</string>
<string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth хуваалцах: Ирж байгаа файл"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Та энэ файлыг хүлээн авахыг хүсэж байна уу?"</string>
@@ -60,19 +60,19 @@
<string name="download_fail_line1" msgid="3846450148862894552">"Файлыг хүлээж аваагүй"</string>
<string name="download_fail_line2" msgid="8950394574689971071">"Файл: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="download_fail_line3" msgid="3451040656154861722">"Шалтгаан: <xliff:g id="REASON">%1$s</xliff:g>"</string>
- <string name="download_fail_ok" msgid="1521733664438320300">"OK"</string>
+ <string name="download_fail_ok" msgid="1521733664438320300">"Тийм"</string>
<string name="download_succ_line5" msgid="4509944688281573595">"Файлыг хүлээж авсан"</string>
<string name="download_succ_ok" msgid="7053688246357050216">"Нээх"</string>
<string name="upload_line1" msgid="2055952074059709052">"Хэнд: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
<string name="upload_line3" msgid="4920689672457037437">"Файлын хэлбэр: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
<string name="upload_line5" msgid="7759322537674229752">"Файл илгээж байна…"</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"Файлыг илгээсэн"</string>
- <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
+ <string name="upload_succ_ok" msgid="7705428476405478828">"Тийм"</string>
<string name="upload_fail_line1" msgid="7899394672421491701">"Файл \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" руу илгээгдсэнгүй."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"Файл: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"Дахин оролдоно уу"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"Хаах"</string>
- <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
+ <string name="bt_error_btn_ok" msgid="5965151173011534240">"Тийм"</string>
<string name="unknown_file" msgid="6092727753965095366">"Үл мэдэгдэх файл"</string>
<string name="unknown_file_desc" msgid="480434281415453287">"Ийм төрлийн файлыг нээх апп байхгүй байна. \n"</string>
<string name="not_exist_file" msgid="3489434189599716133">"Файл байхгүй"</string>
@@ -92,7 +92,7 @@
<string name="status_pending" msgid="2503691772030877944">"Файл дамжуулалт хараахан эхлээгүй байна."</string>
<string name="status_running" msgid="6562808920311008696">"Файл дамжуулалт үргэлжилж байна."</string>
<string name="status_success" msgid="239573225847565868">"Файл дамжуулалт амжилттай дууслаа."</string>
- <string name="status_not_accept" msgid="1695082417193780738">"Агуулга дэмжигдэхгүй байна."</string>
+ <string name="status_not_accept" msgid="1695082417193780738">"Контент дэмжигдэхгүй байна."</string>
<string name="status_forbidden" msgid="613956401054050725">"Дамжуулалтыг хүлээн авагч төхөөрөмжөөс хориглосон."</string>
<string name="status_canceled" msgid="6664490318773098285">"Дамжуулалтыг хэрэглэгч цуцалсан."</string>
<string name="status_file_error" msgid="3671917770630165299">"Хадгалах сангийн асуудал."</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Жагсаалтаас бүгдийг нь арилгах болно."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth хуваалцах: Илгээсэн файлууд"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth хуваалцах: Хүлээн авсан файлууд"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> амжилтгүй.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> амжилтгүй.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> амжилттай, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> амжилттай, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> амжилттай, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> амжилтгүй."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Жагсаалтыг арилгах"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Нээх"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Жагсаалтаас арилгах"</string>
diff --git a/res/values-mn-rMN/test_strings.xml b/res/values-mn-rMN/test_strings.xml
index 8a89e5aff..43e8d2e09 100644
--- a/res/values-mn-rMN/test_strings.xml
+++ b/res/values-mn-rMN/test_strings.xml
@@ -7,7 +7,7 @@
<string name="update_record" msgid="2480425402384910635">"Бичлэгийг баталгаажуулах"</string>
<string name="ack_record" msgid="6716152390978472184">"Ack бичлэг"</string>
<string name="deleteAll_record" msgid="4383349788485210582">"Бүх бичлэгийг устгах"</string>
- <string name="ok_button" msgid="6519033415223065454">"OK"</string>
+ <string name="ok_button" msgid="6519033415223065454">"Тийм"</string>
<string name="delete_record" msgid="4645040331967533724">"Бичлэгийг устгах"</string>
<string name="start_server" msgid="9034821924409165795">"TCP серверийг эхлүүлэх"</string>
<string name="notify_server" msgid="4369106744022969655">"TCP серверт мэдэгдэх"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index b8e178893..93a887c22 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -19,15 +19,15 @@
<string name="permlab_bluetoothShareManager" msgid="311492132450338925">"डाउनलोड व्यवस्थापकावर प्रवेश करा."</string>
<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"अ‍ॅपला BluetoothShare व्‍यवस्‍थापकामध्‍ये प्रवेश करण्‍याची आणि फायली स्‍थानांतरित करण्‍यासाठी त्याचा वापर करण्‍याची अनुमती देते."</string>
<string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"श्वेतसूची ब्लूटूथ डिव्‍हाइस प्रवेश."</string>
- <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"अ‍ॅपला त्या डिव्‍हाइसला वापरकर्ता पुष्‍टीशिवाय या डिव्‍हासवर फायली पाठविण्‍याची अनुमती देऊन तात्पुरते ब्लूटुथ डिव्‍हाइसला श्वेतसूची करण्‍याची अनुमती देते."</string>
+ <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"अ‍ॅपला त्या डिव्‍हाइसला वापरकर्ता पुष्‍टीशिवाय या डिव्‍हासवर फायली पाठविण्‍याची अनुमती देऊन तात्पुरते ब डिव्‍हाइसला श्वेतसूची करण्‍याची अनुमती देते."</string>
<string name="bt_share_picker_label" msgid="6268100924487046932">"ब्लूटुथ"</string>
<string name="unknown_device" msgid="9221903979877041009">"अज्ञात डिव्हाइस"</string>
<string name="unknownNumber" msgid="4994750948072751566">"अज्ञात"</string>
<string name="airplane_error_title" msgid="2683839635115739939">"विमान मोड"</string>
- <string name="airplane_error_msg" msgid="8698965595254137230">"आपण विमान मोड मध्ये ब्लूटुथ वापरू शकत नाही."</string>
+ <string name="airplane_error_msg" msgid="8698965595254137230">"आपण विमान मोड मध्ये ब वापरू शकत नाही."</string>
<string name="bt_enable_title" msgid="8657832550503456572"></string>
- <string name="bt_enable_line1" msgid="7203551583048149">"ब्लूटुथ सेवांचा वापर करण्‍यासाठी, आपण प्रथम ब्लूटुथ चालू करा."</string>
- <string name="bt_enable_line2" msgid="4341936569415937994">"आता ब्लूटुथ चालू करायचे?"</string>
+ <string name="bt_enable_line1" msgid="7203551583048149">"ब सेवांचा वापर करण्‍यासाठी, आपण प्रथम ब चालू करा."</string>
+ <string name="bt_enable_line2" msgid="4341936569415937994">"आता ब चालू करायचे?"</string>
<string name="bt_enable_cancel" msgid="1988832367505151727">"रद्द करा"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"चालू करा"</string>
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"फाइल स्थानांतरण"</string>
@@ -36,16 +36,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"स्वीकारा"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"ठीक"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" कडील फाइल स्‍वीकार करताना वेळ संपली."</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"ब्लूटुथ शेअर: येणारी फाइल"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"ब शेअर: येणारी फाइल"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"आपण ही फाइल प्राप्त करू इच्छिता?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"दुसर्‍या डिव्‍हाइस वरील येणारी फाइल. ही फाइल आपण प्राप्त करू इच्‍छिता याची पुष्‍टी करा."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"ब्लूटुथ शेअर: <xliff:g id="FILE">%1$s</xliff:g> प्राप्त करीत आहे"</string>
- <string name="notification_received" msgid="3324588019186687985">"ब्लूटुथ शेअर: <xliff:g id="FILE">%1$s</xliff:g> प्राप्त केली"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"ब्लूटुथ शेअर: <xliff:g id="FILE">%1$s</xliff:g> फाइल प्राप्त केली नाही"</string>
- <string name="notification_sending" msgid="3035748958534983833">"ब्लूटुथ शेअर: <xliff:g id="FILE">%1$s</xliff:g> पाठवित आहे"</string>
- <string name="notification_sent" msgid="9218710861333027778">"ब्लूटुथ शेअर: <xliff:g id="FILE">%1$s</xliff:g> पाठविली"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"ब शेअर: <xliff:g id="FILE">%1$s</xliff:g> प्राप्त करीत आहे"</string>
+ <string name="notification_received" msgid="3324588019186687985">"ब शेअर: <xliff:g id="FILE">%1$s</xliff:g> प्राप्त केली"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"ब शेअर: <xliff:g id="FILE">%1$s</xliff:g> फाइल प्राप्त केली नाही"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"ब शेअर: <xliff:g id="FILE">%1$s</xliff:g> पाठवित आहे"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"ब शेअर: <xliff:g id="FILE">%1$s</xliff:g> पाठविली"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100% पूर्ण"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"ब्लूटुथ शेअर: <xliff:g id="FILE">%1$s</xliff:g> फाइल पाठविली नाही"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"ब शेअर: <xliff:g id="FILE">%1$s</xliff:g> फाइल पाठविली नाही"</string>
<string name="download_title" msgid="3353228219772092586">"फाइल स्थानांतरण"</string>
<string name="download_line1" msgid="4926604799202134144">"प्रेेषक: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"फाइल: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -78,7 +78,7 @@
<string name="not_exist_file" msgid="3489434189599716133">"फाइल नाही"</string>
<string name="not_exist_file_desc" msgid="4059531573790529229">"फाइल अस्‍तित्वात नाही. \n"</string>
<string name="enabling_progress_title" msgid="436157952334723406">"कृपया प्रतीक्षा करा..."</string>
- <string name="enabling_progress_content" msgid="4601542238119927904">"ब्लूटुथ चालू करीत आहे…"</string>
+ <string name="enabling_progress_content" msgid="4601542238119927904">"ब चालू करीत आहे…"</string>
<string name="bt_toast_1" msgid="972182708034353383">"फाइल प्राप्त होईल. सूचना पॅनेल मधील प्रगती तपासा."</string>
<string name="bt_toast_2" msgid="8602553334099066582">"फाइल प्राप्त होऊ शकत नाही."</string>
<string name="bt_toast_3" msgid="6707884165086862518">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" कडील फाइल प्राप्त करणे थांबविले"</string>
@@ -94,30 +94,23 @@
<string name="status_success" msgid="239573225847565868">"फाइल स्थानांतरण यशस्वीरित्या पूर्ण झाले."</string>
<string name="status_not_accept" msgid="1695082417193780738">"सामग्री समर्थित नाही."</string>
<string name="status_forbidden" msgid="613956401054050725">"लक्ष्‍य डिव्‍हाइसद्वारे स्‍थानांतरण निषिद्ध केले."</string>
- <string name="status_canceled" msgid="6664490318773098285">"वापरकर्त्याने स्‍थानांतरण रद्द केले."</string>
+ <string name="status_canceled" msgid="6664490318773098285">"वापरकर्त्याद्वारे स्‍थानांतरण रद्द केले."</string>
<string name="status_file_error" msgid="3671917770630165299">"संचयन समस्‍या."</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"USB संचयन नाही."</string>
<string name="status_no_sd_card" product="default" msgid="5760944071743325592">"SD कार्ड नाही. स्‍थानांतरित केलेल्‍या फायली जतन करण्‍यासाठी SD कार्ड घाला."</string>
<string name="status_connection_error" msgid="947681831523219891">"कनेक्‍शन अयशस्‍वी."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"विनंती योग्यरितीने हाताळली जाऊ शकत नाही."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"अज्ञात त्रुटी."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"ब्लूटुथ प्राप्त केले"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"ब प्राप्त केले"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> प्राप्त करणे पूर्ण."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> पाठविणे पूर्ण."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"इनबाउंड स्‍थानांतरणे"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"आउटबाउंड स्‍थानांतरणे"</string>
<string name="no_transfers" msgid="3482965619151865672">"स्‍थानांतरण इतिहास रिक्त आहे."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"सूचीमधून सर्व आयटम साफ केले जातील."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"ब्लूटुथ शेअर: पाठविलेल्‍या फायली"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"ब्लूटुथ शेअर: प्राप्त केलेल्‍या फायली"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> अयशस्वी झाले.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> अयशस्वी झाले.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> यशस्वी झाले, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> यशस्वी झाले, %2$s</item>
- </plurals>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"ब शेअर: पाठविलेल्‍या फायली"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"ब शेअर: प्राप्त केलेल्‍या फायली"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> यशस्‍वी, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> अयशस्‍वी."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"सूची साफ करा"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"उघडा"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"सूचीमधून साफ करा"</string>
diff --git a/res/values-mr-rIN/strings_pbap.xml b/res/values-mr-rIN/strings_pbap.xml
index 48d8ce33c..57b3f1d48 100644
--- a/res/values-mr-rIN/strings_pbap.xml
+++ b/res/values-mr-rIN/strings_pbap.xml
@@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"%1$s साठी सत्र की टाईप करा"</string>
- <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"ब्लूटुथ सत्र की आवश्‍यक आहे"</string>
+ <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"ब सत्र की आवश्‍यक आहे"</string>
<string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"%1$s सह कनेक्शन स्वीकारणे कालबाह्य झाले"</string>
<string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"%1$s सह सत्र की इनपुट करणे कालबाह्य झाले"</string>
<string name="auth_notif_ticker" msgid="1575825798053163744">"Obex प्रमाणीकरण विनंती"</string>
diff --git a/res/values-mr-rIN/test_strings.xml b/res/values-mr-rIN/test_strings.xml
index a5dd344a4..1650fc491 100644
--- a/res/values-mr-rIN/test_strings.xml
+++ b/res/values-mr-rIN/test_strings.xml
@@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hello" msgid="1740533743008967039">"हॅलो वर्ल्ड, TestActivity"</string>
- <string name="app_name" msgid="1203877025577761792">"ब्लूटुथ शेअर"</string>
+ <string name="app_name" msgid="1203877025577761792">"ब शेअर"</string>
<string name="insert_record" msgid="1450997173838378132">"रेकॉर्ड घाला"</string>
<string name="update_record" msgid="2480425402384910635">"रेकॉर्डची पुष्टी करा"</string>
<string name="ack_record" msgid="6716152390978472184">"Ack रेकॉर्ड"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 4f52adbd8..99896efa6 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Semua item akan dipadam bersih daripada senarai."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Perkongsian Bluetooth: Fail diterima"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Perkongsian Bluetooth: Fail diterima"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> tidak berjaya.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> tidak berjaya.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> berjaya, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> berjaya, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> berjaya, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> tidak berjaya."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Padam bersih senarai"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Buka"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Padam bersih daripada senarai"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 77baf7b79..b81249bba 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -19,7 +19,7 @@
<string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ဒေါင်းလုပ်မန်နေဂျာကို အသုံးပြုနိုင်မည်"</string>
<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"အပလီကေးရှင်းအား ဘလူးတုသ်မျှဝေမှု မန်နေဂျာကို အသုံးပြုခွင့်ပေးပြီး ဖိုင်လွှဲရန် အသုံးပြုပါ"</string>
<string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ဘလူးတုသ်ယာယီခွင့်ပြုစာရင်းကို အသုံးပြုခွင့်"</string>
- <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"အက်ပ်အား ဘလူးတုသ်စက်ကို ယာယီခွင့်ပြုစာရင်းထဲ ထည့်ရန်ခွင့်ပြုကာ အသုံးပြုသူ၏ အတည်ပြုချက်မရယူပဲ ဖိုင်များကို စက်ထဲသို့ ပို့ခွင့်ပြုမည်"</string>
+ <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"အပလီကေးရှင်းအား ဘလူးတုသ်စက်ကို ယာယီခွင့်ပြုစာရင်းထဲ ထည့်ရန်ခွင့်ပြုကာ အသုံးပြုသူ၏ အတည်ပြုချက်မရယူပဲ ဖိုင်များကို စက်ထဲသို့ ပို့ခွင့်ပြုမည်"</string>
<string name="bt_share_picker_label" msgid="6268100924487046932">"ဘလူးတုသ်"</string>
<string name="unknown_device" msgid="9221903979877041009">"မသိသော စက်"</string>
<string name="unknownNumber" msgid="4994750948072751566">"အကြောင်းအရာ မသိရှိ"</string>
@@ -28,13 +28,13 @@
<string name="bt_enable_title" msgid="8657832550503456572"></string>
<string name="bt_enable_line1" msgid="7203551583048149">"ဘလူးတုသ်ဆားဗစ်ကိုအသုံးပြုရန် ပထမဦးစွာ ဘလူးတုသ်ကိုဖွင့်ပါ"</string>
<string name="bt_enable_line2" msgid="4341936569415937994">"ယခုပင် ဘလူးတုသ်ကိုဖွင့်မည်လား?"</string>
- <string name="bt_enable_cancel" msgid="1988832367505151727">"မလုပ်တော့"</string>
+ <string name="bt_enable_cancel" msgid="1988832367505151727">"ထားတော့"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"ဖွင့်မည်"</string>
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"ဖိုင်လွှဲပြောင်းခြင်း"</string>
<string name="incoming_file_confirm_content" msgid="2752605552743148036">"ဝင်လာသည့် ဖိုင်ကို လက်ခံမလား?"</string>
<string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"လက်မခံပါ"</string>
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"လက်ခံရန်"</string>
- <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"အိုကေ"</string>
+ <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"ကောင်းပြီ"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\"မှ အဝင်ဖိုင်ကို လက်ခံနေစဥ် အချိန်ကုန်ဆုံးသွားပါပြီ"</string>
<string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"ဘလူးတုသ် ဝေမျှမှု - အဝင်ဖိုင်"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"ဤဖိုင်ကို လက်ခံမည်လား?"</string>
@@ -60,19 +60,19 @@
<string name="download_fail_line1" msgid="3846450148862894552">"ဖိုင် မရရှိပါ"</string>
<string name="download_fail_line2" msgid="8950394574689971071">"ဖိုင် - <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="download_fail_line3" msgid="3451040656154861722">"အကြောင်းပြချက် - <xliff:g id="REASON">%1$s</xliff:g>"</string>
- <string name="download_fail_ok" msgid="1521733664438320300">"အိုကေ"</string>
+ <string name="download_fail_ok" msgid="1521733664438320300">"ကောင်းပြီ"</string>
<string name="download_succ_line5" msgid="4509944688281573595">"လက်ခံရပြီးဖိုင်"</string>
<string name="download_succ_ok" msgid="7053688246357050216">"ဖွင့်ရန်"</string>
<string name="upload_line1" msgid="2055952074059709052">"သို့ - \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
<string name="upload_line3" msgid="4920689672457037437">"ဖိုင်အမျိုးအစား - <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
<string name="upload_line5" msgid="7759322537674229752">"ဖိုင်ပို့နေပါသည်"</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"ဖိုင်ပို့ပြီး"</string>
- <string name="upload_succ_ok" msgid="7705428476405478828">"အိုကေ"</string>
+ <string name="upload_succ_ok" msgid="7705428476405478828">"ကောင်းပြီ"</string>
<string name="upload_fail_line1" msgid="7899394672421491701">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"ထံသို့ ဖိုင်ကို မပို့ပါ"</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"ဖိုင် - <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"ပြန်ကြိုးစားပါ"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"ပိတ်ရန်"</string>
- <string name="bt_error_btn_ok" msgid="5965151173011534240">"အိုကေ"</string>
+ <string name="bt_error_btn_ok" msgid="5965151173011534240">"ကောင်းပြီ"</string>
<string name="unknown_file" msgid="6092727753965095366">"အမျိုးအမည် မသိသောဖိုင်"</string>
<string name="unknown_file_desc" msgid="480434281415453287">"ဤဖိုင်အမျိုးအစားကို ကိုင်တွယ်ရန် အပလီကေးရှင်းမရှိပါ\n"</string>
<string name="not_exist_file" msgid="3489434189599716133">"ဖိုင်မရှိပါ"</string>
@@ -110,23 +110,16 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"အရာများအားလုံး စာရင်းမှ ရှင်းလင်းပစ်လိမ့်မည်"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"ဘလူးတုသ် ဝေမျှမှု - ဖိုင်ပို့ပြီး"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"ဘလူးတုသ် ဝေမျှမှု - ရရှိပြီးဖိုင်များ"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> မအောင်မြင်ပါ။</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> မအ​ောင်မြင်ပါ။</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> အောင်မြင်ပါသည်၊ %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> အောင်မြင်ပါသည်၊ %2$s</item>
- </plurals>
- <string name="transfer_menu_clear_all" msgid="790017462957873132">"စာရင်းကို ဖယ်ရှားရန်"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> အောင်မြင်သည် <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> မအောင်မြင်ပါ"</string>
+ <string name="transfer_menu_clear_all" msgid="790017462957873132">"စာရင်းကို ရှင်းလင်းရန်"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"ဖွင့်ရန်"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"စာရင်းမှ ရှင်းပစ်မည်"</string>
- <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ရှင်းရန်"</string>
- <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"သိမ်းရန်"</string>
- <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"မလုပ်တော့"</string>
+ <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ရှင်းလင်းရန်"</string>
+ <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"သိမ်းဆည်းရန်"</string>
+ <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ဖျက်သိမ်းရန်"</string>
<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="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"အပလီကေးရှင်း အိုင်ကွန်"</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-my-rMM/test_strings.xml b/res/values-my-rMM/test_strings.xml
index 02d200d97..b615a5d63 100644
--- a/res/values-my-rMM/test_strings.xml
+++ b/res/values-my-rMM/test_strings.xml
@@ -7,7 +7,7 @@
<string name="update_record" msgid="2480425402384910635">"မှတ်တမ်းအတည်ပြုရန်"</string>
<string name="ack_record" msgid="6716152390978472184">"အသိအမှတ်ပြု မှတ်တမ်း"</string>
<string name="deleteAll_record" msgid="4383349788485210582">"မှတ်တမ်းအားလုံးကို ဖျက်ရန်"</string>
- <string name="ok_button" msgid="6519033415223065454">"အိုကေ"</string>
+ <string name="ok_button" msgid="6519033415223065454">"ကောင်းပြီ"</string>
<string name="delete_record" msgid="4645040331967533724">"မှတ်တမ်းကို ဖျက်ရန်"</string>
<string name="start_server" msgid="9034821924409165795">"TCP ဆာဗာ စတင်ရန်"</string>
<string name="notify_server" msgid="4369106744022969655">"TCP ဆာဗာကို အကြောင်းကြားရန်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 91eb03dd9..6d42c751a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -93,31 +93,24 @@
<string name="status_running" msgid="6562808920311008696">"Filoverføring pågår."</string>
<string name="status_success" msgid="239573225847565868">"Filoverføring fullført."</string>
<string name="status_not_accept" msgid="1695082417193780738">"Innholdet støttes ikke."</string>
- <string name="status_forbidden" msgid="613956401054050725">"Overføring nektes av mottakerenheten."</string>
- <string name="status_canceled" msgid="6664490318773098285">"Overføring avbrutt av bruker."</string>
+ <string name="status_forbidden" msgid="613956401054050725">"Overføring forbudt av målenheten."</string>
+ <string name="status_canceled" msgid="6664490318773098285">"Overføringen avbrutt av bruker."</string>
<string name="status_file_error" msgid="3671917770630165299">"Problem med lagring."</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Ingen USB-lagring."</string>
<string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Mangler minnekort. Sett inn et minnekort for å lagre overførte filer."</string>
<string name="status_connection_error" msgid="947681831523219891">"Tilkobling mislyktes."</string>
- <string name="status_protocol_error" msgid="3245444473429269539">"Kan ikke behandle forespørsel på riktig måte."</string>
+ <string name="status_protocol_error" msgid="3245444473429269539">"Forespørselen kan ikke behandles på riktig måte."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Ukjent feil."</string>
<string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth mottatt"</string>
- <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> mottatt – ferdig."</string>
+ <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> mottatt."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> sendt."</string>
- <string name="inbound_history_title" msgid="6940914942271327563">"Innkommende overføringer"</string>
+ <string name="inbound_history_title" msgid="6940914942271327563">"Inngående overføringer"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Utgående overføringer"</string>
<string name="no_transfers" msgid="3482965619151865672">"Overføringsloggen er tom."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle elementer fjernes fra listen."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-deling: Filer sendt"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-deling: Filer mottatt"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> mislyktes.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> mislyktes.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> vellykket, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> vellykket, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> vellykket, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> mislykket."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Tøm listen"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Åpne"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Fjern fra listen"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index da97be300..c453b7cbb 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"सूचीबाट सम्पूर्ण वस्तुहरू मेटाइने छन्।"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"ब्लुटुथ साझेदारी: पठाइएका फाइलहरू"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"ब्लुटुथ साझेदारी: प्राप्त फाइलहरू"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> असफल।</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> असफल।</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> सफल, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> सफल, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> सफल, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> विफल।"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"सूची हटाउनुहोस्"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"खोल्नुहोस्"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"सूचीबाट हटाउनुहोस्"</string>
diff --git a/res/values-ne-rNP/strings_pbap.xml b/res/values-ne-rNP/strings_pbap.xml
index 071d295e2..c4f28bb68 100644
--- a/res/values-ne-rNP/strings_pbap.xml
+++ b/res/values-ne-rNP/strings_pbap.xml
@@ -5,7 +5,7 @@
<string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"ब्लुटुथ सत्र कुञ्जी आवाश्यक"</string>
<string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"समय %1$sका साथ जडान मञ्जुर गर्न समय सकियो"</string>
<string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"%1$sका साथ सत्र कुञ्जी इनपुट गर्न समय सकियो"</string>
- <string name="auth_notif_ticker" msgid="1575825798053163744">"Obex प्रमाणीकरण अनुरोध"</string>
+ <string name="auth_notif_ticker" msgid="1575825798053163744">"Obex प्रमाणिकरण अनुरोध"</string>
<string name="auth_notif_title" msgid="7599854855681573258">"सत्र कुञ्जी"</string>
<string name="auth_notif_message" msgid="6667218116427605038">"%1$s का लागि सत्र कुञ्जी टाइप गर्नुहोस्"</string>
<string name="defaultname" msgid="4821590500649090078">"कारकिट"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d835abf8c..0b28ff429 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -24,9 +24,9 @@
<string name="unknown_device" msgid="9221903979877041009">"Onbekend apparaat"</string>
<string name="unknownNumber" msgid="4994750948072751566">"Onbekend"</string>
<string name="airplane_error_title" msgid="2683839635115739939">"Vliegtuigmodus"</string>
- <string name="airplane_error_msg" msgid="8698965595254137230">"Je kunt Bluetooth niet gebruiken in Vliegtuigmodus."</string>
+ <string name="airplane_error_msg" msgid="8698965595254137230">"U kunt Bluetooth niet gebruiken in Vliegtuigmodus."</string>
<string name="bt_enable_title" msgid="8657832550503456572"></string>
- <string name="bt_enable_line1" msgid="7203551583048149">"Als je Bluetooth-services wilt gebruiken, moet je eerst Bluetooth inschakelen."</string>
+ <string name="bt_enable_line1" msgid="7203551583048149">"Als u Bluetooth-services wilt gebruiken, moet u eerst Bluetooth inschakelen."</string>
<string name="bt_enable_line2" msgid="4341936569415937994">"Bluetooth nu inschakelen?"</string>
<string name="bt_enable_cancel" msgid="1988832367505151727">"Annuleren"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"Inschakelen"</string>
@@ -37,8 +37,8 @@
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Er is een time-out opgetreden bij het accepteren van een inkomend bestand van \'<xliff:g id="SENDER">%1$s</xliff:g>\'"</string>
<string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Delen via Bluetooth: inkomend bestand"</string>
- <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Wil je dit bestand ontvangen?"</string>
- <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Er is een inkomend bestand van een ander apparaat beschikbaar. Bevestig dat je dit bestand wilt ontvangen."</string>
+ <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Wilt u dit bestand ontvangen?"</string>
+ <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Er is een inkomend bestand van een ander apparaat beschikbaar. Bevestig dat u dit bestand wilt ontvangen."</string>
<string name="notification_receiving" msgid="4674648179652543984">"Delen via Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> ontvangen"</string>
<string name="notification_received" msgid="3324588019186687985">"Delen via Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> ontvangen"</string>
<string name="notification_received_fail" msgid="3619350997285714746">"Delen via Bluetooth: bestand <xliff:g id="FILE">%1$s</xliff:g> niet ontvangen"</string>
@@ -56,7 +56,7 @@
<string name="download_ok" msgid="5000360731674466039">"Verbergen"</string>
<string name="incoming_line1" msgid="2127419875681087545">"Van"</string>
<string name="incoming_line2" msgid="3348994249285315873">"Bestandsnaam"</string>
- <string name="incoming_line3" msgid="7954237069667474024">"Grootte"</string>
+ <string name="incoming_line3" msgid="7954237069667474024">"Gootte"</string>
<string name="download_fail_line1" msgid="3846450148862894552">"Bestand niet ontvangen"</string>
<string name="download_fail_line2" msgid="8950394574689971071">"Bestand: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="download_fail_line3" msgid="3451040656154861722">"Reden: <xliff:g id="REASON">%1$s</xliff:g>"</string>
@@ -79,7 +79,7 @@
<string name="not_exist_file_desc" msgid="4059531573790529229">"Het bestand bestaat niet. \n"</string>
<string name="enabling_progress_title" msgid="436157952334723406">"Een ogenblik geduld..."</string>
<string name="enabling_progress_content" msgid="4601542238119927904">"Bluetooth inschakelen…"</string>
- <string name="bt_toast_1" msgid="972182708034353383">"Het bestand wordt ontvangen. Je kunt de voortgang controleren in het venster \'Meldingen\'."</string>
+ <string name="bt_toast_1" msgid="972182708034353383">"Het bestand wordt ontvangen. U kunt de voortgang controleren in het venster \'Meldingen\'."</string>
<string name="bt_toast_2" msgid="8602553334099066582">"Het bestand kan niet worden opgehaald."</string>
<string name="bt_toast_3" msgid="6707884165086862518">"Ontvangen van bestand van \'<xliff:g id="SENDER">%1$s</xliff:g>\' is beëindigd"</string>
<string name="bt_toast_4" msgid="4678812947604395649">"Bestand verzenden naar \'<xliff:g id="RECIPIENT">%1$s</xliff:g>\'"</string>
@@ -107,24 +107,17 @@
<string name="inbound_history_title" msgid="6940914942271327563">"Inkomende overdrachten"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Uitgaande overdrachten"</string>
<string name="no_transfers" msgid="3482965619151865672">"Overdrachtsgeschiedenis is leeg."</string>
- <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle items op de lijst worden gewist."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Delen via Bluetooth: verzonden bestanden"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Delen via Bluetooth: ontvangen bestanden"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> mislukt.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> mislukt.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> geslaagd, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> geslaagd, %2$s</item>
- </plurals>
+ <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle items worden gewist uit de lijst."</string>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-share: verzonden bestanden"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-share: ontvangen bestanden"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> geslaagd, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> mislukt."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Lijst wissen"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Openen"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Wissen uit lijst"</string>
<string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Wissen"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Opslaan"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Annuleren"</string>
- <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selecteer de accounts die je wilt delen via Bluetooth. Je moet nog steeds elke toegang tot de accounts accepteren wanneer er verbinding wordt gemaakt."</string>
+ <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selecteer de accounts die u wilt delen via Bluetooth. U moet nog steeds elke toegang tot de accounts accepteren wanneer er verbinding wordt gemaakt."</string>
<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Plaatsen over:"</string>
<string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"App-pictogram"</string>
<string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Instellingen voor delen van berichten via Bluetooth"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index af57b4835..7170806db 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -18,10 +18,10 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ਡਾਊਨਲੋਡ ਪ੍ਰਬੰਧਕ ਤੱਕ ਪਹੁੰਚ।"</string>
<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"ਐਪ ਨੂੰ BluetoothShare ਪ੍ਰਬੰਧਕ ਤੱਕ ਪਹੁੰਚ ਅਤੇ ਫਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਲਈ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
- <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ਵਾਈਟਲਿਸਟ bluetooth ਡੀਵਾਈਸ ਪਹੁੰਚ।"</string>
- <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ਐਪ ਨੂੰ ਇਹ ਆਗਿਆ ਦਿੰਦੇ ਹੋਏ ਕਿ ਡੀਵਾਈਸ ਉਪਭੋਗਤਾ ਦੀ ਪੁਸ਼ਟੀ ਤੋਂ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਫਾਈਲਾਂ ਭੇਜੇ, ਇੱਕ Bluetooth ਡੀਵਾਈਸ ਨੂੰ ਅਸਥਾਈ ਤੌਰ ਤੇ ਵਾਈਟਲਿਸਟ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
+ <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ਵਾਈਟਲਿਸਟ bluetooth ਡਿਵਾਈਸ ਪਹੁੰਚ।"</string>
+ <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ਐਪ ਨੂੰ ਇਹ ਆਗਿਆ ਦਿੰਦੇ ਹੋਏ ਕਿ ਡਿਵਾਈਸ ਉਪਭੋਗਤਾ ਦੀ ਪੁਸ਼ਟੀ ਤੋਂ ਬਿਨਾਂ ਇਸ ਡਿਵਾਈਸ ਨੂੰ ਫਾਈਲਾਂ ਭੇਜੇ, ਇੱਕ Bluetooth ਡਿਵਾਈਸ ਨੂੰ ਅਸਥਾਈ ਤੌਰ ਤੇ ਵਾਈਟਲਿਸਟ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
<string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
- <string name="unknown_device" msgid="9221903979877041009">"ਅਗਿਆਤ ਡੀਵਾਈਸ"</string>
+ <string name="unknown_device" msgid="9221903979877041009">"ਅਗਿਆਤ ਡਿਵਾਈਸ"</string>
<string name="unknownNumber" msgid="4994750948072751566">"ਅਗਿਆਤ"</string>
<string name="airplane_error_title" msgid="2683839635115739939">"ਏਅਰਪਲੇਨ ਮੋਡ"</string>
<string name="airplane_error_msg" msgid="8698965595254137230">"ਤੁਸੀਂ ਏਅਰਪਲੇਨ ਮੋਡ ਵਿੱਚ Bluetooth ਨਹੀਂ ਵਰਤ ਸਕਦੇ।"</string>
@@ -38,7 +38,7 @@
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" ਦੀ ਇੱਕ ਇਨਕਮਿੰਗ ਫਾਈਲ ਸਵੀਕਾਰ ਕਰਨ ਵੇਲੇ ਇੱਕ ਟਾਈਮਆਊਟ ਹੋਇਆ ਸੀ।"</string>
<string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth ਸ਼ੇਅਰ: ਇਨਕਮਿੰਗ ਫਾਈਲ"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"ਕੀ ਤੁਸੀਂ ਇਹ ਫਾਈਲ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
- <string name="incoming_file_toast_msg" msgid="1733710749992901811">"ਦੂਜੀ ਡੀਵਾਈਸ ਤੋਂ ਇਨਕਮਿੰਗ ਫਾਈਲ। ਪੁਸ਼ਟੀ ਕਰੋ ਕਿ ਤੁਸੀਂ ਇਹ ਫਾਈਲ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
+ <string name="incoming_file_toast_msg" msgid="1733710749992901811">"ਦੂਜੀ ਡਿਵਾਈਸ ਤੋਂ ਇਨਕਮਿੰਗ ਫਾਈਲ। ਪੁਸ਼ਟੀ ਕਰੋ ਕਿ ਤੁਸੀਂ ਇਹ ਫਾਈਲ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
<string name="notification_receiving" msgid="4674648179652543984">"Bluetooth ਸ਼ੇਅਰ: <xliff:g id="FILE">%1$s</xliff:g> ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
<string name="notification_received" msgid="3324588019186687985">"Bluetooth ਸ਼ੇਅਰ: <xliff:g id="FILE">%1$s</xliff:g> ਪ੍ਰਾਪਤ ਕੀਤੀ"</string>
<string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth ਸ਼ੇਅਰ: ਫਾਈਲ <xliff:g id="FILE">%1$s</xliff:g> ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ"</string>
@@ -93,7 +93,7 @@
<string name="status_running" msgid="6562808920311008696">"ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਜਾਰੀ ਹੈ।"</string>
<string name="status_success" msgid="239573225847565868">"ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਸਫਲਤਾਪੂਰਵਕ ਪੂਰੀ ਹੋਈ।"</string>
<string name="status_not_accept" msgid="1695082417193780738">"ਸਮੱਗਰੀ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।"</string>
- <string name="status_forbidden" msgid="613956401054050725">"ਟੀਚਾ ਡੀਵਾਈਸ ਵੱਲੋਂ ਟ੍ਰਾਂਸਫਰ ਵਰਜਿਤ।"</string>
+ <string name="status_forbidden" msgid="613956401054050725">"ਟੀਚਾ ਡਿਵਾਈਸ ਵੱਲੋਂ ਟ੍ਰਾਂਸਫਰ ਵਰਜਿਤ।"</string>
<string name="status_canceled" msgid="6664490318773098285">"ਉਪਭੋਗਤਾ ਵੱਲੋਂ ਟ੍ਰਾਂਸਫਰ ਰੱਦ ਕੀਤਾ ਗਿਆ।"</string>
<string name="status_file_error" msgid="3671917770630165299">"ਸਟੋਰੇਜ ਸਮੱਸਿਆ।"</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"ਕੋਈ USB ਸਟੋਰੇਜ ਨਹੀਂ।"</string>
@@ -110,19 +110,12 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"ਸਾਰੀਆਂ ਆਈਟਮਾਂ ਸੂਚੀ ਵਿੱਚੋਂ ਹਟਾਈਆਂ ਜਾਣਗੀਆਂ।"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth ਸ਼ੇਅਰ: ਭੇਜੀਆਂ ਗਈਆਂ ਫਾਈਲਾਂ"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth ਸ਼ੇਅਰ: ਪ੍ਰਾਪਤ ਕੀਤੀਆਂ ਫਾਈਲਾਂ"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ਅਸਫਲ।</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ਅਸਫਲ।</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ਸਫਲ, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ਸਫਲ, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> ਸਫਲ, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ਅਸਫਲ।"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"ਸੂਚੀ ਹਟਾਓ"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"ਖੋਲ੍ਹੋ"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"ਸੂਚੀ ਵਿੱਚੋਂ ਹਟਾਓ"</string>
<string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ਹਟਾਓ"</string>
- <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"ਰੱਖਿਅਤ ਕਰੋ"</string>
+ <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ਰੱਦ ਕਰੋ"</string>
<string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"ਉਹ ਖਾਤੇ ਚੁਣੋ ਜਿਹਨਾਂ ਨੂੰ ਤੁਸੀਂ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸ਼ੇਅਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ। ਤੁਹਾਨੂੰ ਤਦ ਵੀ ਕਨੈਕਟ ਕਰਨ ਵੇਲੇ ਖਾਤਿਆਂ ਤੱਕ ਕਿਸੇ ਵੀ ਪਹੁੰਚ ਨੂੰ ਸਵੀਕਾਰ ਕਰਨਾ ਪਵੇਗਾ।"</string>
<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"ਸਲੌਟ ਬਾਕੀ:"</string>
diff --git a/res/values-pa-rIN/test_strings.xml b/res/values-pa-rIN/test_strings.xml
index d8e6c7678..b3f587987 100644
--- a/res/values-pa-rIN/test_strings.xml
+++ b/res/values-pa-rIN/test_strings.xml
@@ -3,7 +3,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hello" msgid="1740533743008967039">"ਹੈਲੋ ਦੁਨੀਆ, TestActivity"</string>
<string name="app_name" msgid="1203877025577761792">"Bluetooth ਸ਼ੇਅਰ"</string>
- <string name="insert_record" msgid="1450997173838378132">"ਰਿਕਾਰਡ ਦਾਖਲ ਕਰੋ"</string>
+ <string name="insert_record" msgid="1450997173838378132">"ਰਿਕਾਰਡ ਦਰਜ ਕਰੋ"</string>
<string name="update_record" msgid="2480425402384910635">"ਰਿਕਾਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
<string name="ack_record" msgid="6716152390978472184">"Ack ਰਿਕਾਰਡ"</string>
<string name="deleteAll_record" msgid="4383349788485210582">"ਸਾਰੇ ਰਿਕਾਰਡ ਮਿਟਾਓ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ebab1ac46..6a431d5df 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -31,7 +31,7 @@
<string name="bt_enable_cancel" msgid="1988832367505151727">"Anuluj"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"Włącz"</string>
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"Przesyłanie pliku"</string>
- <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Zaakceptować przesyłany plik?"</string>
+ <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Zaakceptować udostępniony plik?"</string>
<string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Odrzuć"</string>
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Akceptuj"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
@@ -104,24 +104,13 @@
<string name="btopp_live_folder" msgid="7967791481444474554">"Odebrane przez Bluetooth"</string>
<string name="download_success" msgid="7036160438766730871">"Odbieranie <xliff:g id="FILE_SIZE">%1$s</xliff:g> zakończono."</string>
<string name="upload_success" msgid="4014469387779648949">"Wysyłanie <xliff:g id="FILE_SIZE">%1$s</xliff:g> zakończono."</string>
- <string name="inbound_history_title" msgid="6940914942271327563">"Transfery przychodzące"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"Transfery wychodzące"</string>
- <string name="no_transfers" msgid="3482965619151865672">"Historia transferów jest pusta."</string>
+ <string name="inbound_history_title" msgid="6940914942271327563">"Transmisje przychodzące"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"Transmisje wychodzące"</string>
+ <string name="no_transfers" msgid="3482965619151865672">"Historia transmisji jest pusta."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Wszystkie elementy zostaną usunięte z listy."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Udostępnianie Bluetooth: wysłane pliki"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Udostępnianie Bluetooth: odebrane pliki"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="few"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> nieudane.</item>
- <item quantity="many"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> nieudanych.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> nieudanego.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> nieudany.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="few"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> udane, %2$s</item>
- <item quantity="many"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> udanych, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> udanego, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> udany, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"Powodzenia: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, niepowodzenia: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Wyczyść listę"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Otwórz"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Usuń z listy"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f0fb7e817..d283a2423 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Todos os itens serão removidos da lista."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Partilha por Bluetooth: ficheiros enviados"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Partilha por Bluetooth: ficheiros recebidos"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> sem êxito.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> sem êxito.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> com êxito, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> com êxito, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> com êxito, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> sem êxito."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Limpar lista"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Limpar da lista"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index cf7f34c42..18a438045 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Todos os itens serão excluídos da lista."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Compartilhamento Bluetooth: Arquivos enviados"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Compartilhamento Bluetooth: Arquivos recebidos"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> com falha.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> com falha.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> com sucesso, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> com sucesso, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> com êxito, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> com falha."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Limpar lista"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Limpar da lista"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1dd145340..13cc6d029 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -16,114 +16,105 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accesați managerul de descărcare."</string>
+ <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accesaţi managerul de descărcare."</string>
<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permite aplicațiilor să acceseze managerul Distribuire prin Bluetooth și să-l utilizeze la transferul fișierelor."</string>
<string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Acces la dispozitivele Bluetooth din lista albă."</string>
- <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permite aplicației să treacă temporar pe lista albă un dispozitiv Bluetooth, permițându-i să trimită fișiere la acest dispozitiv fără confirmare din partea utilizatorului."</string>
+ <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permite aplicației să treacă temporar pe lista albă un dispozitiv Bluetooth, permiţându-i să trimită fişiere la acest dispozitiv fără confirmare din partea utilizatorului."</string>
<string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
<string name="unknown_device" msgid="9221903979877041009">"Dispozitiv necunoscut"</string>
<string name="unknownNumber" msgid="4994750948072751566">"Necunoscut"</string>
<string name="airplane_error_title" msgid="2683839635115739939">"Mod Avion"</string>
- <string name="airplane_error_msg" msgid="8698965595254137230">"Nu puteți utiliza Bluetooth în modul Avion."</string>
+ <string name="airplane_error_msg" msgid="8698965595254137230">"Nu puteţi utiliza Bluetooth în modul Avion."</string>
<string name="bt_enable_title" msgid="8657832550503456572"></string>
- <string name="bt_enable_line1" msgid="7203551583048149">"Pentru a putea utiliza serviciile Bluetooth, trebuie mai întâi să le activați."</string>
- <string name="bt_enable_line2" msgid="4341936569415937994">"Activați acum Bluetooth?"</string>
+ <string name="bt_enable_line1" msgid="7203551583048149">"Pentru a putea utiliza serviciile Bluetooth, trebuie mai întâi să le activaţi."</string>
+ <string name="bt_enable_line2" msgid="4341936569415937994">"Activaţi acum Bluetooth?"</string>
<string name="bt_enable_cancel" msgid="1988832367505151727">"Anulați"</string>
- <string name="bt_enable_ok" msgid="3432462749994538265">"Activați"</string>
- <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transfer de fișier"</string>
+ <string name="bt_enable_ok" msgid="3432462749994538265">"Activaţi"</string>
+ <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transfer de fişier"</string>
<string name="incoming_file_confirm_content" msgid="2752605552743148036">"Acceptați fișierul primit?"</string>
- <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Refuzați"</string>
- <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Acceptați"</string>
+ <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Refuzaţi"</string>
+ <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Acceptaţi"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
- <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"A fost atins timpul limită pentru acceptarea unui fișier primit de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth: se primește fișierul"</string>
- <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Doriți să primiți acest fișier?"</string>
- <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Un fișier de la alt dispozitiv se află în curs de primire. Confirmați dacă doriți primirea acestuia."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Distribuire prin Bluetooth: se primește <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"A fost atins timpul limită pentru acceptarea unui fişier primit de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth: se primeşte fişierul"</string>
+ <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Doriţi să primiţi acest fişier?"</string>
+ <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Un fişier de la alt dispozitiv se află în curs de primire. Confirmaţi dacă doriţi primirea acestuia."</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Distribuire prin Bluetooth: se primeşte <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_received" msgid="3324588019186687985">"Distribuire prin Bluetooth: s-a primit <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Distribuire prin Bluetooth: fișierul <xliff:g id="FILE">%1$s</xliff:g> nu s-a primit"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Distribuire prin Bluetooth: fişierul <xliff:g id="FILE">%1$s</xliff:g> nu s-a primit"</string>
<string name="notification_sending" msgid="3035748958534983833">"Distribuire prin Bluetooth: se trimite <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_sent" msgid="9218710861333027778">"Distribuire prin Bluetooth: s-a trimis <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100 % finalizat"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Distribuire prin Bluetooth: fișierul <xliff:g id="FILE">%1$s</xliff:g> nu a fost trimis"</string>
- <string name="download_title" msgid="3353228219772092586">"Transfer de fișier"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Distribuire prin Bluetooth: fişierul <xliff:g id="FILE">%1$s</xliff:g> nu a fost trimis"</string>
+ <string name="download_title" msgid="3353228219772092586">"Transfer de fişier"</string>
<string name="download_line1" msgid="4926604799202134144">"De la: „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
- <string name="download_line2" msgid="5876973543019417712">"Fișier: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="download_line3" msgid="4384821622908676061">"Dimensiunea fișierului: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+ <string name="download_line2" msgid="5876973543019417712">"Fişier: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="download_line3" msgid="4384821622908676061">"Dimensiunea fişierului: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
<string name="download_line4" msgid="8535996869722666525"></string>
- <string name="download_line5" msgid="3069560415845295386">"Se primește fișierul..."</string>
- <string name="download_cancel" msgid="9177305996747500768">"Opriți"</string>
- <string name="download_ok" msgid="5000360731674466039">"Ascundeți"</string>
+ <string name="download_line5" msgid="3069560415845295386">"Se primeşte fişierul..."</string>
+ <string name="download_cancel" msgid="9177305996747500768">"Opriţi"</string>
+ <string name="download_ok" msgid="5000360731674466039">"Ascundeţi"</string>
<string name="incoming_line1" msgid="2127419875681087545">"De la"</string>
<string name="incoming_line2" msgid="3348994249285315873">"Numele fișierului"</string>
<string name="incoming_line3" msgid="7954237069667474024">"Dimensiunea"</string>
- <string name="download_fail_line1" msgid="3846450148862894552">"Fișierul nu este primit"</string>
- <string name="download_fail_line2" msgid="8950394574689971071">"Fișier: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="download_fail_line1" msgid="3846450148862894552">"Fişierul nu este primit"</string>
+ <string name="download_fail_line2" msgid="8950394574689971071">"Fişier: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="download_fail_line3" msgid="3451040656154861722">"Motiv: <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="download_fail_ok" msgid="1521733664438320300">"OK"</string>
- <string name="download_succ_line5" msgid="4509944688281573595">"Fișier primit"</string>
- <string name="download_succ_ok" msgid="7053688246357050216">"Deschideți"</string>
+ <string name="download_succ_line5" msgid="4509944688281573595">"Fişier primit"</string>
+ <string name="download_succ_ok" msgid="7053688246357050216">"Deschideţi"</string>
<string name="upload_line1" msgid="2055952074059709052">"Către: „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
- <string name="upload_line3" msgid="4920689672457037437">"Tip de fișier: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
- <string name="upload_line5" msgid="7759322537674229752">"Se trimite fișierul..."</string>
- <string name="upload_succ_line5" msgid="5687317197463383601">"Fișier trimis"</string>
+ <string name="upload_line3" msgid="4920689672457037437">"Tip de fişier: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
+ <string name="upload_line5" msgid="7759322537674229752">"Se trimite fişierul..."</string>
+ <string name="upload_succ_line5" msgid="5687317197463383601">"Fişier trimis"</string>
<string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"Fișierul nu a fost trimis la „<xliff:g id="RECIPIENT">%1$s</xliff:g>”."</string>
- <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fișier: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="upload_fail_ok" msgid="5807702461606714296">"Încercați din nou"</string>
- <string name="upload_fail_cancel" msgid="9118496285835687125">"Închideți"</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"Fişierul nu a fost trimis la „<xliff:g id="RECIPIENT">%1$s</xliff:g>”."</string>
+ <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fişier: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="upload_fail_ok" msgid="5807702461606714296">"Încercaţi din nou"</string>
+ <string name="upload_fail_cancel" msgid="9118496285835687125">"Închideţi"</string>
<string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
- <string name="unknown_file" msgid="6092727753965095366">"Fișier necunoscut"</string>
- <string name="unknown_file_desc" msgid="480434281415453287">"Nu există nicio aplicație care să gestioneze acest tip de fișier. \n"</string>
- <string name="not_exist_file" msgid="3489434189599716133">"Niciun fișier"</string>
- <string name="not_exist_file_desc" msgid="4059531573790529229">"Fișierul nu există. \n"</string>
- <string name="enabling_progress_title" msgid="436157952334723406">"Așteptați..."</string>
+ <string name="unknown_file" msgid="6092727753965095366">"Fişier necunoscut"</string>
+ <string name="unknown_file_desc" msgid="480434281415453287">"Nu există nicio aplicație care să gestioneze acest tip de fişier. \n"</string>
+ <string name="not_exist_file" msgid="3489434189599716133">"Niciun fişier"</string>
+ <string name="not_exist_file_desc" msgid="4059531573790529229">"Fişierul nu există. \n"</string>
+ <string name="enabling_progress_title" msgid="436157952334723406">"Aşteptaţi..."</string>
<string name="enabling_progress_content" msgid="4601542238119927904">"Se activează Bluetooth..."</string>
- <string name="bt_toast_1" msgid="972182708034353383">"Se va primi fișierul. Verificați progresul în panoul de notificări."</string>
- <string name="bt_toast_2" msgid="8602553334099066582">"Fișierul nu poate fi primit."</string>
- <string name="bt_toast_3" msgid="6707884165086862518">"Primirea fișierului de la „<xliff:g id="SENDER">%1$s</xliff:g>” a fost anulată"</string>
- <string name="bt_toast_4" msgid="4678812947604395649">"Se trimite fișierul către „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
- <string name="bt_toast_5" msgid="2846870992823019494">"Se trimit <xliff:g id="NUMBER">%1$s</xliff:g> fișiere către „<xliff:g id="RECIPIENT">%2$s</xliff:g>”"</string>
- <string name="bt_toast_6" msgid="1855266596936622458">"Trimiterea fișierului către „<xliff:g id="RECIPIENT">%1$s</xliff:g>” a fost anulată"</string>
- <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"Nu există spațiu suficient pe stocarea USB pentru a salva fișierul de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
- <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Nu există suficient spațiu pe cardul SD pentru a salva fișierul de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
- <string name="bt_sm_2_2" msgid="2965243265852680543">"Spațiu necesar: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Există prea multe solicitări în curs de procesare. Încercați din nou mai târziu."</string>
- <string name="status_pending" msgid="2503691772030877944">"Transferul fișierului nu a început încă."</string>
- <string name="status_running" msgid="6562808920311008696">"Transferul fișierului este în curs de desfășurare."</string>
- <string name="status_success" msgid="239573225847565868">"Transferul fișierului s-a încheiat."</string>
- <string name="status_not_accept" msgid="1695082417193780738">"Conținutul nu este acceptat."</string>
- <string name="status_forbidden" msgid="613956401054050725">"Transfer interzis de dispozitivul de destinație."</string>
+ <string name="bt_toast_1" msgid="972182708034353383">"Se va primi fişierul. Verificaţi progresul în panoul de notificări."</string>
+ <string name="bt_toast_2" msgid="8602553334099066582">"Fişierul nu poate fi primit."</string>
+ <string name="bt_toast_3" msgid="6707884165086862518">"Primirea fişierului de la „<xliff:g id="SENDER">%1$s</xliff:g>” a fost anulată"</string>
+ <string name="bt_toast_4" msgid="4678812947604395649">"Se trimite fişierul către „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
+ <string name="bt_toast_5" msgid="2846870992823019494">"Se trimit <xliff:g id="NUMBER">%1$s</xliff:g> (de) fişiere către „<xliff:g id="RECIPIENT">%2$s</xliff:g>”"</string>
+ <string name="bt_toast_6" msgid="1855266596936622458">"Trimiterea fişierului către „<xliff:g id="RECIPIENT">%1$s</xliff:g>” a fost anulată"</string>
+ <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"Nu există spaţiu suficient pe stocarea USB pentru a salva fişierul de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
+ <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Nu există suficient spaţiu pe cardul SD pentru a salva fişierul de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
+ <string name="bt_sm_2_2" msgid="2965243265852680543">"Spaţiu necesar: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+ <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Există prea multe solicitări în curs de procesare. Încercaţi din nou mai târziu."</string>
+ <string name="status_pending" msgid="2503691772030877944">"Transferul fişierului nu a început încă."</string>
+ <string name="status_running" msgid="6562808920311008696">"Transferul fişierului este în curs de desfăşurare."</string>
+ <string name="status_success" msgid="239573225847565868">"Transferul fişierului s-a încheiat."</string>
+ <string name="status_not_accept" msgid="1695082417193780738">"Conţinutul nu este acceptat."</string>
+ <string name="status_forbidden" msgid="613956401054050725">"Transfer interzis de dispozitivul de destinaţie."</string>
<string name="status_canceled" msgid="6664490318773098285">"Transfer anulat de către utilizator."</string>
<string name="status_file_error" msgid="3671917770630165299">"Problemă de stocare."</string>
- <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Nu există spațiu de stocare USB."</string>
- <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Nu există card SD. Introduceți un card SD pentru a salva fișierele transferate."</string>
- <string name="status_connection_error" msgid="947681831523219891">"Conectare eșuată."</string>
+ <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Nu există spaţiu de stocare USB."</string>
+ <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Nu există card SD. Introduceţi un card SD pentru a salva fişierele transferate."</string>
+ <string name="status_connection_error" msgid="947681831523219891">"Conectare eşuată."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"Solicitarea nu poate fi gestionată corect."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Eroare necunoscută."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth recepționat"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth recepţionat"</string>
<string name="download_success" msgid="7036160438766730871">"Primire finalizată: <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>
<string name="upload_success" msgid="4014469387779648949">"Trimitere finalizată: <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Transferuri de intrare"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"Transferuri de ieșire"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"Transferuri de ieşire"</string>
<string name="no_transfers" msgid="3482965619151865672">"Istoricul de transferuri este gol."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Toate elementele din listă vor fi eliminate."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Distribuire prin Bluetooth: fișiere trimise"</string>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Distribuire prin Bluetooth: fişiere trimise"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: fișiere primite"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="few"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> fișiere netransferate.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> de fișiere netransferate.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> fișier netransferat.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="few"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> fișiere transferate, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> de fișiere transferate, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> fișier transferat, %2$s</item>
- </plurals>
- <string name="transfer_menu_clear_all" msgid="790017462957873132">"Ștergeți lista"</string>
- <string name="transfer_menu_open" msgid="3368984869083107200">"Deschideți"</string>
- <string name="transfer_menu_clear" msgid="5854038118831427492">"Ștergeți din listă"</string>
- <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Ștergeți"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> reuşite, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> eşuate."</string>
+ <string name="transfer_menu_clear_all" msgid="790017462957873132">"Ștergeţi lista"</string>
+ <string name="transfer_menu_open" msgid="3368984869083107200">"Deschideţi"</string>
+ <string name="transfer_menu_clear" msgid="5854038118831427492">"Ștergeţi din listă"</string>
+ <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Ștergeţi"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Salvați"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Anulați"</string>
<string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selectați conturile la care doriți să permiteți accesul prin Bluetooth. Va trebui să acceptați accesul la conturi la conectare."</string>
diff --git a/res/values-ro/strings_pbap.xml b/res/values-ro/strings_pbap.xml
index e5119f07d..cc84114b7 100644
--- a/res/values-ro/strings_pbap.xml
+++ b/res/values-ro/strings_pbap.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Introduceți cheia de sesiune pentru %1$s"</string>
+ <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Introduceţi cheia de sesiune pentru %1$s"</string>
<string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Cheie de sesiune Bluetooth solicitată"</string>
<string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"A expirat timpul pentru acceptarea conexiunii cu %1$s"</string>
<string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"A expirat timpul de introducere a cheii de sesiune cu %1$s"</string>
<string name="auth_notif_ticker" msgid="1575825798053163744">"Cerere de autentificare pentru protocolul OBEX"</string>
<string name="auth_notif_title" msgid="7599854855681573258">"Cheia sesiunii"</string>
- <string name="auth_notif_message" msgid="6667218116427605038">"Introduceți cheia de sesiune pentru %1$s"</string>
- <string name="defaultname" msgid="4821590500649090078">"Set de mașină"</string>
+ <string name="auth_notif_message" msgid="6667218116427605038">"Introduceţi cheia de sesiune pentru %1$s"</string>
+ <string name="defaultname" msgid="4821590500649090078">"Set de maşină"</string>
<string name="unknownName" msgid="2841414754740600042">"Nume necunoscut"</string>
<string name="localPhoneName" msgid="2349001318925409159">"Numele meu"</string>
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
diff --git a/res/values-ro/test_strings.xml b/res/values-ro/test_strings.xml
index 4221e93ce..3e10db179 100644
--- a/res/values-ro/test_strings.xml
+++ b/res/values-ro/test_strings.xml
@@ -3,12 +3,12 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hello" msgid="1740533743008967039">"Bună ziua tuturor! Test de activitate!"</string>
<string name="app_name" msgid="1203877025577761792">"Distribuire prin Bluetooth"</string>
- <string name="insert_record" msgid="1450997173838378132">"Inserați o înregistrare"</string>
- <string name="update_record" msgid="2480425402384910635">"Confirmați înregistrarea"</string>
+ <string name="insert_record" msgid="1450997173838378132">"Inseraţi o înregistrare"</string>
+ <string name="update_record" msgid="2480425402384910635">"Confirmaţi înregistrarea"</string>
<string name="ack_record" msgid="6716152390978472184">"Înregistrare Ack"</string>
- <string name="deleteAll_record" msgid="4383349788485210582">"Ștergeți toate înregistrările"</string>
+ <string name="deleteAll_record" msgid="4383349788485210582">"Ștergeţi toate înregistrările"</string>
<string name="ok_button" msgid="6519033415223065454">"OK"</string>
- <string name="delete_record" msgid="4645040331967533724">"Ștergeți înregistrarea"</string>
- <string name="start_server" msgid="9034821924409165795">"Porniți serverul TCP"</string>
- <string name="notify_server" msgid="4369106744022969655">"Notificați serverul TCP"</string>
+ <string name="delete_record" msgid="4645040331967533724">"Ștergeţi înregistrarea"</string>
+ <string name="start_server" msgid="9034821924409165795">"Porniţi serverul TCP"</string>
+ <string name="notify_server" msgid="4369106744022969655">"Notificaţi serverul TCP"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a99f4f95b..de15ac0dd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -110,18 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Все элементы будут удалены из списка."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Передано по Bluetooth"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Получено по Bluetooth"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one">Не удалось передать <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> файл.</item>
- <item quantity="few">Не удалось передать <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> файла.</item>
- <item quantity="many">Не удалось передать <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> файлов.</item>
- <item quantity="other">Не удалось передать <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> файла.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one">Передан <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> файл, %2$s</item>
- <item quantity="few">Передано <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> файла, %2$s</item>
- <item quantity="many">Передано <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> файлов, %2$s</item>
- <item quantity="other">Передано <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> файла, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"Удачно: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, неудачно: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Очистить список"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Открыть"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Удалить из списка"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 2edcc43b9..23df33b35 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"ලැයිස්තුව වෙතින් සියලු අයිතම හිස් කරනු ඇත."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"බ්ලූටූත් බෙදා ගන්න: ගොනු යැවිණි"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"බ්ලූටූත් බෙදා ගැනීම: ගොනු ලැබිණි"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> අසාර්ථකයි.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> අසාර්ථකයි.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> සාර්ථකයි, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> සාර්ථකයි, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> සාර්ථකයි, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> අසාර්ථකයි."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"ලැයිස්තුව හිස් කරන්න"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"විවෘත කරන්න"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"ලැයිස්තුව වෙතින් හිස් කරන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 555023414..e32998b8c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -36,16 +36,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Prijať"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Pri prijímaní prichádzajúceho súboru od používateľa <xliff:g id="SENDER">%1$s</xliff:g> vypršal časový limit."</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth: Prichádzajúci súbor"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Zdieľanie Bluetooth: Prichádzajúci súbor"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Chcete prijať tento súbor?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"Potvrďte príjem súboru prichádzajúceho z iného zariadenia."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth: Prijíma sa <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received" msgid="3324588019186687985">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> prijatý"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> neprijatý"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Bluetooth: Odosiela sa <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> odoslaný"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Zdieľanie Bluetooth: Prijímanie súboru <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Zdieľanie Bluetooth: Súbor <xliff:g id="FILE">%1$s</xliff:g> bol prijatý"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Zdieľanie Bluetooth: Súbor <xliff:g id="FILE">%1$s</xliff:g> nebol prijatý"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Zdieľanie Bluetooth: Odosielanie súboru <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Zdieľanie Bluetooth: Súbor <xliff:g id="FILE">%1$s</xliff:g> bol odoslaný"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100 % hotovo"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> neodoslaný"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Zdieľanie Bluetooth: Súbor <xliff:g id="FILE">%1$s</xliff:g> nebol odoslaný"</string>
<string name="download_title" msgid="3353228219772092586">"Prenos súborov"</string>
<string name="download_line1" msgid="4926604799202134144">"Od: <xliff:g id="SENDER">%1$s</xliff:g>"</string>
<string name="download_line2" msgid="5876973543019417712">"Súbor: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -68,7 +68,7 @@
<string name="upload_line5" msgid="7759322537674229752">"Odosielanie súboru..."</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"Súbor bol odoslaný"</string>
<string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"Súbor nebol odoslaný zariadení <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"Súbor nebol odoslaný používateľovi „<xliff:g id="RECIPIENT">%1$s</xliff:g>“."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"Súbor: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"Skúsiť znova"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"Zavrieť"</string>
@@ -86,42 +86,31 @@
<string name="bt_toast_5" msgid="2846870992823019494">"Odosielanie súborov (počet: <xliff:g id="NUMBER">%1$s</xliff:g>) používateľovi <xliff:g id="RECIPIENT">%2$s</xliff:g>"</string>
<string name="bt_toast_6" msgid="1855266596936622458">"Odosielanie súboru používateľovi <xliff:g id="RECIPIENT">%1$s</xliff:g> bolo zastavené"</string>
<string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"V úložisku USB nie je dostatok miesta na uloženie súboru od používateľa „<xliff:g id="SENDER">%1$s</xliff:g>“"</string>
- <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Na SD karte nie je dostatok miesta na uloženie súboru od používateľa „<xliff:g id="SENDER">%1$s</xliff:g>“"</string>
+ <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Na karte SD nie je dostatok miesta na uloženie súboru od používateľa „<xliff:g id="SENDER">%1$s</xliff:g>“"</string>
<string name="bt_sm_2_2" msgid="2965243265852680543">"Požadované miesto v pamäti: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
<string name="ErrorTooManyRequests" msgid="8578277541472944529">"Spracúva sa príliš veľa žiadostí. Opakujte akciu neskôr."</string>
<string name="status_pending" msgid="2503691772030877944">"Prenos súborov ešte nebol spustený."</string>
<string name="status_running" msgid="6562808920311008696">"Prebieha prenos súborov."</string>
<string name="status_success" msgid="239573225847565868">"Prenos súborov bol úspešne dokončený."</string>
<string name="status_not_accept" msgid="1695082417193780738">"Obsah nie je podporovaný."</string>
- <string name="status_forbidden" msgid="613956401054050725">"Prenos bol zakázaný cieľovým zariadením."</string>
+ <string name="status_forbidden" msgid="613956401054050725">"Tento prenos bol zakázaný cieľovým zariadením."</string>
<string name="status_canceled" msgid="6664490318773098285">"Prenos bol zrušený používateľom."</string>
<string name="status_file_error" msgid="3671917770630165299">"Problém s ukladacím priestorom."</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Žiadny ukladací priestor USB."</string>
- <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Žiadna SD karta nie je dostupná. Ak chcete prenášané súbory uložiť, vložte SD kartu."</string>
+ <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Žiadna karta SD nie je dostupná. Ak chcete prenášané súbory uložiť, vložte kartu SD."</string>
<string name="status_connection_error" msgid="947681831523219891">"Neúspešný pokus o pripojenie."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"Žiadosť nie je možné správne spracovať."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Neznáma chyba."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Prijaté cez Bluetooth"</string>
- <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g>, príjem dokončený"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth – prijaté súbory"</string>
+ <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Prijatie dokončené."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Odosielanie dokončené."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Prichádzajúce prenosy"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Odchádzajúce prenosy"</string>
<string name="no_transfers" msgid="3482965619151865672">"História prenosov je prázdna."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Zo zoznamu budú vymazané všetky položky."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth: Odoslané súbory"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: Prijaté súbory"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="few">Neúspešné: <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g></item>
- <item quantity="many">Neúspešné: <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g></item>
- <item quantity="other">Neúspešné: <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g></item>
- <item quantity="one">Neúspešné: <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g></item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="few">Úspešné: <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>, %2$s</item>
- <item quantity="many">Úspešné: <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>, %2$s</item>
- <item quantity="other">Úspešné: <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>, %2$s</item>
- <item quantity="one">Úspešné: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g>, %2$s</item>
- </plurals>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Zdieľanie Bluetooth: Odoslané súbory"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Zdieľanie Bluetooth: Prijaté súbory"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"Počet úspešných operácií: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, počet neúspešných operácií: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Vymazať zoznam"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Otvoriť"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Vymazať zo zoznamu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1d5f9d320..c2faf8301 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -36,16 +36,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Sprejmi"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"V redu"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Pri sprejemanju datoteke pošiljatelja »<xliff:g id="SENDER">%1$s</xliff:g>« je potekla časovna omejitev"</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth: Prihajajoča datoteka"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Delež Bluetootha: Prihajajoča datoteka"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Ali želite prejeti to datoteko?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"Iz druge naprave prihaja datoteka. Potrdite, da jo želite prejeti."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth: Prejemanje <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received" msgid="3324588019186687985">"Bluetooth: Prejeto <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Delež Bluetootha: Prejemanje<xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Delež Bluetootha: Prejeto<xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth: Datoteka <xliff:g id="FILE">%1$s</xliff:g> ni bila prejeta"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Bluetooth: Pošiljanje <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Delež Bluetootha: Pošiljanje<xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_sent" msgid="9218710861333027778">"Bluetooth: Poslano <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"Dokončano: 100 %"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth: Datoteka <xliff:g id="FILE">%1$s</xliff:g> ni bila poslana"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Delež Bluetootha: Datoteka <xliff:g id="FILE">%1$s</xliff:g> ni bila poslana"</string>
<string name="download_title" msgid="3353228219772092586">"Prenos datoteke"</string>
<string name="download_line1" msgid="4926604799202134144">"Od: »<xliff:g id="SENDER">%1$s</xliff:g>«"</string>
<string name="download_line2" msgid="5876973543019417712">"Datoteka: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -70,7 +70,7 @@
<string name="upload_succ_ok" msgid="7705428476405478828">"V redu"</string>
<string name="upload_fail_line1" msgid="7899394672421491701">"Datoteka ni bila poslana prejemniku »<xliff:g id="RECIPIENT">%1$s</xliff:g>«."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"Datoteka: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="upload_fail_ok" msgid="5807702461606714296">"Poskusite znova"</string>
+ <string name="upload_fail_ok" msgid="5807702461606714296">"Poskusite znova."</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"Zapri"</string>
<string name="bt_error_btn_ok" msgid="5965151173011534240">"V redu"</string>
<string name="unknown_file" msgid="6092727753965095366">"Neznana datoteka"</string>
@@ -108,20 +108,9 @@
<string name="outbound_history_title" msgid="4279418703178140526">"Odhodni prenosi"</string>
<string name="no_transfers" msgid="3482965619151865672">"Zgodovina prenosov je prazna."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Vsi elementi bodo izbrisani s seznama."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth: Poslane datoteke"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: Prejete datoteke"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neuspešen.</item>
- <item quantity="two"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neuspešna.</item>
- <item quantity="few"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neuspešni.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> neuspešnih.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> uspešen, %2$s</item>
- <item quantity="two"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> uspešna, %2$s</item>
- <item quantity="few"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> uspešni, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> uspešnih, %2$s</item>
- </plurals>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Delež Bluetootha: Poslane datoteke"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Delež Bluetootha: Prejete datoteke"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"št. uspešnih: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, št. neuspešnih: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Počisti seznam"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Odpri"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Počisti s seznama"</string>
diff --git a/res/values-sl/test_strings.xml b/res/values-sl/test_strings.xml
index 023bc42e7..aaf5d65a0 100644
--- a/res/values-sl/test_strings.xml
+++ b/res/values-sl/test_strings.xml
@@ -2,7 +2,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hello" msgid="1740533743008967039">"Zdravo, svet, TestActivity"</string>
- <string name="app_name" msgid="1203877025577761792">"Skupna raba prek Bluetootha"</string>
+ <string name="app_name" msgid="1203877025577761792">"Delež Bluetootha"</string>
<string name="insert_record" msgid="1450997173838378132">"Vstavi zapis"</string>
<string name="update_record" msgid="2480425402384910635">"Potrdi zapis"</string>
<string name="ack_record" msgid="6716152390978472184">"Zapis potrditve"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 1c4e73214..d49f786de 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -31,7 +31,7 @@
<string name="bt_enable_cancel" msgid="1988832367505151727">"Anulo"</string>
<string name="bt_enable_ok" msgid="3432462749994538265">"Aktivizo"</string>
<string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferimi i skedarit"</string>
- <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Të pranohet skedari?"</string>
+ <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Të pranohet skedari hyrës?"</string>
<string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Refuzo"</string>
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Prano"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"Në rregull!"</string>
@@ -40,12 +40,12 @@
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Dëshiron ta marrësh këtë skedar?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"Skedar hyrës nga një tjetër pajisje. Konfirmo që dëshiron ta marrësh këtë skedar."</string>
<string name="notification_receiving" msgid="4674648179652543984">"Shpërndarja përmes bluetooth-it: Po merret skedari <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received" msgid="3324588019186687985">"Shpërndarja përmes bluetooth-it: U pranua skedari <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Shpërndarja përmes bluetooth-it: Skedari <xliff:g id="FILE">%1$s</xliff:g> nuk u pranua"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Shpërndarja përmes bluetooth-it: Skedari <xliff:g id="FILE">%1$s</xliff:g> u mor"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Shpërndarja përmes bluetooth-it: Skedari <xliff:g id="FILE">%1$s</xliff:g> nuk u mor"</string>
<string name="notification_sending" msgid="3035748958534983833">"Shpërndarja përmes bluetooth-it: Po dërgohet skedari <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Shpërndarja përmes Bluetooth-it: Skedari <xliff:g id="FILE">%1$s</xliff:g> u dërgua"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Shpërndarja përmes bluetooth-it: Skedari <xliff:g id="FILE">%1$s</xliff:g> u dërgua"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100% i përfunduar"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Shpërndarja përmes Bluetooth-it: Skedari <xliff:g id="FILE">%1$s</xliff:g> nuk u dërgua"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Shpërndarja përmes bluetooth-it: Skedari <xliff:g id="FILE">%1$s</xliff:g> nuk u dërgua"</string>
<string name="download_title" msgid="3353228219772092586">"Transferimi i skedarit"</string>
<string name="download_line1" msgid="4926604799202134144">"Nga: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"Skedari: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -93,7 +93,7 @@
<string name="status_running" msgid="6562808920311008696">"Transferimi i skedarit është duke u kryer."</string>
<string name="status_success" msgid="239573225847565868">"Transferimi i skedarit përfundoi me sukses."</string>
<string name="status_not_accept" msgid="1695082417193780738">"Përmbajtja nuk mbështetet"</string>
- <string name="status_forbidden" msgid="613956401054050725">"Transferimi ndalohet nga pajisja pritëse."</string>
+ <string name="status_forbidden" msgid="613956401054050725">"Transferimi ndalohet nga pajisja e shënjestruar."</string>
<string name="status_canceled" msgid="6664490318773098285">"Transferimi u anulua nga përdoruesi."</string>
<string name="status_file_error" msgid="3671917770630165299">"Problem me hapësirën ruajtëse."</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Nuk ka hapësirë ruajtëse USB."</string>
@@ -101,23 +101,16 @@
<string name="status_connection_error" msgid="947681831523219891">"Lidhja ishte e pasuksesshme."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"Kërkesa nuk mund të trajtohet si duhet."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Gabim i panjohur."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Marrjet përmes Bluetooth-it"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth-i u pranua"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> - Marrja përfundoi."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Dërgimi përfundoi."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Transferimet hyrëse"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Transferimet dalëse"</string>
<string name="no_transfers" msgid="3482965619151865672">"Historiku i transferimeve është bosh."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Të gjithë artikujt do të pastrohen nga lista."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Shpërndarja përmes Bluetooth-it: Skedarët e dërguar"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Shpërndarja përmes bluetooth-it: Skedarët e pranuar"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> të pasuksesshme.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> i pasuksesshëm.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> të suksesshme, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> i suksesshëm, %2$s</item>
- </plurals>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Shpërndarja përmes bluetooth-it: Skedarët e dërguar"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Shpërndarja përmes bluetooth-it: Skedarët e marrë"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> me sukses, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> pa sukses."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Pastro listën"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Hap"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Pastro nga lista"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d873a8fe9..43cf22727 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -68,7 +68,7 @@
<string name="upload_line5" msgid="7759322537674229752">"Слање датотеке..."</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"Датотека је послата"</string>
<string name="upload_succ_ok" msgid="7705428476405478828">"Потврди"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"Датотека није послата на <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"Датотека није послата примаоцу „<xliff:g id="RECIPIENT">%1$s</xliff:g>“."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"Датотека: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"Покушај поново"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"Затвори"</string>
@@ -107,19 +107,10 @@
<string name="inbound_history_title" msgid="6940914942271327563">"Долазни преноси"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Одлазни преноси"</string>
<string name="no_transfers" msgid="3482965619151865672">"Историја преноса је празна."</string>
- <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Све ставке ће бити избрисане са листе."</string>
+ <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Све ставке биће избрисане са листе."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Дељење преко Bluetooth-а: послате датотеке"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Дељење преко Bluetooth-а: примљене датотеке"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> неуспешна.</item>
- <item quantity="few"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> неуспешне.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> неуспешних.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> успешна, %2$s</item>
- <item quantity="few"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> успешне, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> успешних, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"Успешно: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>; неуспешно: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Обриши листу"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Отвори"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Обриши са листе"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 44db0c874..222a42056 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -101,7 +101,7 @@
<string name="status_connection_error" msgid="947681831523219891">"Anslutningen misslyckades."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"Begäran kan inte hanteras korrekt."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Okänt fel."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Mottaget via Bluetooth"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth har tagits emot"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> har tagits emot fullständigt."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> har skickats fullständigt."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Inkommande överföringar"</string>
@@ -110,18 +110,11 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alla objekt tas bort från listan."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-delning: skickade filer"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-delning: mottagna filer"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> misslyckades.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> misslyckades.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> lyckades, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> lyckades, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> lyckades, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> misslyckades."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Rensa listan"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Öppna"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Ta bort från listan"</string>
- <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Rensa"</string>
+ <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Ta bort"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Spara"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Avbryt"</string>
<string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Välj de konton du vill dela via Bluetooth. Du måste fortfarande godkänna åtkomsten till kontona vid anslutning."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index bb744ca27..e7fa07737 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Vipengee vyote vitafutwa kutoka kwenye orodha."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Kushiriki kwa bluetooth: Faili zilizotumwa"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Kushiriki kwa bluetooth: Faili zilizopokelewa"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> haikufaulu.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> hazikufaulu.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> imefaulu, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> zimefaulu, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> zimetumwa, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> hazikutumwa"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Futa orodha"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Fungua"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Futa kutoka orodha"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 98b284e14..3e948995a 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -101,23 +101,16 @@
<string name="status_connection_error" msgid="947681831523219891">"இணைப்பு தோல்வி."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"கோரிக்கை சரியாக கையாளப்படவில்லை."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"தெரியாத பிழை."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"புளூடூத் - பெற்றவை"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"புளூடூத் பெறப்பட்டது"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> பெறப்பட்டது."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> அனுப்புவது முடிந்தது."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"உள் இடமாற்றங்கள்"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"வெளிச்செல்லும் பரிமாற்றங்கள்"</string>
<string name="no_transfers" msgid="3482965619151865672">"பரிமாற்ற வரலாற்றில் எதுவுமில்லை."</string>
- <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"பட்டியலிலிருந்து அனைத்தும் அழிக்கப்படும்."</string>
+ <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"எல்லா உருப்படிகளும் பட்டியலிலிருந்து அழிக்கப்படும்."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"புளூடூத் பகிர்வு: அனுப்பியவை"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"புளூடூத் பகிர்வு: பெற்ற கோப்புகள்"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> தோல்வி.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> தோல்வி.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> வெற்றி, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> வெற்றி, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> வெற்றி, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> தோல்வி."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"பட்டியலை அழி"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"திற"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"பட்டியலிலிருந்து அழி"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 088f92fdf..780ea0ad4 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -101,7 +101,7 @@
<string name="status_connection_error" msgid="947681831523219891">"కనెక్షన్ విఫలమైంది."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"అభ్యర్థన సరిగ్గా నిర్వహించబడదు."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"తెలియని లోపం."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"బ్లూటూత్‌తో స్వీకరించినవి"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"బ్లూటూత్ స్వీకరించబడింది"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> స్వీకరించడం పూర్తయింది."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> పంపడం పూర్తయింది."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"స్వీకృత బదిలీలు"</string>
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"జాబితా నుండి అన్ని అంశాలు క్లియర్ చేయబడతాయి."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"బ్లూటూత్ భాగస్వామ్యం: పంపిన ఫైల్‌లు"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"బ్లూటూత్ భాగస్వామ్యం: స్వీకరించబడిన ఫైల్‌లు"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> విఫలం.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> విఫలం.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> విజయవంతం, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> విజయవంతం, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> విజయవంతమయ్యాయి, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> విఫలమయ్యాయి."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"జాబితాను క్లియర్ చేయి"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"తెరువు"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"జాబితా నుండి క్లియర్ చేయి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1fe1795be..ae2bcf6a0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -105,19 +105,12 @@
<string name="download_success" msgid="7036160438766730871">"ได้รับแล้ว <xliff:g id="FILE_SIZE">%1$s</xliff:g>"</string>
<string name="upload_success" msgid="4014469387779648949">"ส่ง <xliff:g id="FILE_SIZE">%1$s</xliff:g> เรียบร้อยแล้ว"</string>
<string name="inbound_history_title" msgid="6940914942271327563">"การถ่ายโอนขาเข้า"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"การถ่ายโอนข้อมูล"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"การถ่ายโอนขาออก"</string>
<string name="no_transfers" msgid="3482965619151865672">"ประวัติการถ่ายโอนว่างเปล่า"</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"รายการทั้งหมดจะถูกล้างจากรายการ"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"การแชร์ทางบลูทูธ: ส่งไฟล์แล้ว"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"การแชร์ทางบลูทูธ: รับไฟล์แล้ว"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other">ล้มเหลว <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> รายการ</item>
- <item quantity="one">ล้มเหลว <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> รายการ</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other">สำเร็จ <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> รายการ %2$s</item>
- <item quantity="one">สำเร็จ <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> รายการ %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"สำเร็จ <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> รายการ, ไม่สำเร็จ <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> รายการ"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"ล้างรายการ"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"เปิด"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"ล้างจากรายการ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 7033d1c76..9dd178afa 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -68,7 +68,7 @@
<string name="upload_line5" msgid="7759322537674229752">"Nagpapadala ng file..."</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"Naipadala ang file"</string>
<string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"Hindi naipadala ang file kay \"<xliff:g id="RECIPIENT">%1$s</xliff:g>.\""</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"Hindi naipadala ang file kay \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="upload_fail_ok" msgid="5807702461606714296">"Subukang muli"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"Isara"</string>
@@ -101,23 +101,16 @@
<string name="status_connection_error" msgid="947681831523219891">"Hindi matagumpay ang koneksyon."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"Hindi mapangasiwaan nang tama ang kahilingan."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Hindi kilalang error."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Natanggap sa bluetooth"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Natanggap ang bluetooth"</string>
<string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Kumpleto na ang pagtanggap."</string>
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Kumpleto na ang pagpapadala."</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Mga inbound na paglilipat"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Mga palabas na paglilipat"</string>
- <string name="no_transfers" msgid="3482965619151865672">"Walang laman ang history ng paglilipat."</string>
+ <string name="no_transfers" msgid="3482965619151865672">"Walang laman ang kasaysayan ng paglilipat."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Iki-clear ang lahat ng mga item mula sa listahan."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth share: Mga naipadalang file"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth share: Mga natanggap na file"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ang hindi matagumpay.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ang hindi matagumpay.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ang matagumpay, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ang matagumpay, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> ang matagumpay, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ang hindi matagumpay."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"I-clear ang listahan"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Buksan"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"I-clear mula sa listahan"</string>
diff --git a/res/values-tl/test_strings.xml b/res/values-tl/test_strings.xml
index 1feb0321b..5fd26652e 100644
--- a/res/values-tl/test_strings.xml
+++ b/res/values-tl/test_strings.xml
@@ -6,9 +6,9 @@
<string name="insert_record" msgid="1450997173838378132">"Ipasok ang tala"</string>
<string name="update_record" msgid="2480425402384910635">"Kumpirmahin ang tala"</string>
<string name="ack_record" msgid="6716152390978472184">"Ack na tala"</string>
- <string name="deleteAll_record" msgid="4383349788485210582">"I-delete ang lahat ng tala"</string>
+ <string name="deleteAll_record" msgid="4383349788485210582">"Tanggalin ang lahat ng tala"</string>
<string name="ok_button" msgid="6519033415223065454">"OK"</string>
- <string name="delete_record" msgid="4645040331967533724">"I-delete ang tala"</string>
+ <string name="delete_record" msgid="4645040331967533724">"Tanggalin ang tala"</string>
<string name="start_server" msgid="9034821924409165795">"Simulan ang TCP server"</string>
<string name="notify_server" msgid="4369106744022969655">"I-notify ang TCP server"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f539c97ee..1c148ba80 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Tüm öğeler listeden temizlenecek."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth paylaşımı: Gönderilen dosyalar"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth paylaşımı: Dosyalar alındı"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> başarısız.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> başarısız.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> başarılı, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> başarılı, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> başarılı, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> başarısız."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Listeyi temizle"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Aç"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Listeden temizle"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b951c4d2b..57ed8dea8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -46,7 +46,7 @@
<string name="notification_sent" msgid="9218710861333027778">"Через Bluetooth: надісл. <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100% виконано"</string>
<string name="notification_sent_fail" msgid="6696082233774569445">"Через Bluetooth: файл <xliff:g id="FILE">%1$s</xliff:g> не надісл."</string>
- <string name="download_title" msgid="3353228219772092586">"Передача файлів"</string>
+ <string name="download_title" msgid="3353228219772092586">"Пересилка файлів"</string>
<string name="download_line1" msgid="4926604799202134144">"Від: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"Файл: <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="download_line3" msgid="4384821622908676061">"Розмір файлу: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
@@ -62,15 +62,15 @@
<string name="download_fail_line3" msgid="3451040656154861722">"Причина: <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="download_fail_ok" msgid="1521733664438320300">"OK"</string>
<string name="download_succ_line5" msgid="4509944688281573595">"Файл отримано"</string>
- <string name="download_succ_ok" msgid="7053688246357050216">"Відкрити"</string>
+ <string name="download_succ_ok" msgid="7053688246357050216">"Відкр."</string>
<string name="upload_line1" msgid="2055952074059709052">"Кому: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
<string name="upload_line3" msgid="4920689672457037437">"Тип файлу: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
<string name="upload_line5" msgid="7759322537674229752">"Надсил-ня файлу..."</string>
<string name="upload_succ_line5" msgid="5687317197463383601">"Файл надіслано"</string>
<string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"Файл не надіслано на пристрій \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"Файл не надіслано отримувачеві \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
<string name="upload_fail_line1_2" msgid="2108129204050841798">"Файл: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="upload_fail_ok" msgid="5807702461606714296">"Повторити"</string>
+ <string name="upload_fail_ok" msgid="5807702461606714296">"Спробуйте ще"</string>
<string name="upload_fail_cancel" msgid="9118496285835687125">"Закрити"</string>
<string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
<string name="unknown_file" msgid="6092727753965095366">"Невідомий файл"</string>
@@ -101,30 +101,19 @@
<string name="status_connection_error" msgid="947681831523219891">"Помилка з’єднання."</string>
<string name="status_protocol_error" msgid="3245444473429269539">"Запит неможливо обробити належним чином."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Невідома помилка."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Отримані через Bluetooth"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth отримані"</string>
<string name="download_success" msgid="7036160438766730871">"Завершено отримання <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>
<string name="upload_success" msgid="4014469387779648949">"Заверш. надсил. <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>
- <string name="inbound_history_title" msgid="6940914942271327563">"Вхідні передавання"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"Вихідні передавання"</string>
- <string name="no_transfers" msgid="3482965619151865672">"Немає даних."</string>
+ <string name="inbound_history_title" msgid="6940914942271327563">"Вхідні пересилки"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"Вихідні пересилки"</string>
+ <string name="no_transfers" msgid="3482965619151865672">"Історія пересилок порожня."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Зі списку буде видалено всі елементи."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Через Bluetooth: надісл. файли"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Через Bluetooth: отримані файли"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one">Не виконано <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>.</item>
- <item quantity="few">Не виконано <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>.</item>
- <item quantity="many">Не виконано <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>.</item>
- <item quantity="other">Не виконано <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one">Виконано <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>, %2$s</item>
- <item quantity="few">Виконано <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>, %2$s</item>
- <item quantity="many">Виконано <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>, %2$s</item>
- <item quantity="other">Виконано <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>, %2$s</item>
- </plurals>
- <string name="transfer_menu_clear_all" msgid="790017462957873132">"Очистити список"</string>
- <string name="transfer_menu_open" msgid="3368984869083107200">"Відкрити"</string>
- <string name="transfer_menu_clear" msgid="5854038118831427492">"Видалити зі списку"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> виконано, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> не виконано."</string>
+ <string name="transfer_menu_clear_all" msgid="790017462957873132">"Очист. список"</string>
+ <string name="transfer_menu_open" msgid="3368984869083107200">"Відкр."</string>
+ <string name="transfer_menu_clear" msgid="5854038118831427492">"Видал. зі списку"</string>
<string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Очистити"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Зберегти"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Скасувати"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index fbf213693..5aaa1e2fe 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"سبھی آئٹمز فہرست سے صاف کر دیے جائیں گے۔"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"بلوٹوتھ اشتراک: ارسال کردہ فائلیں"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"بلوٹوتھ اشتراک: فائلیں موصول ہو گئیں"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ناکام۔</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> ناکام۔</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other">‏<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> کامیاب، ‎%2$s‎</item>
- <item quantity="one">‏<xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> کامیاب، ‎%2$s‎</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> کامیاب، <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ناکام۔"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"فہرست صاف کریں"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"کھولیں"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"فہرست سے صاف کریں"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 040aa557c..2137f1716 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -36,16 +36,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Qabul qilish"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\"dan kiruvchi xabarni olishga rozilik bildirilayotganda, kutish vaqti o‘tib ketdi."</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth o‘tkazmalari"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth o‘tkazmalari: kiruvchi fayl"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Fayl qabul qilinsinmi?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"Boshqa qurilmadan kiruvchi fayl. Ushbu faylni qabul qilmoqchi bo‘lsangiz, tasdiqlang."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth orqali yuborildi: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received" msgid="3324588019186687985">"Bluetooth orqali olindi: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Fayl qabul qilinmadi: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Bluetooth orqali yuborish: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Bluetooth orqali yuborildi: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth o‘tkazmalari: <xliff:g id="FILE">%1$s</xliff:g> fayli qabul qilinmoqda"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Bluetooth o‘tkazmalari: <xliff:g id="FILE">%1$s</xliff:g> fayli qabul qilindi"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth o‘tkazmalari: <xliff:g id="FILE">%1$s</xliff:g> fayli qabul qilinmadi"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Bluetooth o‘tkazmalari: <xliff:g id="FILE">%1$s</xliff:g> fayli yuborilmoqda"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Bluetooth o‘tkazmalari: <xliff:g id="FILE">%1$s</xliff:g> fayli yuborildi"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100% tugadi"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Fayl yuborilmadi: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth o‘tkazmalari: <xliff:g id="FILE">%1$s</xliff:g> fayli yuborilmadi"</string>
<string name="download_title" msgid="3353228219772092586">"Fayl o‘tkazish"</string>
<string name="download_line1" msgid="4926604799202134144">"Yuboruvchi: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"Fayl: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -107,17 +107,10 @@
<string name="inbound_history_title" msgid="6940914942271327563">"Kiruvchi o‘tkazmalar"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Chiquvchi o‘tkazmalar"</string>
<string name="no_transfers" msgid="3482965619151865672">"O‘tkazmalar tarixi bo‘m-bo‘sh."</string>
- <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Barcha qaydlar ro‘yxatdan o‘chirib tashlanadi."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth orqali yuborildi"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth orqali olindi"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> ta muvaffaqiyatsiz.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> ta muvaffaqiyatsiz.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ta muvaffaqiyatli, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> ta muvaffaqiyatli, %2$s</item>
- </plurals>
+ <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Barcha elementlar ro‘yxatdan o‘chiriladi."</string>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth o‘tkazmalari: Yuborilgan fayllar"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth o‘tkazmalari: Qabul qilingan fayllar"</string>
+ <string name="noti_caption" msgid="7508708288885707365">"Muvaffaqiyatli: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, muvaffaqiyatsiz: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Ro‘yxatni tozalash"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Ochish"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Ro‘yxatdan o‘chirish"</string>
diff --git a/res/values-uz-rUZ/test_strings.xml b/res/values-uz-rUZ/test_strings.xml
index a67af705e..4fc16cd7a 100644
--- a/res/values-uz-rUZ/test_strings.xml
+++ b/res/values-uz-rUZ/test_strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="hello" msgid="1740533743008967039">"Salom, dunyo! (aloqa tekshiruvi)"</string>
+ <string name="hello" msgid="1740533743008967039">"Salom dunyo, TestActivity"</string>
<string name="app_name" msgid="1203877025577761792">"Bluetooth o‘tkazmalari"</string>
<string name="insert_record" msgid="1450997173838378132">"Yozuvni kiriting"</string>
<string name="update_record" msgid="2480425402384910635">"Yozuvni tasdiqlash"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e34224e74..f3038611d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Tất cả các mục sẽ bị xóa khỏi danh sách."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Chia sẻ qua Bluetooth: Tệp đã gửi"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Chia sẻ qua Bluetooth: Tệp đã nhận"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> không thành công.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> không thành công.</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> thành công, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> thành công, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> thành công, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> không thành công."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Xóa danh sách"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Mở"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Xóa khỏi danh sách"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d9f5a1fe8..9de62b83a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -110,23 +110,16 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"所有内容都将从列表中清除。"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"蓝牙共享:已发送文件"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"蓝牙共享:已接收文件"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> 个文件传输失败。</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> 个文件传输失败。</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> 个文件传输成功,%2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> 个文件传输成功,%2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>个成功,<xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>个失败。"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"清除列表"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"打开"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"从列表中清除"</string>
<string name="transfer_clear_dlg_title" msgid="2953444575556460386">"清除"</string>
<string name="bluetooth_map_settings_save" msgid="7635491847388074606">"保存"</string>
<string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"取消"</string>
- <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"选中您要通过蓝牙共享的帐号。建立连接后,您仍需接受对这些帐号的所有访问请求。"</string>
+ <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="bluetooth_map_settings_title" msgid="7420332483392851321">"蓝牙消息共享设置"</string>
- <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"无法选择帐号,目前没有任何空档"</string>
+ <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"无法选择帐户,目前没有任何空档"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 666b7dc15..9245aee08 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"將會從清單清除所有項目。"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"藍牙分享:傳送的檔案"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"藍牙分享:接收的檔案"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other">無法傳送 <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> 個檔案。</item>
- <item quantity="one">無法傳送 <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> 個檔案。</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other">成功傳送 <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> 個檔案,%2$s</item>
- <item quantity="one">成功傳送 <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> 個檔案,%2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> 個成功,<xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> 個失敗。"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"清除清單"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"開啟"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"從清單清除"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 54d405255..b6cf07652 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -93,7 +93,7 @@
<string name="status_running" msgid="6562808920311008696">"正在進行檔案傳輸。"</string>
<string name="status_success" msgid="239573225847565868">"已完成檔案傳輸。"</string>
<string name="status_not_accept" msgid="1695082417193780738">"內容不受支援。"</string>
- <string name="status_forbidden" msgid="613956401054050725">"目標裝置禁止進行傳輸。"</string>
+ <string name="status_forbidden" msgid="613956401054050725">"目標裝置禁止這項傳輸。"</string>
<string name="status_canceled" msgid="6664490318773098285">"使用者已取消傳輸。"</string>
<string name="status_file_error" msgid="3671917770630165299">"儲存空間問題。"</string>
<string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"沒有 USB 儲存裝置。"</string>
@@ -104,20 +104,13 @@
<string name="btopp_live_folder" msgid="7967791481444474554">"已透過藍牙接收的檔案"</string>
<string name="download_success" msgid="7036160438766730871">"已完成 <xliff:g id="FILE_SIZE">%1$s</xliff:g> 的接收作業。"</string>
<string name="upload_success" msgid="4014469387779648949">"已完成 <xliff:g id="FILE_SIZE">%1$s</xliff:g> 的傳送作業。"</string>
- <string name="inbound_history_title" msgid="6940914942271327563">"傳入"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"傳出"</string>
- <string name="no_transfers" msgid="3482965619151865672">"傳輸紀錄是空的。"</string>
- <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"所有項目都會從清單中清除。"</string>
+ <string name="inbound_history_title" msgid="6940914942271327563">"向內傳輸"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"向外傳輸"</string>
+ <string name="no_transfers" msgid="3482965619151865672">"傳輸記錄是空的。"</string>
+ <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"將會從清單清除所有項目。"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"藍牙分享:傳送的檔案"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"藍牙分享:接收的檔案"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other">未成功傳輸 <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> 個檔案。</item>
- <item quantity="one">未成功傳輸 <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> 個檔案。</item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other">成功傳輸 <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> 個檔案,%2$s</item>
- <item quantity="one">成功傳輸 <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> 個檔案,%2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> 個成功,<xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> 個失敗。"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"清除清單"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"開啟"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"從清單清除"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 04b7936a1..4c6f7d3cf 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -110,14 +110,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Zonke izintwana zizosulwa ohlwini."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Abelana ne-Bluetooth. Amafayela athunyelwe"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Abelana ne-Bluetooth: Amafayela atholakele"</string>
- <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> kwehlulekile.</item>
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> kwehlulekile. </item>
- </plurals>
- <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> impumelelo, %2$s</item>
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> impumelelo, %2$s</item>
- </plurals>
+ <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> aphumelele, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ahlulekile."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Sula uhlu"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Vula"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Sula ohlwini"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index b32d5853c..799501c9b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -34,8 +34,24 @@
of the location permissions. -->
<bool name="strict_location_check">true</bool>
- <!-- For AVRCP absolute volume feature. If the threshold is non-zero,
- restrict the initial volume to the threshold.
- Valid value is 1-14, and recommended value is 8 -->
- <integer name="a2dp_absolute_volume_initial_threshold">8</integer>
+ <!-- Specifies the min/max connection interval parameters for high priority,
+ balanced and low power GATT configurations. These values are in
+ multiples of 1.25ms. -->
+ <integer name="gatt_high_priority_min_interval">9</integer>
+ <integer name="gatt_high_priority_max_interval">12</integer>
+ <!-- Default specs recommended interval is 30 (24 * 1.25) -> 50 (40 * 1.25)
+ ms. -->
+ <integer name="gatt_balanced_priority_min_interval">24</integer>
+ <integer name="gatt_balanced_priority_max_interval">40</integer>
+ <integer name="gatt_low_power_min_interval">80</integer>
+ <integer name="gatt_low_power_max_interval">100</integer>
+
+ <!-- Specifies latency parameters for high priority, balanced and low power
+ GATT configurations. These values represents the number of packets a
+ slave device is allowed to skip. -->
+ <integer name="gatt_high_priority_latency">0</integer>
+ <integer name="gatt_balanced_priority_latency">0</integer>
+ <integer name="gatt_low_power_latency">2</integer>
+
+ <bool name="headset_client_initial_audio_route_allowed">true</bool>
</resources>
diff --git a/src/com/android/bluetooth/a2dp/A2dpService.java b/src/com/android/bluetooth/a2dp/A2dpService.java
index a278927d3..e14302caf 100755
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -213,10 +213,6 @@ public class A2dpService extends ProfileService {
mAvrcp.setA2dpAudioState(state);
}
- public void resetAvrcpBlacklist(BluetoothDevice device) {
- mAvrcp.resetBlackList(device.getAddress());
- }
-
synchronized boolean isA2dpPlaying(BluetoothDevice device) {
enforceCallingOrSelfPermission(BLUETOOTH_PERM,
"Need BLUETOOTH permission");
diff --git a/src/com/android/bluetooth/avrcp/Avrcp.java b/src/com/android/bluetooth/avrcp/Avrcp.java
index 7d1403736..abc0b8481 100755
--- a/src/com/android/bluetooth/avrcp/Avrcp.java
+++ b/src/com/android/bluetooth/avrcp/Avrcp.java
@@ -24,8 +24,6 @@ import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothAvrcp;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
-import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.media.AudioManager;
import android.media.IRemoteControlDisplay;
@@ -47,7 +45,6 @@ import android.os.SystemClock;
import android.util.Log;
import android.view.KeyEvent;
-import com.android.bluetooth.R;
import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.Utils;
@@ -57,7 +54,6 @@ import com.android.internal.util.StateMachine;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Set;
/**
@@ -67,7 +63,6 @@ import java.util.Set;
public final class Avrcp {
private static final boolean DEBUG = false;
private static final String TAG = "Avrcp";
- private static final String ABSOLUTE_VOLUME_BLACKLIST = "absolute_volume_blacklist";
private Context mContext;
private final AudioManager mAudioManager;
@@ -89,23 +84,12 @@ public final class Avrcp {
private long mPrevPosMs;
private long mSkipStartTime;
private int mFeatures;
- private int mRemoteVolume;
- private int mLastRemoteVolume;
- private int mInitialRemoteVolume;
-
- /* Local volume in audio index 0-15 */
- private int mLocalVolume;
- private int mLastLocalVolume;
- private int mAbsVolThreshold;
-
- private String mAddress;
- private HashMap<Integer, Integer> mVolumeMapping;
-
+ private int mAbsoluteVolume;
+ private int mLastSetVolume;
private int mLastDirection;
private final int mVolumeStep;
private final int mAudioStreamMax;
- private boolean mVolCmdAdjustInProgress;
- private boolean mVolCmdSetInProgress;
+ private boolean mVolCmdInProgress;
private int mAbsVolRetryTimes;
private int mSkipAmount;
@@ -169,17 +153,11 @@ public final class Avrcp {
mPlaybackIntervalMs = 0L;
mPlayPosChangedNT = NOTIFICATION_TYPE_CHANGED;
mFeatures = 0;
- mRemoteVolume = -1;
- mInitialRemoteVolume = -1;
- mLastRemoteVolume = -1;
+ mAbsoluteVolume = -1;
+ mLastSetVolume = -1;
mLastDirection = 0;
- mVolCmdAdjustInProgress = false;
- mVolCmdSetInProgress = false;
+ mVolCmdInProgress = false;
mAbsVolRetryTimes = 0;
- mLocalVolume = -1;
- mLastLocalVolume = -1;
- mAbsVolThreshold = 0;
- mVolumeMapping = new HashMap<Integer, Integer>();
mContext = context;
@@ -188,10 +166,6 @@ public final class Avrcp {
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
mAudioStreamMax = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
mVolumeStep = Math.max(AVRCP_BASE_VOLUME_STEP, AVRCP_MAX_VOL/mAudioStreamMax);
- Resources resources = context.getResources();
- if (resources != null) {
- mAbsVolThreshold = resources.getInteger(R.integer.a2dp_absolute_volume_initial_threshold);
- }
}
private void start() {
@@ -223,8 +197,6 @@ public final class Avrcp {
public void cleanup() {
cleanupNative();
- if (mVolumeMapping != null)
- mVolumeMapping.clear();
}
private static class RemoteControllerWeak implements RemoteController.OnClientUpdateListener {
@@ -311,15 +283,7 @@ public final class Avrcp {
if (DEBUG) Log.v(TAG, "MESSAGE_GET_RC_FEATURES: address="+address+
", features="+msg.arg1);
mFeatures = msg.arg1;
- mFeatures = modifyRcFeatureFromBlacklist(mFeatures, address);
mAudioManager.avrcpSupportsAbsoluteVolume(address, isAbsoluteVolumeSupported());
- mLastLocalVolume = -1;
- mRemoteVolume = -1;
- mLocalVolume = -1;
- mInitialRemoteVolume = -1;
- mAddress = address;
- if (mVolumeMapping != null)
- mVolumeMapping.clear();
break;
case MESSAGE_GET_PLAY_STATUS:
@@ -357,158 +321,47 @@ public final class Avrcp {
break;
case MESSAGE_VOLUME_CHANGED:
- if (!isAbsoluteVolumeSupported()) {
- if (DEBUG) Log.v(TAG, "ignore MESSAGE_VOLUME_CHANGED");
- break;
- }
-
if (DEBUG) Log.v(TAG, "MESSAGE_VOLUME_CHANGED: volume=" + ((byte)msg.arg1 & 0x7f)
+ " ctype=" + msg.arg2);
-
- boolean volAdj = false;
if (msg.arg2 == AVRC_RSP_ACCEPT || msg.arg2 == AVRC_RSP_REJ) {
- if (mVolCmdAdjustInProgress == false && mVolCmdSetInProgress == false) {
+ if (mVolCmdInProgress == false) {
Log.e(TAG, "Unsolicited response, ignored");
break;
}
removeMessages(MESSAGE_ABS_VOL_TIMEOUT);
-
- volAdj = mVolCmdAdjustInProgress;
- mVolCmdAdjustInProgress = false;
- mVolCmdSetInProgress = false;
+ mVolCmdInProgress = false;
mAbsVolRetryTimes = 0;
}
-
- byte absVol = (byte)((byte)msg.arg1 & 0x7f); // discard MSB as it is RFD
- // convert remote volume to local volume
- int volIndex = convertToAudioStreamVolume(absVol);
- if (mInitialRemoteVolume == -1) {
- mInitialRemoteVolume = absVol;
- if (mAbsVolThreshold > 0 && mAbsVolThreshold < mAudioStreamMax && volIndex > mAbsVolThreshold) {
- if (DEBUG) Log.v(TAG, "remote inital volume too high " + volIndex + ">" + mAbsVolThreshold);
- Message msg1 = mHandler.obtainMessage(MESSAGE_SET_ABSOLUTE_VOLUME, mAbsVolThreshold , 0);
- mHandler.sendMessage(msg1);
- mRemoteVolume = absVol;
- mLocalVolume = volIndex;
- break;
- }
- }
-
- if (mLocalVolume != volIndex &&
- (msg.arg2 == AVRC_RSP_ACCEPT ||
+ if (mAbsoluteVolume != msg.arg1 && (msg.arg2 == AVRC_RSP_ACCEPT ||
msg.arg2 == AVRC_RSP_CHANGED ||
msg.arg2 == AVRC_RSP_INTERIM)) {
- /* If the volume has successfully changed */
- mLocalVolume = volIndex;
- if (mLastLocalVolume != -1 && msg.arg2 == AVRC_RSP_ACCEPT) {
- if (mLastLocalVolume != volIndex) {
- /* remote volume changed more than requested due to
- * local and remote has different volume steps */
- if (DEBUG) Log.d(TAG, "Remote returned volume does not match desired volume "
- + mLastLocalVolume + " vs "
- + volIndex);
- mLastLocalVolume = mLocalVolume;
- }
- }
- // remember the remote volume value, as it's the one supported by remote
- if (volAdj) {
- synchronized (mVolumeMapping) {
- mVolumeMapping.put(volIndex, (int)absVol);
- if (DEBUG) Log.v(TAG, "remember volume mapping " +volIndex+ "-"+absVol);
- }
- }
-
- notifyVolumeChanged(mLocalVolume);
- mRemoteVolume = absVol;
+ byte absVol = (byte)((byte)msg.arg1 & 0x7f); // discard MSB as it is RFD
+ notifyVolumeChanged(absVol);
+ mAbsoluteVolume = absVol;
long pecentVolChanged = ((long)absVol * 100) / 0x7f;
Log.e(TAG, "percent volume changed: " + pecentVolChanged + "%");
} else if (msg.arg2 == AVRC_RSP_REJ) {
Log.e(TAG, "setAbsoluteVolume call rejected");
- } else if (volAdj && mLastRemoteVolume > 0 && mLastRemoteVolume < AVRCP_MAX_VOL &&
- mLocalVolume == volIndex &&
- (msg.arg2 == AVRC_RSP_ACCEPT )) {
- /* oops, the volume is still same, remote does not like the value
- * retry a volume one step up/down */
- if (DEBUG) Log.d(TAG, "Remote device didn't tune volume, let's try one more step.");
- int retry_volume = Math.min(AVRCP_MAX_VOL,
- Math.max(0, mLastRemoteVolume + mLastDirection));
- if (setVolumeNative(retry_volume)) {
- mLastRemoteVolume = retry_volume;
- sendMessageDelayed(obtainMessage(MESSAGE_ABS_VOL_TIMEOUT),
- CMD_TIMEOUT_DELAY);
- mVolCmdAdjustInProgress = true;
- }
}
break;
case MESSAGE_ADJUST_VOLUME:
- if (!isAbsoluteVolumeSupported()) {
- if (DEBUG) Log.v(TAG, "ignore MESSAGE_ADJUST_VOLUME");
- break;
- }
-
if (DEBUG) Log.d(TAG, "MESSAGE_ADJUST_VOLUME: direction=" + msg.arg1);
-
- if (mVolCmdAdjustInProgress || mVolCmdSetInProgress) {
+ if (mVolCmdInProgress) {
if (DEBUG) Log.w(TAG, "There is already a volume command in progress.");
break;
}
-
- // Remote device didn't set initial volume. Let's black list it
- if (mInitialRemoteVolume == -1) {
- Log.d(TAG, "remote " + mAddress + " never tell us initial volume, black list it.");
- blackListCurrentDevice();
- break;
- }
-
// Wait on verification on volume from device, before changing the volume.
- if (mRemoteVolume != -1 && (msg.arg1 == -1 || msg.arg1 == 1)) {
- int setVol = -1;
- int targetVolIndex = -1;
- if (mLocalVolume == 0 && msg.arg1 == -1) {
- if (DEBUG) Log.w(TAG, "No need to Vol down from 0.");
- break;
- }
- if (mLocalVolume == mAudioStreamMax && msg.arg1 == 1) {
- if (DEBUG) Log.w(TAG, "No need to Vol up from max.");
- break;
- }
-
- targetVolIndex = mLocalVolume + msg.arg1;
- if (DEBUG) Log.d(TAG, "Adjusting volume to " + targetVolIndex);
-
- Integer i;
- synchronized (mVolumeMapping) {
- i = mVolumeMapping.get(targetVolIndex);
- }
-
- if (i != null) {
- /* if we already know this volume mapping, use it */
- setVol = i.byteValue();
- if (setVol == mRemoteVolume) {
- if (DEBUG) Log.d(TAG, "got same volume from mapping for " + targetVolIndex + ", ignore.");
- setVol = -1;
- }
- if (DEBUG) Log.d(TAG, "set volume from mapping " + targetVolIndex + "-" + setVol);
- }
-
- if (setVol == -1) {
- /* otherwise use phone steps */
- setVol = Math.min(AVRCP_MAX_VOL,
- convertToAvrcpVolume(Math.max(0, targetVolIndex)));
- if (DEBUG) Log.d(TAG, "set volume from local volume "+ targetVolIndex+"-"+ setVol);
- }
-
+ if (mAbsoluteVolume != -1 && (msg.arg1 == -1 || msg.arg1 == 1)) {
+ int setVol = Math.min(AVRCP_MAX_VOL,
+ Math.max(0, mAbsoluteVolume + msg.arg1*mVolumeStep));
if (setVolumeNative(setVol)) {
sendMessageDelayed(obtainMessage(MESSAGE_ABS_VOL_TIMEOUT),
CMD_TIMEOUT_DELAY);
- mVolCmdAdjustInProgress = true;
+ mVolCmdInProgress = true;
mLastDirection = msg.arg1;
- mLastRemoteVolume = setVol;
- mLastLocalVolume = targetVolIndex;
- } else {
- if (DEBUG) Log.d(TAG, "setVolumeNative failed");
+ mLastSetVolume = setVol;
}
} else {
Log.e(TAG, "Unknown direction in MESSAGE_ADJUST_VOLUME");
@@ -516,50 +369,29 @@ public final class Avrcp {
break;
case MESSAGE_SET_ABSOLUTE_VOLUME:
- if (!isAbsoluteVolumeSupported()) {
- if (DEBUG) Log.v(TAG, "ignore MESSAGE_SET_ABSOLUTE_VOLUME");
- break;
- }
-
if (DEBUG) Log.v(TAG, "MESSAGE_SET_ABSOLUTE_VOLUME");
-
- if (mVolCmdSetInProgress || mVolCmdAdjustInProgress) {
+ if (mVolCmdInProgress) {
if (DEBUG) Log.w(TAG, "There is already a volume command in progress.");
break;
}
-
- // Remote device didn't set initial volume. Let's black list it
- if (mInitialRemoteVolume == -1) {
- if (DEBUG) Log.d(TAG, "remote " + mAddress + " never tell us initial volume, black list it.");
- blackListCurrentDevice();
- break;
- }
-
- int avrcpVolume = convertToAvrcpVolume(msg.arg1);
- avrcpVolume = Math.min(AVRCP_MAX_VOL, Math.max(0, avrcpVolume));
- if (DEBUG) Log.d(TAG, "Setting volume to " + msg.arg1+"-"+avrcpVolume);
- if (setVolumeNative(avrcpVolume)) {
+ if (setVolumeNative(msg.arg1)) {
sendMessageDelayed(obtainMessage(MESSAGE_ABS_VOL_TIMEOUT), CMD_TIMEOUT_DELAY);
- mVolCmdSetInProgress = true;
- mLastRemoteVolume = avrcpVolume;
- mLastLocalVolume = msg.arg1;
- } else {
- if (DEBUG) Log.d(TAG, "setVolumeNative failed");
+ mVolCmdInProgress = true;
+ mLastSetVolume = msg.arg1;
}
break;
case MESSAGE_ABS_VOL_TIMEOUT:
if (DEBUG) Log.v(TAG, "MESSAGE_ABS_VOL_TIMEOUT: Volume change cmd timed out.");
- mVolCmdAdjustInProgress = false;
- mVolCmdSetInProgress = false;
+ mVolCmdInProgress = false;
if (mAbsVolRetryTimes >= MAX_ERROR_RETRY_TIMES) {
mAbsVolRetryTimes = 0;
} else {
mAbsVolRetryTimes += 1;
- if (setVolumeNative(mLastRemoteVolume)) {
+ if (setVolumeNative(mLastSetVolume)) {
sendMessageDelayed(obtainMessage(MESSAGE_ABS_VOL_TIMEOUT),
CMD_TIMEOUT_DELAY);
- mVolCmdSetInProgress = true;
+ mVolCmdInProgress = true;
}
}
break;
@@ -967,13 +799,10 @@ public final class Avrcp {
}
public void setAbsoluteVolume(int volume) {
- if (volume == mLocalVolume) {
- if (DEBUG) Log.v(TAG, "setAbsoluteVolume is setting same index, ignore "+volume);
- return;
- }
-
+ int avrcpVolume = convertToAvrcpVolume(volume);
+ avrcpVolume = Math.min(AVRCP_MAX_VOL, Math.max(0, avrcpVolume));
mHandler.removeMessages(MESSAGE_ADJUST_VOLUME);
- Message msg = mHandler.obtainMessage(MESSAGE_SET_ABSOLUTE_VOLUME, volume, 0);
+ Message msg = mHandler.obtainMessage(MESSAGE_SET_ABSOLUTE_VOLUME, avrcpVolume, 0);
mHandler.sendMessage(msg);
}
@@ -990,50 +819,20 @@ public final class Avrcp {
}
private void notifyVolumeChanged(int volume) {
+ volume = convertToAudioStreamVolume(volume);
mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, volume,
AudioManager.FLAG_SHOW_UI | AudioManager.FLAG_BLUETOOTH_ABS_VOLUME);
}
private int convertToAudioStreamVolume(int volume) {
// Rescale volume to match AudioSystem's volume
- return (int) Math.floor((double) volume*mAudioStreamMax/AVRCP_MAX_VOL);
+ return (int) Math.round((double) volume*mAudioStreamMax/AVRCP_MAX_VOL);
}
private int convertToAvrcpVolume(int volume) {
return (int) Math.ceil((double) volume*AVRCP_MAX_VOL/mAudioStreamMax);
}
- private void blackListCurrentDevice() {
- mFeatures &= ~BTRC_FEAT_ABSOLUTE_VOLUME;
- mAudioManager.avrcpSupportsAbsoluteVolume(mAddress, isAbsoluteVolumeSupported());
-
- SharedPreferences pref = mContext.getSharedPreferences(ABSOLUTE_VOLUME_BLACKLIST,
- Context.MODE_PRIVATE);
- SharedPreferences.Editor editor = pref.edit();
- editor.putBoolean(mAddress, true);
- editor.commit();
- }
-
- private int modifyRcFeatureFromBlacklist(int feature, String address) {
- SharedPreferences pref = mContext.getSharedPreferences(ABSOLUTE_VOLUME_BLACKLIST,
- Context.MODE_PRIVATE);
- if (!pref.contains(address)) {
- return feature;
- }
- if (pref.getBoolean(address, false)) {
- feature &= ~BTRC_FEAT_ABSOLUTE_VOLUME;
- }
- return feature;
- }
-
- public void resetBlackList(String address) {
- SharedPreferences pref = mContext.getSharedPreferences(ABSOLUTE_VOLUME_BLACKLIST,
- Context.MODE_PRIVATE);
- SharedPreferences.Editor editor = pref.edit();
- editor.remove(address);
- editor.commit();
- }
-
/**
* This is called from A2dpStateMachine to set A2dp audio state.
*/
@@ -1059,16 +858,14 @@ public final class Avrcp {
ProfileService.println(sb, "mPrevPosMs: " + mPrevPosMs);
ProfileService.println(sb, "mSkipStartTime: " + mSkipStartTime);
ProfileService.println(sb, "mFeatures: " + mFeatures);
- ProfileService.println(sb, "mRemoteVolume: " + mRemoteVolume);
- ProfileService.println(sb, "mLastRemoteVolume: " + mLastRemoteVolume);
+ ProfileService.println(sb, "mAbsoluteVolume: " + mAbsoluteVolume);
+ ProfileService.println(sb, "mLastSetVolume: " + mLastSetVolume);
ProfileService.println(sb, "mLastDirection: " + mLastDirection);
ProfileService.println(sb, "mVolumeStep: " + mVolumeStep);
ProfileService.println(sb, "mAudioStreamMax: " + mAudioStreamMax);
- ProfileService.println(sb, "mVolCmdAdjustInProgress: " + mVolCmdAdjustInProgress);
- ProfileService.println(sb, "mVolCmdSetInProgress: " + mVolCmdSetInProgress);
+ ProfileService.println(sb, "mVolCmdInProgress: " + mVolCmdInProgress);
ProfileService.println(sb, "mAbsVolRetryTimes: " + mAbsVolRetryTimes);
ProfileService.println(sb, "mSkipAmount: " + mSkipAmount);
- ProfileService.println(sb, "mVolumeMapping: " + mVolumeMapping.toString());
}
// Do not modify without updating the HAL bt_rc.h files.
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 3ac242ccd..1b21d7887 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -188,6 +188,8 @@ public class AdapterService extends Service {
private PowerManager.WakeLock mWakeLock;
private String mWakeLockName;
+ private ProfileObserver mProfileObserver;
+
public AdapterService() {
super();
if (TRACE_REF) {
@@ -459,9 +461,8 @@ public class AdapterService extends Service {
mSdpManager = SdpManager.init(this);
registerReceiver(mAlarmBroadcastReceiver, new IntentFilter(ACTION_ALARM_WAKEUP));
-
-
-
+ mProfileObserver = new ProfileObserver(getApplicationContext(), this, new Handler());
+ mProfileObserver.start();
}
@Override
@@ -477,10 +478,17 @@ public class AdapterService extends Service {
public void onDestroy() {
debugLog("onDestroy()");
+ mProfileObserver.stop();
}
void BleOnProcessStart() {
debugLog("BleOnProcessStart()");
+
+ if (getApplicationContext().getResources().getBoolean(
+ R.bool.config_bluetooth_reload_supported_profiles_when_enabled)) {
+ Config.init(getApplicationContext());
+ }
+
Class[] supportedProfileServices = Config.getSupportedProfiles();
//Initialize data objects
for (int i=0; i < supportedProfileServices.length;i++) {
@@ -1030,6 +1038,12 @@ public class AdapterService extends Service {
return service.getBondState(device);
}
+ public long getSupportedProfiles() {
+ AdapterService service = getService();
+ if (service == null) return 0;
+ return service.getSupportedProfiles();
+ }
+
public int getConnectionState(BluetoothDevice device) {
AdapterService service = getService();
if (service == null) return 0;
@@ -1673,6 +1687,10 @@ public class AdapterService extends Service {
return deviceProp.getBondState();
}
+ long getSupportedProfiles() {
+ return Config.getSupportedProfilesBitMask();
+ }
+
int getConnectionState(BluetoothDevice device) {
enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
byte[] addr = Utils.getBytesFromAddress(device.getAddress());
@@ -2154,7 +2172,7 @@ public class AdapterService extends Service {
private native static void classInitNative();
private native boolean initNative();
private native void cleanupNative();
- /*package*/ native boolean enableNative(boolean startRestricted);
+ /*package*/ native boolean enableNative();
/*package*/ native boolean disableNative();
/*package*/ native boolean setAdapterPropertyNative(int type, byte[] val);
/*package*/ native boolean getAdapterPropertiesNative();
diff --git a/src/com/android/bluetooth/btservice/AdapterState.java b/src/com/android/bluetooth/btservice/AdapterState.java
index b47d3242b..555e175e8 100644
--- a/src/com/android/bluetooth/btservice/AdapterState.java
+++ b/src/com/android/bluetooth/btservice/AdapterState.java
@@ -20,7 +20,6 @@ import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.content.Intent;
import android.os.Message;
-import android.os.UserManager;
import android.util.Log;
import com.android.internal.util.State;
@@ -361,8 +360,7 @@ final class AdapterState extends StateMachine {
removeMessages(BLE_START_TIMEOUT);
//Enable
- boolean isGuest = UserManager.get(mAdapterService).isGuestUser();
- if (!adapterService.enableNative(isGuest)) {
+ if (!adapterService.enableNative()) {
errorLog("Error while turning Bluetooth on");
notifyAdapterStateChange(BluetoothAdapter.STATE_OFF);
transitionTo(mOffState);
diff --git a/src/com/android/bluetooth/btservice/BondStateMachine.java b/src/com/android/bluetooth/btservice/BondStateMachine.java
index b4241c13c..7bed94a03 100644
--- a/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -462,10 +462,6 @@ final class BondStateMachine extends StateMachine {
a2dpService.setPriority(device,BluetoothProfile.PRIORITY_UNDEFINED);
if(headsetService != null)
headsetService.setPriority(device,BluetoothProfile.PRIORITY_UNDEFINED);
-
- // Clear Absolute Volume black list
- if(a2dpService != null)
- a2dpService.resetAvrcpBlacklist(device);
}
private void infoLog(String msg) {
diff --git a/src/com/android/bluetooth/btservice/Config.java b/src/com/android/bluetooth/btservice/Config.java
index 4301cd9df..6bfb0982e 100644
--- a/src/com/android/bluetooth/btservice/Config.java
+++ b/src/com/android/bluetooth/btservice/Config.java
@@ -17,10 +17,15 @@
package com.android.bluetooth.btservice;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import android.bluetooth.BluetoothProfile;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
import android.os.SystemProperties;
+import android.provider.Settings;
import android.util.Log;
import com.android.bluetooth.R;
@@ -84,10 +89,11 @@ public class Config {
if (resources == null) {
return;
}
+
ArrayList<Class> profiles = new ArrayList<Class>(PROFILE_SERVICES.length);
for (int i=0; i < PROFILE_SERVICES_FLAG.length; i++) {
boolean supported = resources.getBoolean(PROFILE_SERVICES_FLAG[i]);
- if (supported) {
+ if (supported && !isProfileDisabled(ctx, PROFILE_SERVICES[i])) {
Log.d(TAG, "Adding " + PROFILE_SERVICES[i].getSimpleName());
profiles.add(PROFILE_SERVICES[i]);
}
@@ -100,4 +106,63 @@ public class Config {
static Class[] getSupportedProfiles() {
return SUPPORTED_PROFILES;
}
+
+ static long getSupportedProfilesBitMask() {
+ long mask = 0;
+ for (final Class profileClass : getSupportedProfiles()) {
+ final int profileIndex = getProfileIndex(profileClass);
+
+ if (profileIndex != -1) {
+ mask |= 1 << getProfileIndex(profileClass);
+ }
+ }
+
+ return mask;
+ }
+
+ private static boolean isProfileDisabled(Context context, Class profile) {
+ final int profileIndex = getProfileIndex(profile);
+
+ if (profileIndex == -1) {
+ Log.w(TAG, "Could not find profile bit mask");
+ return false;
+ }
+
+ final ContentResolver resolver = context.getContentResolver();
+ final long disabledProfilesBitMask = Settings.Global.getLong(resolver,
+ Settings.Global.BLUETOOTH_DISABLED_PROFILES, 0);
+ final long profileBit = 1 << profileIndex;
+
+ return (disabledProfilesBitMask & profileBit) != 0;
+ }
+
+ private static int getProfileIndex(Class profile) {
+ int profileIndex = -1;
+
+ if (profile == HeadsetService.class) {
+ profileIndex = BluetoothProfile.HEADSET;
+ } else if (profile == A2dpService.class) {
+ profileIndex = BluetoothProfile.A2DP;
+ } else if (profile == A2dpSinkService.class) {
+ profileIndex = BluetoothProfile.A2DP_SINK;
+ } else if (profile == HidService.class) {
+ profileIndex = BluetoothProfile.INPUT_DEVICE;
+ } else if (profile == HealthService.class) {
+ profileIndex = BluetoothProfile.HEALTH;
+ } else if (profile == PanService.class) {
+ profileIndex = BluetoothProfile.PAN;
+ } else if (profile == GattService.class) {
+ profileIndex = BluetoothProfile.GATT;
+ } else if (profile == BluetoothMapService.class) {
+ profileIndex = BluetoothProfile.MAP;
+ } else if (profile == HeadsetClientService.class) {
+ profileIndex = BluetoothProfile.HEADSET_CLIENT;
+ } else if (profile == AvrcpControllerService.class) {
+ profileIndex = BluetoothProfile.AVRCP_CONTROLLER;
+ } else if (profile == SapService.class) {
+ profileIndex = BluetoothProfile.SAP;
+ }
+
+ return profileIndex;
+ }
}
diff --git a/src/com/android/bluetooth/btservice/ProfileObserver.java b/src/com/android/bluetooth/btservice/ProfileObserver.java
new file mode 100644
index 000000000..cccd96ad4
--- /dev/null
+++ b/src/com/android/bluetooth/btservice/ProfileObserver.java
@@ -0,0 +1,69 @@
+package com.android.bluetooth.btservice;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.provider.Settings;
+
+/**
+ * This helper class monitors the state of the enabled profiles and will update and restart
+ * the adapter when necessary.
+ */
+public class ProfileObserver extends ContentObserver {
+ private Context mContext;
+ private AdapterService mService;
+ private AdapterStateObserver mStateObserver;
+
+ public ProfileObserver(Context context, AdapterService service, Handler handler) {
+ super(handler);
+ mContext = context;
+ mService = service;
+ mStateObserver = new AdapterStateObserver(this);
+ }
+
+ public void start() {
+ mContext.getContentResolver().registerContentObserver(
+ Settings.Global.getUriFor(Settings.Global.BLUETOOTH_DISABLED_PROFILES), false,
+ this);
+ }
+
+ private void onBluetoothOff() {
+ mContext.unregisterReceiver(mStateObserver);
+ Config.init(mContext);
+ mService.enable();
+ }
+
+ public void stop() {
+ mContext.getContentResolver().unregisterContentObserver(this);
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ if (mService.isEnabled()) {
+ mContext.registerReceiver(mStateObserver,
+ new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
+ mService.disable();
+ }
+ }
+
+ private static class AdapterStateObserver extends BroadcastReceiver {
+ private ProfileObserver mProfileObserver;
+
+ public AdapterStateObserver(ProfileObserver observer) {
+ mProfileObserver = observer;
+ }
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(intent.getAction())
+ && intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1)
+ == BluetoothAdapter.STATE_OFF) {
+ mProfileObserver.onBluetoothOff();
+ }
+ }
+ }
+}
diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index 26ef18d1f..d6a236dba 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -1661,12 +1661,11 @@ public class GattService extends ProfileService {
void connectionParameterUpdate(int clientIf, String address, int connectionPriority) {
enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
- // Default spec recommended interval is 30->50 ms
- int minInterval = 24; // 24 * 1.25ms = 30ms
- int maxInterval = 40; // 40 * 1.25ms = 50ms
+ int minInterval;
+ int maxInterval;
// Slave latency
- int latency = 0;
+ int latency;
// Link supervision timeout is measured in N * 10ms
int timeout = 2000; // 20s
@@ -1674,14 +1673,24 @@ public class GattService extends ProfileService {
switch (connectionPriority)
{
case BluetoothGatt.CONNECTION_PRIORITY_HIGH:
- minInterval = 9; // 11.25ms
- maxInterval = 12; // 15ms
+ minInterval = getResources().getInteger(R.integer.gatt_high_priority_min_interval);
+ maxInterval = getResources().getInteger(R.integer.gatt_high_priority_max_interval);
+ latency = getResources().getInteger(R.integer.gatt_high_priority_latency);
break;
case BluetoothGatt.CONNECTION_PRIORITY_LOW_POWER:
- minInterval = 80; // 100ms
- maxInterval = 100; // 125ms
- latency = 2;
+ minInterval = getResources().getInteger(R.integer.gatt_low_power_min_interval);
+ maxInterval = getResources().getInteger(R.integer.gatt_low_power_max_interval);
+ latency = getResources().getInteger(R.integer.gatt_low_power_latency);
+ break;
+
+ default:
+ // Using the values for CONNECTION_PRIORITY_BALANCED.
+ minInterval =
+ getResources().getInteger(R.integer.gatt_balanced_priority_min_interval);
+ maxInterval =
+ getResources().getInteger(R.integer.gatt_balanced_priority_max_interval);
+ latency = getResources().getInteger(R.integer.gatt_balanced_priority_latency);
break;
}
diff --git a/src/com/android/bluetooth/hfp/HeadsetService.java b/src/com/android/bluetooth/hfp/HeadsetService.java
index f6153cb42..cda51fce1 100755
--- a/src/com/android/bluetooth/hfp/HeadsetService.java
+++ b/src/com/android/bluetooth/hfp/HeadsetService.java
@@ -243,6 +243,21 @@ public class HeadsetService extends ProfileService {
return service.disconnectAudio();
}
+ public void setAudioRouteAllowed(boolean allowed) {
+ HeadsetService service = getService();
+ if (service == null) return;
+ service.setAudioRouteAllowed(allowed);
+ }
+
+ public boolean getAudioRouteAllowed() {
+ HeadsetService service = getService();
+ if (service != null) {
+ return service.getAudioRouteAllowed();
+ }
+
+ return false;
+ }
+
public boolean startScoUsingVirtualVoiceCall(BluetoothDevice device) {
HeadsetService service = getService();
if (service == null) return false;
@@ -448,6 +463,14 @@ public class HeadsetService extends ProfileService {
return mStateMachine.getAudioState(device);
}
+ public void setAudioRouteAllowed(boolean allowed) {
+ mStateMachine.setAudioRouteAllowed(allowed);
+ }
+
+ public boolean getAudioRouteAllowed() {
+ return mStateMachine.getAudioRouteAllowed();
+ }
+
boolean connectAudio() {
// TODO(BT) BLUETOOTH or BLUETOOTH_ADMIN permission
enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index 0cf5f335f..fc55bae77 100644
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -162,6 +162,9 @@ final class HeadsetStateMachine extends StateMachine {
private IBluetoothHeadsetPhone mPhoneProxy;
private boolean mNativeAvailable;
+ // Indicates whether audio can be routed to the device.
+ private boolean mAudioRouteAllowed = true;
+
// mCurrentDevice is the device connected before the state changes
// mTargetDevice is the device to be connected
// mIncomingDevice is the device connecting to us, valid only in Pending state
@@ -2153,6 +2156,14 @@ final class HeadsetStateMachine extends StateMachine {
return false;
}
+ public void setAudioRouteAllowed(boolean allowed) {
+ mAudioRouteAllowed = allowed;
+ }
+
+ public boolean getAudioRouteAllowed() {
+ return mAudioRouteAllowed;
+ }
+
int getAudioState(BluetoothDevice device) {
synchronized(this) {
if (mConnectedDevicesList.size() == 0) {
@@ -3292,7 +3303,7 @@ final class HeadsetStateMachine extends StateMachine {
// Accept incoming SCO only when there is active call, VR activated,
// active VOIP call
private boolean isScoAcceptable() {
- return (mVoiceRecognitionStarted || isInCall());
+ return mAudioRouteAllowed && (mVoiceRecognitionStarted || isInCall());
}
boolean isConnected() {
diff --git a/src/com/android/bluetooth/hfpclient/HeadsetClientService.java b/src/com/android/bluetooth/hfpclient/HeadsetClientService.java
index d7eb12d91..484eda0fb 100644
--- a/src/com/android/bluetooth/hfpclient/HeadsetClientService.java
+++ b/src/com/android/bluetooth/hfpclient/HeadsetClientService.java
@@ -80,7 +80,9 @@ public class HeadsetClientService extends ProfileService {
} catch (Exception e) {
Log.w(TAG, "Unable to unregister broadcast receiver", e);
}
- mStateMachine.doQuit();
+ if (mStateMachine != null) {
+ mStateMachine.doQuit();
+ }
return true;
}
@@ -253,6 +255,24 @@ public class HeadsetClientService extends ProfileService {
}
@Override
+ public void setAudioRouteAllowed(boolean allowed) {
+ HeadsetClientService service = getService();
+ if (service != null) {
+ service.setAudioRouteAllowed(allowed);
+ }
+ }
+
+ @Override
+ public boolean getAudioRouteAllowed() {
+ HeadsetClientService service = getService();
+ if (service != null) {
+ return service.getAudioRouteAllowed();
+ }
+
+ return false;
+ }
+
+ @Override
public boolean connectAudio() {
HeadsetClientService service = getService();
if (service == null) {
@@ -543,6 +563,14 @@ public class HeadsetClientService extends ProfileService {
return mStateMachine.getAudioState(device);
}
+ public void setAudioRouteAllowed(boolean allowed) {
+ mStateMachine.setAudioRouteAllowed(allowed);
+ }
+
+ public boolean getAudioRouteAllowed() {
+ return mStateMachine.getAudioRouteAllowed();
+ }
+
boolean connectAudio() {
enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");
if (!mStateMachine.isConnected()) {
diff --git a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
index 7ff8fcf52..9ae7ba3c8 100644
--- a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
+++ b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
@@ -68,6 +68,8 @@ import java.util.List;
import java.util.Queue;
import java.util.Set;
+import com.android.bluetooth.R;
+
final class HeadsetClientStateMachine extends StateMachine {
private static final String TAG = "HeadsetClientStateMachine";
private static final boolean DBG = false;
@@ -126,8 +128,6 @@ final class HeadsetClientStateMachine extends StateMachine {
private int mIndicatorCallHeld;
private boolean mVgsFromStack = false;
private boolean mVgmFromStack = false;
- private Uri alert = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
- private Ringtone mRingtone = null;
private String mOperatorName;
private String mSubscriberInfo;
@@ -144,6 +144,8 @@ final class HeadsetClientStateMachine extends StateMachine {
private final AudioManager mAudioManager;
private int mAudioState;
+ // Indicates whether audio can be routed to the device.
+ private boolean mAudioRouteAllowed;
private boolean mAudioWbs;
private final BluetoothAdapter mAdapter;
private boolean mNativeAvailable;
@@ -173,18 +175,23 @@ final class HeadsetClientStateMachine extends StateMachine {
ProfileService.println(sb, "mIndicatorCallHeld: " + mIndicatorCallHeld);
ProfileService.println(sb, "mVgsFromStack: " + mVgsFromStack);
ProfileService.println(sb, "mVgmFromStack: " + mVgmFromStack);
- ProfileService.println(sb, "mRingtone: " + mRingtone);
ProfileService.println(sb, "mOperatorName: " + mOperatorName);
ProfileService.println(sb, "mSubscriberInfo: " + mSubscriberInfo);
ProfileService.println(sb, "mVoiceRecognitionActive: " + mVoiceRecognitionActive);
ProfileService.println(sb, "mInBandRingtone: " + mInBandRingtone);
+
ProfileService.println(sb, "mCalls:");
- for (BluetoothHeadsetClientCall call : mCalls.values()) {
- ProfileService.println(sb, " " + call);
+ if (mCalls != null) {
+ for (BluetoothHeadsetClientCall call : mCalls.values()) {
+ ProfileService.println(sb, " " + call);
+ }
}
+
ProfileService.println(sb, "mCallsUpdate:");
- for (BluetoothHeadsetClientCall call : mCallsUpdate.values()) {
- ProfileService.println(sb, " " + call);
+ if (mCallsUpdate != null) {
+ for (BluetoothHeadsetClientCall call : mCallsUpdate.values()) {
+ ProfileService.println(sb, " " + call);
+ }
}
}
@@ -446,11 +453,6 @@ final class HeadsetClientStateMachine extends StateMachine {
private void updateCallSetupIndicator(int callsetup) {
Log.d(TAG, "updateCallSetupIndicator " + callsetup + " " + mPendingAction.first);
- if (mRingtone != null && mRingtone.isPlaying()) {
- Log.d(TAG,"stopping ring after no response");
- mRingtone.stop();
- }
-
if (waitForIndicators(-1, callsetup, -1)) {
return;
}
@@ -1000,10 +1002,6 @@ final class HeadsetClientStateMachine extends StateMachine {
int action;
Log.d(TAG, "rejectCall");
- if ( mRingtone != null && mRingtone.isPlaying()) {
- Log.d(TAG,"stopping ring after call reject");
- mRingtone.stop();
- }
BluetoothHeadsetClientCall c =
getCall(BluetoothHeadsetClientCall.CALL_STATE_INCOMING,
@@ -1216,19 +1214,9 @@ final class HeadsetClientStateMachine extends StateMachine {
mAudioState = BluetoothHeadsetClient.STATE_AUDIO_DISCONNECTED;
mAudioWbs = false;
- if(alert == null) {
- // alert is null, using backup
- alert = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
- if(alert == null) {
- // alert backup is null, using 2nd backup
- alert = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
- }
- }
- if (alert != null) {
- mRingtone = RingtoneManager.getRingtone(mService, alert);
- } else {
- Log.e(TAG,"alert is NULL no ringtone");
- }
+ mAudioRouteAllowed = context.getResources().getBoolean(
+ R.bool.headset_client_initial_audio_route_allowed);
+
mIndicatorNetworkState = HeadsetClientHalConstants.NETWORK_STATE_NOT_AVAILABLE;
mIndicatorNetworkType = HeadsetClientHalConstants.SERVICE_TYPE_HOME;
mIndicatorNetworkSignal = 0;
@@ -1977,24 +1965,6 @@ final class HeadsetClientStateMachine extends StateMachine {
mService.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);
break;
case EVENT_TYPE_RING_INDICATION:
- Log.e(TAG, "start ringing");
- if (mRingtone != null && mRingtone.isPlaying()) {
- Log.d(TAG,"ring already playing");
- break;
- }
- int newAudioMode = AudioManager.MODE_RINGTONE;
- int currMode = mAudioManager.getMode();
- if (currMode != newAudioMode) {
- // request audio focus before setting the new mode
- mAudioManager.requestAudioFocusForCall(AudioManager.MODE_RINGTONE,
- AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
- Log.d(TAG, "setAudioMode Setting audio mode from "
- + currMode + " to " + newAudioMode);
- mAudioManager.setMode(newAudioMode);
- }
- if (mRingtone != null) {
- mRingtone.play();
- }
break;
default:
Log.e(TAG, "Unknown stack event: " + event.type);
@@ -2053,12 +2023,13 @@ final class HeadsetClientStateMachine extends StateMachine {
mAudioWbs = true;
// fall through
case HeadsetClientHalConstants.AUDIO_STATE_CONNECTED:
+ if (!mAudioRouteAllowed) {
+ sendMessage(HeadsetClientStateMachine.DISCONNECT_AUDIO);
+ break;
+ }
+
mAudioState = BluetoothHeadsetClient.STATE_AUDIO_CONNECTED;
// request audio focus for call
- if (mRingtone != null && mRingtone.isPlaying()) {
- Log.d(TAG,"stopping ring and request focus for call");
- mRingtone.stop();
- }
int newAudioMode = AudioManager.MODE_IN_CALL;
int currMode = mAudioManager.getMode();
if (currMode != newAudioMode) {
@@ -2069,6 +2040,11 @@ final class HeadsetClientStateMachine extends StateMachine {
+ currMode + " to " + newAudioMode);
mAudioManager.setMode(newAudioMode);
}
+
+ // We need to set the volume after switching into HFP mode as some Audio HALs
+ // reset the volume to a known-default on mode switch.
+ final int volume =
+ mAudioManager.getStreamVolume(AudioManager.STREAM_BLUETOOTH_SCO);
Log.d(TAG,"hfp_enable=true");
Log.d(TAG,"mAudioWbs is " + mAudioWbs);
if (mAudioWbs) {
@@ -2080,8 +2056,7 @@ final class HeadsetClientStateMachine extends StateMachine {
mAudioManager.setParameters("hfp_set_sampling_rate=8000");
}
mAudioManager.setParameters("hfp_enable=true");
- broadcastAudioState(device, BluetoothHeadsetClient.STATE_AUDIO_CONNECTED,
- BluetoothHeadsetClient.STATE_AUDIO_CONNECTING);
+ mAudioManager.setParameters("hfp_volume=" + volume);
transitionTo(mAudioOn);
break;
case HeadsetClientHalConstants.AUDIO_STATE_CONNECTING:
@@ -2115,6 +2090,9 @@ final class HeadsetClientStateMachine extends StateMachine {
Log.d(TAG, "Enter AudioOn: " + getCurrentMessage().what);
mAudioManager.setStreamSolo(AudioManager.STREAM_BLUETOOTH_SCO, true);
+
+ broadcastAudioState(mCurrentDevice, BluetoothHeadsetClient.STATE_AUDIO_CONNECTED,
+ BluetoothHeadsetClient.STATE_AUDIO_CONNECTING);
}
@Override
@@ -2399,6 +2377,14 @@ final class HeadsetClientStateMachine extends StateMachine {
return (getCurrentState() == mAudioOn);
}
+ public void setAudioRouteAllowed(boolean allowed) {
+ mAudioRouteAllowed = allowed;
+ }
+
+ public boolean getAudioRouteAllowed() {
+ return mAudioRouteAllowed;
+ }
+
synchronized int getAudioState(BluetoothDevice device) {
if (mCurrentDevice == null || !mCurrentDevice.equals(device)) {
return BluetoothHeadsetClient.STATE_AUDIO_DISCONNECTED;
diff --git a/src/com/android/bluetooth/map/BluetoothMapUtils.java b/src/com/android/bluetooth/map/BluetoothMapUtils.java
index f10c4ec00..66ceecc28 100755
--- a/src/com/android/bluetooth/map/BluetoothMapUtils.java
+++ b/src/com/android/bluetooth/map/BluetoothMapUtils.java
@@ -394,16 +394,15 @@ public class BluetoothMapUtils {
static public byte[] truncateUtf8StringToBytearray(String utf8String, int maxLength)
throws UnsupportedEncodingException {
- byte[] utf8Bytes = new byte[utf8String.length() + 1];
+ byte[] utf8Bytes = null;
try {
- System.arraycopy(utf8String.getBytes("UTF-8"), 0,
- utf8Bytes, 0, utf8String.length());
+ utf8Bytes = utf8String.getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
Log.e(TAG,"truncateUtf8StringToBytearray: getBytes exception ", e);
throw e;
}
- if (utf8Bytes.length > maxLength) {
+ if (utf8Bytes.length > (maxLength - 1)) {
/* if 'continuation' byte is in place 200,
* then strip previous bytes until utf-8 start byte is found */
if ( (utf8Bytes[maxLength - 1] & 0xC0) == 0x80 ) {