Import revised translations.

Change-Id: I2024294abb3c97c19f8dd8532c54451bf38df2d1

12 files changed, 114 insertions, 157 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b71281655..8ba083df6 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -16,106 +16,66 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for permlab_bluetoothShareManager (311492132450338925) -->
-    <skip />
-    <!-- no translation found for permdesc_bluetoothShareManager (8739116224907566462) -->
-    <skip />
-    <!-- no translation found for bt_share_picker_label (6268100924487046932) -->
-    <skip />
-    <!-- no translation found for unknown_device (9221903979877041009) -->
-    <skip />
+    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Maak toegang aflaaibestuurder oop."</string>
+    <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Laat die toepassing toe om by BluetoothShare-bestuurder in te gaan en om dit te gebruik om lêers oor te dra."</string>
+    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
+    <string name="unknown_device" msgid="9221903979877041009">"Onbekende toestel"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Onbekend"</string>
-    <!-- no translation found for airplane_error_title (2683839635115739939) -->
-    <skip />
+    <string name="airplane_error_title" msgid="2683839635115739939">"Vliegtuigmodus"</string>
     <string name="airplane_error_msg" msgid="8698965595254137230">"Jy kan nie Bluetooth in vliegtuigmodus gebruik nie."</string>
-    <!-- no translation found for bt_enable_title (2371250311764527124) -->
-    <skip />
-    <!-- no translation found for bt_enable_line1 (7203551583048149) -->
-    <skip />
-    <!-- no translation found for bt_enable_line2 (4341936569415937994) -->
-    <skip />
-    <!-- no translation found for bt_enable_cancel (1988832367505151727) -->
-    <skip />
-    <!-- no translation found for bt_enable_ok (3432462749994538265) -->
-    <skip />
-    <!-- no translation found for incoming_file_confirm_title (8139874248612182627) -->
-    <skip />
+    <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
+    <string name="bt_enable_line1" msgid="7203551583048149">"Om Bluetooth-dienste te kan gebruik, moet jy eers Bluetooth aanskakel."</string>
+    <string name="bt_enable_line2" msgid="4341936569415937994">"Skakel nou Bluetooth aan?"</string>
+    <string name="bt_enable_cancel" msgid="1988832367505151727">"Kanselleer"</string>
+    <string name="bt_enable_ok" msgid="3432462749994538265">"Skakel aan"</string>
+    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Lêeroordrag"</string>
     <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" wil <xliff:g id="FILE">%2$s</xliff:g> vir jou stuur (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" Aanvaar die lêer?"</string>
-    <!-- no translation found for incoming_file_confirm_cancel (2973321832477704805) -->
-    <skip />
-    <!-- no translation found for incoming_file_confirm_ok (281462442932231475) -->
-    <skip />
-    <!-- no translation found for incoming_file_confirm_timeout_ok (860272542827665475) -->
-    <skip />
+    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Wys af"</string>
+    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Aanvaar"</string>
+    <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"Ok"</string>
     <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Daar was \'n uittelling terwyl \'n inkomende lêer van \"<xliff:g id="SENDER">%1$s</xliff:g>\" aanvaar is"</string>
-    <!-- no translation found for incoming_file_confirm_Notification_title (2958227698135117210) -->
-    <skip />
-    <!-- no translation found for incoming_file_confirm_Notification_caption (85804056450169291) -->
-    <skip />
-    <!-- no translation found for incoming_file_toast_msg (5763638110029586276) -->
-    <skip />
+    <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth-deel: Inkomende lêer"</string>
+    <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Bevestig dat jy hierdie lêer wil ontvang"</string>
+    <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Daar is \'n inkomende lêer vanaf \'n ander toestel, bevestig asseblief dat jy hierdie lêer wil ontvang"</string>
     <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth-deling: Ontvang <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="notification_received" msgid="3324588019186687985">"Bluetooth-deling: Het \"<xliff:g id="FILE">%1$s</xliff:g>\" ontvang"</string>
     <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth-deling: Lêer <xliff:g id="FILE">%1$s</xliff:g> nie ontvang nie"</string>
     <string name="notification_sending" msgid="3035748958534983833">"Bluetooth-deling: Stuur <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="notification_sent" msgid="9218710861333027778">"Bluetooth-deling: <xliff:g id="FILE">%1$s</xliff:g> gestuur"</string>
-    <!-- no translation found for notification_sent_complete (302943281067557969) -->
-    <skip />
+    <string name="notification_sent_complete" msgid="302943281067557969">"100% voltooi"</string>
     <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth-deling: Lêer <xliff:g id="FILE">%1$s</xliff:g> nie gestuur nie"</string>
-    <!-- no translation found for download_title (3353228219772092586) -->
-    <skip />
+    <string name="download_title" msgid="3353228219772092586">"Lêeroordrag"</string>
     <string name="download_line1" msgid="4926604799202134144">"Van: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="download_line2" msgid="5876973543019417712">"Lêer: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="download_line3" msgid="4384821622908676061">"Lêergrootte: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
-    <!-- no translation found for download_line5 (3069560415845295386) -->
-    <skip />
-    <!-- no translation found for download_cancel (9177305996747500768) -->
-    <skip />
-    <!-- no translation found for download_ok (5000360731674466039) -->
-    <skip />
-    <!-- no translation found for download_fail_line1 (3846450148862894552) -->
-    <skip />
+    <string name="download_line5" msgid="3069560415845295386">"Ontvang tans lêer…"</string>
+    <string name="download_cancel" msgid="9177305996747500768">"Stop"</string>
+    <string name="download_ok" msgid="5000360731674466039">"Versteek"</string>
+    <string name="download_fail_line1" msgid="3846450148862894552">"Lêer nie ontvang nie"</string>
     <string name="download_fail_line2" msgid="8950394574689971071">"Lêer: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="download_fail_line3" msgid="5611058289180135888">"Rede vir mislukking: <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <!-- no translation found for download_fail_ok (1521733664438320300) -->
-    <skip />
-    <!-- no translation found for download_succ_line5 (4509944688281573595) -->
-    <skip />
-    <!-- no translation found for download_succ_ok (7053688246357050216) -->
-    <skip />
+    <string name="download_fail_ok" msgid="1521733664438320300">"OK"</string>
+    <string name="download_succ_line5" msgid="4509944688281573595">"Lêer ontvang"</string>
+    <string name="download_succ_ok" msgid="7053688246357050216">"Open"</string>
     <string name="upload_line1" msgid="2055952074059709052">"Aan: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
     <string name="upload_line3" msgid="5866755479845641607">"Lêertipe: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
-    <!-- no translation found for upload_line5 (7759322537674229752) -->
-    <skip />
-    <!-- no translation found for upload_succ_line5 (5687317197463383601) -->
-    <skip />
-    <!-- no translation found for upload_succ_ok (7705428476405478828) -->
-    <skip />
+    <string name="upload_line5" msgid="7759322537674229752">"Stuur tans lêer…"</string>
+    <string name="upload_succ_line5" msgid="5687317197463383601">"Lêer gestuur"</string>
+    <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
     <string name="upload_fail_line1" msgid="229249873880944683">"Die lêer is nie na \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" gestuur nie."</string>
     <string name="upload_fail_line1_2" msgid="2108129204050841798">"Lêer: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <!-- no translation found for upload_fail_ok (5807702461606714296) -->
-    <skip />
-    <!-- no translation found for upload_fail_cancel (9118496285835687125) -->
-    <skip />
-    <!-- no translation found for bt_error_btn_ok (5965151173011534240) -->
-    <skip />
-    <!-- no translation found for unknown_file (6092727753965095366) -->
-    <skip />
-    <!-- no translation found for unknown_file_desc (5845231383612478643) -->
-    <skip />
-    <!-- no translation found for not_exist_file (2245958259960700777) -->
-    <skip />
-    <!-- no translation found for not_exist_file_desc (2392808771821464983) -->
-    <skip />
-    <!-- no translation found for enabling_progress_title (436157952334723406) -->
-    <skip />
-    <!-- no translation found for enabling_progress_content (1291028079299309898) -->
-    <skip />
-    <!-- no translation found for bt_toast_1 (972182708034353383) -->
-    <skip />
-    <!-- no translation found for bt_toast_2 (6357386241778417651) -->
-    <skip />
+    <string name="upload_fail_ok" msgid="5807702461606714296">"Probeer weer"</string>
+    <string name="upload_fail_cancel" msgid="9118496285835687125">"Maak toe"</string>
+    <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
+    <string name="unknown_file" msgid="6092727753965095366">"Onbekende lêer"</string>
+    <string name="unknown_file_desc" msgid="5845231383612478643">"Daar is geen toepassing om hierdie lêertipe te hanteer nie. "\n</string>
+    <string name="not_exist_file" msgid="2245958259960700777">"Lêer bestaan nie"</string>
+    <string name="not_exist_file_desc" msgid="2392808771821464983">"Die lêer bestaan nie! "\n</string>
+    <string name="enabling_progress_title" msgid="436157952334723406">"Wag asseblief…"</string>
+    <string name="enabling_progress_content" msgid="1291028079299309898">"Skakel tans Bluetooth aan…"</string>
+    <string name="bt_toast_1" msgid="972182708034353383">"Die lêer sal ontvang word. Kontroleer vordering in die Kennisgewings-paneel."</string>
+    <string name="bt_toast_2" msgid="6357386241778417651">"Die lêer sal nie ontvang word nie."</string>
     <string name="bt_toast_3" msgid="6707884165086862518">"Opgehou om lêer van \"<xliff:g id="SENDER">%1$s</xliff:g>\" te ontvang"</string>
     <string name="bt_toast_4" msgid="4678812947604395649">"Stuur lêer na \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
     <string name="bt_toast_5" msgid="2846870992823019494">"Stuur <xliff:g id="NUMBER">%1$s</xliff:g> lêers na \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
@@ -124,26 +84,19 @@
     <string name="bt_sm_2_1" product="default" msgid="2801238507525833799">"Daar is te min spasie op die SD-kaart om die lêer van \"<xliff:g id="SENDER">%1$s</xliff:g>\" te stoor"</string>
     <string name="bt_sm_2_2" msgid="2965243265852680543">"Spasie nodig: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Te veel versoeke word verwerk. Probeer later weer."</string>
-    <!-- no translation found for status_pending (7446884326084324082) -->
-    <skip />
-    <!-- no translation found for status_running (2695810336448055064) -->
-    <skip />
-    <!-- no translation found for status_success (2268261336330060663) -->
-    <skip />
+    <string name="status_pending" msgid="7446884326084324082">"Lêeroordrag nog nie begin nie"</string>
+    <string name="status_running" msgid="2695810336448055064">"Lêeroordrag is voortdurend"</string>
+    <string name="status_success" msgid="2268261336330060663">"Die lêeroordrag is suksesvol voltooi"</string>
     <string name="status_not_accept" msgid="2489805942397459486">"Inhoud nie ondersteun nie."</string>
-    <!-- no translation found for status_forbidden (8499236547788725258) -->
-    <skip />
-    <!-- no translation found for status_canceled (5514756906439790976) -->
-    <skip />
-    <!-- no translation found for status_file_error (6125632529575521755) -->
-    <skip />
+    <string name="status_forbidden" msgid="8499236547788725258">"Hierdie oordrag word deur die teikentoestel verbied"</string>
+    <string name="status_canceled" msgid="5514756906439790976">"Hierdie oordrag is deur die gebruiker gekanselleer"</string>
+    <string name="status_file_error" msgid="6125632529575521755">"Bergingsprobleem"</string>
     <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Geen USB-berging nie."</string>
-    <!-- outdated translation 1112125377088421469 -->     <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Geen USB-berging nie."</string>
+    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Geen SD-kaart nie. Sit \'n SD-kaart in om oorgedraagde lêers te stoor."</string>
     <string name="status_connection_error" msgid="947681831523219891">"Verbinding onsuksesvol."</string>
     <string name="status_protocol_error" msgid="1199135510987767468">"Die versoek kan nie korrek hanteer word."</string>
     <string name="status_unknown_error" msgid="8156660554237824912">"Onbekende fout"</string>
-    <!-- no translation found for btopp_live_folder (7967791481444474554) -->
-    <skip />
+    <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth ontvang"</string>
     <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g>  volledig ontvang."</string>
     <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> klaar gestuur."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Inkomende oordragte"</string>
diff --git a/res/values-af/strings_pbap.xml b/res/values-af/strings_pbap.xml
index f4e3ef2f7..e781ec3e9 100644
--- a/res/values-af/strings_pbap.xml
+++ b/res/values-af/strings_pbap.xml
@@ -1,25 +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">
-    <!-- no translation found for pbap_session_key_dialog_title (3580996574333882561) -->
-    <skip />
-    <!-- no translation found for pbap_session_key_dialog_header (2772472422782758981) -->
-    <skip />
-    <!-- no translation found for pbap_acceptance_timeout_message (1107401415099814293) -->
-    <skip />
-    <!-- no translation found for pbap_authentication_timeout_message (4166979525521902687) -->
-    <skip />
-    <!-- no translation found for auth_notif_ticker (1575825798053163744) -->
-    <skip />
-    <!-- no translation found for auth_notif_title (7599854855681573258) -->
-    <skip />
-    <!-- no translation found for auth_notif_message (6667218116427605038) -->
-    <skip />
-    <!-- no translation found for defaultname (4821590500649090078) -->
-    <skip />
-    <!-- no translation found for unknownName (2841414754740600042) -->
-    <skip />
+    <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Tipe-sessiesleutel vir %1$s"</string>
+    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth-sessiesleutel benodig"</string>
+    <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"Die tyd het verstryk om verbinding met %1$s te aanvaar"</string>
+    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Die invoer-sessiesleutel met %1$s het uitgetel"</string>
+    <string name="auth_notif_ticker" msgid="1575825798053163744">"Obex-stawingsversoek"</string>
+    <string name="auth_notif_title" msgid="7599854855681573258">"Sessiesleutel"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"Tik sessiesleutel vir %1$s"</string>
+    <string name="defaultname" msgid="4821590500649090078">"Motortoebehore"</string>
+    <string name="unknownName" msgid="2841414754740600042">"Onbekende naam"</string>
     <string name="localPhoneName" msgid="2349001318925409159">"My naam"</string>
-    <!-- no translation found for defaultnumber (8520116145890867338) -->
-    <skip />
+    <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
 </resources>
diff --git a/res/values-af/test_strings.xml b/res/values-af/test_strings.xml
new file mode 100644
index 000000000..1722f5b5a
--- /dev/null
+++ b/res/values-af/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">"Hallo wêreld, TestActivity"</string>
+    <string name="app_name" msgid="1203877025577761792">"Bluetooth-deel"</string>
+    <string name="insert_record" msgid="1450997173838378132">"Voeg rekord in"</string>
+    <string name="update_record" msgid="2480425402384910635">"Bevestig rekord"</string>
+    <string name="ack_record" msgid="6716152390978472184">"Ack-rekord"</string>
+    <string name="deleteAll_record" msgid="4383349788485210582">"Vee alle rekords uit"</string>
+    <string name="ok_button" msgid="6519033415223065454">"OK"</string>
+    <string name="delete_record" msgid="4645040331967533724">"Vee rekord uit"</string>
+    <string name="start_server" msgid="9034821924409165795">"Begin TCP-bediener"</string>
+    <string name="notify_server" msgid="4369106744022969655">"Stel TCP-bediener in kennis"</string>
+</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6a4885e8f..7f7603081 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/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="8739116224907566462">" የብሉቱዝ ማጋሪያ አደራጁን ለመድረስ እና ፋይሎች እንዲያስተላልፉ ለመጠቀም ለመተግበሪያው  ይፈቅዳል።"</string>
+    <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"የብሉቱዝ ማጋሪያ አደራጁን ለመድረስ እና ፋይሎች እንዲያስተላልፉ ለመጠቀም ለመተግበሪያው  ይፈቅዳል።"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ብሉቱዝ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"ያልታወቀ መሣሪያ"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"ያልታወቀ"</string>
@@ -25,12 +25,12 @@
     <string name="airplane_error_msg" msgid="8698965595254137230">"ብሉቱዝበአውሮፕላን ሁነትመጠቀም አይችሉም።"</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"ብሉቱዝ"</string>
     <string name="bt_enable_line1" msgid="7203551583048149">"የብሉቱዝ አገልግሎት ለመጠቀም፣ መጀመሪያ ብሉቱዝን ያብሩ።"</string>
-    <string name="bt_enable_line2" msgid="4341936569415937994">"አብራ  ብሉቱዝ"</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_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_cancel" msgid="2973321832477704805">"አትቀበል"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"ተቀበል"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"እሺ"</string>
     <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"ከ \"<xliff:g id="SENDER">%1$s</xliff:g>\" ገቢ መልዕክት ፋይል እየተቀበለ ሳለ ጊዜ አልቆ ነበር።"</string>
@@ -44,7 +44,7 @@
     <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_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>
@@ -52,11 +52,11 @@
     <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_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="5611058289180135888">"የመታወክ ምክንያት፡ <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_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="5866755479845641607">"የፋይል ዓይነት: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
@@ -65,17 +65,17 @@
     <string name="upload_succ_ok" msgid="7705428476405478828">"እሺ"</string>
     <string name="upload_fail_line1" msgid="229249873880944683">"ፋይሉ ወደ \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" አልተላከም ነበር።"</string>
     <string name="upload_fail_line1_2" msgid="2108129204050841798">"ፋይል: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="upload_fail_ok" msgid="5807702461606714296">"በድጋሚ ሞክር"</string>
+    <string name="upload_fail_ok" msgid="5807702461606714296">"በድጋሚ  ሞክር"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"ዝጋ"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"እሺ"</string>
     <string name="unknown_file" msgid="6092727753965095366">"ያልታወቀ ፋይል"</string>
-    <string name="unknown_file_desc" msgid="5845231383612478643">\n" ይህ አይነት ፋይል ለማስተናገድ ምንም ትግበራ የለም።"</string>
+    <string name="unknown_file_desc" msgid="5845231383612478643">" ይህ አይነት ፋይል ለማስተናገድ ምንም ትግበራ የለም።"\n</string>
     <string name="not_exist_file" msgid="2245958259960700777">"ፋይል የለም"</string>
-    <string name="not_exist_file_desc" msgid="2392808771821464983">"ፋይል የለም"\n</string>
+    <string name="not_exist_file_desc" msgid="2392808771821464983">"ፋይል የለም!"\n</string>
     <string name="enabling_progress_title" msgid="436157952334723406">"እባክዎ ይጠብቁ…"</string>
-    <string name="enabling_progress_content" msgid="1291028079299309898">"ብሉቱዝ በመብራት ላይ...."</string>
+    <string name="enabling_progress_content" msgid="1291028079299309898">"ብሉቱዝ በማብራት ላይ..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"ፋይሉ ይደርሳል።በማሳወቂያ ውስን ቦታ ውስጥ ሂደቱን ተመልከት።"</string>
-    <string name="bt_toast_2" msgid="6357386241778417651">"ፋይሉ አይቀበለውም።"</string>
+    <string name="bt_toast_2" msgid="6357386241778417651">"ፋይሉን አይቀበለውም።"</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>
@@ -84,12 +84,12 @@
     <string name="bt_sm_2_1" product="default" msgid="2801238507525833799">" ከ \"<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="7446884326084324082">"የፋይል ዝውውርገና አልተጀመረም"</string>
-    <string name="status_running" msgid="2695810336448055064">"የፋይል ዝውውር በመኪያሄድ ላይ ነው"</string>
+    <string name="status_pending" msgid="7446884326084324082">"የፋይል ሰደዳገና አልተጀመረም"</string>
+    <string name="status_running" msgid="2695810336448055064">"የፋይል ሰደዳ በመኪያሄድ ላይ ነው"</string>
     <string name="status_success" msgid="2268261336330060663">"የፋይል ዝውውሩ በተሳካ ተጠናቋል"</string>
     <string name="status_not_accept" msgid="2489805942397459486">"ያልታገዘ ይዘት።"</string>
     <string name="status_forbidden" msgid="8499236547788725258">"ይህ ዝውውር በታለመው መሣሪያ የተከለከለ ነው።"</string>
-    <string name="status_canceled" msgid="5514756906439790976">" ይህ ማስተላለፍ በተጠቃሚው ተሰርዟል"</string>
+    <string name="status_canceled" msgid="5514756906439790976">" ይህ ሰደዳ በተጠቃሚው ተሰርዟል"</string>
     <string name="status_file_error" msgid="6125632529575521755">"የማከማቻ ጉዳይ"</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>
diff --git a/res/values-am/strings_pbap.xml b/res/values-am/strings_pbap.xml
index fe777bc63..48d7cb479 100644
--- a/res/values-am/strings_pbap.xml
+++ b/res/values-am/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="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-am/test_strings.xml b/res/values-am/test_strings.xml
index da06eaafd..3b47239d8 100644
--- a/res/values-am/test_strings.xml
+++ b/res/values-am/test_strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="hello" msgid="1740533743008967039">"ታዲያስ አለም፣ የሙከራ እንቅስቃሴ"</string>
+    <string name="hello" msgid="1740533743008967039">"ታዲያስ ዓለም፣ የሙከራ እንቅስቃሴ"</string>
     <string name="app_name" msgid="1203877025577761792">"የብሉቱዝ መጋሪያ"</string>
     <string name="insert_record" msgid="1450997173838378132">"መዝገብ  አስገባ"</string>
     <string name="update_record" msgid="2480425402384910635">"መዝገብ አረጋግጥ"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index af5b4d135..7a3812c34 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -16,19 +16,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">"Fikia kidhibiti cha vipakuzi"</string>
-    <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Huruhusu programu kufikia kidhibiti cha ShirikiBluetooth na kukitumia ili kuhamisha faili."</string>
+    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Fikia kidhibiti kipakuzi"</string>
+    <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Huruhusu programu kufikia kidhibiti cha kushiriki Bluetooth  na kukitumia ili kuhamisha faili."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Kifaa kisichojulikana"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Haijulikani"</string>
-    <string name="airplane_error_title" msgid="2683839635115739939">"hali ya ndege"</string>
+    <string name="airplane_error_title" msgid="2683839635115739939">"Muundo wa ndege"</string>
     <string name="airplane_error_msg" msgid="8698965595254137230">"Huwezi kutumia Bluetooth katika hali ya Ndege."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
-    <string name="bt_enable_line1" msgid="7203551583048149">"Kutumia huduma za Bluetooth, lazima kwanza uwashe Bluetooth."</string>
-    <string name="bt_enable_line2" msgid="4341936569415937994">"Washa Bluetooth sasa?"</string>
+    <string name="bt_enable_line1" msgid="7203551583048149">"Kutumia huduma za Bluetooth, lazima kwanza ufungue Bluetooth."</string>
+    <string name="bt_enable_line2" msgid="4341936569415937994">"Je wataka kuwasha Bluetooth sasa?"</string>
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Ghairi"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Washa"</string>
-    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Uhamishaji wa faili"</string>
+    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Uhamishaji faili"</string>
     <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" anataka kukutumia <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" Ikubali faili?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Kataa"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Kubali"</string>
@@ -42,7 +42,7 @@
     <string name="notification_received_fail" msgid="3619350997285714746">"Kushiriki kwa Bluetooth: Faili <xliff:g id="FILE">%1$s</xliff:g> haijapokewa"</string>
     <string name="notification_sending" msgid="3035748958534983833">"Kushiriki kwa bluetooth: Inatuma <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="notification_sent" msgid="9218710861333027778">"Kushiriki kwa bluetooth: <xliff:g id="FILE">%1$s</xliff:g> Iliyotumwa"</string>
-    <string name="notification_sent_complete" msgid="302943281067557969">"asilimia 100 imekamilika"</string>
+    <string name="notification_sent_complete" msgid="302943281067557969">"100% imekamilika"</string>
     <string name="notification_sent_fail" msgid="6696082233774569445">"Kushiriki kwa bluetooth: Faili <xliff:g id="FILE">%1$s</xliff:g> haijatumwa"</string>
     <string name="download_title" msgid="3353228219772092586">"Uhamishaji faili"</string>
     <string name="download_line1" msgid="4926604799202134144">"Kutoka: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
@@ -52,11 +52,11 @@
     <string name="download_line5" msgid="3069560415845295386">"Inapokea faili..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Komesha"</string>
     <string name="download_ok" msgid="5000360731674466039">"Ficha"</string>
-    <string name="download_fail_line1" msgid="3846450148862894552">"Faili haijapokewa"</string>
+    <string name="download_fail_line1" msgid="3846450148862894552">"Faili haijapokelewa"</string>
     <string name="download_fail_line2" msgid="8950394574689971071">"Faili: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="download_fail_line3" msgid="5611058289180135888">"Sababu ya kushindwa: <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="download_fail_ok" msgid="1521733664438320300">"Sawa"</string>
-    <string name="download_succ_line5" msgid="4509944688281573595">"Faili imepokewa"</string>
+    <string name="download_succ_line5" msgid="4509944688281573595">"Faili imepokelewa"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Fungua"</string>
     <string name="upload_line1" msgid="2055952074059709052">"Kwa: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
     <string name="upload_line3" msgid="5866755479845641607">"Aina ya Faili: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
@@ -74,7 +74,7 @@
     <string name="not_exist_file_desc" msgid="2392808771821464983">"Faili haipo! "\n</string>
     <string name="enabling_progress_title" msgid="436157952334723406">"Tafadhali subiri…"</string>
     <string name="enabling_progress_content" msgid="1291028079299309898">"Inawasha Bluetooth..."</string>
-    <string name="bt_toast_1" msgid="972182708034353383">"Faili itapokewa. Kagua maendeleo katika paneli ya Arifa."</string>
+    <string name="bt_toast_1" msgid="972182708034353383">"Faili itapokelewa. Kagua maendeleo katika paneli ya Arifa."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Faili haitapokewa."</string>
     <string name="bt_toast_3" msgid="6707884165086862518">"Ilikomesha upokeaji wa faili kutoka \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="bt_toast_4" msgid="4678812947604395649">"Inatuma faili kwa \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
@@ -84,11 +84,11 @@
     <string name="bt_sm_2_1" product="default" msgid="2801238507525833799">"Hakuna nafasi ya kutosha katika kadi ya SD ya kuhifadhi faili kutoka \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="bt_sm_2_2" msgid="2965243265852680543">"Nafasi inayohitajika: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Maombi mengi sana yanashughulikiwa. Jaribu tena baadaye."</string>
-    <string name="status_pending" msgid="7446884326084324082">"hali wa faili bado haujaanzishwa"</string>
-    <string name="status_running" msgid="2695810336448055064">"hali wa faili unaendelea"</string>
-    <string name="status_success" msgid="2268261336330060663">"Uhamishaji faili umefaulu kukamilika"</string>
+    <string name="status_pending" msgid="7446884326084324082">"Utumaji faili bado haujaanzishwa"</string>
+    <string name="status_running" msgid="2695810336448055064">"Uhamishaji wa faili unaendelea"</string>
+    <string name="status_success" msgid="2268261336330060663">"Uhamishaji wa faili umefaulu kukamilika"</string>
     <string name="status_not_accept" msgid="2489805942397459486">"Maudhui hayahimiliwi."</string>
-    <string name="status_forbidden" msgid="8499236547788725258">"hali huu umekatazwa na kifaa lengwa"</string>
+    <string name="status_forbidden" msgid="8499236547788725258">"Utumaji huu umekatazwa na kifaa lengwa"</string>
     <string name="status_canceled" msgid="5514756906439790976">"Uhamishaji huu ulighairiwa na mtumiaji"</string>
     <string name="status_file_error" msgid="6125632529575521755">"Suala la hifadhi"</string>
     <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Hakuna hifadhi ya USB."</string>
@@ -96,7 +96,7 @@
     <string name="status_connection_error" msgid="947681831523219891">"Muunganisho haujafanikiwa."</string>
     <string name="status_protocol_error" msgid="1199135510987767468">"Ombi haliwezi kushughulikiwa kwa usahihi."</string>
     <string name="status_unknown_error" msgid="8156660554237824912">"Hitilafu isiyojulikana."</string>
-    <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth imepokewa"</string>
+    <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth imepokelewa"</string>
     <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Imepokelewa kikamilifu"</string>
     <string name="upload_success" msgid="4014469387779648949">"Kutuma kwa <xliff:g id="FILE_SIZE">%1$s</xliff:g> kumekamilika."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Mahamisho yanayoingia"</string>
diff --git a/res/values-sw/strings_pbap.xml b/res/values-sw/strings_pbap.xml
index 9f7f5bcfa..bdab9ad9e 100644
--- a/res/values-sw/strings_pbap.xml
+++ b/res/values-sw/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">"Andika ufunguo wa kipindi wa %1$s"</string>
-    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Ufunguo wa kipindi cha Bluetooth unahitajika"</string>
+    <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Andika nywila ya kipindi wa %1$s"</string>
+    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Nywila ya kipindi cha Bluetooth inahitajika"</string>
     <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"Muda wa kukubali muunganisho na %1$s umepita"</string>
-    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Muda wa kuweka ufunguo wa kipindi na %1$s umepita"</string>
+    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Muda wa kuweka nywila kwa kipindi na %1$s umepita"</string>
     <string name="auth_notif_ticker" msgid="1575825798053163744">"Ombi la uthibitishaji kutoka Obex"</string>
-    <string name="auth_notif_title" msgid="7599854855681573258">"Ufunguo wa Kipindi"</string>
-    <string name="auth_notif_message" msgid="6667218116427605038">"Andika ufunguo wa kipindi wa %1$s"</string>
+    <string name="auth_notif_title" msgid="7599854855681573258">"nywila wa Kipindi"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"Andika nywila ya kipindi wa %1$s"</string>
     <string name="defaultname" msgid="4821590500649090078">"Kifaa cha gari"</string>
     <string name="unknownName" msgid="2841414754740600042">"Jina lisilojulikana"</string>
     <string name="localPhoneName" msgid="2349001318925409159">"Jina langu"</string>
diff --git a/res/values-sw/test_strings.xml b/res/values-sw/test_strings.xml
index 6b068ae6b..cd3f33461 100644
--- a/res/values-sw/test_strings.xml
+++ b/res/values-sw/test_strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="hello" msgid="1740533743008967039">"Hujambo Ulimwengu, Shughuli ya Jaribio"</string>
+    <string name="hello" msgid="1740533743008967039">"Halo Dunia, Shughuli ya Jaribio"</string>
     <string name="app_name" msgid="1203877025577761792">"Shiriki Bluetooth"</string>
     <string name="insert_record" msgid="1450997173838378132">"Ingiza rekodi"</string>
     <string name="update_record" msgid="2480425402384910635">"Thibitisha rekodi"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c90eb25c0..c80810c6f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -90,7 +90,7 @@
     <string name="status_not_accept" msgid="2489805942397459486">"Okuqukethwe akusekelwe."</string>
     <string name="status_forbidden" msgid="8499236547788725258">"Lokhu kudlulisa kunqatshelwe idivayisi eqondiwe"</string>
     <string name="status_canceled" msgid="5514756906439790976">"Lokhu kudlulisa kususwe umsebenzisi"</string>
-    <string name="status_file_error" msgid="6125632529575521755">"Inkinga yesitoreji"</string>
+    <string name="status_file_error" msgid="6125632529575521755">"Inkinga yokugcina"</string>
     <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Akukho sitoreji se-USB."</string>
     <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Alikho ikhadi le-SD. Faka ikhadi le-SD ukulondoloza amafayela adlulisiwe."</string>
     <string name="status_connection_error" msgid="947681831523219891">"Ukuxhumeka akuphumelelanga."</string>
diff --git a/res/values-zu/strings_pbap.xml b/res/values-zu/strings_pbap.xml
index efbbd260b..e2497049b 100644
--- a/res/values-zu/strings_pbap.xml
+++ b/res/values-zu/strings_pbap.xml
@@ -4,7 +4,7 @@
     <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Thayipha ukhiye wesikhathi we-%1$s"</string>
     <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Ukhiye wesikhathi se-Bluetooth uyadingeka"</string>
     <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"Kube khona ukuphela kwesikhathi ekwamukeleni uxhumano ne %1$s"</string>
-    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Kube khona ukuphela kwesikhathi ekufakeni ukhiye wesikhathi ngo-%1$s"</string>
+    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Kube khona ukuphela kwesikhathi ekufakeni ukhiye wesikhathi ne %1$s"</string>
     <string name="auth_notif_ticker" msgid="1575825798053163744">"Isicelo sokufakazela ubuqiniso se-obex"</string>
     <string name="auth_notif_title" msgid="7599854855681573258">"Ukhiye Wesikhathi"</string>
     <string name="auth_notif_message" msgid="6667218116427605038">"Thayipha ukhiye wesikhathi we-%1$s"</string>
diff --git a/res/values-zu/test_strings.xml b/res/values-zu/test_strings.xml
index 1f6524846..524484208 100644
--- a/res/values-zu/test_strings.xml
+++ b/res/values-zu/test_strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="hello" msgid="1740533743008967039">"Sawubona Mhlaba, Umsebenzi Wokuhlola"</string>
+    <string name="hello" msgid="1740533743008967039">"Sawubona Mhlaba, UmsebenziWokuhlola"</string>
     <string name="app_name" msgid="1203877025577761792">"Abelana ne-Bluetooth"</string>
     <string name="insert_record" msgid="1450997173838378132">"Faka irekhodi"</string>
     <string name="update_record" msgid="2480425402384910635">"Qinisekisa irekhodi"</string>