Import revised translations.

Change-Id: I60421ab0e93faf83fcf6e3f6e859ae33e1e452fe

20 files changed, 540 insertions, 520 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3e6c591d5..46ab5afa1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Umožňuje aplikaci přístup ke Správci sdílení Bluetooth a jeho využívání k přenosu souborů."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Neznámé zařízení"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Neznámé"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Režim V letadle"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Režim V letadle nedovoluje používat rozhraní Bluetooth."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Zrušit"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Zapnout"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Přenos souborů"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"Zařízení „%1$s“ se vám pokouší odeslat soubor %2$s (%3$s). "\n\n" Chcete soubor přijmout?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"Uživatel <xliff:g id="SENDER">%1$s</xliff:g> se vám pokouší odeslat soubor <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" Chcete soubor přijmout?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Odmítnout"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Přijmout"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"Ok"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Časový limit pro přijetí souboru ze zařízení „%1$s“ vypršel"</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Při příjmu příchozího souboru od uživatele <xliff:g id="SENDER">%1$s</xliff:g> vypršel časový limit."</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Sdílení Bluetooth: Příchozí soubor"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Potvrďte prosím, zda tento soubor chcete přijmout."</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Potvrďte prosím příjem příchozího souboru z jiného zařízení"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Sdílení Bluetooth: Příjem souboru %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Sdílení Bluetooth: Soubor %1$s byl přijat"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Sdílení Bluetooth: Soubor %1$s nebyl přijat"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Sdílení Bluetooth: Odesílání souboru %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Sdílení Bluetooth: Soubor %1$s byl odeslán"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Sdílení Bluetooth: Příjem souboru <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Sdílení Bluetooth: Soubor <xliff:g id="FILE">%1$s</xliff:g> byl přijat"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Sdílení Bluetooth: Soubor <xliff:g id="FILE">%1$s</xliff:g> nebyl přijat"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Sdílení Bluetooth: Odesílání souboru <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Sdílení Bluetooth: Soubor <xliff:g id="FILE">%1$s</xliff:g> byl odeslán"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"Dokončeno 100 %"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Sdílení Bluetooth: Soubor %1$s nebyl odeslán"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Sdílení Bluetooth: Soubor <xliff:g id="FILE">%1$s</xliff:g> nebyl odeslán"</string>
     <string name="download_title" msgid="3353228219772092586">"Přenos souborů"</string>
-    <string name="download_line1" msgid="3470164761579278582">"Z: „%1$s“"</string>
-    <string name="download_line2" msgid="65085079456902842">"Soubor: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Velikost souboru: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Od uživatele: <xliff:g id="SENDER">%1$s</xliff:g>"</string>
+    <string name="download_line2" msgid="5876973543019417712">"Soubor: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Velikost souboru: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Přijímání souboru..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Zastavit"</string>
     <string name="download_ok" msgid="5000360731674466039">"Skrýt"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Soubor nebyl přijat"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Soubor: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Příčina selhání: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Soubor: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Příčina selhání: <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">"Soubor byl přijat"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Otevřít"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Do: „%1$s“"</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Typ souboru: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Komu: <xliff:g id="RECIPIENT">%1$s</xliff:g>"</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Typ souboru: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Odesílání souboru..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Soubor byl odeslán"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Soubor nebyl odeslán do zařízení „%1$s“."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Soubor: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Soubor nebyl odeslán uživateli <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Soubor: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Zkuste to znovu"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Zavřít"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Zapínání rozhraní Bluetooth..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Proběhne přijímání souboru. Průběh můžete sledovat na panelu Oznámení."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Soubor nebude přijat."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Přijímání souboru ze zařízení „%1$s“ bylo zastaveno"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Odesílání souboru do zařízení „%1$s“"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Odesílání %1$s souborů zařízení „%2$s“"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Odesílání souboru do zařízení „%1$s“ bylo zastaveno"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Na kartě SD není pro přijetí souboru ze zařízení „%1$s“ dost místa."</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Požadované místo v paměti: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Příjem souboru od uživatele <xliff:g id="SENDER">%1$s</xliff:g> byl zastaven"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Odesílání souboru uživateli <xliff:g id="RECIPIENT">%1$s</xliff:g>"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Odesílání souborů (počet: <xliff:g id="NUMBER">%1$s</xliff:g>) uživateli <xliff:g id="RECIPIENT">%2$s</xliff:g>"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Odesílání souboru uživateli <xliff:g id="RECIPIENT">%1$s</xliff:g> bylo zastaveno"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Na kartě SD není dost místa pro uložení souboru od uživatele <xliff:g id="SENDER">%1$s</xliff:g>"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Požadované místo v paměti: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Je zpracováváno příliš mnoho požadavků. Opakujte akci později."</string>
     <string name="status_pending" msgid="7446884326084324082">"Přenos souborů ještě nebyl zahájen"</string>
     <string name="status_running" msgid="2695810336448055064">"Probíhá přenos souborů"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Požadavek není možné správně zpracovat"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Neznámá chyba"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth – přijaté soubory"</string>
-    <string name="download_success" msgid="8038161914083925191">"Příjem souboru %1$s dokončen."</string>
-    <string name="upload_success" msgid="8160573453144095129">"Odeslání souboru %1$s dokončeno."</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Přijetí dokončeno."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Odeslání dokončeno."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Příchozí přenosy"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Odchozí přenosy"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Historie přenosů je prázdná."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Ze seznamu budou vymazány všechny položky."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Sdílení Bluetooth: Odeslané soubory"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Sdílení Bluetooth: Přijaté soubory"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"Úspěšné: %1$s, neúspěšné: %2$s"</string>
+    <string name="noti_caption" msgid="8510712376046370819">"Počet úspěšných operací: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, počet neúspěšných operací: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Vymazat seznam"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Otevřít"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Vymazat ze seznamu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d8bd7b9a9..ed4a9109f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Giver programmer adgang til BluetoothShare-administratoren og til at bruge det til overførsel af filer."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Ukendt enhed"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Ukendt"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Flytilstand"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Du kan ikke bruge Bluetooth, når telefonen er i flytilstand."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Annuller"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Slå til"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Filoverførsel"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\"%1$s\" vil sende %2$s (%3$s) til dig. "\n\n" Vil du modtage filen?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" vil sende <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>) til dig. "\n\n" Vil du modtage filen?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Afvis"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accepter"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Der var timeout ved modtagelse af indgående fil fra \"%1$s\""</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Der opstod timeout ved modtagelse af indgående fil fra \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Deling med Bluetooth: indgående fil"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Bekræft, at du vil modtage denne fil"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Der var en indgående fil fra en anden tjeneste. Bekræft, at du vil modtage denne fil"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Deling med Bluetooth: Modtager %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Deling med Bluetooth: Modtog %1$s"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Deling med Bluetooth: Filen %1$s blev ikke modtaget"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Deling med Bluetooth: Sender %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Deling med Bluetooth: Sendt %1$s"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Deling med Bluetooth: Modtager <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Deling med Bluetooth: Modtog <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Deling med Bluetooth: Filen <xliff:g id="FILE">%1$s</xliff:g> blev ikke modtaget"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Deling med Bluetooth: Sender <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Deling med Bluetooth: Sendt <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100 % fuldført"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Deling med Bluetooth: Filen %1$s blev ikke sendt"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Deling med Bluetooth: Filen <xliff:g id="FILE">%1$s</xliff:g> blev ikke sendt"</string>
     <string name="download_title" msgid="3353228219772092586">"Filoverførsel"</string>
-    <string name="download_line1" msgid="3470164761579278582">"Fra: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Fil: % 1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Filstørrelse: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Fra: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="download_line2" msgid="5876973543019417712">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Filstørrelse: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Modtager fil…"</string>
     <string name="download_cancel" msgid="9177305996747500768">"Stop"</string>
     <string name="download_ok" msgid="5000360731674466039">"Skjul"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Filen blev ikke modtaget"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Fil: % 1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Årsag til fejl: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Årsag til fejl: <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">"Filen blev modtaget"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Åbn"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Til: \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Filtype: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Til: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Filtype: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Sender fil…"</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Filen er sendt"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Filen blev ikke sendt til \"%1$s\"."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Fil: % 1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Filen blev ikke sendt til \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Prøv igen"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Luk"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Aktiverer Bluetooth ..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Filen modtages. Se status i meddelelsespanelet."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Filen modtages ikke."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Stoppede modtagelse af fil fra \"%1$s\""</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Sender fil til \"%1$s\""</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Sender %1$s filer til \"%2$s\""</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Stoppede afsendelse af fil til \"%1$s\""</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Der var ikke nok plads på SD-kortet til at gemme filen fra \"%1$s\""</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Nødvendig plads: %1$s"</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>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Sender <xliff:g id="NUMBER">%1$s</xliff:g> filer til \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Afsendelse af fil til \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" stoppede"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Der var ikke nok plads på SD-kortet til at gemme filen fra \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Nødvendig plads: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Der behandles for mange anmodninger. Prøv igen senere."</string>
     <string name="status_pending" msgid="7446884326084324082">"Filoverførslen er ikke påbegyndt"</string>
     <string name="status_running" msgid="2695810336448055064">"Filoverførslen er i gang"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Anmodningen kan ikke håndteres korrekt"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Ukendt fejl"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth modtaget"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s Modtagelse fuldført."</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s Afsendelse fuldført."</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Modtagelse fuldført."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Afsendelse fuldført."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Overførsler hertil"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Overførsler herfra"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Overførselsoversigten er tom."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle elementer vil blive fjernet fra listen."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-deling: Sendte filer"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-deling: Modtagne filer"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s fuldført, %2$s mislykkedes."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> fuldført, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> mislykket."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Ryd liste"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Åbn"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Fjern fra listen"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 05ba8305f..61dd23f82 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Die Anwendung kann auf den Bluetooth-Weiterleitungs-Manager zugreifen und diesen für die Übertragung von Dateien verwenden."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Unbekanntes Gerät"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Unbekannt"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Flugmodus"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Wenn sich das Telefon im Flugmodus befindet, können Sie Bluetooth nicht verwenden."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Abbrechen"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Aktivieren"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Dateiübertragung"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\"%1$s\" möchte Ihnen %2$s (%3$s) senden. "\n\n" Datei annehmen?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" möchte Ihnen <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" senden. Datei annehmen?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Ablehnen"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Akzeptieren"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Die Zeit zum Empfang der eingehenden Datei von \"%1$s\" ist abgelaufen."</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Die Zeit zum Empfang der eingehenden Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\" ist abgelaufen."</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth-Weiterleitung: Eingehende Datei"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Bestätigen Sie, dass Sie diese Datei empfangen möchten."</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Ein anderes Gerät versucht, eine Datei zu übertragen. Bestätigen Sie, dass Sie diese Datei empfangen möchten."</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Bluetooth-Weiterleitung: empfange %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Bluetooth-Weiterleitung: %1$s empfangen"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Bluetooth-Weiterleitung: Die Datei %1$s wurde nicht empfangen."</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Bluetooth-Weiterleitung: %1$s gesendet"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Bluetooth-Weiterleitung: %1$s gesendet"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth-Weiterleitung: <xliff:g id="FILE">%1$s</xliff:g> wird empfangen"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Bluetooth-Weiterleitung: <xliff:g id="FILE">%1$s</xliff:g> wurde empfangen"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth-Weiterleitung: Die Datei <xliff:g id="FILE">%1$s</xliff:g> wurde nicht empfangen."</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth-Weiterleitung: <xliff:g id="FILE">%1$s</xliff:g> wird gesendet"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth-Weiterleitung: <xliff:g id="FILE">%1$s</xliff:g> gesendet"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"Zu 100 % abgeschlossen"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Bluetooth-Weiterleitung: Die Datei %1$s wurde nicht gesendet."</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth-Weiterleitung: Die Datei <xliff:g id="FILE">%1$s</xliff:g> wurde nicht gesendet"</string>
     <string name="download_title" msgid="3353228219772092586">"Dateiübertragung"</string>
-    <string name="download_line1" msgid="3470164761579278582">"Von: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Datei: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Dateigröße: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Von: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="download_line2" msgid="5876973543019417712">"Datei: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Dateigröße: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Datei wird heruntergeladen..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Abbrechen"</string>
     <string name="download_ok" msgid="5000360731674466039">"Ausblenden"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Datei nicht empfangen"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Datei: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Grund für den Fehler: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Datei: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Grund für den Fehler: <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">"Datei empfangen"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Öffnen"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"An: \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Dateityp: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"An: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Dateityp: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Datei wird gesendet..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Die Datei wurde gesendet."</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Die Datei wurde nicht an \"%1$s\" gesendet."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Datei: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Die Datei wurde nicht an \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" gesendet."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Datei: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Wiederholen"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Schließen"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Bluetooth wird aktiviert..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Die Datei wird empfangen. Überprüfen Sie den Fortschritt im Benachrichtigungsfenster."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Die Datei wird nicht empfangen."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Der Empfang der Datei von \"%1$s\" wurde angehalten."</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Die Datei wird an \"%1$s\" gesendet."</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"%1$s Dateien werden an \"%2$s\" gesendet."</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Die Übertragung der Datei auf \"%1$s\" wurde abgebrochen."</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Die SD-Karte verfügt über zu wenig Speicher für die Datei von \"%1$s\"."</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Erforderlicher Speicherplatz: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Der Empfang der Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\" wurde angehalten."</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Die Datei wird an \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" gesendet."</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"<xliff:g id="NUMBER">%1$s</xliff:g> Dateien werden an \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\" gesendet."</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Die Übertragung der Datei an \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" wurde abgebrochen"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Die SD-Karte verfügt über zu wenig Speicher für die Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\"."</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Erforderlicher Speicherplatz: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Es werden zurzeit zu viele Anfragen verarbeitet. Versuchen Sie es später erneut."</string>
     <string name="status_pending" msgid="7446884326084324082">"Die Dateiübertragung wurde noch nicht gestartet."</string>
     <string name="status_running" msgid="2695810336448055064">"Dateiübertragung läuft"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Die Anfrage kann nicht richtig verarbeitet werden."</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Unbekannter Fehler"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth empfangen"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s empfangen"</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s gesendet"</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> vollständig empfangen."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> vollständig gesendet."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Eingehende Übertragungen"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Ausgehende Übertragungen"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Übertragungsverlauf ist leer."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle Elemente werden aus der Liste gelöscht."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-Weiterleitung: gesendete Dateien"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-Weiterleitung: empfangene Dateien"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s erfolgreich, %2$s fehlgeschlagen"</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> erfolgreich, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> fehlgeschlagen."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Liste löschen"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Öffnen"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Aus Liste löschen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b2e55632a..129a3f131 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Επιτρέπει στην εφαρμογή να αποκτά πρόσβαση στο πρόγραμμα διαχείρισης BluetoothShare και να το χρησιμοποιεί για τη μεταφορά αρχείων."</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="8031842956782631624">"Δεν μπορείτε να χρησιμοποιήσετε το Bluetooth όταν το τηλέφωνο βρίσκεται σε λειτουργία πτήσης."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <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="3243341858335056258">"Ο χρήστης της συσκευής \"%1$s\" θέλει να σας στείλει το %2$s (%3$s). "\n\n" Αποδοχή του αρχείου;"</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="860272542827665475">"ΟΚ"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Υπήρχε χρονικό όριο για την αποδοχή του εισερχόμενου αρχείου από τη συσκευή \"%1$s\""</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="85804056450169291">"Επιβεβαιώστε ότι θέλετε να λάβετε αυτό το αρχείο"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Υπάρχει ένα εισερχόμενο αρχείο από μια άλλη συσκευή, επιβεβαιώστε ότι θέλετε να λάβετε αυτό το αρχείο"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Κοινή χρήση μέσω Bluetooth: Γίνεται λήψη %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Κοινή χρήση μέσω Bluetooth: Ελήφθη %1$s"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Κοινή χρήση μέσω Bluetooth: Το αρχείο %1$s δεν ελήφθη"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Κοινή χρήση μέσω Bluetooth: Αποστολή %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Κοινή χρήση μέσω Bluetooth: Εστάλη %1$s"</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="6632995333466325127">"Κοινή χρήση μέσω Bluetooth: Το αρχείο %1$s δεν εστάλη"</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="3470164761579278582">"Από: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Αρχείο: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Μέγεθος αρχείου: %1$s"</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="3138506111127456201">"Αρχείο: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Αιτία αποτυχίας: %1$s"</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_ok" msgid="7053688246357050216">"Άνοιγμα"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Προς: \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Τύπος αρχείου: %1$s (%2$s)"</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>
     <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="604517433515376787">"Το αρχείο δεν εστάλη στη συσκευή \"%1$s\"."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Αρχείο: %1$s"</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_cancel" msgid="9118496285835687125">"Κλείσιμο"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"ΟΚ"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Ενεργοποίηση του Bluetooth…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Θα γίνει λήψη του αρχείου. Ελέγξτε την πρόοδο στο πλαίσιο \"Ειδοποιήσεις\"."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Δεν θα γίνει λήψη του αρχείου."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Διακόπηκε η λήψη του αρχείου από τη συσκευή \"%1$s\""</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Γίνεται αποστολή του αρχείου στη συσκευή \"%1$s\""</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Αποστολή %1$s αρχείων στη συσκευή \"%2$s\""</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Διακόπηκε η αποστολή του αρχείου στη συσκευή \"%1$s\""</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Δεν υπάρχει αρκετός χώρος στην κάρτα SD για την αποθήκευση του αρχείου από τη συσκευή \"%1$s\""</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Απαιτούμενος χώρος: %1$s"</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" msgid="2801238507525833799">"Δεν υπάρχει αρκετός χώρος στην κάρτα 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="7446884326084324082">"Δεν έχει ξεκινήσει ακόμα η μεταφορά αρχείου"</string>
     <string name="status_running" msgid="2695810336448055064">"Η μεταφορά του αρχείου βρίσκεται σε εξέλιξη"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Δεν μπορεί να γίνει σωστός χειρισμός του αιτήματος"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Άγνωστο σφάλμα"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Ελήφθη μέσω Bluetooth"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s Η λήψη ολοκληρώθηκε."</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s Η αποστολή ολοκληρώθηκε."</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="5553338716725484736">"%1$s επιτυχία, %2$s αποτυχία."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> επιτυχημένα, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> αποτυχημένα."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Εκκαθάριση λίστας"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Άνοιγμα"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Εκκαθάριση από τη λίστα"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5030b53b7..e7b6135f7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Permite a la aplicación acceder al administrador de BluetoothShare y usarlo para transferir archivos."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo desconocido"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Desconocido"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Modo de avión"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"No puedes usar el Bluetooth cuando el teléfono está en modo de avión."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Cancelar"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Activar"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferencia de archivo"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\"%1$s\"\" desea enviarte %2$s (%3$s)."\n\n" ¿Aceptas el archivo?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" desea enviarte <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" ¿Aceptas el archivo?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Rechazar"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Aceptar"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"Aceptar"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Hubo tiempo muerto al aceptar el archivo entrante desde \"%1$s\"."</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Se produjo un tiempo de espera al aceptar un archivo entrante de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Compartir por Bluetooth: Archivo entrante"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Confirma si deseas recibir este archivo."</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Hay un archivo entrante de otro dispositivo, confirma si deseas recibir este archivo."</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Compartir por Bluetooth: Recibiendo %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Compartir por Bluetooth: Recibió %1$s"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Compartir por Bluetooth: El archivo %1$s no fue recibido."</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Compartir por Bluetooth: Enviando %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Compartir por Bluetooth: Envió %1$s"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Compartir por Bluetooth: Recibiendo <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Compartir por Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> Recibido"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Compartir por Bluetooth: No se recibió el archivo <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Compartir por Bluetooth: Enviando <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Compartir por Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviado"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"Completado el 100%"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Compartir por Bluetooth: El archivo %1$s no ha sido enviado."</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Compartir por Bluetooth: No se envió el archivo <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="download_title" msgid="3353228219772092586">"Transferencia de archivo"</string>
-    <string name="download_line1" msgid="3470164761579278582">"De: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Archivo: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Tamaño del archivo: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"De: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="download_line2" msgid="5876973543019417712">"Archivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Tamaño de archivo:<xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Recibiendo archivo..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Detener"</string>
     <string name="download_ok" msgid="5000360731674466039">"Ocultar"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Archivo no recibido"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Archivo: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Motivo de la falla: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Archivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Motivo de la falla: <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="download_fail_ok" msgid="1521733664438320300">"Aceptar"</string>
     <string name="download_succ_line5" msgid="4509944688281573595">"Archivo recibido"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Abrir"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Para: \"%1$s\"\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Tipo de archivo: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Para: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Tipo de archivo: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Enviando archivo..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Archivo enviado"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"Aceptar"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"No se envió el archivo a \"%1$s\"."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Archivo: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"No se envió el archivo a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Archivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Vuelve a intentarlo"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Cerrar"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"Aceptar"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Activando Bluetooth…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"El archivo será recibido. Verifica el progreso en el panel de notificaciones."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"El archivo no se recibirá."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Se detuvo la recepción del archivo de \"%1$s\"."</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Enviando archivo a \"%1$s\""</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Enviando %1$s archivos a \"%2$s\""</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Se detuvo el envío del archivo a \"%1$s\"\""</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"No hay espacio suficiente en la tarjeta SD para guardar el archivo de \"%1$s\"."</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Espacio necesario: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Se detuvo la recepción del archivo de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Enviando archivo a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Enviando <xliff:g id="NUMBER">%1$s</xliff:g> archivos a \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Se detuvo el envío del archivo a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"No hay espacio suficiente en la tarjeta SD para guardar el archivo de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Espacio necesario: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Se están procesando demasiadas solicitudes. Vuelve a intentarlo más tarde."</string>
     <string name="status_pending" msgid="7446884326084324082">"La transferencia del archivo aún no ha comenzado."</string>
     <string name="status_running" msgid="2695810336448055064">"Se está realizando la transferencia del archivo."</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"No se pudo administrar la solicitud correctamente."</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Error desconocido"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth recibido"</string>
-    <string name="download_success" msgid="8038161914083925191">"El %1$s se recibió por completo."</string>
-    <string name="upload_success" msgid="8160573453144095129">"El %1$s se envió por completo."</string>
+    <string name="download_success" msgid="7036160438766730871">"Se recibieron <xliff:g id="FILE_SIZE">%1$s</xliff:g> completos."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> enviados por completo."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Transferencias de entrada"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Transferencias de salida"</string>
     <string name="no_transfers" msgid="3482965619151865672">"El historial de transferencia está vacío."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Se borrarán todos los elementos de la lista."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Compartir con Bluetooth: Archivos enviados"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Compartir con Bluetooth: Archivos recibidos"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s exitoso, %2$s falló"</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> exitoso, error en <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Borrar lista"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Borrar de la lista"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 327d19649..378b36ead 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Permite que la aplicación acceda al administrador BluetoothShare para utilizarlo y transferir los archivos."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo desconocido"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Desconocido"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Modo avión"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"No puedes utilizar la función Bluetooth cuando el teléfono está en modo avión."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Cancelar"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Activar"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferencia de archivos"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\"%1$s\" quiere enviarte %2$s (%3$s). "\n\n" ¿Aceptas el archivo?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" quiere enviarte <xliff:g id="FILE">%2$s</xliff:g>(<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" ¿Aceptas el archivo?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Rechazar"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Aceptar"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"Aceptar"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Se ha agotado el tiempo para aceptar el archivo entrante de \"%1$s\"."</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Se ha agotado el tiempo para aceptar el archivo entrante de \"<xliff:g id="SENDER">%1$s</xliff:g>\"."</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Compartir con Bluetooth: archivo entrante"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Confirma que quieres recibir este archivo."</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Hay un archivo entrante de otro dispositivo. Confirma que quieres recibirlo."</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Compartir con Bluetooth: recibiendo %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Compartir con Bluetooth: %1$s recibido"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Compartir con Bluetooth: el archivo %1$s no se ha recibido."</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Compartir con Bluetooth: enviando %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Compartir con Bluetooth: %1$s enviado"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Compartir con Bluetooth: recibiendo <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Compartir con Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> recibido"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Compartir con Bluetooth: archivo <xliff:g id="FILE">%1$s</xliff:g> no recibido"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Compartir con Bluetooth: enviando <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Compartir con Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviado"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100% completado"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Compartir con Bluetooth: el archivo %1$s no se ha enviado."</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Compartir con Bluetooth: el archivo <xliff:g id="FILE">%1$s</xliff:g> no se ha enviado."</string>
     <string name="download_title" msgid="3353228219772092586">"Transferencia de archivos"</string>
-    <string name="download_line1" msgid="3470164761579278582">"De: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Archivo: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Tamaño de archivo: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"De: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="download_line2" msgid="5876973543019417712">"Archivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Tamaño de archivo: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Recibiendo archivo…"</string>
     <string name="download_cancel" msgid="9177305996747500768">"Detener"</string>
     <string name="download_ok" msgid="5000360731674466039">"Ocultar"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Archivo no recibido"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Archivo: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Motivo del error: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Archivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Motivo del error: <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="download_fail_ok" msgid="1521733664438320300">"Aceptar"</string>
     <string name="download_succ_line5" msgid="4509944688281573595">"Archivo recibido"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Abrir"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Para: \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Tipo de archivo: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Para: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Tipo de archivo: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Enviando archivo…"</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Archivo enviado"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"Aceptar"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"No se ha enviado el archivo a \"%1$s\"."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Archivo: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"No se ha enviado el archivo a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Archivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Volver a intentarlo"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Cerrar"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"Aceptar"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Activando Bluetooth..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Se recibirá el archivo. Comprueba el progreso en el panel de notificaciones."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"No se recibirá el archivo."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Se ha detenido la recepción del archivo de \"%1$s\"."</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Enviando archivo a \"%1$s\""</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Enviando %1$s archivos a \"%2$s\""</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Se ha detenido el envío del archivo a \"%1$s\"."</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"No hay suficiente espacio en la tarjeta SD para guardar el archivo de \"%1$s\"."</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Espacio necesario: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Se ha detenido la recepción del archivo de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Enviando archivo a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Enviando <xliff:g id="NUMBER">%1$s</xliff:g> archivos a \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Se ha detenido el envío del archivo a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"No hay suficiente espacio en la tarjeta SD para guardar el archivo de \"<xliff:g id="SENDER">%1$s</xliff:g>\"."</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Espacio necesario: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Se están procesando demasiadas solicitudes. Vuelve a intentarlo más tarde."</string>
     <string name="status_pending" msgid="7446884326084324082">"No se ha iniciado aún la transferencia de archivos."</string>
     <string name="status_running" msgid="2695810336448055064">"La transferencia de archivos está en curso."</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"No se ha podido procesar la solicitud correctamente."</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Error desconocido"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth recibido"</string>
-    <string name="download_success" msgid="8038161914083925191">"Se han recibido %1$s archivos."</string>
-    <string name="upload_success" msgid="8160573453144095129">"Se ha completado el envío de %1$s archivos."</string>
+    <string name="download_success" msgid="7036160438766730871">"Recepción de <xliff:g id="FILE_SIZE">%1$s</xliff:g> completada"</string>
+    <string name="upload_success" msgid="4014469387779648949">"Envío de <xliff:g id="FILE_SIZE">%1$s</xliff:g> completado"</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Transferencias entrantes"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Transferencias salientes"</string>
     <string name="no_transfers" msgid="3482965619151865672">"El historial de transferencias está vacío."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Se borrarán todos los elementos de la lista."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Compartir con Bluetooth: archivos enviados"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Compartir con Bluetooth: archivos recibidos"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s archivos correctos, %2$s archivos incorrectos"</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> correcto, error en <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>"</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Borrar lista"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Borrar de la lista"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 78c17f20d..f775fb640 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Permet à l\'application d\'accéder au gestionnaire BluetoothShare et de l\'utiliser pour le transfert de fichiers."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Périphérique inconnu"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Inconnu"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Mode Avion"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Impossible d\'utiliser le mode Bluetooth lorsque le téléphone est en mode Avion."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Annuler"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Activer"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transfert de fichier"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\"%1$s\" souhaite vous envoyer %2$s (%3$s). "\n\n" Accepter le fichier ?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" souhaite vous envoyer <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" Accepter le fichier ?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Refuser"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accepter"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Délai d\'attente dépassé pour l\'acceptation du fichier entrant de \"%1$s\""</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Expiration du délai de réception du fichier de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Partage Bluetooth : réception de fichier"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Veuillez confirmer que vous acceptez ce fichier."</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Réception en cours d\'un fichier provenant d\'un autre périphérique. Veuillez confirmer que vous souhaitez recevoir ce fichier."</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Partage Bluetooth : réception de %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Partage Bluetooth : %1$s reçu"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Partage Bluetooth : fichier %1$s non reçu"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Partage Bluetooth : envoi de %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Partage Bluetooth : %1$s envoyé"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Partage Bluetooth : réception de <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Partage Bluetooth : <xliff:g id="FILE">%1$s</xliff:g> reçu"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Partage Bluetooth : fichier <xliff:g id="FILE">%1$s</xliff:g> non reçu"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Partage Bluetooth : envoi de <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Partage Bluetooth : <xliff:g id="FILE">%1$s</xliff:g> envoyé"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100 % effectués"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Partage Bluetooth : fichier %1$s non envoyé"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Partage Bluetooth : fichier <xliff:g id="FILE">%1$s</xliff:g> non envoyé"</string>
     <string name="download_title" msgid="3353228219772092586">"Transfert de fichier"</string>
-    <string name="download_line1" msgid="3470164761579278582">"De : \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Fichier : %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Taille du fichier : %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"De : \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="download_line2" msgid="5876973543019417712">"Fichier : <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Taille du fichier : <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Réception de fichier en cours…"</string>
     <string name="download_cancel" msgid="9177305996747500768">"Arrêter"</string>
     <string name="download_ok" msgid="5000360731674466039">"Masquer"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Fichier non reçu"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Fichier : %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Motif de l\'échec : %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Fichier : <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Motif de l\'échec : <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">"Fichier reçu"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Ouvrir"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"À : \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Type de fichier : %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"À : \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Type de fichier : <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Envoi de fichier en cours..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Fichier envoyé"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Le fichier n\'a pas été envoyé à \"%1$s\"."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Fichier : %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Le fichier n\'a pas été envoyé à \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fichier : <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Réessayer"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Fermer"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Activation Bluetooth..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"La réception du fichier va commencer. La progression va s\'afficher dans le panneau de notification."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Le fichier ne sera pas reçu."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Réception de fichier de \"%1$s\" interrompue"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Envoi du fichier à \"%1$s\""</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Envoi de %1$s fichiers à \"%2$s\""</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Envoi du fichier à \"%1$s\" interrompu"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Espace insuffisant sur la carte SD pour l\'enregistrement du fichier de \"%1$s\""</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Espace nécessaire : %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Réception du fichier de \"<xliff:g id="SENDER">%1$s</xliff:g>\" interrompue"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Envoi du fichier à \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Envoi de <xliff:g id="NUMBER">%1$s</xliff:g> fichiers à \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Envoi du fichier à \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" interrompu"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Espace insuffisant sur la carte SD pour l\'enregistrement du fichier de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Espace nécessaire : <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Trop de requêtes sont en cours de traitement. Veuillez réessayer ultérieurement."</string>
     <string name="status_pending" msgid="7446884326084324082">"Le transfert de fichier n\'a pas encore commencé."</string>
     <string name="status_running" msgid="2695810336448055064">"Le transfert de fichier est en cours."</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"La demande n\'a pas pu être traitée correctement."</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Erreur inconnue"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth reçu"</string>
-    <string name="download_success" msgid="8038161914083925191">"Réception de %1$s terminée"</string>
-    <string name="upload_success" msgid="8160573453144095129">"Envoi de %1$s terminé"</string>
+    <string name="download_success" msgid="7036160438766730871">"Réception de <xliff:g id="FILE_SIZE">%1$s</xliff:g> terminée"</string>
+    <string name="upload_success" msgid="4014469387779648949">"Envoi de <xliff:g id="FILE_SIZE">%1$s</xliff:g> terminé"</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Transferts entrants"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Transferts sortants"</string>
     <string name="no_transfers" msgid="3482965619151865672">"L\'historique des transferts est vide."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Tous les éléments de la liste seront effacés."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Partage Bluetooth : fichiers envoyés"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Partage Bluetooth : fichiers reçus"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"Réussite : %1$s ; Échec : %2$s"</string>
+    <string name="noti_caption" msgid="8510712376046370819">"Réussite : <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> ; Échec : <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>"</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Effacer la liste"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Ouvrir"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Effacer de la liste"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index cf66a397c..c43a9d700 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Consente l\'accesso dell\'applicazione al gestore BluetoothShare e il suo utilizzo per trasferire i file."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo sconosciuto"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Sconosciuto"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Modalità aereo"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Non puoi utilizzare Bluetooth quando il telefono è in modalità aereo."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Annulla"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Attiva"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Trasferimento file"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\"%1$s\" vuole inviarti %2$s (%3$s). "\n\n" Accetti il file?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" vuole inviarti <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" Accetti il file?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Rifiuta"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accetta"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Timeout dell\'accettazione del file in arrivo da \"%1$s\""</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Si è verificato un timeout durante l\'accettazione di un file in arrivo da \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Condivisione Bluetooth: file in arrivo"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Conferma che desideri ricevere questo file"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"File in arrivo da un altro dispositivo, conferma che vuoi ricevere il file"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Condivisione Bluetooth: ricezione %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Condivisione Bluetooth: file %1$s ricevuto"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Condivisione Bluetooth: file %1$s non ricevuto"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Condivisione Bluetooth: invio %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Condivisione Bluetooth: file %1$s inviato"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Condivisione Bluetooth: ricezione file <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Condivisione Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> ricevuto"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Condivisione Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> non ricevuto"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Condivisione Bluetooth: invio file <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Condivisione Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> inviato"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100% completato"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Condivisione Bluetooth: file %1$s non inviato"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Condivisione Bluetooth: file <xliff:g id="FILE">%1$s</xliff:g> non inviato"</string>
     <string name="download_title" msgid="3353228219772092586">"Trasferimento file"</string>
-    <string name="download_line1" msgid="3470164761579278582">"Da: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"File: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Dimensioni file: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Da: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="download_line2" msgid="5876973543019417712">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Dim. file: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Ricezione file in corso..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Interrompi"</string>
     <string name="download_ok" msgid="5000360731674466039">"Nascondi"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"File non ricevuto"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"File: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Motivo dell\'errore: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Motivo dell\'errore: <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">"File ricevuto"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Apri"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Su: \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Tipo di file: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"A: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Tipo di file: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Invio file in corso..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"File inviato"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Impossibile inviare il file a \"%1$s."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"File: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Impossibile inviare il file a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Riprova"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Chiudi"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Attivazione Bluetooth in corso…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Il file verrà ricevuto. Controlla l\'avanzamento nel pannello Notifiche."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Impossibile ricevere il file."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Interruzione della ricezione del file da \"%1$s\""</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Invio del file a \"%1$s\""</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Invio di %1$s file a \"%2$s\""</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Invio del file a \"%1$s\" interrotto"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Spazio sulla scheda SD insufficiente per salvare il file da \"%1$s\""</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Spazio necessario: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Interruzione della ricezione del file da \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Invio del file a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Invio di <xliff:g id="NUMBER">%1$s</xliff:g> file a \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Invio del file a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" interrotto"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Spazio sulla scheda SD insufficiente per salvare il file da \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Spazio necessario: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Troppe richieste in fase di elaborazione. Riprova più tardi."</string>
     <string name="status_pending" msgid="7446884326084324082">"Trasferimento file non ancora iniziato"</string>
     <string name="status_running" msgid="2695810336448055064">"Trasferimento file in corso"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"La richiesta non può essere gestita correttamente"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Errore sconosciuto"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Ricezione Bluetooth avvenuta"</string>
-    <string name="download_success" msgid="8038161914083925191">"Ricezione completata (%1$s)."</string>
-    <string name="upload_success" msgid="8160573453144095129">"Invio completato (%1$s)."</string>
+    <string name="download_success" msgid="7036160438766730871">"Ricezione completata (<xliff:g id="FILE_SIZE">%1$s</xliff:g>)"</string>
+    <string name="upload_success" msgid="4014469387779648949">"Invio completato (<xliff:g id="FILE_SIZE">%1$s</xliff:g>)"</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Trasferimenti in entrata"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Trasferimenti in uscita"</string>
     <string name="no_transfers" msgid="3482965619151865672">"La cronologia di trasferimento è vuota."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Tutti gli elementi verranno cancellati dall\'elenco."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Condivisione Bluetooth: file inviati"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Condivisione Bluetooth: file ricevuti"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s riuscite, %2$s non riuscite."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> operazioni riuscite, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> operazioni non riuscite."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Cancella elenco"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Apri"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Cancella da elenco"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index db6f64b9f..eb8605107 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"BluetoothShareマネージャーへのアクセスとそれを利用したファイル転送をアプリケーションに許可します。"</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="8031842956782631624">"携帯が機内モードのときはBluetoothを使用できません。"</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"キャンセル"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"ONにする"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"ファイル転送"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"「%1$s」が%2$s（%3$s）を送信しようとしています。"\n\n"ファイルを受信しますか？"</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="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"「%1$s」からの着信ファイルの受信がタイムアウトになりました"</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="85804056450169291">"このファイルを受信してもよろしいですか"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"別の携帯端末からファイルが着信しました。このファイルを受信してもよろしいですか"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Bluetooth共有: %1$sを受信中"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Bluetooth共有: %1$sを受信済み"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Bluetooth共有: ファイル%1$sの受信に失敗"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Bluetooth共有: %1$sを送信中"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Bluetooth共有: %1$sを送信済み"</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="6632995333466325127">"Bluetooth共有: ファイル%1$sの送信に失敗"</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="3470164761579278582">"From: 「%1$s」"</string>
-    <string name="download_line2" msgid="65085079456902842">"ファイル: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"ファイルサイズ: %1$s"</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="3138506111127456201">"ファイル: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"失敗の理由: %1$s"</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">"OK"</string>
     <string name="download_succ_line5" msgid="4509944688281573595">"ファイルを受信しました"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"開く"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"To: 「%1$s」"</string>
-    <string name="upload_line3" msgid="6702013202133020437">"ファイル形式: %1$s（%2$s）"</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>
     <string name="upload_line5" msgid="7759322537674229752">"ファイルを送信中..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"ファイルを送信しました"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"ファイルは「%1$s」に送信されませんでした。"</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"ファイル: %1$s"</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_cancel" msgid="9118496285835687125">"閉じる"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"BluetoothをONにしています..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"ファイルを受信します。進行状況は[通知]パネルでご確認ください。"</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"ファイルは受信されません。"</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"「%1$s」からのファイルの受信を停止しました"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"「%1$s」にファイルを送信中"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"%1$s個のファイルを「%2$s」に送信中"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"「%1$s」へのファイルの送信を停止しました"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"「%1$s」からのファイルを保存する十分な空き領域がSDカードにありません"</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"空き領域が必要: %1$s"</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" 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>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"リクエストを正しく処理できません"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"不明なエラー"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetoothを受信しました"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$sの受信が完了しました。"</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$sの送信が完了しました。"</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="5553338716725484736">"%1$s成功、%2$s失敗しました。"</string>
+    <string name="noti_caption" msgid="8510712376046370819">"成功したファイル<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>個、失敗したファイル<xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>個。"</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"リストを消去"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"開く"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"リストから消去"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8f2dfd122..3ce5bbc42 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"애플리케이션에서 BluetoothShare 관리자에 액세스하고 이를 사용하여 파일을 전송할 수 있습니다."</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="8031842956782631624">"휴대전화가 비행기 모드인 경우에는 Bluetooth를 사용할 수 없습니다."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <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="3243341858335056258">"\'%1$s\'이(가) %2$s(%3$s)을(를) 보내려고 합니다. "\n\n" 파일을 수락하시겠습니까?"</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="860272542827665475">"확인"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"\'%1$s\'에서 수신 중인 파일 수락 제한 시간이 초과되었습니다."</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="85804056450169291">"이 파일을 수신할 것인지 확인하세요."</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"다른 장치에서 수신 중인 파일이 있습니다. 이 파일을 수신할 것인지 확인하세요."</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Bluetooth 공유: %1$s을(를) 수신하는 중"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Bluetooth 공유: %1$s을(를) 수신함"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Bluetooth 공유: %1$s 파일이 수신되지 않음"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Bluetooth 공유: %1$s을(를) 보내는 중"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Bluetooth 공유: %1$s을(를) 보냄"</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="6632995333466325127">"Bluetooth 공유: %1$s 파일을 보내지 못함"</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="3470164761579278582">"위치: \'%1$s\'"</string>
-    <string name="download_line2" msgid="65085079456902842">"파일: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"파일 크기: %1$s"</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="3138506111127456201">"파일: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"실패 이유: %1$s"</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_ok" msgid="7053688246357050216">"열기"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"대상: \'%1$s\'"</string>
-    <string name="upload_line3" msgid="6702013202133020437">"파일 형식: %1$s(%2$s)"</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>
     <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="604517433515376787">"\'%1$s\'에 파일을 보내지 못했습니다."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"파일: %1$s"</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_cancel" msgid="9118496285835687125">"닫기"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"확인"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Bluetooth 사용 설정 중…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"파일이 수신됩니다. 알림 패널에서 진행률을 확인하세요."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"파일이 수신되지 않습니다."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"\'%1$s\'에서 파일 수신이 중지되었습니다."</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"\'%1$s\'에 파일을 보내는 중"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"\'%2$s\'에 %1$s 파일을 보내는 중"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"\'%1$s\'에 파일 보내기가 중지되었습니다."</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"\'%1$s\'에서 수신한 파일을 저장할 SD 카드의 공간이 부족합니다."</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"필요한 공간: %1$s"</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" 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>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"요청을 제대로 처리할 수 없습니다."</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"알 수 없는 오류"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth 수신함"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s 수신 완료."</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s 전송 완료."</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="5553338716725484736">"%1$s 성공, %2$s 실패."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"성공 <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>개, 실패 <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>개"</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"목록 지우기"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"열기"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"목록에서 지우기"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ac38512e5..ffd878cb2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Gir programmet tilgang til BluetoothShare-administratoren, og tillatelse til å bruke det til filoverføring"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Ukjent enhet"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Ukjent"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Flymodus"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Du kan ikke bruke Bluetooth når telefonen er i flymodus."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Avbryt"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Slå på"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Filoverføring"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"«%1$s» vil sende deg %2$s (%3$s). "\n\n" Godta filen?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"«<xliff:g id="SENDER">%1$s</xliff:g>» vil sende deg <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" Vil du godta filen?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Avslå"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Godta"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Det·tok·for·lang·tid·å·godta·innkommende·fil·fra·«%1$s»"</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Det oppstod et tidsavbrudd under mottak av fil fra «<xliff:g id="SENDER">%1$s</xliff:g>»"</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth-deling: Innkommende fil"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Bekreft at du ønsker å motta denne filen"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"En fil er på vei inn fra en annen enhet. Bekreft at du vil motta denne filen"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Bluetooth-deling: Mottar %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Bluetooth-deling: %1$s er mottatt"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Bluetooth-deling: Filen %1$s er ikke mottatt"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Bluetooth-deling: Sender %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Bluetooth-deling: Sendt %1$s"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth-deling: Mottar <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Bluetooth-deling: <xliff:g id="FILE">%1$s</xliff:g> er mottatt"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth-deling: Filen <xliff:g id="FILE">%1$s</xliff:g> er ikke mottatt"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth-deling: Sender <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth-deling: Sendt <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100 % fullført"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Bluetooth-deling: Filen %1$s ble ikke sendt"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth-deling: Filen <xliff:g id="FILE">%1$s</xliff:g> ble ikke sendt"</string>
     <string name="download_title" msgid="3353228219772092586">"Filoverføring"</string>
-    <string name="download_line1" msgid="3470164761579278582">"Fra «%1$s»"</string>
-    <string name="download_line2" msgid="65085079456902842">"Fil: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Filstørrelse: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Fra: «<xliff:g id="SENDER">%1$s</xliff:g>»"</string>
+    <string name="download_line2" msgid="5876973543019417712">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Filstørrelse: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Mottar fil ..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Stopp"</string>
     <string name="download_ok" msgid="5000360731674466039">"Skjul"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Filen ble ikke mottatt"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Fil: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Årsak til feilen: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Årsak til feilen: <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">"Fil mottatt"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Åpne"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Til: «%1$s»"</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Filtype: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Til: «<xliff:g id="RECIPIENT">%1$s</xliff:g>»"</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Filtype: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Sender filen ..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Fil sendt"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Filen ble ikke sendt til «%1$s»."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Fil: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Filen ble ikke sendt til «<xliff:g id="RECIPIENT">%1$s</xliff:g>»."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Prøv igjen"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Lukk"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Slår på Bluetooth ..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Filen vil bli mottatt. Du kan se fremdriften i varselpanelet."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Filen vil ikke bli mottatt."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Stoppet mottak av fil fra «%1$s»"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Sender fil til «%1$s»"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Sender %1$s filer til «%2$s»"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Stoppet sendingen av fil til «%1$s»"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Det er ikke nok plass på SD-kortet til å lagre filen fra «%1$s»"</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Nødvendig plass: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Stoppet mottak av fil fra «<xliff:g id="SENDER">%1$s</xliff:g>»"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Sender fil til «<xliff:g id="RECIPIENT">%1$s</xliff:g>»"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Sender <xliff:g id="NUMBER">%1$s</xliff:g> filer til «<xliff:g id="RECIPIENT">%2$s</xliff:g>»"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Stoppet sendingen av fil til «<xliff:g id="RECIPIENT">%1$s</xliff:g>»"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Det er ikke nok plass på SD-kortet til å lagre filen fra «<xliff:g id="SENDER">%1$s</xliff:g>»"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Nødvendig plass: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"For mange forespørsler behandles for øyeblikket. Prøv på nytt senere."</string>
     <string name="status_pending" msgid="7446884326084324082">"Filoverføringen har ikke startet ennå"</string>
     <string name="status_running" msgid="2695810336448055064">"Filoverføring pågår"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Forespørselen kan ikke behandles korrekt"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Ukjent feil"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth mottatt"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s mottatt."</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s sendt."</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> mottatt."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> sendt."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Inngående overføringer"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Utgående overføringer"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Overføringsloggen er tom."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle elementer fjernes fra listen."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-deling: Filer sendt"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-deling: Filer mottatt"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s fullført, %2$s mislyktes."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> er vellykket, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> mislyktes."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Tøm listen"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Åpne"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Fjern fra listen"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b7771d464..0be17ca91 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Hiermee krijgt de toepassing toegang tot de beheerfunctie voor delen via Bluetooth om deze functie te gebruiken voor het overdragen van bestanden."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Onbekend apparaat"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Onbekend"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Vliegmodus"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"U kunt Bluetooth niet gebruiken als de vliegtuigmodus van de telefoon actief is."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Annuleren"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Inschakelen"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Bestandsoverdracht"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\'%1$s\' wil %2$s (%3$s) naar u verzenden. "\n\n" Wilt u het bestand accepteren?"</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> (<xliff:g id="SIZE">%3$s</xliff:g>) naar u verzenden. "\n\n" Het bestand accepteren?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Weigeren"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accepteren"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Er is een time-out opgetreden voor het accepteren van het inkomende bestand van \'%1$s\'"</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Er is een time-out opgetreden bij het accepteren van een inkomend bestand van \'<xliff:g id="SENDER">%1$s</xliff:g>\'"</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Delen via Bluetooth: inkomend bestand"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Bevestig dat u dit bestand wilt ontvangen"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Er is een inkomend bestand van een ander apparaat beschikbaar. Als u dit bestand wilt ontvangen, moet u dit bevestigen."</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Delen via Bluetooth: %1$s ontvangen"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Delen via Bluetooth: %1$s ontvangen"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Delen via Bluetooth: bestand %1$s niet ontvangen"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Delen via Bluetooth: %1$s verzenden"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Delen via Bluetooth: %1$s verzonden"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Delen via Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> ontvangen"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Delen via Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> ontvangen"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Delen via Bluetooth: bestand <xliff:g id="FILE">%1$s</xliff:g> niet ontvangen"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Delen via Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> verzenden"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Delen via Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> verzonden"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100% voltooid"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Delen via Bluetooth: bestand %1$s niet verzonden"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Delen via Bluetooth: bestand <xliff:g id="FILE">%1$s</xliff:g> niet verzonden"</string>
     <string name="download_title" msgid="3353228219772092586">"Bestandsoverdracht"</string>
-    <string name="download_line1" msgid="3470164761579278582">"Van: \'%1$s\'"</string>
-    <string name="download_line2" msgid="65085079456902842">"Bestand: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Bestandsgrootte: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Van: \'<xliff:g id="SENDER">%1$s</xliff:g>\'"</string>
+    <string name="download_line2" msgid="5876973543019417712">"Bestand: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Bestandsgrootte: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Bestand ontvangen…"</string>
     <string name="download_cancel" msgid="9177305996747500768">"Stoppen"</string>
     <string name="download_ok" msgid="5000360731674466039">"Verbergen"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Bestand niet ontvangen"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Bestand: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Oorzaak van fout: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Bestand: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Oorzaak van fout: <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">"Bestand ontvangen"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Openen"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Aan: \'%1$s\'"</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Bestandstype: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Aan: \'<xliff:g id="RECIPIENT">%1$s</xliff:g>\'"</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Bestandstype: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Bestand verzenden…"</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Bestand verzonden"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Het bestand is niet verzonden naar \'%1$s\'."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Bestand: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Het bestand is niet verzonden naar \'<xliff:g id="RECIPIENT">%1$s</xliff:g>\'."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Bestand: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Opnieuw proberen"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Sluiten"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Bluetooth inschakelen…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Het bestand wordt ontvangen. U kunt de voortgang controleren in het venster \'Meldingen\'."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Het bestand wordt niet ontvangen."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Ontvangen van bestand van \'%1$s\' is beëindigd"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Bestand verzenden naar \'%1$s\'"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"%1$s bestanden verzenden naar \'%2$s\'"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Verzenden van bestand naar \'%1$s\' is beëindigd"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Er is onvoldoende ruimte op de SD-kaart beschikbaar om het bestand van \'%1$s\' op te slaan"</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Benodigde ruimte: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Ontvangen van bestand van \'<xliff:g id="SENDER">%1$s</xliff:g>\' is beëindigd"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Bestand verzenden naar \'<xliff:g id="RECIPIENT">%1$s</xliff:g>\'"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"<xliff:g id="NUMBER">%1$s</xliff:g> bestanden verzenden naar \'<xliff:g id="RECIPIENT">%2$s</xliff:g>\'"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Verzenden van bestand naar \'<xliff:g id="RECIPIENT">%1$s</xliff:g>\' is beëindigd"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Er is onvoldoende ruimte op de SD-kaart beschikbaar om het bestand van \'<xliff:g id="SENDER">%1$s</xliff:g>\' op te slaan"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Benodigde ruimte: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Er worden te veel aanvragen verwerkt. Probeer het later opnieuw."</string>
     <string name="status_pending" msgid="7446884326084324082">"Bestandsoverdracht nog niet gestart"</string>
     <string name="status_running" msgid="2695810336448055064">"Bestandsoverdracht wordt uitgevoerd"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Het verzoek kan niet correct worden verwerkt"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Onbekende fout"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Ontvangen via Bluetooth"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s ontvangen voltooid."</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s verzonden voltooid."</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> ontvangen voltooid."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> verzonden voltooid."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Inkomende overdrachten"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Uitgaande overdrachten"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Overdrachtsgeschiedenis is leeg."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle items worden gewist uit de lijst."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-share: verzonden bestanden"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-share: ontvangen bestanden"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s geslaagd, %2$s mislukt."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> geslaagd, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> mislukt."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Lijst wissen"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Openen"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Wissen uit lijst"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index bedfe99cc..ddc909de9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Zezwala aplikacji na dostęp do menedżera BluetoothShare i używanie go do przesyłania plików."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Nieznane urządzenie"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Nieznany"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Tryb samolotowy"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Nie można używać funkcji Bluetooth, gdy telefon jest w trybie samolotowym."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Anuluj"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Włącz"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Przesyłanie pliku"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"Urządzenie „%1$s” chce wysłać do Ciebie plik %2$s (%3$s). "\n\n" Czy zaakceptować ten plik?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"Urządzenie „<xliff:g id="SENDER">%1$s</xliff:g>” chce wysłać do Ciebie plik <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" Czy zaakceptować ten plik?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Odrzuć"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Akceptuj"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Nastąpiło przekroczenie limitu czasu na akceptację przychodzącego pliku z urządzenia „%1$s”"</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Upłynął czas oczekiwania przy akceptowaniu przychodzącego pliku z urządzenia „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Udostępnianie Bluetooth: plik przychodzący"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Potwierdź, że chcesz odebrać ten plik"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Przysłano plik z innego urządzenia. Potwierdź, że chcesz go odebrać."</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Udostępnianie Bluetooth: odbieranie %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Udostępnianie Bluetooth: odebrano %1$s"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Udostępnianie Bluetooth: nie odebrano pliku %1$s"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Udostępnianie Bluetooth: wysyłanie %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Udostępnianie Bluetooth: wysłano %1$s"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Udostępnianie Bluetooth: odbieranie <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Udostępnianie Bluetooth: odebrano <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Udostępnianie Bluetooth: nie odebrano pliku <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Udostępnianie Bluetooth: wysyłanie <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Udostępnianie Bluetooth: wysłano <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"Ukończono w 100%"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Udostępnianie Bluetooth: plik %1$s nie został wysłany"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Udostępnianie Bluetooth: plik <xliff:g id="FILE">%1$s</xliff:g> nie został wysłany"</string>
     <string name="download_title" msgid="3353228219772092586">"Przesyłanie pliku"</string>
-    <string name="download_line1" msgid="3470164761579278582">"Od: „%1$s”"</string>
-    <string name="download_line2" msgid="65085079456902842">"Plik: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Rozmiar pliku: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Od: „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
+    <string name="download_line2" msgid="5876973543019417712">"Plik: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Rozmiar pliku: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Odbieranie pliku…"</string>
     <string name="download_cancel" msgid="9177305996747500768">"Zatrzymaj"</string>
     <string name="download_ok" msgid="5000360731674466039">"Ukryj"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Plik nie został odebrany"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Plik: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Przyczyna niepowodzenia: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Plik: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Przyczyna niepowodzenia: <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">"Odebrano plik"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Otwórz"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Do: „%1$s”"</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Typ pliku: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Do: „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Typ pliku: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Wysyłanie pliku…"</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Plik został wysłany"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Plik nie został wysłany do urządzenia „%1$s”."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Plik: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Plik nie został wysłany do urządzenia „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Plik: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Spróbuj ponownie"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Zamknij"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Włączanie modułu Bluetooth…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Plik zostanie odebrany. Sprawdzaj postęp na panelu powiadomień."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Plik nie zostanie odebrany."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Zatrzymano odbiór pliku z urządzenia „%1$s”"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Wysyłanie pliku do urządzenia „%1$s”"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Wysyłanie %1$s plików do urządzenia „%2$s”"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Zatrzymano wysyłanie pliku do urządzenia „%1$s”"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Brak wystarczającej ilości miejsca na karcie SD do zapisania pliku z urządzenia „%1$s”"</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Wymagane miejsce: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Zatrzymano odbiór pliku z urządzenia „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Wysyłanie pliku do urządzenia „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Wysyłanie <xliff:g id="NUMBER">%1$s</xliff:g> plików do urządzenia „<xliff:g id="RECIPIENT">%2$s</xliff:g>”"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Zatrzymano wysyłanie pliku do urządzenia „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Brak wystarczającej ilości miejsca na karcie SD do zapisania pliku z urządzenia „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Wymagane miejsce: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Przetwarzanych jest zbyt wiele żądań. Spróbuj ponownie później."</string>
     <string name="status_pending" msgid="7446884326084324082">"Przesyłanie pliku nie zostało jeszcze rozpoczęte"</string>
     <string name="status_running" msgid="2695810336448055064">"Trwa przesyłanie pliku"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Nie można poprawnie obsłużyć żądania"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Nieznany błąd"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Odebrane przez Bluetooth"</string>
-    <string name="download_success" msgid="8038161914083925191">"Ukończono odbieranie: %1$s."</string>
-    <string name="upload_success" msgid="8160573453144095129">"Ukończono wysyłanie: %1$s."</string>
+    <string name="download_success" msgid="7036160438766730871">"Odbiór <xliff:g id="FILE_SIZE">%1$s</xliff:g> zakończony."</string>
+    <string name="upload_success" msgid="4014469387779648949">"Wysyłanie <xliff:g id="FILE_SIZE">%1$s</xliff:g> zakończono."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Transmisje przychodzące"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Transmisje wychodzące"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Historia transmisji jest pusta."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Wszystkie elementy zostaną usunięte z listy."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Udostępnianie Bluetooth: wysłane pliki"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Udostępnianie Bluetooth: odebrane pliki"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"Powodzenie: %1$s, niepowodzenie: %2$s."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"Powodzenia: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, niepowodzenia: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Wyczyść listę"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Otwórz"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Usuń z listy"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1fcddd506..20d50888e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Permite à aplicação aceder ao gestor BluetoothShare e utilizá-lo para transferir ficheiros."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo desconhecido"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Desconhecido"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Modo de avião"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Não pode utilizar o Bluetooth com o telefone em modo de avião."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Cancelar"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Activar"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferência do ficheiro"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\"%1$s\" quer enviar-lhe %2$s (%3$s). "\n\n" Aceita o ficheiro?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" quer enviar-lhe <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" Aceita o ficheiro?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Recusar"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Aceitar"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Foi excedido o tempo para aceitar o ficheiro recebido de \"%1$s\""</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Foi excedido o tempo limite durante a aceitação de um ficheiro de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Partilha Bluetooth: ficheiro recebido"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Confirme se quer receber este ficheiro"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Está a receber um ficheiro vindo de outro dispositivo, confirme se pretende recebê-lo"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Partilha Bluetooth: a receber %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Partilha Bluetooth: %1$s recebido"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Partilha Bluetooth: ficheiro %1$s não recebido"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Partilha Bluetooth: a enviar %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Partilha Bluetooth: %1$s enviado"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Partilha Bluetooth: a receber <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Partilha Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> recebido"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Partilha Bluetooth: Ficheiro <xliff:g id="FILE">%1$s</xliff:g> não recebido"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Partilha Bluetooth: a enviar <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Partilha Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviado"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100% concluído"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Partilha Bluetooth: ficheiro %1$s não enviado"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Partilha Bluetooth: ficheiro <xliff:g id="FILE">%1$s</xliff:g> não enviado"</string>
     <string name="download_title" msgid="3353228219772092586">"Transferência do ficheiro"</string>
-    <string name="download_line1" msgid="3470164761579278582">"De: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Ficheiro: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Tamanho do ficheiro: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"De: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="download_line2" msgid="5876973543019417712">"Ficheiro: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Tamanho do ficheiro: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"A receber ficheiro..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Parar"</string>
     <string name="download_ok" msgid="5000360731674466039">"Ocultar"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Ficheiro não recebido"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Ficheiro: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Causa da falha: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Ficheiro: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Motivo da falha: <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">"Ficheiro recebido"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Abrir"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Para: \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Tipo de ficheiro: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Para: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Tipo de ficheiro: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"A enviar ficheiro..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Ficheiro enviado"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"O ficheiro não foi enviado para \"%1$s\"."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Ficheiro: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"O ficheiro não foi enviado para \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Ficheiro: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Tente novamente"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Fechar"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"A activar Bluetooth…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"O ficheiro será recebido. Consulte o progresso no painel Notificações."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"O ficheiro não será recebido."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"A recepção do ficheiro de \"%1$s\" foi parada"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"A enviar o ficheiro para \"%1$s\""</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"A enviar %1$s ficheiros para \"%2$s\""</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"O envio do ficheiro para \"%1$s\" foi parado"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Não existe espaço suficiente no cartão SD para guardar o ficheiro de \"%1$s\""</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Espaço necessário: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"A recepção do ficheiro de \"<xliff:g id="SENDER">%1$s</xliff:g>\" foi interrompida"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"A enviar ficheiro para \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"A enviar <xliff:g id="NUMBER">%1$s</xliff:g> ficheiros para \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"O envio do ficheiro para \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" foi interrompido"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Não existe espaço suficiente no cartão SD para guardar o ficheiro de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Espaço necessário: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Existem demasiados pedidos em processamento. Tente novamente mais tarde."</string>
     <string name="status_pending" msgid="7446884326084324082">"Ainda não foi iniciada a transferência do ficheiro"</string>
     <string name="status_running" msgid="2695810336448055064">"Está a decorrer a transferência do ficheiro"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Não é possível processar o pedido correctamente"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Erro desconhecido"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth recebido"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s Recepção concluída."</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s Envio concluído"</string>
+    <string name="download_success" msgid="7036160438766730871">"Recepção completa de <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>
+    <string name="upload_success" msgid="4014469387779648949">"Envio de <xliff:g id="FILE_SIZE">%1$s</xliff:g> concluído "</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Transferências de entrada"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Transferências de saída"</string>
     <string name="no_transfers" msgid="3482965619151865672">"O histórico de transferências está vazio."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Todos os itens serão removidos da lista."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Partilha por Bluetooth: ficheiros enviados"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Partilha por Bluetooth: ficheiros recebidos"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s com êxito, %2$s sem êxito."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> com êxito, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> sem êxito."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Limpar lista"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Limpar da lista"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 609e08e8a..b89e71ff4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Permite que o aplicativo acesse e use o gerenciador BluetoothShare para transferir arquivos."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo desconhecido"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Desconhecido"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Modo para avião"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Você não pode usar Bluetooth quando o telefone estiver no modo para avião."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Cancelar"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Ativar"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferência de arquivo"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\"%1$s\" deseja enviar %2$s (%3$s) para você. "\n\n" Aceitar o arquivo?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" deseja enviar para você <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>). "\n\n" Aceitar o arquivo?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Recusar"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Aceitar"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"Ok"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Tempo limite esgotado para aceitar o arquivo recebido de \"%1$s\""</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"O tempo limite foi atingido ao aceitar um arquivo recebido de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Compartilhamento Bluetooth: arquivo recebido"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Confirme que deseja receber esse arquivo"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Chegou um arquivo de outro dispositivo. Confirme se deseja receber esse arquivo"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Compartilhamento Bluetooth: recebendo %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Compartilhamento Bluetooth: %1$s recebido"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Compartilhamento Bluetooth: o arquivo %1$s não foi recebido"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Compartilhamento Bluetooth: enviando %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Compartilhamento Bluetooth: %1$s enviado"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Compartilhamento Bluetooth: recebendo <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Compartilhamento Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> recebido"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Compartilhamento Bluetooth: o arquivo <xliff:g id="FILE">%1$s</xliff:g> não foi recebido"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Compartilhamento Bluetooth: enviando <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Compartilhamento Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviado"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100% concluído"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Compartilhamento Bluetooth: o arquivo %1$s não foi enviado"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Compartilhamento Bluetooth: o arquivo <xliff:g id="FILE">%1$s</xliff:g> não foi enviado"</string>
     <string name="download_title" msgid="3353228219772092586">"Transferência de arquivo"</string>
-    <string name="download_line1" msgid="3470164761579278582">"De: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Arquivo: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Tamanho do arquivo: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"De: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="download_line2" msgid="5876973543019417712">"Arquivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Tamanho do arquivo: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Recebendo arquivo…"</string>
     <string name="download_cancel" msgid="9177305996747500768">"Parar"</string>
     <string name="download_ok" msgid="5000360731674466039">"Ocultar"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Arquivo não recebido"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Arquivo: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Motivo da falha: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Arquivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Motivo da falha: <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">"Arquivo recebido"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Abrir"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Para: \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Tipo de arquivo: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Para: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Tipo de arquivo: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Enviando arquivo…"</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Arquivo enviado"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"O arquivo não foi enviado para \"%1$s\"."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Arquivo: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"O arquivo não foi enviado para \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Arquivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Tentar novamente"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Fechar"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Ativando bluetooth…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"O arquivo será recebido. Verifique o andamento no painel de Notificações."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"O arquivo não será recebido."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Parou de receber o arquivo de \"%1$s\""</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Enviando arquivo para \"%1$s\""</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Enviando %1$s arquivos para \"%2$s\""</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Transferência de arquivo para \"%1$s\" interrompida"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Não há espaço suficiente no cartão SD para salvar o arquivo de \"%1$s\""</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Espaço necessário: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"O recebimento do arquivo de \"<xliff:g id="SENDER">%1$s</xliff:g>\" foi interrompido"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Enviando arquivo para \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Enviando <xliff:g id="NUMBER">%1$s</xliff:g> arquivos para \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Envio de arquivo para \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" interrompido"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Não há espaço suficiente no cartão SD para salvar o arquivo de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Espaço necessário: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Há muitas solicitações sendo processadas. Tente novamente mais tarde."</string>
     <string name="status_pending" msgid="7446884326084324082">"Transferência de arquivo não iniciada"</string>
     <string name="status_running" msgid="2695810336448055064">"Transferência de arquivo em andamento"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"A solicitação não pode ser tratada corretamente"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Erro desconhecido"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth recebido"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s do recebimento concluído."</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s do envio concluído."</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Recebimento concluído."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Envio concluído."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Transferências de entrada"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Transferências de saída"</string>
     <string name="no_transfers" msgid="3482965619151865672">"O histórico de transferências está vazio."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Todos os itens serão excluídos da lista."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Compartilhamento Bluetooth: Arquivos enviados"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Compartilhamento Bluetooth: Arquivos recebidos"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s bem-sucedido, %2$s com falha."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> com êxito, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> com falha."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Limpar lista"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Limpar da lista"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 26110408e..7aff93994 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Позволяет приложению получать доступ к диспетчеру передачи файлов по каналу 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="8031842956782631624">"Невозможно использовать функцию Bluetooth в режиме полета."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <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="3243341858335056258">"\"%1$s\"отправляет вам %2$s (%3$s). "\n\n" Принять файл?"</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="860272542827665475">"ОК"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Истекло время ожидания при получении файла с устройства \"%1$s\"."</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="85804056450169291">"Подтвердите прием этого файла."</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Входящий файл с другого устройства. Подтвердите получение этого файла."</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Передача по Bluetooth: получение %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Передача по Bluetooth: получено %1$s"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Передача по Bluetooth: файл %1$s не получен"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Передача по Bluetooth: отправка %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Передача по Bluetooth: отправлено %1$s"</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="6632995333466325127">"Передача по Bluetooth: файл %1$s не отправлен"</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="3470164761579278582">"Источник: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Файл: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Размер файла: %1$s"</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="3138506111127456201">"Файл: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Причина ошибки: %1$s"</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_ok" msgid="7053688246357050216">"Открыть"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Назначение: \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Тип файла: %1$s (%2$s)"</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>
     <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="604517433515376787">"Файл не был отправлен на устройство %1$s."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Файл: %1$s"</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_cancel" msgid="9118496285835687125">"Закрыть"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"ОК"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Включение Bluetooth…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Этот файл будет получен. Ход выполнения отображается на панели уведомлений."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Этот файл не будет получен."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Получение файла с устройства \"%1$s\" прервано."</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Отправка файла на \"%1$s\""</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Отправка файлов (%1$s) на устройство \"%2$s\""</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Отправка файла на \"%1$s\" остановлена"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Недостаточно места на SD-карте для сохранения файла, полученного от \"%1$s\"."</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Необходимо свободного места: %1$s"</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" msgid="2801238507525833799">"Недостаточно места на 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="7446884326084324082">"Передача файла еще не началась."</string>
     <string name="status_running" msgid="2695810336448055064">"Выполняется передача файла."</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Невозможно правильно обработать запрос."</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Неизвестная ошибка"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Получено по Bluetooth"</string>
-    <string name="download_success" msgid="8038161914083925191">"Получено: %1$s"</string>
-    <string name="upload_success" msgid="8160573453144095129">"Отправлено: %1$s"</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="5553338716725484736">"Выполнено: %1$s, не выполнено: %2$s."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"Выполнено: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>; не выполнено: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Очистить список"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Открыть"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Удалить из списка"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ad159e891..f8f934832 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Tillåter att programmet använder BluetoothShare-hanteraren till att överföra filer."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Okänd enhet"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Okänd"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Flygplansläge"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Det går inte att använda Bluetooth när telefonen är i flygplansläge."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Avbryt"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Aktivera"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Filöverföring"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"%1$s vill skicka %2$s (%3$s) till dig. "\n\n" Vill du ta emot filen?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"<xliff:g id="SENDER">%1$s</xliff:g> vill skicka <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>) till dig. "\n\n" Vill du ta emot filen?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Avvisa"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Godkänn"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"OK"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"Tidsgränsen för godkännande av inkommande fil från %1$s har överskridits"</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Tidsgränsen överskreds när en inkommande fil från <xliff:g id="SENDER">%1$s</xliff:g> skulle tas emot"</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth-delning: inkommande fil"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Bekräfta att du vill ta emot filen"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"En fil är på väg från en annan enhet. Bekräfta att du vill ta emot filen"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Bluetooth-delning: tar emot %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Bluetooth-delning: %1$s har tagits emot"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Bluetooth-delning: filen %1$s har inte tagits emot"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Bluetooth-delning: skickar %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Bluetooth-delning: %1$s har skickats"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth-delning: tar emot <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Bluetooth-delning: <xliff:g id="FILE">%1$s</xliff:g> har tagits emot"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth-delning: filen <xliff:g id="FILE">%1$s</xliff:g> har inte tagits emot"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth-delning: skickar <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth-delning: <xliff:g id="FILE">%1$s</xliff:g> har skickats"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100 % slutfört"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Bluetooth-delning: filen %1$s har inte skickats"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth-delning: filen <xliff:g id="FILE">%1$s</xliff:g> har inte skickats"</string>
     <string name="download_title" msgid="3353228219772092586">"Filöverföring"</string>
-    <string name="download_line1" msgid="3470164761579278582">"Från: %1$s"</string>
-    <string name="download_line2" msgid="65085079456902842">"Fil: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Filstorlek: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Från: <xliff:g id="SENDER">%1$s</xliff:g>"</string>
+    <string name="download_line2" msgid="5876973543019417712">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Filstorlek: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Tar emot fil ..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Stopp"</string>
     <string name="download_ok" msgid="5000360731674466039">"Dölj"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Filen har inte tagits emot"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Fil: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Felorsak: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Felorsak: <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">"Filen har tagits emot"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Öppna"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Till: %1$s"</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Filtyp: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Till: <xliff:g id="RECIPIENT">%1$s</xliff:g>"</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Filtyp: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Skickar fil ..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Filen har skickats"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Filen skickades inte till %1$s."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Fil: %1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Filen skickades inte till <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fil: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Försök igen"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Stäng"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Aktiverar Bluetooth …"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Filen tas emot. Du kan se förloppet på aviseringspanelen."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Filen tas inte emot."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"Slutade ta emot fil från %1$s"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Skickar fil till %1$s"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"Skickar %1$s filer till %2$s"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"Filöverföringen till %1$s har avbrutits"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"Det finns för lite utrymme på SD-kortet för att spara filen från %1$s"</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Utrymmesbehov: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Slutade ta emot fil från <xliff:g id="SENDER">%1$s</xliff:g>"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Skickar fil till <xliff:g id="RECIPIENT">%1$s</xliff:g>"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Skickar <xliff:g id="NUMBER">%1$s</xliff:g> filer till <xliff:g id="RECIPIENT">%2$s</xliff:g>"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Filöverföringen till <xliff:g id="RECIPIENT">%1$s</xliff:g> har avbrutits"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"Det finns för lite utrymme på SD-kortet för att spara filen från <xliff:g id="SENDER">%1$s</xliff:g>"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Utrymmesbehov: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"För många begäranden bearbetas. Försök igen senare."</string>
     <string name="status_pending" msgid="7446884326084324082">"Filöverföringen har inte börjat"</string>
     <string name="status_running" msgid="2695810336448055064">"Filöverföring pågår"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"Begäran kan inte hanteras korrekt"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Okänt fel"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth har tagits emot"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s har tagits emot fullständigt."</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s har skickats fullständigt."</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> har tagits emot fullständigt."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> har skickats fullständigt."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Inkommande överföringar"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Utgående överföringar"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Det finns ingen överföringshistorik."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alla objekt tas bort från listan."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-delning: skickade filer"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-delning: mottagna filer"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s lyckades, %2$s misslyckades."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> lyckades, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> misslyckades."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Rensa listan"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Öppna"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Ta bort från listan"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8e9bbea92..52795347d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"Uygulamaya BluetoothShare yöneticisine erişme ve bunu dosyaları aktarmak için kullanma izni verir."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Bilinmeyen cihaz"</string>
+    <string name="unknownNumber" msgid="4994750948072751566">"Bilinmiyor"</string>
     <string name="airplane_error_title" msgid="2683839635115739939">"Uçak modu"</string>
     <string name="airplane_error_msg" msgid="8031842956782631624">"Telefon uçak modundayken Bluetooth\'u kullanamazsınız."</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"Bluetooth"</string>
@@ -28,42 +29,42 @@
     <string name="bt_enable_cancel" msgid="1988832367505151727">"İptal"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Aç"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Dosya aktarımı"</string>
-    <string name="incoming_file_confirm_content" msgid="3243341858335056258">"\"%1$s\", size %2$s (%3$s) dosyasını göndermek istiyor. "\n\n" Dosyayı kabul ediyor musunuz?"</string>
+    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" size <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>) dosyasını göndermek istiyor. "\n\n" Dosyayı kabul ediyor musunuz?"</string>
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Reddet"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Kabul Et"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="860272542827665475">"Tamam"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"\"%1$s\" kaynağından gelen dosyayı kabul etme süresi doldu"</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" kaynağından gelen dosyayı kabul etme süresi doldu"</string>
     <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth paylaşımı: Gelen dosya"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"Lütfen bu dosyayı almak istediğinizi onaylayın"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"Başka cihazdan gelen bir dosya var, lütfen bu dosyayı almak istediğinizi onaylayın"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Bluetooth paylaşımı: %1$s alınıyor"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Bluetooth paylaşımı: %1$s alındı"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Bluetooth paylaşımı: %1$s dosyası alınamadı"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Bluetooth paylaşımı: 1$s gönderiliyor"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Bluetooth paylaşımı: %1$s gönderildi"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth paylaşımı: <xliff:g id="FILE">%1$s</xliff:g> alınıyor"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Bluetooth paylaşımı: <xliff:g id="FILE">%1$s</xliff:g> alındı"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth paylaşımı:<xliff:g id="FILE">%1$s</xliff:g> dosyası alınamadı"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth paylaşımı: <xliff:g id="FILE">%1$s</xliff:g> gönderiliyor"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth paylaşımı: <xliff:g id="FILE">%1$s</xliff:g> gönderildi"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"%100 tamamlandı"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Bluetooth paylaşımı: Dosya %1$s gönderilemedi"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth paylaşımı: <xliff:g id="FILE">%1$s</xliff:g> dosyası gönderilmedi"</string>
     <string name="download_title" msgid="3353228219772092586">"Dosya aktarımı"</string>
-    <string name="download_line1" msgid="3470164761579278582">"Gönderen: \"%1$s\""</string>
-    <string name="download_line2" msgid="65085079456902842">"Dosya: %1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"Dosya boyutu: %1$s"</string>
+    <string name="download_line1" msgid="4926604799202134144">"Gönderen: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+    <string name="download_line2" msgid="5876973543019417712">"Dosya: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Dosya boyutu: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
     <string name="download_line5" msgid="3069560415845295386">"Dosya alınıyor..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Durdur"</string>
     <string name="download_ok" msgid="5000360731674466039">"Gizle"</string>
     <string name="download_fail_line1" msgid="3846450148862894552">"Dosya alınamadı"</string>
-    <string name="download_fail_line2" msgid="3138506111127456201">"Dosya: %1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"Hata nedeni: %1$s"</string>
+    <string name="download_fail_line2" msgid="8950394574689971071">"Dosya: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="download_fail_line3" msgid="5611058289180135888">"Hata nedeni: <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="download_fail_ok" msgid="1521733664438320300">"Tamam"</string>
     <string name="download_succ_line5" msgid="4509944688281573595">"Dosya alındı"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Aç"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"Hedef: \"%1$s\""</string>
-    <string name="upload_line3" msgid="6702013202133020437">"Dosya Türü: %1$s (%2$s)"</string>
+    <string name="upload_line1" msgid="2055952074059709052">"Kime: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+    <string name="upload_line3" msgid="5866755479845641607">"Dosya Türü: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Dosya gönderiliyor..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Dosya gönderildi"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"Tamam"</string>
-    <string name="upload_fail_line1" msgid="604517433515376787">"Dosya, \"%1$s\" hedefine gönderilemedi."</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"Dosya: 1$s"</string>
+    <string name="upload_fail_line1" msgid="229249873880944683">"Dosya \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" hedefine gönderilmedi."</string>
+    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Dosya: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Tekrar dene"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Kapat"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"Tamam"</string>
@@ -75,12 +76,12 @@
     <string name="enabling_progress_content" msgid="1291028079299309898">"Bluetooth açılıyor..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Dosya alınacak. İlerlemeyi Bildirimler panelinden izleyebilirsiniz."</string>
     <string name="bt_toast_2" msgid="6357386241778417651">"Dosya alınmayacak."</string>
-    <string name="bt_toast_3" msgid="369942279238724592">"\"%1$s\" kaynağından dosya alımı durduruldu"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"Dosya \"%1$s\" hedefine gönderiliyor"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"%1$s dosyaları \"%2$s\" alıcısına gönderiliyor"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"\"%1$s\" hedefine dosya gönderme işlemi durduruldu"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"SD kartta, \"%1$s\" kaynağından gelen dosyayı kaydedecek kadar alan yok"</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"Gereken alan: %1$s"</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" kaynağından dosya alımı durduruldu"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Dosya \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" hedefine gönderiliyor"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"<xliff:g id="NUMBER">%1$s</xliff:g> dosya \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\" hedefine gönderiliyor"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" hedefine dosya gönderme işlemi durduruldu"</string>
+    <string name="bt_sm_2_1" msgid="2801238507525833799">"SD kartta \"<xliff:g id="SENDER">%1$s</xliff:g>\" kaynağından gelen dosyayı kaydedecek kadar alan yok"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Gereken alan: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Çok fazla sayıda istek işleniyor. Daha sonra yeniden deneyin."</string>
     <string name="status_pending" msgid="7446884326084324082">"Dosya aktarımı henüz başlatılmadı"</string>
     <string name="status_running" msgid="2695810336448055064">"Dosya aktarımı devam ediyor"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"İstek düzgün bir şekilde işlenemiyor"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"Bilinmeyen hata"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth alındı"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s Alma tamamlandı."</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s Gönderme tamamlandı."</string>
+    <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Alma tamamlandı."</string>
+    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Gönderme tamamlandı."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Gelen aktarımlar"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"Giden aktarımlar"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Aktarım geçmişi boş."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Tüm öğeler listeden temizlenecek."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth paylaşımı: Gönderilen dosyalar"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth paylaşımı: Dosyalar alındı"</string>
-    <string name="noti_caption" msgid="5553338716725484736">"%1$s başarılı, %2$s başarısız."</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> başarılı, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> başarısız."</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"Listeyi temizle"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"Aç"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"Listeden temizle"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 00f8b8905..5cf33db2d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"允许应用程序访问 Bluetooth Share 管理器，并使用该管理器传输文件。"</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="8031842956782631624">"手机处于飞行模式时，您不能使用蓝牙。"</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"蓝牙"</string>
@@ -28,42 +29,42 @@
     <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="3243341858335056258">"“%1$s”想给您发送 %2$s (%3$s)。"\n\n" 是否接受该文件？"</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="860272542827665475">"确定"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"接受来自“%1$s”的文件时超时"</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 Share：传入文件"</string>
     <string name="incoming_file_confirm_Notification_caption" msgid="85804056450169291">"请确认您要接收该文件"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"从其他设备收到一个文件，请确认是否要接收该文件"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"Bluetooth Share：正在接收 %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"Bluetooth Share：已接收 %1$s"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"Bluetooth Share：未收到文件 %1$s"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"Bluetooth Share：正在发送 %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"Bluetooth Share：已发送 %1$s"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth Share：正在接收 <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Bluetooth Share：<xliff:g id="FILE">%1$s</xliff:g> 已接收"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"蓝牙共享：未收到文件 <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth Share：正在发送 <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth Share：<xliff:g id="FILE">%1$s</xliff:g> 已发送"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"已完成 100%"</string>
-    <string name="notification_sent_fail" msgid="6632995333466325127">"Bluetooth Share：未发送文件 %1$s"</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="3470164761579278582">"发送者：“%1$s”"</string>
-    <string name="download_line2" msgid="65085079456902842">"文件：%1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"文件大小：%1$s"</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="3138506111127456201">"文件：%1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"失败原因：%1$s"</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_ok" msgid="7053688246357050216">"打开"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"接收者：“%1$s”"</string>
-    <string name="upload_line3" msgid="6702013202133020437">"文件类型：%1$s (%2$s)"</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>
     <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="604517433515376787">"未将该文件发送至“%1$s”。"</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"文件：%1$s"</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_cancel" msgid="9118496285835687125">"关闭"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"确定"</string>
@@ -75,12 +76,12 @@
     <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_3" msgid="369942279238724592">"已停止接收来自“%1$s”的文件"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"正向“%1$s”发送文件"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"正在向“%2$s”发送 %1$s 个文件"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"已停止向“%1$s”发送文件"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"SD 卡存储空间不足，无法保存来自“%1$s”的文件"</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"所需空间：%1$s"</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" msgid="2801238507525833799">"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="7446884326084324082">"尚未开始传输文件"</string>
     <string name="status_running" msgid="2695810336448055064">"正在传输文件"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"无法正确处理请求"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"未知错误"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth received"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$s接收完成。"</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$s发送完成。"</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="5553338716725484736">"%1$s成功，%2$s失败。"</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> 个成功，<xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> 个失败。"</string>
     <string name="transfer_menu_clear_all" msgid="790017462957873132">"清除列表"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"打开"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"从列表中清除"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a3f5f07c9..646f469c4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,6 +20,7 @@
     <string name="permdesc_bluetoothShareManager" msgid="8739116224907566462">"允許應用程式存取 BluetoothShare 管理員並使用它傳輸檔案。"</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="8031842956782631624">"手機處於飛行模式時，無法使用藍牙功能。"</string>
     <string name="bt_enable_title" msgid="2371250311764527124">"藍牙"</string>
@@ -28,42 +29,42 @@
     <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="3243341858335056258">"「%1$s」想傳送給您 %2$s (%3$s)。"\n\n"要接收檔案嗎？"</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="860272542827665475">"確定"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="4795632076456456334">"從「%1$s」接受外來檔案時發生作業逾時"</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="85804056450169291">"請確認您想接收這個檔案"</string>
     <string name="incoming_file_toast_msg" msgid="5763638110029586276">"有來自其他裝置的外來檔案，請確認您想接收這個檔案"</string>
-    <string name="notification_receiving" msgid="3938472603351415139">"藍牙分享：正在接收 %1$s"</string>
-    <string name="notification_received" msgid="7594846429703561009">"藍牙分享：已接收 %1$s"</string>
-    <string name="notification_received_fail" msgid="2017422835194149214">"藍牙分享：尚未收到 %1$s 檔案"</string>
-    <string name="notification_sending" msgid="3118149961355869912">"藍牙分享：正在傳送 %1$s"</string>
-    <string name="notification_sent" msgid="6345048674000520702">"藍牙分享：已傳送 %1$s"</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="6632995333466325127">"藍牙分享：尚未傳送 %1$s 檔案"</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="3470164761579278582">"來自：「%1$s」"</string>
-    <string name="download_line2" msgid="65085079456902842">"檔案：%1$s"</string>
-    <string name="download_line3" msgid="7381726201104929958">"檔案大小：%1$s"</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="3138506111127456201">"檔案：%1$s"</string>
-    <string name="download_fail_line3" msgid="7362197851195915506">"失敗原因：%1$s"</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_ok" msgid="7053688246357050216">"開啟"</string>
-    <string name="upload_line1" msgid="1813850771254840346">"傳送到：「%1$s」"</string>
-    <string name="upload_line3" msgid="6702013202133020437">"檔案類型：%1$s (%2$s)"</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>
     <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="604517433515376787">"檔案並未傳送至「%1$s」。"</string>
-    <string name="upload_fail_line1_2" msgid="5519612777343102736">"檔案：%1$s"</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_cancel" msgid="9118496285835687125">"關閉"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"確定"</string>
@@ -75,12 +76,12 @@
     <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_3" msgid="369942279238724592">"已停止從「%1$s」接收檔案"</string>
-    <string name="bt_toast_4" msgid="6320052202214451994">"傳送檔案至「%1$s」"</string>
-    <string name="bt_toast_5" msgid="3481598201604043629">"正在傳送 %1$s 個檔案至「%2$s」"</string>
-    <string name="bt_toast_6" msgid="4157809141200418519">"已停止傳送檔案至「%1$s」"</string>
-    <string name="bt_sm_2_1" msgid="6625813581585502551">"SD 卡上沒有足夠的空間可儲存來自「%1$s」的檔案"</string>
-    <string name="bt_sm_2_2" msgid="2697023602119073395">"所需儲存空間：%1$s"</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" msgid="2801238507525833799">"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="7446884326084324082">"尚未開始傳輸檔案"</string>
     <string name="status_running" msgid="2695810336448055064">"正在進行檔案傳輸"</string>
@@ -94,15 +95,15 @@
     <string name="status_protocol_error" msgid="8898902951085043597">"無法正確處理要求"</string>
     <string name="status_unknown_error" msgid="7441602228720350817">"未知的錯誤"</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"已透過藍牙接收"</string>
-    <string name="download_success" msgid="8038161914083925191">"%1$ 接收完成。"</string>
-    <string name="upload_success" msgid="8160573453144095129">"%1$ 傳送完成。"</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="5553338716725484736">"%1$ 成功，%2$ 失敗。"</string>
+    <string name="noti_caption" msgid="8510712376046370819">"<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>