am e3c4ef80: am 24dce607: DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050

* commit 'e3c4ef80690ff1389367806fcbafaaf019d0f5ca':
  DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/13289050
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 205b8dc..0d20a5a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -132,6 +132,7 @@
                 <data android:mimeType="text/x-vcard" />
                 <data android:mimeType="text/plain" />
                 <data android:mimeType="text/html" />
+                <data android:mimeType="text/xml" />
                 <data android:mimeType="application/zip" />
                 <data android:mimeType="application/vnd.ms-excel" />
                 <data android:mimeType="application/msword" />
diff --git a/jni/com_android_bluetooth_hid.cpp b/jni/com_android_bluetooth_hid.cpp
index 96795e0..adff0f5 100755
--- a/jni/com_android_bluetooth_hid.cpp
+++ b/jni/com_android_bluetooth_hid.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "BluetoothHidServiceJni"
 
-#define LOG_NDEBUG 0
+#define LOG_NDEBUG 1
 
 #define CHECK_CALLBACK_ENV                                                      \
    if (!checkCallbackThread()) {                                                \
@@ -36,6 +36,7 @@
 static jmethodID method_onConnectStateChanged;
 static jmethodID method_onGetProtocolMode;
 static jmethodID method_onGetReport;
+static jmethodID method_onHandshake;
 static jmethodID method_onVirtualUnplug;
 
 static const bthh_interface_t *sBluetoothHidInterface = NULL;
@@ -96,8 +97,42 @@
     sCallbackEnv->DeleteLocalRef(addr);
 }
 
+static void get_report_callback(bt_bdaddr_t *bd_addr, bthh_status_t hh_status, uint8_t *rpt_data, int rpt_size) {
+    jbyteArray addr;
+    jbyteArray data;
+
+    CHECK_CALLBACK_ENV
+    if (hh_status != BTHH_OK) {
+        ALOGE("BTHH Status is not OK!");
+        checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
+        return;
+    }
+
+    addr = sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t));
+    if (!addr) {
+        ALOGE("Fail to new jbyteArray bd addr for get report callback");
+        checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
+        return;
+    }
+    data = sCallbackEnv->NewByteArray(rpt_size);
+    if (!data) {
+        ALOGE("Fail to new jbyteArray data for get report callback");
+        checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
+        sCallbackEnv->DeleteLocalRef(addr);
+        return;
+    }
+
+    sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte *) bd_addr);
+    sCallbackEnv->SetByteArrayRegion(data, 0, rpt_size, (jbyte *) rpt_data);
+
+    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onGetReport, addr, data, (jint) rpt_size);
+    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
+    sCallbackEnv->DeleteLocalRef(addr);
+    sCallbackEnv->DeleteLocalRef(data);
+}
+
 static void virtual_unplug_callback(bt_bdaddr_t *bd_addr, bthh_status_t hh_status) {
-    ALOGD("call to virtual_unplug_callback");
+    ALOGV("call to virtual_unplug_callback");
     jbyteArray addr;
 
     CHECK_CALLBACK_ENV
@@ -129,6 +164,23 @@
     sCallbackEnv->DeleteLocalRef(addr);*/
 }
 
+static void handshake_callback(bt_bdaddr_t *bd_addr, bthh_status_t hh_status)
+{
+    jbyteArray addr;
+
+    CHECK_CALLBACK_ENV
+
+    addr = sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t));
+    if (!addr) {
+        ALOGE("Fail to new jbyteArray bd addr for handshake callback");
+        checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
+        return;
+    }
+    sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte *) bd_addr);
+    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onHandshake, addr, (jint) hh_status);
+    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
+    sCallbackEnv->DeleteLocalRef(addr);
+}
 
 static bthh_callbacks_t sBluetoothHidCallbacks = {
     sizeof(sBluetoothHidCallbacks),
@@ -136,8 +188,9 @@
     NULL,
     get_protocol_mode_callback,
     NULL,
-    NULL,
-    virtual_unplug_callback
+    get_report_callback,
+    virtual_unplug_callback,
+    handshake_callback
 };
 
 // Define native functions
@@ -149,6 +202,8 @@
 
     method_onConnectStateChanged = env->GetMethodID(clazz, "onConnectStateChanged", "([BI)V");
     method_onGetProtocolMode = env->GetMethodID(clazz, "onGetProtocolMode", "([BI)V");
+    method_onGetReport = env->GetMethodID(clazz, "onGetReport", "([B[BI)V");
+    method_onHandshake = env->GetMethodID(clazz, "onHandshake", "([BI)V");
     method_onVirtualUnplug = env->GetMethodID(clazz, "onVirtualUnplug", "([BI)V");
 
 /*
@@ -364,7 +419,7 @@
 }
 
 static jboolean getReportNative(JNIEnv *env, jobject object, jbyteArray address, jbyte reportType, jbyte reportId, jint bufferSize) {
-    ALOGD("%s: reportType = %d, reportId = %d, bufferSize = %d", __FUNCTION__, reportType, reportId, bufferSize);
+    ALOGV("%s: reportType = %d, reportId = %d, bufferSize = %d", __FUNCTION__, reportType, reportId, bufferSize);
 
     bt_status_t status;
     jbyte *addr;
@@ -392,7 +447,7 @@
 
 
 static jboolean setReportNative(JNIEnv *env, jobject object, jbyteArray address, jbyte reportType, jstring report) {
-    ALOGD("%s: reportType = %d", __FUNCTION__, reportType);
+    ALOGV("%s: reportType = %d", __FUNCTION__, reportType);
     bt_status_t status;
     jbyte *addr;
     jboolean ret = JNI_TRUE;
@@ -418,7 +473,7 @@
 }
 
 static jboolean sendDataNative(JNIEnv *env, jobject object, jbyteArray address, jstring report) {
-    ALOGD("%s", __FUNCTION__);
+    ALOGV("%s", __FUNCTION__);
     bt_status_t status;
     jbyte *addr;
     jboolean ret = JNI_TRUE;
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d137ef8..a98dda7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,7 +17,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="permdesc_bluetoothShareManager" msgid="8930572979123190223">"للسماح للتطبيق بالدخول إلى إدارة BluetoothShare واستخدامها لنقل الملفات."</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_handoverStatus" msgid="7316032998801933554">"استلام عمليات البث المتعلقة بنقل إمكانية التحكم عبر البلوتوث."</string>
@@ -84,8 +84,8 @@
     <string name="bt_toast_4" msgid="4678812947604395649">"إرسال الملف إلى \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
     <string name="bt_toast_5" msgid="2846870992823019494">"إرسال <xliff:g id="NUMBER">%1$s</xliff:g> من الملفات إلى \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
     <string name="bt_toast_6" msgid="1855266596936622458">"تم إيقاف إرسال الملف إلى \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
-    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"لا توجد مساحة كافية على وحدة تخزين USB لحفظ الملف من \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
-    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"لا توجد مساحة كافية على بطاقة SD لحفظ الملف من \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"‏لا توجد مساحة كافية على وحدة تخزين USB لحفظ الملف من \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"‏لا توجد مساحة كافية على بطاقة SD لحفظ الملف من \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="bt_sm_2_2" msgid="2965243265852680543">"المساحة اللازمة: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"تتم حاليًا معالجة طلبات كثيرة جدًا. حاول مرة أخرى لاحقًا."</string>
     <string name="status_pending" msgid="2503691772030877944">"لم يبدأ نقل الملف بعد."</string>
@@ -95,8 +95,8 @@
     <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_no_sd_card" product="default" msgid="5760944071743325592">"ليس هناك بطاقة SD. أدرج بطاقة SD لحفظ الملفات المنقولة."</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>
diff --git a/res/values-ar/strings_pbap.xml b/res/values-ar/strings_pbap.xml
index c41a2b1..7dee306 100644
--- a/res/values-ar/strings_pbap.xml
+++ b/res/values-ar/strings_pbap.xml
@@ -1,13 +1,13 @@
 <?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">"اكتب مفتاح الجلسة لـ %1$s"</string>
+    <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_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="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_title" msgid="7599854855681573258">"مفتاح الجلسة"</string>
-    <string name="auth_notif_message" msgid="6667218116427605038">"اكتب مفتاح الجلسة لـ %1$s"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"‏اكتب مفتاح الجلسة لـ %1$s"</string>
     <string name="defaultname" msgid="4821590500649090078">"مجموعة أدوات السيارة"</string>
     <string name="unknownName" msgid="2841414754740600042">"اسم غير معروف"</string>
     <string name="localPhoneName" msgid="2349001318925409159">"اسمي"</string>
diff --git a/res/values-ar/test_strings.xml b/res/values-ar/test_strings.xml
index 6f5d316..1b2b49c 100644
--- a/res/values-ar/test_strings.xml
+++ b/res/values-ar/test_strings.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="hello" msgid="1740533743008967039">"مرحبًا بالضيوف، TestActivity"</string>
+    <string name="hello" msgid="1740533743008967039">"‏مرحبًا بالضيوف، TestActivity"</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>
+    <string name="ack_record" msgid="6716152390978472184">"‏سجل Ack"</string>
     <string name="deleteAll_record" msgid="4383349788485210582">"حذف السجل كله"</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>
+    <string name="start_server" msgid="9034821924409165795">"‏بدء الخادم TCP"</string>
+    <string name="notify_server" msgid="4369106744022969655">"‏إعلام الخادم TCP"</string>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..18b938c
--- /dev/null
+++ b/res/values-az-rAZ/strings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Endirmə menecerinə daxil olun."</string>
+    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Tətbiq BluetoothPaylaşım menecerinə daxil ola və faylları ötürmək üçün ondan istifadə edə bilər."</string>
+    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth cihazına girişi ağ siyahıya salın."</string>
+    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Tətbiq Bluetooth cihazını müvəqqəti olaraq ağ siyahıya daxil edə bilər, bununla həmin cihaz istifadəçi təsdiqi olmadan bu cihaza fayllar göndərə biləcək."</string>
+    <string name="permlab_handoverStatus" msgid="7316032998801933554">"BT transfer təhvili yayımlarını əldə edin."</string>
+    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"Bluetooth\'dan transferin təhvil statusu haqqında məlumat əldə etməyə imkan verir."</string>
+    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
+    <string name="unknown_device" msgid="9221903979877041009">"Naməlum cihaz"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Naməlum"</string>
+    <string name="airplane_error_title" msgid="2683839635115739939">"Təyyarə rejimi"</string>
+    <string name="airplane_error_msg" msgid="8698965595254137230">"Təyyarə rejimində Bluetooth istifadə edə bilməzsiniz."</string>
+    <string name="bt_enable_title" msgid="8657832550503456572"></string>
+    <string name="bt_enable_line1" msgid="7203551583048149">"Bluetooth xidmətlərindən istifadə etmək üçün ilk öncə Bluetooth\'u yandırmalısınız."</string>
+    <string name="bt_enable_line2" msgid="4341936569415937994">"İndi Bluetooth\'u yandıraq?"</string>
+    <string name="bt_enable_cancel" msgid="1988832367505151727">"Ləğv et"</string>
+    <string name="bt_enable_ok" msgid="3432462749994538265">"Yandır"</string>
+    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Fayl transferi"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" Sizə <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>) faylını göndərmək istəyir. \n \n Faylı qəbul edirsinizl?"</string>
+    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"İmtina edin"</string>
+    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Qəbul edirəm"</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>\" adlı istifadəçidən gələn faylı qəbul edərkən gecikmə baş verdi"</string>
+    <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth paylaşım: Gələn fayl"</string>
+    <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Bu faylı qəbul etmək istəyirsiniz?"</string>
+    <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Başqa cihazdan fayl gəlir. Qəbul etmə istəyinizi təsdiq edin."</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> qəbul edilir"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> qəbul edildi"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> faylı qəbul edilmədi"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> göndərilir"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> göndərildi"</string>
+    <string name="notification_sent_complete" msgid="302943281067557969">"100% tamamlandı"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> göndərilmədi"</string>
+    <string name="download_title" msgid="3353228219772092586">"Fayl transferi"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Kimdən: \" <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>
+    <string name="download_line3" msgid="4384821622908676061">"Fayl ölçüsü: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="download_line4" msgid="8535996869722666525"></string>
+    <string name="download_line5" msgid="3069560415845295386">"Fayl qəbulu edilir..."</string>
+    <string name="download_cancel" msgid="9177305996747500768">"Dayandır"</string>
+    <string name="download_ok" msgid="5000360731674466039">"Gizlət"</string>
+    <string name="download_fail_line1" msgid="3846450148862894552">"Fayl qəbul edilmədi"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Fayl: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="3451040656154861722">"Səbəb: <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">"Fayl qəbul edildi"</string>
+    <string name="download_succ_ok" msgid="7053688246357050216">"Aç"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Kimə: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="4920689672457037437">"Fayl tipi: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
+    <string name="upload_line5" msgid="7759322537674229752">"Fayl göndərilir..."</string>
+    <string name="upload_succ_line5" msgid="5687317197463383601">"Fayl göndərildi"</string>
+    <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
+    <string name="upload_fail_line1" msgid="7899394672421491701">"Fayl \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" adlı istifadəçiyə göndərilmədi.."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fayl: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="upload_fail_ok" msgid="5807702461606714296">"Yenidən cəhd edin"</string>
+    <string name="upload_fail_cancel" msgid="9118496285835687125">"Qapadın"</string>
+    <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
+    <string name="unknown_file" msgid="6092727753965095366">"Naməlum fayl"</string>
+    <string name="unknown_file_desc" msgid="480434281415453287">"Bu fayl növünü idarə etmək üçün heç bir tətbiq yoxdur. \n"</string>
+    <string name="not_exist_file" msgid="3489434189599716133">"Fayl yoxdur"</string>
+    <string name="not_exist_file_desc" msgid="4059531573790529229">"Fayl mövcud deyil. \n"</string>
+    <string name="enabling_progress_title" msgid="436157952334723406">"Lütfən, gözləyin..."</string>
+    <string name="enabling_progress_content" msgid="4601542238119927904">"Bluetooth yandırılır..."</string>
+    <string name="bt_toast_1" msgid="972182708034353383">"Fayl qəbul ediləcək. Gedişatı Bildiriş panelində yoxlayın."</string>
+    <string name="bt_toast_2" msgid="8602553334099066582">"Fayl qəbul edilə bilməz."</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" tərəfindən faylın göndərilməsi dayandırıldı"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" adlı istifadəçiyə fayl göndərilir"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"\"<xliff:g id="RECIPIENT">%2$s</xliff:g>\" adlı istifadəçiyə <xliff:g id="NUMBER">%1$s</xliff:g> fayl göndərilir"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" adlı istifadəçiyə faylın göndərilməsi dayandırıldı"</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" tərəfindən göndərilən faylı saxlamaq üçün USB yaddaşında kifayət qədər yer yoxdur."</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" tərəfindən göndərilən faylı saxlamaq üçün SD kartda kifayət qədər yer yoxdur."</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Gərəkli: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Həddindən çox sorğu işlənilir. Sonra bir daha cəhd edin."</string>
+    <string name="status_pending" msgid="2503691772030877944">"Fayl transferi hələ başlamayıb."</string>
+    <string name="status_running" msgid="6562808920311008696">"Fayl transferi davam edir."</string>
+    <string name="status_success" msgid="239573225847565868">"Fayl transferi uğurla sona çatdı."</string>
+    <string name="status_not_accept" msgid="1695082417193780738">"Kontent dəstəklənmir."</string>
+    <string name="status_forbidden" msgid="613956401054050725">"Transfer hədəf cihaz tərəfindən qadağan edilib."</string>
+    <string name="status_canceled" msgid="6664490318773098285">"Transfer istifadəçi tərəfindən ləğv edildi."</string>
+    <string name="status_file_error" msgid="3671917770630165299">"Yaddaş problemi."</string>
+    <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"USB yaddaş yoxdur."</string>
+    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"SD kart yoxdur. Transfer edilən faylları saxlamaq üçün SD kart daxil edin."</string>
+    <string name="status_connection_error" msgid="947681831523219891">"Uğursuz bağlantı."</string>
+    <string name="status_protocol_error" msgid="3245444473429269539">"Sorğu düzgün idarə edilə bilməz."</string>
+    <string name="status_unknown_error" msgid="8156660554237824912">"Naməlum xəta."</string>
+    <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth ilə qəbul edilənlər"</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> tam qəbul olundu."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> tam göndərildi."</string>
+    <string name="inbound_history_title" msgid="6940914942271327563">"Gələn transferlər"</string>
+    <string name="outbound_history_title" msgid="4279418703178140526">"Gedən transferlər"</string>
+    <string name="no_transfers" msgid="3482965619151865672">"Transfer tarixi boşdur."</string>
+    <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>
+    <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>
+    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Silin"</string>
+</resources>
diff --git a/res/values-az-rAZ/strings_pbap.xml b/res/values-az-rAZ/strings_pbap.xml
new file mode 100644
index 0000000..dc63c47
--- /dev/null
+++ b/res/values-az-rAZ/strings_pbap.xml
@@ -0,0 +1,15 @@
+<?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">"%1$s üçün seans açarı daxil edin"</string>
+    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth seans açarını tələb olunur"</string>
+    <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"%1$s ilə bağlantı qəbul edərkən fasilə yarandı"</string>
+    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"%1$s ilə seans açarını daxil edərkən fasilə yarandı"</string>
+    <string name="auth_notif_ticker" msgid="1575825798053163744">"Obex təsdiqləmə sorğusu"</string>
+    <string name="auth_notif_title" msgid="7599854855681573258">"Seans Açarı"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"%1$s üçün seans şifrəsini daxil edin"</string>
+    <string name="defaultname" msgid="4821590500649090078">"Maşın dəsti"</string>
+    <string name="unknownName" msgid="2841414754740600042">"Naməlum ad"</string>
+    <string name="localPhoneName" msgid="2349001318925409159">"Mənim adım"</string>
+    <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
+</resources>
diff --git a/res/values-az-rAZ/test_strings.xml b/res/values-az-rAZ/test_strings.xml
new file mode 100644
index 0000000..daf9653
--- /dev/null
+++ b/res/values-az-rAZ/test_strings.xml
@@ -0,0 +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="hello" msgid="1740533743008967039">"Salam Dünya, FəallıqTesti"</string>
+    <string name="app_name" msgid="1203877025577761792">"Bluetooth Paylaşım"</string>
+    <string name="insert_record" msgid="1450997173838378132">"Qeyd daxil edin"</string>
+    <string name="update_record" msgid="2480425402384910635">"Qeydi təsdiq edin"</string>
+    <string name="ack_record" msgid="6716152390978472184">"Ack qeydəalma"</string>
+    <string name="deleteAll_record" msgid="4383349788485210582">"Bütün qeydləri silin"</string>
+    <string name="ok_button" msgid="6519033415223065454">"OK"</string>
+    <string name="delete_record" msgid="4645040331967533724">"Qeydi silin"</string>
+    <string name="start_server" msgid="9034821924409165795">"TCP serverinə başlayın"</string>
+    <string name="notify_server" msgid="4369106744022969655">"TCP serverinə bildirin"</string>
+</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
new file mode 100644
index 0000000..18b938c
--- /dev/null
+++ b/res/values-az/strings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Endirmə menecerinə daxil olun."</string>
+    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Tətbiq BluetoothPaylaşım menecerinə daxil ola və faylları ötürmək üçün ondan istifadə edə bilər."</string>
+    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth cihazına girişi ağ siyahıya salın."</string>
+    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Tətbiq Bluetooth cihazını müvəqqəti olaraq ağ siyahıya daxil edə bilər, bununla həmin cihaz istifadəçi təsdiqi olmadan bu cihaza fayllar göndərə biləcək."</string>
+    <string name="permlab_handoverStatus" msgid="7316032998801933554">"BT transfer təhvili yayımlarını əldə edin."</string>
+    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"Bluetooth\'dan transferin təhvil statusu haqqında məlumat əldə etməyə imkan verir."</string>
+    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
+    <string name="unknown_device" msgid="9221903979877041009">"Naməlum cihaz"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Naməlum"</string>
+    <string name="airplane_error_title" msgid="2683839635115739939">"Təyyarə rejimi"</string>
+    <string name="airplane_error_msg" msgid="8698965595254137230">"Təyyarə rejimində Bluetooth istifadə edə bilməzsiniz."</string>
+    <string name="bt_enable_title" msgid="8657832550503456572"></string>
+    <string name="bt_enable_line1" msgid="7203551583048149">"Bluetooth xidmətlərindən istifadə etmək üçün ilk öncə Bluetooth\'u yandırmalısınız."</string>
+    <string name="bt_enable_line2" msgid="4341936569415937994">"İndi Bluetooth\'u yandıraq?"</string>
+    <string name="bt_enable_cancel" msgid="1988832367505151727">"Ləğv et"</string>
+    <string name="bt_enable_ok" msgid="3432462749994538265">"Yandır"</string>
+    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Fayl transferi"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" Sizə <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>) faylını göndərmək istəyir. \n \n Faylı qəbul edirsinizl?"</string>
+    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"İmtina edin"</string>
+    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Qəbul edirəm"</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>\" adlı istifadəçidən gələn faylı qəbul edərkən gecikmə baş verdi"</string>
+    <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth paylaşım: Gələn fayl"</string>
+    <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Bu faylı qəbul etmək istəyirsiniz?"</string>
+    <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Başqa cihazdan fayl gəlir. Qəbul etmə istəyinizi təsdiq edin."</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> qəbul edilir"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> qəbul edildi"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> faylı qəbul edilmədi"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> göndərilir"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> göndərildi"</string>
+    <string name="notification_sent_complete" msgid="302943281067557969">"100% tamamlandı"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth paylaşım: <xliff:g id="FILE">%1$s</xliff:g> göndərilmədi"</string>
+    <string name="download_title" msgid="3353228219772092586">"Fayl transferi"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Kimdən: \" <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>
+    <string name="download_line3" msgid="4384821622908676061">"Fayl ölçüsü: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="download_line4" msgid="8535996869722666525"></string>
+    <string name="download_line5" msgid="3069560415845295386">"Fayl qəbulu edilir..."</string>
+    <string name="download_cancel" msgid="9177305996747500768">"Dayandır"</string>
+    <string name="download_ok" msgid="5000360731674466039">"Gizlət"</string>
+    <string name="download_fail_line1" msgid="3846450148862894552">"Fayl qəbul edilmədi"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Fayl: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="3451040656154861722">"Səbəb: <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">"Fayl qəbul edildi"</string>
+    <string name="download_succ_ok" msgid="7053688246357050216">"Aç"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Kimə: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="4920689672457037437">"Fayl tipi: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
+    <string name="upload_line5" msgid="7759322537674229752">"Fayl göndərilir..."</string>
+    <string name="upload_succ_line5" msgid="5687317197463383601">"Fayl göndərildi"</string>
+    <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
+    <string name="upload_fail_line1" msgid="7899394672421491701">"Fayl \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" adlı istifadəçiyə göndərilmədi.."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fayl: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="upload_fail_ok" msgid="5807702461606714296">"Yenidən cəhd edin"</string>
+    <string name="upload_fail_cancel" msgid="9118496285835687125">"Qapadın"</string>
+    <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
+    <string name="unknown_file" msgid="6092727753965095366">"Naməlum fayl"</string>
+    <string name="unknown_file_desc" msgid="480434281415453287">"Bu fayl növünü idarə etmək üçün heç bir tətbiq yoxdur. \n"</string>
+    <string name="not_exist_file" msgid="3489434189599716133">"Fayl yoxdur"</string>
+    <string name="not_exist_file_desc" msgid="4059531573790529229">"Fayl mövcud deyil. \n"</string>
+    <string name="enabling_progress_title" msgid="436157952334723406">"Lütfən, gözləyin..."</string>
+    <string name="enabling_progress_content" msgid="4601542238119927904">"Bluetooth yandırılır..."</string>
+    <string name="bt_toast_1" msgid="972182708034353383">"Fayl qəbul ediləcək. Gedişatı Bildiriş panelində yoxlayın."</string>
+    <string name="bt_toast_2" msgid="8602553334099066582">"Fayl qəbul edilə bilməz."</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" tərəfindən faylın göndərilməsi dayandırıldı"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" adlı istifadəçiyə fayl göndərilir"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"\"<xliff:g id="RECIPIENT">%2$s</xliff:g>\" adlı istifadəçiyə <xliff:g id="NUMBER">%1$s</xliff:g> fayl göndərilir"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" adlı istifadəçiyə faylın göndərilməsi dayandırıldı"</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" tərəfindən göndərilən faylı saxlamaq üçün USB yaddaşında kifayət qədər yer yoxdur."</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" tərəfindən göndərilən faylı saxlamaq üçün SD kartda kifayət qədər yer yoxdur."</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Gərəkli: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Həddindən çox sorğu işlənilir. Sonra bir daha cəhd edin."</string>
+    <string name="status_pending" msgid="2503691772030877944">"Fayl transferi hələ başlamayıb."</string>
+    <string name="status_running" msgid="6562808920311008696">"Fayl transferi davam edir."</string>
+    <string name="status_success" msgid="239573225847565868">"Fayl transferi uğurla sona çatdı."</string>
+    <string name="status_not_accept" msgid="1695082417193780738">"Kontent dəstəklənmir."</string>
+    <string name="status_forbidden" msgid="613956401054050725">"Transfer hədəf cihaz tərəfindən qadağan edilib."</string>
+    <string name="status_canceled" msgid="6664490318773098285">"Transfer istifadəçi tərəfindən ləğv edildi."</string>
+    <string name="status_file_error" msgid="3671917770630165299">"Yaddaş problemi."</string>
+    <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"USB yaddaş yoxdur."</string>
+    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"SD kart yoxdur. Transfer edilən faylları saxlamaq üçün SD kart daxil edin."</string>
+    <string name="status_connection_error" msgid="947681831523219891">"Uğursuz bağlantı."</string>
+    <string name="status_protocol_error" msgid="3245444473429269539">"Sorğu düzgün idarə edilə bilməz."</string>
+    <string name="status_unknown_error" msgid="8156660554237824912">"Naməlum xəta."</string>
+    <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth ilə qəbul edilənlər"</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> tam qəbul olundu."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> tam göndərildi."</string>
+    <string name="inbound_history_title" msgid="6940914942271327563">"Gələn transferlər"</string>
+    <string name="outbound_history_title" msgid="4279418703178140526">"Gedən transferlər"</string>
+    <string name="no_transfers" msgid="3482965619151865672">"Transfer tarixi boşdur."</string>
+    <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>
+    <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>
+    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Silin"</string>
+</resources>
diff --git a/res/values-az/strings_pbap.xml b/res/values-az/strings_pbap.xml
new file mode 100644
index 0000000..dc63c47
--- /dev/null
+++ b/res/values-az/strings_pbap.xml
@@ -0,0 +1,15 @@
+<?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">"%1$s üçün seans açarı daxil edin"</string>
+    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth seans açarını tələb olunur"</string>
+    <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"%1$s ilə bağlantı qəbul edərkən fasilə yarandı"</string>
+    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"%1$s ilə seans açarını daxil edərkən fasilə yarandı"</string>
+    <string name="auth_notif_ticker" msgid="1575825798053163744">"Obex təsdiqləmə sorğusu"</string>
+    <string name="auth_notif_title" msgid="7599854855681573258">"Seans Açarı"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"%1$s üçün seans şifrəsini daxil edin"</string>
+    <string name="defaultname" msgid="4821590500649090078">"Maşın dəsti"</string>
+    <string name="unknownName" msgid="2841414754740600042">"Naməlum ad"</string>
+    <string name="localPhoneName" msgid="2349001318925409159">"Mənim adım"</string>
+    <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
+</resources>
diff --git a/res/values-az/test_strings.xml b/res/values-az/test_strings.xml
new file mode 100644
index 0000000..daf9653
--- /dev/null
+++ b/res/values-az/test_strings.xml
@@ -0,0 +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="hello" msgid="1740533743008967039">"Salam Dünya, FəallıqTesti"</string>
+    <string name="app_name" msgid="1203877025577761792">"Bluetooth Paylaşım"</string>
+    <string name="insert_record" msgid="1450997173838378132">"Qeyd daxil edin"</string>
+    <string name="update_record" msgid="2480425402384910635">"Qeydi təsdiq edin"</string>
+    <string name="ack_record" msgid="6716152390978472184">"Ack qeydəalma"</string>
+    <string name="deleteAll_record" msgid="4383349788485210582">"Bütün qeydləri silin"</string>
+    <string name="ok_button" msgid="6519033415223065454">"OK"</string>
+    <string name="delete_record" msgid="4645040331967533724">"Qeydi silin"</string>
+    <string name="start_server" msgid="9034821924409165795">"TCP serverinə başlayın"</string>
+    <string name="notify_server" msgid="4369106744022969655">"TCP serverinə bildirin"</string>
+</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
deleted file mode 100644
index 7b3810b..0000000
--- a/res/values-be/strings.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns: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="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Дазваляе прыкладанням атрымліваць доступ да менеджэра BluetoothShare і выкарыстоўваць яго для перадачы файлаў."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Даданне прылад Bluetooth у белы спiс."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Дазваляе прыкладанням часова ўносiць у белы спіс прылады Bluetooth, дазваляючы iм адпраўляць файлы на гэту прыладу без пацверджання карыстальнiка."</string>
-    <string name="permlab_handoverStatus" msgid="7316032998801933554">"Атрымаць перадачы BT."</string>
-    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"Дазваляе атрымліваць iнфармацыю пра статус перадачы з 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">"Вы не можаце выкарыстоўваць 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>
-    <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="6673812334377911289">"Адпраўнік \"<xliff:g id="SENDER">%1$s</xliff:g>\" хоча адправіць вам файл <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). \n\n Прыняць?"</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">"Перадача праз Bluetooth: уваходны файл"</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">"Перадача праз 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>
-    <string name="notification_sending" msgid="3035748958534983833">"Перадача праз Bluetooth: адпраўка файла <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <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_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>
-    <string name="download_line4" msgid="8535996869722666525"></string>
-    <string name="download_line5" msgid="3069560415845295386">"Атрыманне файла..."</string>
-    <string name="download_cancel" msgid="9177305996747500768">"Спыніць"</string>
-    <string name="download_ok" msgid="5000360731674466039">"Схаваць"</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">"ОК"</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_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="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>
-    <string name="enabling_progress_title" msgid="436157952334723406">"Чакайце..."</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>
-    <string name="bt_toast_4" msgid="4678812947604395649">"Адпраўка файла атрымальніку \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
-    <string name="bt_toast_5" msgid="2846870992823019494">"Адпраўка файлаў (<xliff:g id="NUMBER">%1$s</xliff:g>) атрымальніку \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
-    <string name="bt_toast_6" msgid="1855266596936622458">"Адпраўка файла атрымальніку \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" спыненая"</string>
-    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"Не хапае месца на USB-назапашвальнiку, каб захаваць файл ад адпраўнiка \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
-    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"На SD-карце недастаткова месца, каб захаваць файл ад адпраўніка \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
-    <string name="bt_sm_2_2" msgid="2965243265852680543">"Спатрэбіцца месца: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Апрацоўваецца занадта шмат запытаў. Паспрабуйце пазней."</string>
-    <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_forbidden" msgid="613956401054050725">"Перадача забаронена мэтавай прыладай."</string>
-    <string name="status_canceled" msgid="6664490318773098285">"Перадача адменена карыстальнiкам."</string>
-    <string name="status_file_error" msgid="3671917770630165299">"Праблема ўнутранага сховiшча"</string>
-    <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Няма USB-назапашвальнiка."</string>
-    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Няма 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">"Атрыманае праз 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">"Перадача праз Bluetooth: адпраўленыя файлы"</string>
-    <string name="inbound_noti_title" msgid="4143352641953027595">"Перадача праз Bluetooth: атрыманыя файлы"</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>
-</resources>
diff --git a/res/values-be/strings_pbap.xml b/res/values-be/strings_pbap.xml
deleted file mode 100644
index d80bee3..0000000
--- a/res/values-be/strings_pbap.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">"Увядзіце ключ сеансу для %1$s"</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>
-    <string name="auth_notif_title" msgid="7599854855681573258">"Ключ сесіі"</string>
-    <string name="auth_notif_message" msgid="6667218116427605038">"Увядзіце ключ сеансу для %1$s"</string>
-    <string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
-    <string name="unknownName" msgid="2841414754740600042">"Невядомае імя"</string>
-    <string name="localPhoneName" msgid="2349001318925409159">"Маё імя"</string>
-    <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
-</resources>
diff --git a/res/values-be/test_strings.xml b/res/values-be/test_strings.xml
deleted file mode 100644
index 2307f8e..0000000
--- a/res/values-be/test_strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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">"Hello World, TestActivity"</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">"Запіс"</string>
-    <string name="deleteAll_record" msgid="4383349788485210582">"Выдаліць усе запісы"</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">"Апавясцiць сервер TCP"</string>
-</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9649bc4..ef515d3 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -78,7 +78,7 @@
     <string name="not_exist_file_desc" msgid="4059531573790529229">"Filen findes ikke. \n"</string>
     <string name="enabling_progress_title" msgid="436157952334723406">"Vent..."</string>
     <string name="enabling_progress_content" msgid="4601542238119927904">"Aktiverer Bluetooth..."</string>
-    <string name="bt_toast_1" msgid="972182708034353383">"Filen modtages. Se status i meddelelsespanelet."</string>
+    <string name="bt_toast_1" msgid="972182708034353383">"Filen modtages. Se status i underretningspanelet."</string>
     <string name="bt_toast_2" msgid="8602553334099066582">"Filen kan ikke modtages."</string>
     <string name="bt_toast_3" msgid="6707884165086862518">"Modtagelse af fil fra \"<xliff:g id="SENDER">%1$s</xliff:g>\" stoppet"</string>
     <string name="bt_toast_4" msgid="4678812947604395649">"Sender filen til \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
deleted file mode 100644
index a762536..0000000
--- a/res/values-et/strings.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Pääs allalaadimishalduri juurde."</string>
-    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Võimaldab rakendusel pääseda BluetoothShare\'i haldurisse ja kasutada seda failide edastamiseks."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Lubage Bluetooth-seadme juurdepääs."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Lubab rakendusel lisada Bluetooth-seadme ajutiselt lubatud seadmete loendisse, mis võimaldab seadmel saata faile sellesse seadmesse ilma kasutaja kinnituseta."</string>
-    <string name="permlab_handoverStatus" msgid="7316032998801933554">"Võta vastu BT-üleandmise edastusi."</string>
-    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"Võimaldab võtta vastu Bluetoothi üleandmise olekuteavet."</string>
-    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
-    <string name="unknown_device" msgid="9221903979877041009">"Tundmatu seade"</string>
-    <string name="unknownNumber" msgid="4994750948072751566">"Tundmatu"</string>
-    <string name="airplane_error_title" msgid="2683839635115739939">"Lennurežiim"</string>
-    <string name="airplane_error_msg" msgid="8698965595254137230">"Te ei saa Bluetoothi lennukirežiimis kasutada."</string>
-    <string name="bt_enable_title" msgid="8657832550503456572"></string>
-    <string name="bt_enable_line1" msgid="7203551583048149">"Bluetoothi teenuste kasutamiseks peate esmalt Bluetoothi sisse lülitama."</string>
-    <string name="bt_enable_line2" msgid="4341936569415937994">"Lülitan Bluetoothi kohe sisse?"</string>
-    <string name="bt_enable_cancel" msgid="1988832367505151727">"Tühista"</string>
-    <string name="bt_enable_ok" msgid="3432462749994538265">"Lülita sisse"</string>
-    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Failiedastus"</string>
-    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"<xliff:g id="SENDER">%1$s</xliff:g> soovib teile saata faili <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). \n\n Võtan faili vastu?"</string>
-    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Keeldu"</string>
-    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Nõustun"</string>
-    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Esines ajalõpp sissetuleva faili aktsepteerimisel saatjalt „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
-    <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetoothi jagamine: sissetulev fail"</string>
-    <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Kas soovite selle faili vastu võtta?"</string>
-    <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Sissetulev fail teisest seadmest. Kinnitage, et soovite selle faili vastu võtta."</string>
-    <string name="notification_receiving" msgid="4674648179652543984">"Bluetoothi jagamine: faili <xliff:g id="FILE">%1$s</xliff:g> vastuvõtmine"</string>
-    <string name="notification_received" msgid="3324588019186687985">"Bluetoothi jagamine: <xliff:g id="FILE">%1$s</xliff:g> vastu võetud"</string>
-    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetoothi jagamine: faili <xliff:g id="FILE">%1$s</xliff:g> pole saadud"</string>
-    <string name="notification_sending" msgid="3035748958534983833">"Bluetoothi jagamine: faili <xliff:g id="FILE">%1$s</xliff:g> saatmine"</string>
-    <string name="notification_sent" msgid="9218710861333027778">"Bluetoothi jagamine: fail <xliff:g id="FILE">%1$s</xliff:g> saadetud"</string>
-    <string name="notification_sent_complete" msgid="302943281067557969">"100% lõpetatud"</string>
-    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetoothi jagamine: faili <xliff:g id="FILE">%1$s</xliff:g> ei saadetud"</string>
-    <string name="download_title" msgid="3353228219772092586">"Failiedastus"</string>
-    <string name="download_line1" msgid="4926604799202134144">"Saatja: „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
-    <string name="download_line2" msgid="5876973543019417712">"Fail: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="download_line3" msgid="4384821622908676061">"Faili suurus: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="download_line4" msgid="8535996869722666525"></string>
-    <string name="download_line5" msgid="3069560415845295386">"Faili vastuvõtmine ..."</string>
-    <string name="download_cancel" msgid="9177305996747500768">"Peata"</string>
-    <string name="download_ok" msgid="5000360731674466039">"Peida"</string>
-    <string name="download_fail_line1" msgid="3846450148862894552">"Faili ei saadud"</string>
-    <string name="download_fail_line2" msgid="8950394574689971071">"Fail: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="download_fail_line3" msgid="3451040656154861722">"Põhjus: <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">"Fail vastu võetud"</string>
-    <string name="download_succ_ok" msgid="7053688246357050216">"Ava"</string>
-    <string name="upload_line1" msgid="2055952074059709052">"Saaja: „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
-    <string name="upload_line3" msgid="4920689672457037437">"Faili tüüp: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
-    <string name="upload_line5" msgid="7759322537674229752">"Faili saatmine ..."</string>
-    <string name="upload_succ_line5" msgid="5687317197463383601">"Fail saadetud"</string>
-    <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="7899394672421491701">"Faili ei saadetud kasutajale „<xliff:g id="RECIPIENT">%1$s</xliff:g>”."</string>
-    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fail: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="upload_fail_ok" msgid="5807702461606714296">"Proovige uuesti"</string>
-    <string name="upload_fail_cancel" msgid="9118496285835687125">"Sulge"</string>
-    <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
-    <string name="unknown_file" msgid="6092727753965095366">"Tundmatu fail"</string>
-    <string name="unknown_file_desc" msgid="480434281415453287">"Seda tüüpi faili käsitlemiseks pole sobivat rakendust. \n"</string>
-    <string name="not_exist_file" msgid="3489434189599716133">"Fail puudub"</string>
-    <string name="not_exist_file_desc" msgid="4059531573790529229">"Faili ei ole olemas. \n"</string>
-    <string name="enabling_progress_title" msgid="436157952334723406">"Palun oodake ..."</string>
-    <string name="enabling_progress_content" msgid="4601542238119927904">"Bluetoothi sisselülitamine ..."</string>
-    <string name="bt_toast_1" msgid="972182708034353383">"Fail võetakse vastu. Vaadake edenemist teatiste paneelil."</string>
-    <string name="bt_toast_2" msgid="8602553334099066582">"Faili ei saa vastu võtta."</string>
-    <string name="bt_toast_3" msgid="6707884165086862518">"Faili vastuvõtmine saatjalt „<xliff:g id="SENDER">%1$s</xliff:g>” peatatud"</string>
-    <string name="bt_toast_4" msgid="4678812947604395649">"Faili saatmine saajale „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
-    <string name="bt_toast_5" msgid="2846870992823019494">"<xliff:g id="NUMBER">%1$s</xliff:g> faili saatmine saajale „<xliff:g id="RECIPIENT">%2$s</xliff:g>”"</string>
-    <string name="bt_toast_6" msgid="1855266596936622458">"Faili saatmine saajale „<xliff:g id="RECIPIENT">%1$s</xliff:g>” peatatud"</string>
-    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"USB-mäluseadmes pole saatjalt „<xliff:g id="SENDER">%1$s</xliff:g>” saadud faili salvestamiseks piisavalt ruumi"</string>
-    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"SD-kaardil pole saatjalt „<xliff:g id="SENDER">%1$s</xliff:g>” saadud faili salvestamiseks piisavalt ruumi"</string>
-    <string name="bt_sm_2_2" msgid="2965243265852680543">"Vajalik ruum: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Liiga palju taotlusi on töötlemisel. Proovige hiljem uuesti."</string>
-    <string name="status_pending" msgid="2503691772030877944">"Failiedastust pole veel käivitatud."</string>
-    <string name="status_running" msgid="6562808920311008696">"Failiedastus on pooleli."</string>
-    <string name="status_success" msgid="239573225847565868">"Failiedastuse lõpuleviimine õnnestus."</string>
-    <string name="status_not_accept" msgid="1695082417193780738">"Sisu ei toetata."</string>
-    <string name="status_forbidden" msgid="613956401054050725">"Sihtseade on edastuse keelanud."</string>
-    <string name="status_canceled" msgid="6664490318773098285">"Kasutaja tühistas edastuse."</string>
-    <string name="status_file_error" msgid="3671917770630165299">"Probleem talletamisega."</string>
-    <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"USB-mäluseadet ei leita."</string>
-    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"SD-kaart puudub. Edastatud failide salvestamiseks sisestage SD-kaart."</string>
-    <string name="status_connection_error" msgid="947681831523219891">"Ühendus ebaõnnestus."</string>
-    <string name="status_protocol_error" msgid="3245444473429269539">"Taotlust ei saa õigesti käsitleda."</string>
-    <string name="status_unknown_error" msgid="8156660554237824912">"Tundmatu viga."</string>
-    <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth vastu võetud"</string>
-    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> vastuvõtmine lõpetatud."</string>
-    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> saatmine lõpetatud."</string>
-    <string name="inbound_history_title" msgid="6940914942271327563">"Sissetulevad edastused"</string>
-    <string name="outbound_history_title" msgid="4279418703178140526">"Väljuvad edastused"</string>
-    <string name="no_transfers" msgid="3482965619151865672">"Edastusajalugu on tühi."</string>
-    <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>
-    <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>
-    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Kustuta"</string>
-</resources>
diff --git a/res/values-et/strings_map.xml b/res/values-et/strings_map.xml
deleted file mode 100644
index 8fe1642..0000000
--- a/res/values-et/strings_map.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="map_session_key_dialog_title" msgid="4357431314165953502">"Sisestage seansivõti seadmele %1$s"</string>
-    <string name="map_session_key_dialog_header" msgid="1858363785687455516">"Vajalik Bluetoothi seansivõti"</string>
-    <string name="map_acceptance_timeout_message" msgid="2247454902690565876">"Esines ajalõpp ühenduse aktsepteerimiseks seadmega %1$s"</string>
-    <string name="map_authentication_timeout_message" msgid="2151423397615327066">"Esines ajalõpp seansivõtme sisestamiseks seadmele %1$s"</string>
-    <string name="map_auth_notif_ticker" msgid="8840174807927327119">"Obexi autentimise taotlus"</string>
-    <string name="map_auth_notif_title" msgid="301767019364765129">"Seansivõti"</string>
-    <string name="map_auth_notif_message" msgid="1510095655064214863">"Sisestage seansivõti seadmele %1$s"</string>
-    <string name="map_defaultname" msgid="3805234816465216759">"Autokomplekt"</string>
-    <string name="map_unknownName" msgid="4985352365863687360">"Tundmatu nimi"</string>
-    <string name="map_localPhoneName" msgid="6264496105941797768">"Minu nimi"</string>
-    <string name="map_defaultnumber" msgid="3838264444043503815">"000000"</string>
-</resources>
diff --git a/res/values-et/strings_pbap.xml b/res/values-et/strings_pbap.xml
deleted file mode 100644
index 0346c28..0000000
--- a/res/values-et/strings_pbap.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">"Sisestage seansivõti failile %1$s"</string>
-    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Vajalik Bluetoothi seansivõti"</string>
-    <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"Esines ajalõpp ühenduse aktsepteerimiseks seadmega %1$s"</string>
-    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Esines ajalõpp sisendseansivõtmele failiga %1$s"</string>
-    <string name="auth_notif_ticker" msgid="1575825798053163744">"Obexi autentimise taotlus"</string>
-    <string name="auth_notif_title" msgid="7599854855681573258">"Seansivõti"</string>
-    <string name="auth_notif_message" msgid="6667218116427605038">"Sisestage seansivõti failile %1$s"</string>
-    <string name="defaultname" msgid="4821590500649090078">"Autokomplekt"</string>
-    <string name="unknownName" msgid="2841414754740600042">"Tundmatu nimi"</string>
-    <string name="localPhoneName" msgid="2349001318925409159">"Minu nimi"</string>
-    <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
-</resources>
diff --git a/res/values-et/test_strings.xml b/res/values-et/test_strings.xml
deleted file mode 100644
index 9da0688..0000000
--- a/res/values-et/test_strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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">"Tere, maailm, TestActivity"</string>
-    <string name="app_name" msgid="1203877025577761792">"Bluetoothi jagamine"</string>
-    <string name="insert_record" msgid="1450997173838378132">"Sisestage kirje"</string>
-    <string name="update_record" msgid="2480425402384910635">"Kinnita kirje"</string>
-    <string name="ack_record" msgid="6716152390978472184">"Acki kirje"</string>
-    <string name="deleteAll_record" msgid="4383349788485210582">"Kustuta kõik kirjed"</string>
-    <string name="ok_button" msgid="6519033415223065454">"OK"</string>
-    <string name="delete_record" msgid="4645040331967533724">"Kustuta kirje"</string>
-    <string name="start_server" msgid="9034821924409165795">"Käivita TCP-server"</string>
-    <string name="notify_server" msgid="4369106744022969655">"Teavita TCP-serverit"</string>
-</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9bcc04a..7fc53fa 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -16,8 +16,8 @@
 
 <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">"دسترسی به Download Manager."</string>
-    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"به برنامه برای دسترسی به مدیر BluetoothShare و استفاده از آن برای انتقال فایل‌ها اجازه می‌دهد."</string>
+    <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_handoverStatus" msgid="7316032998801933554">"دریافت پخش‌های عمومی انتقالی از بلوتوث."</string>
@@ -84,8 +84,8 @@
     <string name="bt_toast_4" msgid="4678812947604395649">"ارسال فایل به \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
     <string name="bt_toast_5" msgid="2846870992823019494">"ارسال <xliff:g id="NUMBER">%1$s</xliff:g> فایل به \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
     <string name="bt_toast_6" msgid="1855266596936622458">"ارسال فایل به \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" متوقف شد"</string>
-    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"برای ذخیره فایل از \"<xliff:g id="SENDER">%1$s</xliff:g>\" فضای کافی در حافظهٔ USB موجود نیست"</string>
-    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"برای ذخیره فایل \"<xliff:g id="SENDER">%1$s</xliff:g>\" فضای کافی در کارت SD موجود نیست"</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"‏برای ذخیره فایل از \"<xliff:g id="SENDER">%1$s</xliff:g>\" فضای کافی در حافظهٔ USB موجود نیست"</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"‏برای ذخیره فایل \"<xliff:g id="SENDER">%1$s</xliff:g>\" فضای کافی در کارت SD موجود نیست"</string>
     <string name="bt_sm_2_2" msgid="2965243265852680543">"فضای مورد نیاز: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"درخواست‌های بسیاری در حال انجام هستند. بعداً دوباره امتحان کنید."</string>
     <string name="status_pending" msgid="2503691772030877944">"انتقال فایل هنوز شروع نشده است."</string>
@@ -95,8 +95,8 @@
     <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_no_sd_card" product="default" msgid="5760944071743325592">"هیچ کارت SD موجود نیست. برای ذخیره فایل‌های منتقل شده، یک کارت SD در گوشی قرار دهید."</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>
diff --git a/res/values-fa/strings_pbap.xml b/res/values-fa/strings_pbap.xml
index cd434d7..bc68a89 100644
--- a/res/values-fa/strings_pbap.xml
+++ b/res/values-fa/strings_pbap.xml
@@ -1,13 +1,13 @@
 <?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">"تایپ کلید جلسه برای %1$s"</string>
+    <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_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="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_title" msgid="7599854855681573258">"کلید جلسه"</string>
-    <string name="auth_notif_message" msgid="6667218116427605038">"تایپ کلید جلسه برای %1$s"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"‏تایپ کلید جلسه برای %1$s"</string>
     <string name="defaultname" msgid="4821590500649090078">"کیت خودرو"</string>
     <string name="unknownName" msgid="2841414754740600042">"نام ناشناس"</string>
     <string name="localPhoneName" msgid="2349001318925409159">"نام من"</string>
diff --git a/res/values-fa/test_strings.xml b/res/values-fa/test_strings.xml
index 49670e5..000f3f7 100644
--- a/res/values-fa/test_strings.xml
+++ b/res/values-fa/test_strings.xml
@@ -5,10 +5,10 @@
     <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>
+    <string name="ack_record" msgid="6716152390978472184">"‏سابقه Ack"</string>
     <string name="deleteAll_record" msgid="4383349788485210582">"حذف همه سابقه"</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>
+    <string name="start_server" msgid="9034821924409165795">"‏راه‌اندازی سرور TCP"</string>
+    <string name="notify_server" msgid="4369106744022969655">"‏اعلان سرور TCP"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3a01eff..b4d16fa 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,9 +17,9 @@
 <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="permdesc_bluetoothShareManager" msgid="8930572979123190223">"एप्स को BluetoothShare प्रबंधक में पहुंच प्राप्त करने और फ़ाइलों को स्थानांतरित करने के लिए उसका उपयोग करने देता है."</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="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ऐप्स को Bluetooth उपकरण को इस उपकरण पर फ़ाइल भेजने की‍ अनुमति देकर, उपयोगकर्ता की पुष्टि के बिना अस्‍थायी रूप से श्वेतसूची में शामिल करने देता है."</string>
     <string name="permlab_handoverStatus" msgid="7316032998801933554">"BT हस्तांतरण के स्थानांतरण प्रसारण प्राप्त करें."</string>
     <string name="permdesc_handoverStatus" msgid="4752738070064786310">"Bluetooth से हस्तांतरण के स्थानांतरण की स्थिति को प्राप्त करने देता है."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
@@ -73,7 +73,7 @@
     <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_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>
diff --git a/res/values-hy/strings_map.xml b/res/values-hy/strings_map.xml
deleted file mode 100644
index 91f2078..0000000
--- a/res/values-hy/strings_map.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="map_session_key_dialog_title" msgid="4357431314165953502">"Մուտքագրեք աշխատաշրջանի բանալին %1$s-ի համար"</string>
-    <string name="map_session_key_dialog_header" msgid="1858363785687455516">"Պահանջվում է Bluetooth-ի աշխատաշրջանի բանալի"</string>
-    <string name="map_acceptance_timeout_message" msgid="2247454902690565876">"%1$s-ի հետ կապի ընդունման ժամանակը սպառվեց"</string>
-    <string name="map_authentication_timeout_message" msgid="2151423397615327066">"%1$s-ով աշխատաշրջանի բանալու մուտքագրման ժամանակը սպառվեց"</string>
-    <string name="map_auth_notif_ticker" msgid="8840174807927327119">"Կասեցնել նույնականացման հարցումը"</string>
-    <string name="map_auth_notif_title" msgid="301767019364765129">"Աշխատաշրջանի բանալի"</string>
-    <string name="map_auth_notif_message" msgid="1510095655064214863">"Մուտքագրեք աշխատաշրջանի բանալին %1$s-ի համար"</string>
-    <string name="map_defaultname" msgid="3805234816465216759">"Carkit"</string>
-    <string name="map_unknownName" msgid="4985352365863687360">"Անհայտ անուն"</string>
-    <string name="map_localPhoneName" msgid="6264496105941797768">"Իմ անունը"</string>
-    <string name="map_defaultnumber" msgid="3838264444043503815">"000000"</string>
-</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6590ce8..92e898a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -17,19 +17,19 @@
 <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="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_handoverStatus" msgid="7316032998801933554">"קבל שידורי העברת מסירה של Bluetooth."</string>
-    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"מאפשר קבלת מידע סטטוס של העברת מסירה מ-Bluetooth."</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_handoverStatus" msgid="7316032998801933554">"‏קבל שידורי העברת מסירה של Bluetooth."</string>
+    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"‏מאפשר קבלת מידע סטטוס של העברת מסירה מ-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">"לא ניתן להשתמש ב-Bluetooth במצב טיסה."</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>
+    <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>
@@ -38,16 +38,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">"שיתוף Bluetooth: קובץ נכנס"</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="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>
-    <string name="notification_sending" msgid="3035748958534983833">"שיתוף Bluetooth: שולח את <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <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="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>
+    <string name="notification_sending" msgid="3035748958534983833">"‏שיתוף Bluetooth: שולח את <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <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_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>
@@ -77,15 +77,15 @@
     <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">"מפעיל Bluetooth…"</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>
     <string name="bt_toast_4" msgid="4678812947604395649">"שולח קובץ אל \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
     <string name="bt_toast_5" msgid="2846870992823019494">"שולח <xliff:g id="NUMBER">%1$s</xliff:g> קבצים אל \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
     <string name="bt_toast_6" msgid="1855266596936622458">"שליחת קובץ אל \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" הופסקה"</string>
-    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"אין מספיק שטח פנוי באחסון ה-USB לשמירת הקובץ מאת <xliff:g id="SENDER">%1$s</xliff:g>"</string>
-    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"אין מספיק שטח אחסון בכרטיס ה-SD לשמירת הקובץ מאת <xliff:g id="SENDER">%1$s</xliff:g>"</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"‏אין מספיק שטח פנוי באחסון ה-USB לשמירת הקובץ מאת <xliff:g id="SENDER">%1$s</xliff:g>"</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"‏אין מספיק שטח אחסון בכרטיס ה-SD לשמירת הקובץ מאת <xliff:g id="SENDER">%1$s</xliff:g>"</string>
     <string name="bt_sm_2_2" msgid="2965243265852680543">"שטח דרוש: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"בקשות רבות מדי הועברו לעיבוד. נסה שוב מאוחר יותר."</string>
     <string name="status_pending" msgid="2503691772030877944">"העברת הקובץ עדיין לא החלה."</string>
@@ -95,20 +95,20 @@
     <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_no_sd_card" product="default" msgid="5760944071743325592">"אין כרטיס SD. הכנס כרטיס SD כדי לשמור קבצים שהועברו."</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">"התקבל באמצעות 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="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>
+    <string name="outbound_noti_title" msgid="8051906709452260849">"‏שיתוף Bluetooth: נשלחו קבצים"</string>
+    <string name="inbound_noti_title" msgid="4143352641953027595">"‏שיתוף Bluetooth: התקבלו קבצים"</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>
diff --git a/res/values-iw/strings_pbap.xml b/res/values-iw/strings_pbap.xml
index b4c1193..6e1e932 100644
--- a/res/values-iw/strings_pbap.xml
+++ b/res/values-iw/strings_pbap.xml
@@ -1,13 +1,13 @@
 <?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">"הקלד קוד הפעלה עבור %1$s"</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>
+    <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"‏הקלד קוד הפעלה עבור %1$s"</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>
     <string name="auth_notif_title" msgid="7599854855681573258">"קוד הפעלה"</string>
-    <string name="auth_notif_message" msgid="6667218116427605038">"הקלד קוד הפעלה עבור %1$s"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"‏הקלד קוד הפעלה עבור %1$s"</string>
     <string name="defaultname" msgid="4821590500649090078">"דיבורית לרכב"</string>
     <string name="unknownName" msgid="2841414754740600042">"שם לא ידוע"</string>
     <string name="localPhoneName" msgid="2349001318925409159">"השם שלי"</string>
diff --git a/res/values-iw/test_strings.xml b/res/values-iw/test_strings.xml
index d37e421..3406186 100644
--- a/res/values-iw/test_strings.xml
+++ b/res/values-iw/test_strings.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="hello" msgid="1740533743008967039">"שלום לעולם, TestActivity"</string>
-    <string name="app_name" msgid="1203877025577761792">"שיתוף Bluetooth"</string>
+    <string name="hello" msgid="1740533743008967039">"‏שלום לעולם, TestActivity"</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">"אשר רשומה"</string>
     <string name="deleteAll_record" msgid="4383349788485210582">"מחק את כל הרשומות"</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>
+    <string name="start_server" msgid="9034821924409165795">"‏הפעל שרת TCP"</string>
+    <string name="notify_server" msgid="4369106744022969655">"‏שלח התראה לשרת TCP"</string>
 </resources>
diff --git a/res/values-ka/strings_map.xml b/res/values-ka/strings_map.xml
deleted file mode 100644
index 8e645c4..0000000
--- a/res/values-ka/strings_map.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="map_session_key_dialog_title" msgid="4357431314165953502">"სესიის გასაღები %1$s-ისთვის"</string>
-    <string name="map_session_key_dialog_header" msgid="1858363785687455516">"აუცილებელია Bluetooth სესიის გასაღები"</string>
-    <string name="map_acceptance_timeout_message" msgid="2247454902690565876">"%1$s-თან კავშირის მიღების დრო ამოიწურა"</string>
-    <string name="map_authentication_timeout_message" msgid="2151423397615327066">"%1$s-თან სესიის გასაღების შეყვანის დრო ამოიწურა"</string>
-    <string name="map_auth_notif_ticker" msgid="8840174807927327119">"Obex ავთენტიფიკაციის მოთხოვნა"</string>
-    <string name="map_auth_notif_title" msgid="301767019364765129">"სესიის გასაღები"</string>
-    <string name="map_auth_notif_message" msgid="1510095655064214863">"სესიის გასაღები %1$s-ისთვის"</string>
-    <string name="map_defaultname" msgid="3805234816465216759">"მანქანის ნაკრები"</string>
-    <string name="map_unknownName" msgid="4985352365863687360">"უცნობი სახელი"</string>
-    <string name="map_localPhoneName" msgid="6264496105941797768">"ჩემი სახელი"</string>
-    <string name="map_defaultnumber" msgid="3838264444043503815">"000000"</string>
-</resources>
diff --git a/res/values-km/strings_map.xml b/res/values-km/strings_map.xml
deleted file mode 100644
index 8118669..0000000
--- a/res/values-km/strings_map.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="map_session_key_dialog_title" msgid="4357431314165953502">"បញ្ចូល​សោ​សម័យ​សម្រាប់ %1$s"</string>
-    <string name="map_session_key_dialog_header" msgid="1858363785687455516">"បាន​ទាមទារ​សោ​សម័យ​ប៊្លូធូស"</string>
-    <string name="map_acceptance_timeout_message" msgid="2247454902690565876">"អស់​ពេល​វេលា​ក្នុង​ការ​ទទួល​យក​ការ​តភ្ជាប់​ជាមួយ %1$s"</string>
-    <string name="map_authentication_timeout_message" msgid="2151423397615327066">"អស់​ពេល​​ដើម្បី​បញ្ចូល​សោ​សម័យ​ជាមួយ %1$s"</string>
-    <string name="map_auth_notif_ticker" msgid="8840174807927327119">"សំណើ​ការ​ផ្ទៀងផ្ទាត់ Obex"</string>
-    <string name="map_auth_notif_title" msgid="301767019364765129">"សោ​សម័យ"</string>
-    <string name="map_auth_notif_message" msgid="1510095655064214863">"បញ្ចូល​សោ​សម័យ​សម្រាប់ %1$s"</string>
-    <string name="map_defaultname" msgid="3805234816465216759">"Carkit"</string>
-    <string name="map_unknownName" msgid="4985352365863687360">"មិន​ស្គាល់​ឈ្មោះ"</string>
-    <string name="map_localPhoneName" msgid="6264496105941797768">"ឈ្មោះ​របស់​ខ្ញុំ"</string>
-    <string name="map_defaultnumber" msgid="3838264444043503815">"000000"</string>
-</resources>
diff --git a/res/values-lo/strings_map.xml b/res/values-lo/strings_map.xml
deleted file mode 100644
index dd3a288..0000000
--- a/res/values-lo/strings_map.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="map_session_key_dialog_title" msgid="4357431314165953502">"ພິມລະຫັດເຊສຊັນສຳລັບ %1$s"</string>
-    <string name="map_session_key_dialog_header" msgid="1858363785687455516">"ຕ້ອງມີ Bluetooth ລະຫັດເຊສຊັນ"</string>
-    <string name="map_acceptance_timeout_message" msgid="2247454902690565876">"ໝົດເວລາທີ່ຈະຮັບການເຊື່ອມຕໍ່ກັບ %1$s"</string>
-    <string name="map_authentication_timeout_message" msgid="2151423397615327066">"ເກີດໝົດເວລາກ່ອນທີ່ຈະໃສ່ລະຫັດເຊສຊັນກັບ %1$s"</string>
-    <string name="map_auth_notif_ticker" msgid="8840174807927327119">"ການຮ້ອງຂໍພິສູດຢືນຢັນໂຕ Obex"</string>
-    <string name="map_auth_notif_title" msgid="301767019364765129">"ກະແຈເຊສຊັສ"</string>
-    <string name="map_auth_notif_message" msgid="1510095655064214863">"ພິມລະຫັດເຊສຊັນສຳລັບ %1$s"</string>
-    <string name="map_defaultname" msgid="3805234816465216759">"Carkit"</string>
-    <string name="map_unknownName" msgid="4985352365863687360">"ບໍ່ຮູ້ຊື່"</string>
-    <string name="map_localPhoneName" msgid="6264496105941797768">"ຊື່ຂອງຂ້ອຍ"</string>
-    <string name="map_defaultnumber" msgid="3838264444043503815">"000000"</string>
-</resources>
diff --git a/res/values-mn/strings_map.xml b/res/values-mn/strings_map.xml
deleted file mode 100644
index 45fc07d..0000000
--- a/res/values-mn/strings_map.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="map_session_key_dialog_title" msgid="4357431314165953502">"%1$s-н горимын түлхүүрийг оруулна уу"</string>
-    <string name="map_session_key_dialog_header" msgid="1858363785687455516">"Блютүүт горимын түлхүүр шаардлагатай"</string>
-    <string name="map_acceptance_timeout_message" msgid="2247454902690565876">"%1$s-тай холболт хийхийг зөвшөөрөх явцад хугацаа хэтэрсэн байна"</string>
-    <string name="map_authentication_timeout_message" msgid="2151423397615327066">"%1$s-д горимын түлхүүр оруулах явцад хугацаа хэтэрсэн байна"</string>
-    <string name="map_auth_notif_ticker" msgid="8840174807927327119">"Obex гэрчлэлтийн хүсэлт"</string>
-    <string name="map_auth_notif_title" msgid="301767019364765129">"Горимын Түлхүүр"</string>
-    <string name="map_auth_notif_message" msgid="1510095655064214863">"%1$s-н горимын түлхүүрийг оруулна уу"</string>
-    <string name="map_defaultname" msgid="3805234816465216759">"Carkit"</string>
-    <string name="map_unknownName" msgid="4985352365863687360">"Тодорхойгүй нэр"</string>
-    <string name="map_localPhoneName" msgid="6264496105941797768">"Миний нэр"</string>
-    <string name="map_defaultnumber" msgid="3838264444043503815">"000000"</string>
-</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
deleted file mode 100644
index 84c29e9..0000000
--- a/res/values-ms/strings.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Akses pengurus muat turun."</string>
-    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Membenarkan aplikasi mengakses pengurus Perkongsian Bluetooth dan menggunakannya untuk memindahkan fail."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Akses peranti bluetooth senarai putih."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Membenarkan apl untuk menyenarai putihkan peranti Bluetooth sementara waktu, membolehkan peranti itu menghantar fail ke peranti ini tanpa pengesahan pengguna."</string>
-    <string name="permlab_handoverStatus" msgid="7316032998801933554">"Terima siaran pemindahan penyerahan BT."</string>
-    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"Membolehkan penerimaan maklumat status pemindahan penyerahan dari Bluetooth."</string>
-    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
-    <string name="unknown_device" msgid="9221903979877041009">"Peranti tidak diketahui"</string>
-    <string name="unknownNumber" msgid="4994750948072751566">"Tidak diketahui"</string>
-    <string name="airplane_error_title" msgid="2683839635115739939">"Mod pesawat"</string>
-    <string name="airplane_error_msg" msgid="8698965595254137230">"Anda tidak boleh menggunakan Bluetooth dalam mod Pesawat."</string>
-    <string name="bt_enable_title" msgid="8657832550503456572"></string>
-    <string name="bt_enable_line1" msgid="7203551583048149">"Untuk menggunakan perkhidmatan Bluetooth, anda perlu menghidupkan Bluetooth terlebih dahulu."</string>
-    <string name="bt_enable_line2" msgid="4341936569415937994">"Hidupkan Bluetooth sekarang?"</string>
-    <string name="bt_enable_cancel" msgid="1988832367505151727">"Batal"</string>
-    <string name="bt_enable_ok" msgid="3432462749994538265">"Hidupkan"</string>
-    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Pemindahan fail"</string>
-    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" mahu menghantar <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>) kepada anda. \n\n Terima fail?"</string>
-    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Tolak"</string>
-    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Terima"</string>
-    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Berlaku tamat masa semasa menerima fail masuk daripada \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
-    <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Perkongsian Bluetooth: Fail masuk"</string>
-    <string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"Adakah anda mahu menerima fail ini?"</string>
-    <string name="incoming_file_toast_msg" msgid="1733710749992901811">"Fail masuk daripada peranti lain. Sila sahkan bahawa anda mahu menerima fail ini."</string>
-    <string name="notification_receiving" msgid="4674648179652543984">"Perkongsian Bluetooth: Menerima <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="notification_received" msgid="3324588019186687985">"Perkongsian Bluetooth: Diterima <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="notification_received_fail" msgid="3619350997285714746">"Perkongsian Bluetooth: Fail <xliff:g id="FILE">%1$s</xliff:g> tidak diterima"</string>
-    <string name="notification_sending" msgid="3035748958534983833">"Perkongsian Bluetooth: Menghantar <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="notification_sent" msgid="9218710861333027778">"Perkongsian Bluetooth: Dihantar <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="notification_sent_complete" msgid="302943281067557969">"Selesai 100%"</string>
-    <string name="notification_sent_fail" msgid="6696082233774569445">"Perkongsian Bluetooth: Fail <xliff:g id="FILE">%1$s</xliff:g> tidak dihantar"</string>
-    <string name="download_title" msgid="3353228219772092586">"Pemindahan fail"</string>
-    <string name="download_line1" msgid="4926604799202134144">"Daripada: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
-    <string name="download_line2" msgid="5876973543019417712">"Fail: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="download_line3" msgid="4384821622908676061">"Saiz fail: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="download_line4" msgid="8535996869722666525"></string>
-    <string name="download_line5" msgid="3069560415845295386">"Menerima fail..."</string>
-    <string name="download_cancel" msgid="9177305996747500768">"Berhenti"</string>
-    <string name="download_ok" msgid="5000360731674466039">"Sembunyi"</string>
-    <string name="download_fail_line1" msgid="3846450148862894552">"Fail tidak diterima"</string>
-    <string name="download_fail_line2" msgid="8950394574689971071">"Fail: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="download_fail_line3" msgid="3451040656154861722">"Sebab: <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">"Fail diterima"</string>
-    <string name="download_succ_ok" msgid="7053688246357050216">"Buka"</string>
-    <string name="upload_line1" msgid="2055952074059709052">"Kepada: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
-    <string name="upload_line3" msgid="4920689672457037437">"Jenis fail: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
-    <string name="upload_line5" msgid="7759322537674229752">"Menghantar fail..."</string>
-    <string name="upload_succ_line5" msgid="5687317197463383601">"Fail telah dihantar"</string>
-    <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="7899394672421491701">"Fail tidak dihantarkan kepada \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
-    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fail: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="upload_fail_ok" msgid="5807702461606714296">"Cuba lagi"</string>
-    <string name="upload_fail_cancel" msgid="9118496285835687125">"Tutup"</string>
-    <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
-    <string name="unknown_file" msgid="6092727753965095366">"Fail tidak diketahui"</string>
-    <string name="unknown_file_desc" msgid="480434281415453287">"Tiada aplikasi untuk mengendalikan fail jenis ini. \n"</string>
-    <string name="not_exist_file" msgid="3489434189599716133">"Tiada fail"</string>
-    <string name="not_exist_file_desc" msgid="4059531573790529229">"Fail tidak wujud. \n"</string>
-    <string name="enabling_progress_title" msgid="436157952334723406">"Sila tunggu..."</string>
-    <string name="enabling_progress_content" msgid="4601542238119927904">"Menghidupkan Bluetooth..."</string>
-    <string name="bt_toast_1" msgid="972182708034353383">"Fail akan diterima. Semak kemajuan dalam panel Pemberitahuan."</string>
-    <string name="bt_toast_2" msgid="8602553334099066582">"Fail tidak boleh diterima."</string>
-    <string name="bt_toast_3" msgid="6707884165086862518">"Penerimaan fail daripada \"<xliff:g id="SENDER">%1$s</xliff:g>\" dihentikan"</string>
-    <string name="bt_toast_4" msgid="4678812947604395649">"Menghantar fail kepada \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
-    <string name="bt_toast_5" msgid="2846870992823019494">"Menghantar <xliff:g id="NUMBER">%1$s</xliff:g> fail kepada \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
-    <string name="bt_toast_6" msgid="1855266596936622458">"Penghantaran fail ke \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" dihentikan"</string>
-    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"Tiada ruang mencukupi pada storan USB untuk menyimpan fail daripada \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
-    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Tiada ruang mencukupi pada kad SD untuk menyimpan fail daripada \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
-    <string name="bt_sm_2_2" msgid="2965243265852680543">"Ruang diperlukan: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Terlalu banyak permintaan sedang diproses. Cuba sebentar lagi."</string>
-    <string name="status_pending" msgid="2503691772030877944">"Pemindahan fail belum lagi dimulakan."</string>
-    <string name="status_running" msgid="6562808920311008696">"Pemindahan fail sedang berlangsung."</string>
-    <string name="status_success" msgid="239573225847565868">"Pemindahan fail berjaya diselesaikan."</string>
-    <string name="status_not_accept" msgid="1695082417193780738">"Kandungan tidak disokong."</string>
-    <string name="status_forbidden" msgid="613956401054050725">"Pemindahan dilarang oleh peranti sasaran."</string>
-    <string name="status_canceled" msgid="6664490318773098285">"Pemindahan dibatalkan oleh pengguna."</string>
-    <string name="status_file_error" msgid="3671917770630165299">"Isu storan."</string>
-    <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Tiada storan USB."</string>
-    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Tiada kad SD. Masukkan kad SD untuk menyimpan fail yang dipindahkan."</string>
-    <string name="status_connection_error" msgid="947681831523219891">"Sambungan tidak berjaya."</string>
-    <string name="status_protocol_error" msgid="3245444473429269539">"Permintaan tidak dapat dikendalikan dengan betul."</string>
-    <string name="status_unknown_error" msgid="8156660554237824912">"Ralat tidak diketahui."</string>
-    <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> Penerimaan selesai."</string>
-    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Penghantaran selesai."</string>
-    <string name="inbound_history_title" msgid="6940914942271327563">"Pemindahan masuk"</string>
-    <string name="outbound_history_title" msgid="4279418703178140526">"Pemindahan keluar"</string>
-    <string name="no_transfers" msgid="3482965619151865672">"Sejarah pemindahan kosong."</string>
-    <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>
-    <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>
-    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Padam bersih"</string>
-</resources>
diff --git a/res/values-ms/strings_map.xml b/res/values-ms/strings_map.xml
deleted file mode 100644
index afc98d7..0000000
--- a/res/values-ms/strings_map.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="map_session_key_dialog_title" msgid="4357431314165953502">"Taipkan kunci sesi untuk %1$s"</string>
-    <string name="map_session_key_dialog_header" msgid="1858363785687455516">"Kunci sesi Bluetooth diperlukan"</string>
-    <string name="map_acceptance_timeout_message" msgid="2247454902690565876">"Berlaku tamat masa semasa menerima sambungan dengan %1$s"</string>
-    <string name="map_authentication_timeout_message" msgid="2151423397615327066">"Tamat masa berlaku semasa memasukkan kunci sesi dengan %1$s"</string>
-    <string name="map_auth_notif_ticker" msgid="8840174807927327119">"Permintaan pengesahan Obex"</string>
-    <string name="map_auth_notif_title" msgid="301767019364765129">"Kunci Sesi"</string>
-    <string name="map_auth_notif_message" msgid="1510095655064214863">"Taipkan kunci sesi untuk %1$s"</string>
-    <string name="map_defaultname" msgid="3805234816465216759">"Kit kereta"</string>
-    <string name="map_unknownName" msgid="4985352365863687360">"Nama tidak diketahui"</string>
-    <string name="map_localPhoneName" msgid="6264496105941797768">"Nama saya"</string>
-    <string name="map_defaultnumber" msgid="3838264444043503815">"000000"</string>
-</resources>
diff --git a/res/values-ms/strings_pbap.xml b/res/values-ms/strings_pbap.xml
deleted file mode 100644
index 63f873d..0000000
--- a/res/values-ms/strings_pbap.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">"Taipkan kunci sesi untuk %1$s"</string>
-    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Kunci sesi Bluetooth diperlukan"</string>
-    <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"Berlaku tamat masa semasa menerima sambungan dengan %1$s"</string>
-    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Tamat masa berlaku semasa memasukkan kunci sesi dengan %1$s"</string>
-    <string name="auth_notif_ticker" msgid="1575825798053163744">"Permintaan pengesahan Obex"</string>
-    <string name="auth_notif_title" msgid="7599854855681573258">"Kunci Sesi"</string>
-    <string name="auth_notif_message" msgid="6667218116427605038">"Taipkan kunci sesi untuk %1$s"</string>
-    <string name="defaultname" msgid="4821590500649090078">"Kit kereta"</string>
-    <string name="unknownName" msgid="2841414754740600042">"Nama tidak diketahui"</string>
-    <string name="localPhoneName" msgid="2349001318925409159">"Nama saya"</string>
-    <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
-</resources>
diff --git a/res/values-ms/test_strings.xml b/res/values-ms/test_strings.xml
deleted file mode 100644
index ead3bc8..0000000
--- a/res/values-ms/test_strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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">"Hello World, AktivitiUjian"</string>
-    <string name="app_name" msgid="1203877025577761792">"Perkongsian Bluetooth"</string>
-    <string name="insert_record" msgid="1450997173838378132">"Masukkan rekod"</string>
-    <string name="update_record" msgid="2480425402384910635">"Sahkan rekod"</string>
-    <string name="ack_record" msgid="6716152390978472184">"Rekod Ack"</string>
-    <string name="deleteAll_record" msgid="4383349788485210582">"Padamkan semua rekod"</string>
-    <string name="ok_button" msgid="6519033415223065454">"OK"</string>
-    <string name="delete_record" msgid="4645040331967533724">"Padamkan rekod"</string>
-    <string name="start_server" msgid="9034821924409165795">"Mulakan pelayan TCP"</string>
-    <string name="notify_server" msgid="4369106744022969655">"Beritahu pelayan TCP"</string>
-</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
new file mode 100644
index 0000000..d407eb4
--- /dev/null
+++ b/res/values-ne-rNP/strings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns: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="permdesc_bluetoothShareManager" msgid="8930572979123190223">"अनुप्रयोगलाई ब्लुटुथसाझेदारी प्रबन्धक पहुँचको अनुमति दिन्छ र यसलाई फाइलहरू स्थानान्तरण गर्न प्रयोग गर्दछ।"</string>
+    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"स्वेतसूची ब्लुटुथ उपकरण पहुँच।"</string>
+    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"त्यस उपकरणलाई यस उपकरणमा फाइलहरू पठाउन बिना कुनै पुष्टि अनुमति दिँदै अनुप्रयोगलाई अस्थायी रूपमा ब्लुटुथ उपकरणलाई स्वेतसूचीमा राख्न अनुमति दिन्छ।"</string>
+    <string name="permlab_handoverStatus" msgid="7316032998801933554">"BT हस्तान्तरण स्थानान्तरण प्रसारण प्राप्त गर्नुहोस्।"</string>
+    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"ब्लुटुथबाट हस्तान्तरण स्थानान्तरण वस्तुस्थिति जानकारी प्राप्त गर्ने अनुमति दिन्छ।"</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="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_ok" msgid="3432462749994538265">"सक्रिय पार्नुहोस्"</string>
+    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"फाइल स्थानान्तरण"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\" <xliff:g id="SENDER">%1$s</xliff:g>\" ले तपाईँलाई <xliff:g id="FILE">%2$s</xliff:g> ( <xliff:g id="SIZE">%3$s</xliff:g> )। \n \n पठाउन चाहन्छ। फाइल स्वीकार्ने हो?"</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>
+    <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_sent_complete" msgid="302943281067557969">"१००% पुरा"</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>
+    <string name="download_line3" msgid="4384821622908676061">"फाइलको आकार: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="download_line4" msgid="8535996869722666525"></string>
+    <string name="download_line5" msgid="3069560415845295386">"फाइल प्राप्त गर्दै..."</string>
+    <string name="download_cancel" msgid="9177305996747500768">"रोक्नुहोस्"</string>
+    <string name="download_ok" msgid="5000360731674466039">"लुकाउनुहोस्"</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">"ठीक छ"</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_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="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>
+    <string name="enabling_progress_title" msgid="436157952334723406">"कृपया प्रतीक्षा गर्नुहोस्..."</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>
+    <string name="bt_toast_4" msgid="4678812947604395649">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"लाई फाइल पठाउँदै"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"<xliff:g id="NUMBER">%1$s</xliff:g> फाइल \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\"लाई पठाउँदै"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g> \"लाई फाइल पठाउन बन्द भयो"</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" बाट फाइल बचत गर्न USB भण्डारणमा पर्याप्त ठाउँ छैन।"</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" बाट फाइल बचत गर्न SD कार्डमा पर्याप्त ठाउँ छैन"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"ठाउँ चाहियो: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"निकै धेरै अनुरोधहरू प्रसोधिन भइरहेका छन्। पछि फेरि प्रयास गर्नुहोस्।"</string>
+    <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_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_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="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>
+    <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>
+</resources>
diff --git a/res/values-ne-rNP/strings_pbap.xml b/res/values-ne-rNP/strings_pbap.xml
new file mode 100644
index 0000000..c4f28bb
--- /dev/null
+++ b/res/values-ne-rNP/strings_pbap.xml
@@ -0,0 +1,15 @@
+<?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">"%1$sका लागि सत्र कुञ्जी टाइप गर्नुहोस्"</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>
+    <string name="auth_notif_title" msgid="7599854855681573258">"सत्र कुञ्जी"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"%1$s का लागि सत्र कुञ्जी टाइप गर्नुहोस्"</string>
+    <string name="defaultname" msgid="4821590500649090078">"कारकिट"</string>
+    <string name="unknownName" msgid="2841414754740600042">"अज्ञात नाम"</string>
+    <string name="localPhoneName" msgid="2349001318925409159">"मेरो नाम"</string>
+    <string name="defaultnumber" msgid="8520116145890867338">"००००००"</string>
+</resources>
diff --git a/res/values-ne-rNP/test_strings.xml b/res/values-ne-rNP/test_strings.xml
new file mode 100644
index 0000000..7e66f3b
--- /dev/null
+++ b/res/values-ne-rNP/test_strings.xml
@@ -0,0 +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="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>
+    <string name="ack_record" msgid="6716152390978472184">"Ack रेकर्ड"</string>
+    <string name="deleteAll_record" msgid="4383349788485210582">"सबै रेकर्ड मेटाउनुहोस्"</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>
+</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
new file mode 100644
index 0000000..d407eb4
--- /dev/null
+++ b/res/values-ne/strings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns: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="permdesc_bluetoothShareManager" msgid="8930572979123190223">"अनुप्रयोगलाई ब्लुटुथसाझेदारी प्रबन्धक पहुँचको अनुमति दिन्छ र यसलाई फाइलहरू स्थानान्तरण गर्न प्रयोग गर्दछ।"</string>
+    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"स्वेतसूची ब्लुटुथ उपकरण पहुँच।"</string>
+    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"त्यस उपकरणलाई यस उपकरणमा फाइलहरू पठाउन बिना कुनै पुष्टि अनुमति दिँदै अनुप्रयोगलाई अस्थायी रूपमा ब्लुटुथ उपकरणलाई स्वेतसूचीमा राख्न अनुमति दिन्छ।"</string>
+    <string name="permlab_handoverStatus" msgid="7316032998801933554">"BT हस्तान्तरण स्थानान्तरण प्रसारण प्राप्त गर्नुहोस्।"</string>
+    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"ब्लुटुथबाट हस्तान्तरण स्थानान्तरण वस्तुस्थिति जानकारी प्राप्त गर्ने अनुमति दिन्छ।"</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="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_ok" msgid="3432462749994538265">"सक्रिय पार्नुहोस्"</string>
+    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"फाइल स्थानान्तरण"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\" <xliff:g id="SENDER">%1$s</xliff:g>\" ले तपाईँलाई <xliff:g id="FILE">%2$s</xliff:g> ( <xliff:g id="SIZE">%3$s</xliff:g> )। \n \n पठाउन चाहन्छ। फाइल स्वीकार्ने हो?"</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>
+    <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_sent_complete" msgid="302943281067557969">"१००% पुरा"</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>
+    <string name="download_line3" msgid="4384821622908676061">"फाइलको आकार: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="download_line4" msgid="8535996869722666525"></string>
+    <string name="download_line5" msgid="3069560415845295386">"फाइल प्राप्त गर्दै..."</string>
+    <string name="download_cancel" msgid="9177305996747500768">"रोक्नुहोस्"</string>
+    <string name="download_ok" msgid="5000360731674466039">"लुकाउनुहोस्"</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">"ठीक छ"</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_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="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>
+    <string name="enabling_progress_title" msgid="436157952334723406">"कृपया प्रतीक्षा गर्नुहोस्..."</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>
+    <string name="bt_toast_4" msgid="4678812947604395649">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"लाई फाइल पठाउँदै"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"<xliff:g id="NUMBER">%1$s</xliff:g> फाइल \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\"लाई पठाउँदै"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g> \"लाई फाइल पठाउन बन्द भयो"</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" बाट फाइल बचत गर्न USB भण्डारणमा पर्याप्त ठाउँ छैन।"</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" बाट फाइल बचत गर्न SD कार्डमा पर्याप्त ठाउँ छैन"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"ठाउँ चाहियो: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"निकै धेरै अनुरोधहरू प्रसोधिन भइरहेका छन्। पछि फेरि प्रयास गर्नुहोस्।"</string>
+    <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_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_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="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>
+    <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>
+</resources>
diff --git a/res/values-ne/strings_pbap.xml b/res/values-ne/strings_pbap.xml
new file mode 100644
index 0000000..c4f28bb
--- /dev/null
+++ b/res/values-ne/strings_pbap.xml
@@ -0,0 +1,15 @@
+<?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">"%1$sका लागि सत्र कुञ्जी टाइप गर्नुहोस्"</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>
+    <string name="auth_notif_title" msgid="7599854855681573258">"सत्र कुञ्जी"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"%1$s का लागि सत्र कुञ्जी टाइप गर्नुहोस्"</string>
+    <string name="defaultname" msgid="4821590500649090078">"कारकिट"</string>
+    <string name="unknownName" msgid="2841414754740600042">"अज्ञात नाम"</string>
+    <string name="localPhoneName" msgid="2349001318925409159">"मेरो नाम"</string>
+    <string name="defaultnumber" msgid="8520116145890867338">"००००००"</string>
+</resources>
diff --git a/res/values-ne/test_strings.xml b/res/values-ne/test_strings.xml
new file mode 100644
index 0000000..7e66f3b
--- /dev/null
+++ b/res/values-ne/test_strings.xml
@@ -0,0 +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="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>
+    <string name="ack_record" msgid="6716152390978472184">"Ack रेकर्ड"</string>
+    <string name="deleteAll_record" msgid="4383349788485210582">"सबै रेकर्ड मेटाउनुहोस्"</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>
+</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
new file mode 100644
index 0000000..bda20fb
--- /dev/null
+++ b/res/values-si-rLK/strings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns: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="permdesc_bluetoothShareManager" msgid="8930572979123190223">"යෙදුමට බ්ලූටූත් බෙදා ගැනීම් කළමනාකරු වෙත ප්‍රවේශ වීමට ඉඩ දී එය ගොනු මාරු කිරීමට භාවිතා කරන්න."</string>
+    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"බ්ලූටූත් උපාංග ප්‍රවේශය සුදු ලැයිස්තු ගත කරන්න."</string>
+    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"පරිශීලක සහතිකය රහිතව එම උපාංගයට මෙම උපාංගය වෙත ගොනු යැවීමට ඉඩ දෙමින්, බ්ලූටූත් උපාංගයක් තාවකාලිකව සුදු ලැයිස්තු ගත කිරීමට යෙදුමට ඉඩ දෙන්න."</string>
+    <string name="permlab_handoverStatus" msgid="7316032998801933554">"BT බාර දීමේ මාරු විකාශ ලබා ගන්න."</string>
+    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"බ්ලූටූත් වෙතින් බාරදීමේ මාරු තත්ව තොරතුරු ලැබිම ඉඩදෙයි."</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="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_ok" msgid="3432462749994538265">"ක්‍රියාත්මක කරන්න"</string>
+    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"ගොනු මාරුව"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" හට ඔබට <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>) යැවීමට අවශ්‍යයි. \n\n ගොනුව පිළිගන්නද?"</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>
+    <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_sent_complete" msgid="302943281067557969">"100% සම්පූර්ණයි"</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>
+    <string name="download_line3" msgid="4384821622908676061">"ගොනු තරම: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="download_line4" msgid="8535996869722666525"></string>
+    <string name="download_line5" msgid="3069560415845295386">"ගොනුව ලැබේ…"</string>
+    <string name="download_cancel" msgid="9177305996747500768">"නතර කරන්න"</string>
+    <string name="download_ok" msgid="5000360731674466039">"සඟවන්න"</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">"හරි"</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_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="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>
+    <string name="enabling_progress_title" msgid="436157952334723406">"කරුණාකර රැඳී සිටින්න..."</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>
+    <string name="bt_toast_4" msgid="4678812947604395649">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" වෙත ගොනුව යැවේ"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"\"<xliff:g id="RECIPIENT">%2$s</xliff:g>\" වෙත <xliff:g id="NUMBER">%1$s</xliff:g> ගොනු යැවේ"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" වෙත ගොනුව යැවීම නතර විය"</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" වෙතින් ගොනුව සුරැකීමට USB ආචයනය තුළ ප්‍රමාණවත් ඉඩක් නැත"</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" වෙතින් ගොනුව සුරැකීමට SD කාඩ්පත මත ප්‍රමාණවත් ඉඩක් නැත"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"අවශ්‍ය ඉඩ: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"ඉල්ලීම් බොහෝ ගණනක් ක්‍රියාත්මක වෙමින් පවතී. පසුව නැවත උත්සාහ කරන්න."</string>
+    <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_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_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="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>
+    <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>
+</resources>
diff --git a/res/values-si-rLK/strings_pbap.xml b/res/values-si-rLK/strings_pbap.xml
new file mode 100644
index 0000000..e090498
--- /dev/null
+++ b/res/values-si-rLK/strings_pbap.xml
@@ -0,0 +1,15 @@
+<?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">"%1$s සඳහා සැසි යතුර ටයිප් කරන්න"</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>
+    <string name="auth_notif_title" msgid="7599854855681573258">"සැසි යතුර"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"%1$s සඳහා සැසි යතුර ටයිප් කරන්න"</string>
+    <string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
+    <string name="unknownName" msgid="2841414754740600042">"නොදන්නා නමකි"</string>
+    <string name="localPhoneName" msgid="2349001318925409159">"මගේ නම"</string>
+    <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
+</resources>
diff --git a/res/values-si-rLK/test_strings.xml b/res/values-si-rLK/test_strings.xml
new file mode 100644
index 0000000..bf01890
--- /dev/null
+++ b/res/values-si-rLK/test_strings.xml
@@ -0,0 +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="hello" msgid="1740533743008967039">"ආයුබෝවන් ලෝකය, TestActivity"</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>
+    <string name="deleteAll_record" msgid="4383349788485210582">"සියලු වාර්තා මකන්න"</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>
+</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
new file mode 100644
index 0000000..bda20fb
--- /dev/null
+++ b/res/values-si/strings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns: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="permdesc_bluetoothShareManager" msgid="8930572979123190223">"යෙදුමට බ්ලූටූත් බෙදා ගැනීම් කළමනාකරු වෙත ප්‍රවේශ වීමට ඉඩ දී එය ගොනු මාරු කිරීමට භාවිතා කරන්න."</string>
+    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"බ්ලූටූත් උපාංග ප්‍රවේශය සුදු ලැයිස්තු ගත කරන්න."</string>
+    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"පරිශීලක සහතිකය රහිතව එම උපාංගයට මෙම උපාංගය වෙත ගොනු යැවීමට ඉඩ දෙමින්, බ්ලූටූත් උපාංගයක් තාවකාලිකව සුදු ලැයිස්තු ගත කිරීමට යෙදුමට ඉඩ දෙන්න."</string>
+    <string name="permlab_handoverStatus" msgid="7316032998801933554">"BT බාර දීමේ මාරු විකාශ ලබා ගන්න."</string>
+    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"බ්ලූටූත් වෙතින් බාරදීමේ මාරු තත්ව තොරතුරු ලැබිම ඉඩදෙයි."</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="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_ok" msgid="3432462749994538265">"ක්‍රියාත්මක කරන්න"</string>
+    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"ගොනු මාරුව"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" හට ඔබට <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>) යැවීමට අවශ්‍යයි. \n\n ගොනුව පිළිගන්නද?"</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>
+    <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_sent_complete" msgid="302943281067557969">"100% සම්පූර්ණයි"</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>
+    <string name="download_line3" msgid="4384821622908676061">"ගොනු තරම: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="download_line4" msgid="8535996869722666525"></string>
+    <string name="download_line5" msgid="3069560415845295386">"ගොනුව ලැබේ…"</string>
+    <string name="download_cancel" msgid="9177305996747500768">"නතර කරන්න"</string>
+    <string name="download_ok" msgid="5000360731674466039">"සඟවන්න"</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">"හරි"</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_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="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>
+    <string name="enabling_progress_title" msgid="436157952334723406">"කරුණාකර රැඳී සිටින්න..."</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>
+    <string name="bt_toast_4" msgid="4678812947604395649">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" වෙත ගොනුව යැවේ"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"\"<xliff:g id="RECIPIENT">%2$s</xliff:g>\" වෙත <xliff:g id="NUMBER">%1$s</xliff:g> ගොනු යැවේ"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" වෙත ගොනුව යැවීම නතර විය"</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" වෙතින් ගොනුව සුරැකීමට USB ආචයනය තුළ ප්‍රමාණවත් ඉඩක් නැත"</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" වෙතින් ගොනුව සුරැකීමට SD කාඩ්පත මත ප්‍රමාණවත් ඉඩක් නැත"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"අවශ්‍ය ඉඩ: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"ඉල්ලීම් බොහෝ ගණනක් ක්‍රියාත්මක වෙමින් පවතී. පසුව නැවත උත්සාහ කරන්න."</string>
+    <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_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_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="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>
+    <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>
+</resources>
diff --git a/res/values-si/strings_pbap.xml b/res/values-si/strings_pbap.xml
new file mode 100644
index 0000000..e090498
--- /dev/null
+++ b/res/values-si/strings_pbap.xml
@@ -0,0 +1,15 @@
+<?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">"%1$s සඳහා සැසි යතුර ටයිප් කරන්න"</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>
+    <string name="auth_notif_title" msgid="7599854855681573258">"සැසි යතුර"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"%1$s සඳහා සැසි යතුර ටයිප් කරන්න"</string>
+    <string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
+    <string name="unknownName" msgid="2841414754740600042">"නොදන්නා නමකි"</string>
+    <string name="localPhoneName" msgid="2349001318925409159">"මගේ නම"</string>
+    <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
+</resources>
diff --git a/res/values-si/test_strings.xml b/res/values-si/test_strings.xml
new file mode 100644
index 0000000..bf01890
--- /dev/null
+++ b/res/values-si/test_strings.xml
@@ -0,0 +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="hello" msgid="1740533743008967039">"ආයුබෝවන් ලෝකය, TestActivity"</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>
+    <string name="deleteAll_record" msgid="4383349788485210582">"සියලු වාර්තා මකන්න"</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>
+</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7e3522f..198bbb7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/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">"Získať prístup k správcovi preberania."</string>
+    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Získať prístup k správcovi sťahovania."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Umožňuje aplikácii pristupovať k Správcovi BluetoothShare a použiť ho na prenos súborov."</string>
     <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Prístup povoleného zariadenia Bluetooth."</string>
     <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Umožňuje aplikácii dočasne povoliť zariadenie Bluetooth, čím sa povolí zariadeniu odosielať súbory do tohto zariadenia bez potvrdenia používateľa."</string>
diff --git a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
index ebd9117..c9e75c5 100755
--- a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
+++ b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
@@ -567,6 +567,7 @@
                                             BluetoothA2dp.STATE_NOT_PLAYING);
                     }
                     break;
+                case AUDIO_STATE_REMOTE_SUSPEND:
                 case AUDIO_STATE_STOPPED:
                     if (mPlayingA2dpDevice != null) {
                         mPlayingA2dpDevice = null;
diff --git a/src/com/android/bluetooth/a2dp/Avrcp.java b/src/com/android/bluetooth/a2dp/Avrcp.java
index c1ebb70..2db403e 100755
--- a/src/com/android/bluetooth/a2dp/Avrcp.java
+++ b/src/com/android/bluetooth/a2dp/Avrcp.java
@@ -480,13 +480,15 @@
             mCurrentPosMs = getPlayPosition();
         }
 
-        mCurrentPlayState = state;
         if (currentPosMs != RemoteControlClient.PLAYBACK_POSITION_INVALID) {
             mCurrentPosMs = currentPosMs;
         }
-        if (state == RemoteControlClient.PLAYSTATE_PLAYING) {
+        if ((state == RemoteControlClient.PLAYSTATE_PLAYING) &&
+            ((currentPosMs != RemoteControlClient.PLAYBACK_POSITION_INVALID) ||
+            (mCurrentPlayState != RemoteControlClient.PLAYSTATE_PLAYING))) {
             mPlayStartTimeMs = SystemClock.elapsedRealtime();
         }
+        mCurrentPlayState = state;
 
         boolean newPosValid = (mCurrentPosMs !=
                                RemoteControlClient.PLAYBACK_POSITION_ALWAYS_UNKNOWN);
diff --git a/src/com/android/bluetooth/hfp/AtPhonebook.java b/src/com/android/bluetooth/hfp/AtPhonebook.java
index 4528bd6..c9b58de 100755
--- a/src/com/android/bluetooth/hfp/AtPhonebook.java
+++ b/src/com/android/bluetooth/hfp/AtPhonebook.java
@@ -205,15 +205,11 @@
                 if ("SM".equals(mCurrentPhonebook)) {
                     atCommandResponse = "+CPBS: \"SM\",0," + getMaxPhoneBookSize(0);
                     atCommandResult = HeadsetHalConstants.AT_RESPONSE_OK;
-                    if (atCommandResponse != null)
-                        mStateMachine.atResponseStringNative(atCommandResponse);
-                    mStateMachine.atResponseCodeNative(atCommandResult, atCommandErrorCode);
                     break;
                 }
                 PhonebookResult pbr = getPhonebookResult(mCurrentPhonebook, true);
                 if (pbr == null) {
                     atCommandErrorCode = BluetoothCmeError.OPERATION_NOT_SUPPORTED;
-                    mStateMachine.atResponseCodeNative(atCommandResult, atCommandErrorCode);
                     break;
                 }
                 int size = pbr.cursor.getCount();
@@ -232,7 +228,7 @@
                 String[] args = atString.split("=");
                 // Select phonebook memory
                 if (args.length < 2 || !(args[1] instanceof String)) {
-                    mStateMachine.atResponseCodeNative(atCommandResult, atCommandErrorCode);
+                    atCommandErrorCode = BluetoothCmeError.OPERATION_NOT_SUPPORTED;
                     break;
                 }
                 String pb = ((String)args[1]).trim();
@@ -241,7 +237,6 @@
                 if (getPhonebookResult(pb, false) == null && !"SM".equals(pb)) {
                    if (DBG) log("Dont know phonebook: '" + pb + "'");
                    atCommandErrorCode = BluetoothCmeError.OPERATION_NOT_ALLOWED;
-                   mStateMachine.atResponseCodeNative(atCommandResult, atCommandErrorCode);
                    break;
                 }
                 mCurrentPhonebook = pb;
diff --git a/src/com/android/bluetooth/hid/HidService.java b/src/com/android/bluetooth/hid/HidService.java
index 8f2051f..893054a 100755
--- a/src/com/android/bluetooth/hid/HidService.java
+++ b/src/com/android/bluetooth/hid/HidService.java
@@ -67,6 +67,7 @@
     private static final int MESSAGE_SET_REPORT = 10;
     private static final int MESSAGE_SEND_DATA = 11;
     private static final int MESSAGE_ON_VIRTUAL_UNPLUG = 12;
+    private static final int MESSAGE_ON_HANDSHAKE = 13;
 
     static {
         classInitNative();
@@ -240,6 +241,22 @@
                     }
                 }
                 break;
+                case MESSAGE_ON_GET_REPORT:
+                {
+                    BluetoothDevice device = getDevice((byte[])msg.obj);
+                    Bundle data = msg.getData();
+                    byte[] report = data.getByteArray(BluetoothInputDevice.EXTRA_REPORT);
+                    int bufferSize = data.getInt(BluetoothInputDevice.EXTRA_REPORT_BUFFER_SIZE);
+                    broadcastReport(device, report, bufferSize);
+                }
+                break;
+                case MESSAGE_ON_HANDSHAKE:
+                {
+                    BluetoothDevice device = getDevice((byte[])msg.obj);
+                    int status = msg.arg1;
+                    broadcastHandshake(device, status);
+                }
+                break;
                 case MESSAGE_SET_REPORT:
                 {
                     BluetoothDevice device = (BluetoothDevice) msg.obj;
@@ -545,6 +562,23 @@
         mHandler.sendMessage(msg);
     }
 
+    private void onGetReport(byte[] address, byte[] report, int rpt_size) {
+        Message msg = mHandler.obtainMessage(MESSAGE_ON_GET_REPORT);
+        msg.obj = address;
+        Bundle data = new Bundle();
+        data.putByteArray(BluetoothInputDevice.EXTRA_REPORT, report);
+        data.putInt(BluetoothInputDevice.EXTRA_REPORT_BUFFER_SIZE, rpt_size);
+        msg.setData(data);
+        mHandler.sendMessage(msg);
+    }
+
+    private void onHandshake(byte[] address, int status) {
+        Message msg = mHandler.obtainMessage(MESSAGE_ON_HANDSHAKE);
+        msg.obj = address;
+        msg.arg1 = status;
+        mHandler.sendMessage(msg);
+    }
+
     private void onVirtualUnplug(byte[] address, int status) {
         Message msg = mHandler.obtainMessage(MESSAGE_ON_VIRTUAL_UNPLUG);
         msg.obj = address;
@@ -584,6 +618,14 @@
         sendBroadcast(intent, BLUETOOTH_PERM);
     }
 
+    private void broadcastHandshake(BluetoothDevice device, int status) {
+        Intent intent = new Intent(BluetoothInputDevice.ACTION_HANDSHAKE);
+        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+        intent.putExtra(BluetoothInputDevice.EXTRA_STATUS, status);
+        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
+        sendBroadcast(intent, BLUETOOTH_PERM);
+    }
+
     private void broadcastProtocolMode(BluetoothDevice device, int protocolMode) {
         Intent intent = new Intent(BluetoothInputDevice.ACTION_PROTOCOL_MODE_CHANGED);
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
@@ -593,6 +635,15 @@
         if (DBG) log("Protocol Mode (" + device + "): " + protocolMode);
     }
 
+    private void broadcastReport(BluetoothDevice device, byte[] report, int rpt_size) {
+        Intent intent = new Intent(BluetoothInputDevice.ACTION_REPORT);
+        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+        intent.putExtra(BluetoothInputDevice.EXTRA_REPORT, report);
+        intent.putExtra(BluetoothInputDevice.EXTRA_REPORT_BUFFER_SIZE, rpt_size);
+        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
+        sendBroadcast(intent, BLUETOOTH_PERM);
+    }
+
     private void broadcastVirtualUnplugStatus(BluetoothDevice device, int status) {
         Intent intent = new Intent(BluetoothInputDevice.ACTION_VIRTUAL_UNPLUG_STATUS);
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
diff --git a/src/com/android/bluetooth/map/BluetoothMapContentObserver.java b/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
index 11ff0ff..58528f6 100644
--- a/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
+++ b/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
@@ -662,9 +662,7 @@
                         /* Send message if folder is outbox */
                         /* to do, support MMS in the future */
                         /*
-                        if (folder.equals("outbox")) {
                            handle = sendMmsMessage(folder, phone, (BluetoothMapbMessageMmsEmail)msg);
-                        }
                         */
                         break;
                     }
@@ -720,22 +718,16 @@
          *else if folder !outbox:
          *1) push message to folder
          * */
-        if (folder != null && (folder.equalsIgnoreCase("outbox")||  folder.equalsIgnoreCase("drafts"))) {
-            long handle = pushMmsToFolder(Mms.MESSAGE_BOX_DRAFTS, to_address, msg);
-            /* if invalid handle (-1) then just return the handle - else continue sending (if folder is outbox) */
-            if (BluetoothMapAppParams.INVALID_VALUE_PARAMETER != handle && folder.equalsIgnoreCase("outbox")) {
-                moveDraftToOutbox(handle);
+        long handle = pushMmsToFolder(Mms.MESSAGE_BOX_DRAFTS, to_address, msg);
+        /* if invalid handle (-1) then just return the handle - else continue sending (if folder is outbox) */
+        if (BluetoothMapAppParams.INVALID_VALUE_PARAMETER != handle && folder.equalsIgnoreCase("outbox")) {
+            moveDraftToOutbox(handle);
 
-                Intent sendIntent = new Intent("android.intent.action.MMS_SEND_OUTBOX_MSG");
-                Log.d(TAG, "broadcasting intent: "+sendIntent.toString());
-                mContext.sendBroadcast(sendIntent);
-            }
-            return handle;
-        } else {
-            /* not allowed to push mms to anything but outbox/drafts */
-            throw  new IllegalArgumentException("Cannot push message to other folders than outbox/drafts");
+            Intent sendIntent = new Intent("android.intent.action.MMS_SEND_OUTBOX_MSG");
+            Log.d(TAG, "broadcasting intent: "+sendIntent.toString());
+            mContext.sendBroadcast(sendIntent);
         }
-
+        return handle;
     }
 
 
diff --git a/src/com/android/bluetooth/map/BluetoothMapObexServer.java b/src/com/android/bluetooth/map/BluetoothMapObexServer.java
index b497082..6640955 100644
--- a/src/com/android/bluetooth/map/BluetoothMapObexServer.java
+++ b/src/com/android/bluetooth/map/BluetoothMapObexServer.java
@@ -242,6 +242,7 @@
             if(folderName == null || folderName.equals("")) {
                 folderName = mCurrentFolder.getName();
             }
+            folderName = folderName.toLowerCase();
             if(!folderName.equals("outbox") && !folderName.equals("draft")) {
                 if(D) Log.d(TAG, "Push message only allowed to outbox and draft. folderName: " + folderName);
                 return ResponseCodes.OBEX_HTTP_NOT_ACCEPTABLE;
diff --git a/src/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java b/src/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java
index 0f1feac..0fcba3b 100644
--- a/src/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java
+++ b/src/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java
@@ -481,6 +481,7 @@
                 {
                     if(contentTypeParts[j].contains("boundary")) {
                         boundary = contentTypeParts[j].split("boundary[\\s]*=", 2)[1].trim();
+                        boundary = boundary.replaceAll("\"", ""); // " is allowed around a boundary, but is not allowed as part of the boundary
                     }
                 }
             }
@@ -497,49 +498,53 @@
     private void parseMmsMimePart(String partStr) {
         String[] parts = partStr.split("\r\n\r\n", 2); // Split the header from the body
         String body;
+        MimePart newPart = addMimePart();
+        String partEncoding = encoding; /* Use the overall encoding as default */
         if(parts.length != 2) {
             body = partStr;
         } else {
             body = parts[1];
-        }
-        String[] headers = parts[0].split("\r\n");
-        MimePart newPart = addMimePart();
-        String partEncoding = encoding; /* Use the overall encoding as default */
+            String[] headers = parts[0].split("\r\n");
 
-        for(String header : headers) {
-            if(header.length() == 0)
-                continue;
+            for(String header : headers) {
+                if(header.length() == 0)
+                    continue;
 
-            if(header.trim() == "" || header.trim().equals("--")) // Skip empty lines(the \r\n after the boundary tag) and endBoundary tags
-                continue;
-            String[] headerParts = header.split(":",2);
-            if(headerParts.length != 2)
-                throw new IllegalArgumentException("part-Header not formatted correctly: " + header);
-            String headerType = headerParts[0].toUpperCase();
-            String headerValue = headerParts[1].trim();
-            if(headerType.contains("CONTENT-TYPE")) {
-                // TODO: extract charset? Only UTF-8 is allowed for TEXT typed parts
-                newPart.contentType = headerValue;
-                Log.d(TAG, "*** CONTENT-TYPE: " + newPart.contentType);
-            }
-            else if(headerType.contains("CONTENT-LOCATION")) {
-                // This is used if the smil refers to a file name in its src=
-                newPart.contentLocation = headerValue;
-                newPart.partName = headerValue;
-            }
-            else if(headerType.contains("CONTENT-TRANSFER-ENCODING")) {
-                partEncoding = headerValue;
-            }
-            else if(headerType.contains("CONTENT-ID")) {
-                // This is used if the smil refers to a cid:<xxx> in it's src=
-                newPart.contentId = headerValue;
-            }
-            else if(headerType.contains("CONTENT-DISPOSITION")) {
-                // This is used if the smil refers to a cid:<xxx> in it's src=
-                newPart.contentDisposition = headerValue;
-            }
-            else {
-                if(D) Log.w(TAG,"Skipping unknown part-header: " + headerType + " (" + header + ")");
+                if(header.trim() == "" || header.trim().equals("--")) // Skip empty lines(the \r\n after the boundary tag) and endBoundary tags
+                    continue;
+                String[] headerParts = header.split(":",2);
+                if(headerParts.length != 2) {
+                    //throw new IllegalArgumentException("part-Header not formatted correctly: " + header);
+                    // If we find a part without headers, treat the entire content as body
+                    body = partStr;
+                    break;
+                }
+                String headerType = headerParts[0].toUpperCase();
+                String headerValue = headerParts[1].trim();
+                if(headerType.contains("CONTENT-TYPE")) {
+                    // TODO: extract charset? Only UTF-8 is allowed for TEXT typed parts
+                    newPart.contentType = headerValue;
+                    Log.d(TAG, "*** CONTENT-TYPE: " + newPart.contentType);
+                }
+                else if(headerType.contains("CONTENT-LOCATION")) {
+                    // This is used if the smil refers to a file name in its src=
+                    newPart.contentLocation = headerValue;
+                    newPart.partName = headerValue;
+                }
+                else if(headerType.contains("CONTENT-TRANSFER-ENCODING")) {
+                    partEncoding = headerValue;
+                }
+                else if(headerType.contains("CONTENT-ID")) {
+                    // This is used if the smil refers to a cid:<xxx> in it's src=
+                    newPart.contentId = headerValue;
+                }
+                else if(headerType.contains("CONTENT-DISPOSITION")) {
+                    // This is used if the smil refers to a cid:<xxx> in it's src=
+                    newPart.contentDisposition = headerValue;
+                }
+                else {
+                    if(D) Log.w(TAG,"Skipping unknown part-header: " + headerType + " (" + header + ")");
+                }
             }
         }
         // Now for the body
@@ -607,7 +612,7 @@
         else
         {
             mimeParts = messageBody.split("--" + boundary);
-            for(int i = 0; i < mimeParts.length - 1; i++) {
+            for(int i = 1; i < mimeParts.length - 1; i++) {
                 String part = mimeParts[i];
                 if (part != null && (part.length() > 0))
                     parseMmsMimePart(part);
diff --git a/src/com/android/bluetooth/opp/Constants.java b/src/com/android/bluetooth/opp/Constants.java
index 29df875..c31a328 100644
--- a/src/com/android/bluetooth/opp/Constants.java
+++ b/src/com/android/bluetooth/opp/Constants.java
@@ -213,6 +213,7 @@
         "text/x-vcard",
         "text/plain",
         "text/html",
+        "text/xml",
         "application/zip",
         "application/vnd.ms-excel",
         "application/msword",