diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a5447e9a..5081e97c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -79,11 +79,7 @@
   <string name="pairing_request_from">طلب اقتران من %1s</string>
   <string name="received_url_title">استُلمت وصلة من %1s</string>
   <string name="received_url_text">المس لفتح \'%1s\'</string>
-  <string name="incoming_file_title">ملفّ وارد من %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">يرسل ملفًّا إلى %1s</string>
-  <string name="received_file_title">استُقبل ملفّ من %1s</string>
-  <string name="received_file_fail_title">فشل استقبال الملفّ من %1s</string>
   <string name="received_file_text">المس لفتح \'%1s\'</string>
   <string name="sent_file_title">أرسل ملفًّا إلى %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 47389f0a..d867bc73 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -60,10 +60,7 @@
   <string name="pairing_request_from">Uparivanje zatraženo od %1s</string>
   <string name="received_url_title">Primljena veza od %1s</string>
   <string name="received_url_text">Kucni za otvaranje \'%1s\'</string>
-  <string name="incoming_file_title">Dolazna datoteka od %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Slanje datoteke na %1s</string>
-  <string name="received_file_title">Primljena datoteka od %1s</string>
   <string name="received_file_text">Kucni za otvaranje \'%1s\'</string>
   <string name="sent_file_title">Poslana datoteka na %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 547d59d4..a65e27c2 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -96,16 +96,28 @@
   <string name="pairing_request_from">S\'ha demanat aparellar des de %1s</string>
   <string name="received_url_title">S\'ha rebut un vincle des de %1s</string>
   <string name="received_url_text">Puntegeu per obrir «%1s»</string>
-  <string name="incoming_file_title">Fitxer entrant des de %1s</string>
-  <string name="incoming_file_text">%1s</string>
+  <plurals name="incoming_file_title">
+    <item quantity="one">S\'està rebent %1$d fitxer des de %2$s</item>
+    <item quantity="other">S\'estan rebent %1$d fitxers des de %2$s</item>
+  </plurals>
+  <plurals name="incoming_files_text">
+    <item quantity="one">Fitxer: %1s</item>
+    <item quantity="other">(Fitxer %2$d de %3$d): %1$s</item>
+  </plurals>
   <string name="outgoing_file_title">S\'està enviant el fitxer a %1s</string>
   <string name="outgoing_files_title">S\'estan enviant fitxers a %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">S\'ha enviat %1$d fitxer</item>
     <item quantity="other">S\'ha enviat %1$d de %2$d fitxers</item>
   </plurals>
-  <string name="received_file_title">Fitxer rebut des de %1s</string>
-  <string name="received_file_fail_title">Ha fallat en rebre el fitxer des de %1s</string>
+  <plurals name="received_files_title">
+    <item quantity="one">S\'ha rebut %1$d fitxer des de %2$s</item>
+    <item quantity="other">S\'han rebut %1$d fitxers des de %2$s</item>
+  </plurals>
+  <plurals name="received_files_fail_title">
+    <item quantity="one">Ha fallat en rebre %1$d de %2$d fitxer des de %3$s</item>
+    <item quantity="other">Ha fallat en rebre %1$d de %2$d fitxers des de %3$s</item>
+  </plurals>
   <string name="received_file_text">Puntegeu per obrir «%1s»</string>
   <string name="sent_file_title">Fitxer enviat a %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 49361937..cd6ec7df 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -96,8 +96,6 @@
   <string name="pairing_request_from">Požadavek o párování z %1s</string>
   <string name="received_url_title">Přijat odkaz od %1s</string>
   <string name="received_url_text">Ťukněte pro otevření \'%1s\'</string>
-  <string name="incoming_file_title">Příchozí soubor od %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Odesílám soubor do %1s</string>
   <string name="outgoing_files_title">Odesílám soubory do %1s</string>
   <plurals name="outgoing_files_text">
@@ -106,8 +104,6 @@
     <item quantity="many">Odesláno %1$d ze %2$d souborů</item>
     <item quantity="other"/>
   </plurals>
-  <string name="received_file_title">Přijat soubor od %1s</string>
-  <string name="received_file_fail_title">Selhalo přijímání souboru od %1s</string>
   <string name="received_file_text">Ťukněte pro otevření \'%1s\'</string>
   <string name="sent_file_title">Soubor byl odeslán do %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1eb2ea82..03e4aacd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -85,12 +85,8 @@
   <string name="pairing_request_from">Parringsanmodning fra %1s</string>
   <string name="received_url_title">Modtog link fra %1s</string>
   <string name="received_url_text">Tap for at åbne \"%1s\"</string>
-  <string name="incoming_file_title">Indkommende fil fra %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Sender fil til %1s</string>
   <string name="outgoing_files_title">Sender filer til %1s</string>
-  <string name="received_file_title">Modtog fil fra %1s</string>
-  <string name="received_file_fail_title">Kunne ikke modtage fil fra %1s</string>
   <string name="received_file_text">Tap for at åbne \"%1s\"</string>
   <string name="sent_file_title">Fil sendt til %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b4db59d2..65afe67f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -85,16 +85,12 @@
   <string name="pairing_request_from">Verbindungsanfrage von %1s</string>
   <string name="received_url_title">Verknüpfung von %1s erhalten</string>
   <string name="received_url_text">Tippen um „%1s“ zu öffnen</string>
-  <string name="incoming_file_title">Eingehende Datei von %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Datei wird an %1s gesendet</string>
   <string name="outgoing_files_title">Datei wird an %1s gesendet</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">%1$d Datei gesendet</item>
     <item quantity="other">%1$d von %2$d Dateien gesendet</item>
   </plurals>
-  <string name="received_file_title">Datei von %1s erhalten</string>
-  <string name="received_file_fail_title">Der Empfang der Datei %1s ist fehlgeschlagen</string>
   <string name="received_file_text">Tippen um „%1s“ zu öffnen</string>
   <string name="sent_file_title">Datei an %1s gesendet</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7a67cbe2..cf3f5014 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -85,12 +85,8 @@
   <string name="pairing_request_from">Αίτημα σύζευξης από %1s</string>
   <string name="received_url_title">Ελήφθη σύνδεσμος από %1s</string>
   <string name="received_url_text">Χτυπήστε για άνοιγμα \'%1s\'</string>
-  <string name="incoming_file_title">Εισερχόμενο αρχείο από %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Αποστολή αρχείου σε %1s</string>
   <string name="outgoing_files_title">Αποστολή αρχείων σε %1s</string>
-  <string name="received_file_title">Ελήφθη αρχείο από %1s</string>
-  <string name="received_file_fail_title">Αποτυχία λήψης αρχείου από %1s</string>
   <string name="received_file_text">Χτυπήστε για άνοιγμα \'%1s\'</string>
   <string name="sent_file_title">Εστάλη αρχείο σε %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 00b04d23..aa039431 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -96,16 +96,12 @@
   <string name="pairing_request_from">Pairing request from %1s</string>
   <string name="received_url_title">Received link from %1s</string>
   <string name="received_url_text">Tap to open \'%1s\'</string>
-  <string name="incoming_file_title">Incoming file from %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Sending file to %1s</string>
   <string name="outgoing_files_title">Sending files to %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Send files</item>
     <item quantity="other">Sent %1$d out of %2$d files</item>
   </plurals>
-  <string name="received_file_title">Received file from %1s</string>
-  <string name="received_file_fail_title">Failed receiving file from %1s</string>
   <string name="received_file_text">Tap to open \'%1s\'</string>
   <string name="sent_file_title">Sent file to %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4c7e7b2c..50dc1fbb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -96,16 +96,12 @@
   <string name="pairing_request_from">Solicitud de vinculación de %1s</string>
   <string name="received_url_title">Enlace recibido desde %1s</string>
   <string name="received_url_text">Pulse para abrir «%1s»</string>
-  <string name="incoming_file_title">Archivo entrante desde %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Enviando archivo a %1s</string>
   <string name="outgoing_files_title">Enviando archivos a %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Enviado %1$d archivo</item>
     <item quantity="other">Enviados %1$d de %2$d archivos</item>
   </plurals>
-  <string name="received_file_title">Archivo recibido desde %1s</string>
-  <string name="received_file_fail_title">Fallo recibiendo archivo desde %1s</string>
   <string name="received_file_text">Pulse para abrir «%1s»</string>
   <string name="sent_file_title">Archivo enviado a %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index ed6863e8..b9e71e0e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -79,12 +79,8 @@
   <string name="pairing_request_from">Paardumise soov seadmest %1s</string>
   <string name="received_url_title">Lingi saamine seadmest %1s</string>
   <string name="received_url_text">Koputa \"%1s\" avamiseks</string>
-  <string name="incoming_file_title">Saabuv fail seadmest %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Faili saatmine seadmesse %1s</string>
   <string name="outgoing_files_title">Failide saatmine seadmesse %1s</string>
-  <string name="received_file_title">Faili saamine seadmest %1s</string>
-  <string name="received_file_fail_title">Faili saamine seadmest %1s nurjus</string>
   <string name="received_file_text">Koputa \"%1s\" avamiseks</string>
   <string name="sent_file_title">Fail saadeti seadmesse %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 8569374d..d5a8a6eb 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -85,12 +85,8 @@
   <string name="pairing_request_from">Parekatzeko eskaria %1s-tik</string>
   <string name="received_url_title">Esteka jaso da %1s-tik</string>
   <string name="received_url_text">Sakatu \'%1s\' irekitzeko</string>
-  <string name="incoming_file_title">Fitxategia jasotzen %1s-tik</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Fitxategia bidaltzen %1s-ra</string>
   <string name="outgoing_files_title">Fitxategiak bidaltzen %1s-ra</string>
-  <string name="received_file_title">Fitxategia jaso da %1s-tik</string>
-  <string name="received_file_fail_title">Huts egin du fitxategia jasotzea %1s-tik</string>
   <string name="received_file_text">Sakatu \'%1s\' irekitzeko</string>
   <string name="sent_file_title">Fitxategia bidalita %1s-ra</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8e0a4b3c..0af4aefe 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -89,16 +89,12 @@
   <string name="pairing_request_from">Paripyyntö laitteesta %1s</string>
   <string name="received_url_title">Vastaanotettiin linkki lähettäjältä %1s</string>
   <string name="received_url_text">Avaa ”%1s” napauttamalla</string>
-  <string name="incoming_file_title">Saapuva tiedosto lähettäjältä %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Lähetetään tiedostoa laitteeseen %1s</string>
   <string name="outgoing_files_title">Lähetetään tiedostoa laitteeseen %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Lähetetty %1$d tiedosto</item>
     <item quantity="other">Lähetetty %1$d/%2$d tiedostoa</item>
   </plurals>
-  <string name="received_file_title">Vastaanotettiin tiedosto lähettäjältä %1s</string>
-  <string name="received_file_fail_title">Ei voitu vastaanottaa tiedostoa lähettäjältä %1s</string>
   <string name="received_file_text">Avaa ”%1s” napauttamalla</string>
   <string name="sent_file_title">Tiedosto lähetetty laitteeseen %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 99d00a73..8fb0a006 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -93,16 +93,12 @@
   <string name="pairing_request_from">Demande d\'association provenant de %1s</string>
   <string name="received_url_title">Lien reçu de %1s</string>
   <string name="received_url_text">Appuyez pour ouvrir %1s</string>
-  <string name="incoming_file_title">Réception d\'un fichier en cours depuis %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Envoi d\'un fichier à %1s</string>
   <string name="outgoing_files_title">Envoi de fichiers à %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">%1$d fichier envoyé</item>
     <item quantity="other">%1$d fichiers envoyés sur %2$d</item>
   </plurals>
-  <string name="received_file_title">Fichier reçu de %1s</string>
-  <string name="received_file_fail_title">Impossible de recevoir le fichier depuis : %1s</string>
   <string name="received_file_text">Appuyez pour ouvrir %1s</string>
   <string name="sent_file_title">Fichier envoyé à %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 0c636abb..40445776 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -96,16 +96,28 @@
   <string name="pairing_request_from">Solicitude de emparellamento de %1s.</string>
   <string name="received_url_title">Recibiuse unha ligazón de %1s</string>
   <string name="received_url_text">Toque para abrir «%1s».</string>
-  <string name="incoming_file_title">Ficheiro entrande de %1s</string>
-  <string name="incoming_file_text">%1s</string>
+  <plurals name="incoming_file_title">
+    <item quantity="one">Recibindo %1$d ficheiro de %2$s</item>
+    <item quantity="other">Recibindo %1$d ficheiros de %2$s</item>
+  </plurals>
+  <plurals name="incoming_files_text">
+    <item quantity="one">Ficheiro: %1s</item>
+    <item quantity="other">(Ficheiro %2$d de %3$d) : %1$s</item>
+  </plurals>
   <string name="outgoing_file_title">Enviando un ficheiro a %1s</string>
   <string name="outgoing_files_title">Enviando os ficheiros a %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Enviouse %1$d ficheiro.</item>
     <item quantity="other">Enviáronse %1$d de %2$d ficheiros.</item>
   </plurals>
-  <string name="received_file_title">Recibiuse un ficheiro de %1s</string>
-  <string name="received_file_fail_title">A recepción do ficheiro de %1s fallou</string>
+  <plurals name="received_files_title">
+    <item quantity="one">Recibiuse %1$d ficheiro de %2$s</item>
+    <item quantity="other">Recibíronse %1$d ficheiros de %2$s</item>
+  </plurals>
+  <plurals name="received_files_fail_title">
+    <item quantity="one">A recepción de %1$d de %2$d ficheiro de %3$s fallou</item>
+    <item quantity="other">A recepción de %1$d de %2$d ficheiros de %3$s fallou</item>
+  </plurals>
   <string name="received_file_text">Toque para abrir «%1s».</string>
   <string name="sent_file_title">Enviouse o ficheiro a %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index d23a06fb..8f5407ed 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -85,12 +85,8 @@
   <string name="pairing_request_from">בוקשה התאמה מ־%1s</string>
   <string name="received_url_title">התקבל קישור מ־%1s</string>
   <string name="received_url_text">לחץ כדי לפתוח את \"%1s\"</string>
-  <string name="incoming_file_title">התקבל קובץ מאת %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">שולח קובץ אל %1s</string>
   <string name="outgoing_files_title">שולח קובצים אל %1s</string>
-  <string name="received_file_title">התקבל קובץ מאת %1s</string>
-  <string name="received_file_fail_title">נכשל בקבלת קובץ מאת %1s</string>
   <string name="received_file_text">לחץ כדי לפתוח את \"%1s\"</string>
   <string name="sent_file_title">הקובץ נשלח אל %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1e388237..36ac6aae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -55,9 +55,6 @@
   <string name="pairing_request_from">Párosítási kérés innen: %1s</string>
   <string name="received_url_title">Hivatkozás érkezett innen: %1s</string>
   <string name="received_url_text">Koppintson „%1s” megnyitásához</string>
-  <string name="incoming_file_title">Bejövő fájl innen: %1s</string>
-  <string name="incoming_file_text">%1s</string>
-  <string name="received_file_title">Fájl érkezett innen: %1s</string>
   <string name="received_file_text">Koppintson „%1s” megnyitásához</string>
   <string name="tap_to_answer">Érintse meg a válaszhoz</string>
   <string name="reconnect">Újracsatlakozás</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 7b5056d2..545af2de 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -89,15 +89,11 @@
   <string name="pairing_request_from">Minta penyandingan dari %1s</string>
   <string name="received_url_title">Tautan diterima dari %1s</string>
   <string name="received_url_text">Ketuk untuk membuka \'%1s\'</string>
-  <string name="incoming_file_title">File masuk dari %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Mengirim file ke %1s</string>
   <string name="outgoing_files_title">Mengirim file ke %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="other">Kirim %1$d dari dalam file %2$d</item>
   </plurals>
-  <string name="received_file_title">Diterima file dari %1s</string>
-  <string name="received_file_fail_title">Penerimaan file gagal dari %1s</string>
   <string name="received_file_text">Ketuk untuk membuka \'%1s\'</string>
   <string name="sent_file_title">Kirim file ke %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fd160e9a..34db1ea5 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -96,16 +96,12 @@
   <string name="pairing_request_from">Richiesta associazione da %1s</string>
   <string name="received_url_title">Collegamento ricevuto da %1s</string>
   <string name="received_url_text">Tocca per aprire «%1s»</string>
-  <string name="incoming_file_title">File in ingresso da %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Invio file a %1s</string>
   <string name="outgoing_files_title">Invio file a %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Inviato %1$d file</item>
     <item quantity="other">Inviati %1$d di %2$d file</item>
   </plurals>
-  <string name="received_file_title">File ricevuto da %1s</string>
-  <string name="received_file_fail_title">Ricezione file da %1s non riuscita</string>
   <string name="received_file_text">Tocca per aprire «%1s»</string>
   <string name="sent_file_title">File inviato a %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a9091094..ee29103d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -92,15 +92,11 @@
   <string name="pairing_request_from">%1s에서 연결 요청</string>
   <string name="received_url_title">%1s에서 링크 받음</string>
   <string name="received_url_text">\'%1s\'을(를) 열려면 누르십시오</string>
-  <string name="incoming_file_title">%1s에서 파일 보냄</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">%1s(으)로 파일 보내는 중</string>
   <string name="outgoing_files_title">%1s(으)로 파일 보내는 중</string>
   <plurals name="outgoing_files_text">
     <item quantity="other">파일 %2$d개 중 %1$d개 보냄</item>
   </plurals>
-  <string name="received_file_title">%1s에서 파일 받음</string>
-  <string name="received_file_fail_title">%1s에서 파일 받기 실패</string>
   <string name="received_file_text">\'%1s\'을(를) 열려면 누르십시오</string>
   <string name="sent_file_title">%1s(으)로 파일 보냄</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d7211f89..3b790bc6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -96,16 +96,28 @@
   <string name="pairing_request_from">Verzoek om een paar te maken van %1s</string>
   <string name="received_url_title">Ontvangen koppeling van %1s</string>
   <string name="received_url_text">Tap om \'%1s\' te openen</string>
-  <string name="incoming_file_title">Inkomend bestand van %1s</string>
-  <string name="incoming_file_text">%1s</string>
+  <plurals name="incoming_file_title">
+    <item quantity="one">%1$d bestand wordt ontvangen vanaf %2$s</item>
+    <item quantity="other">%1$d bestanden worden ontvangen vanaf %2$s</item>
+  </plurals>
+  <plurals name="incoming_files_text">
+    <item quantity="one">Bestand: %1s</item>
+    <item quantity="other">(Bestand %2$d van %3$d) : %1$s</item>
+  </plurals>
   <string name="outgoing_file_title">Bestand wordt verzonden naar %1s</string>
   <string name="outgoing_files_title">Bezig bestanden te verzenden naar %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Bestand %1$d verzenden</item>
     <item quantity="other">%1$d bestanden uit %2$d verzenden</item>
   </plurals>
-  <string name="received_file_title">Bestand ontvangen van %1s</string>
-  <string name="received_file_fail_title">Bestand ontvangen van %1s is mislukt</string>
+  <plurals name="received_files_title">
+    <item quantity="one">Ontvangen %1$d bestand van %2$s</item>
+    <item quantity="other">Ontvangen %1$d bestanden vanaf %2$s</item>
+  </plurals>
+  <plurals name="received_files_fail_title">
+    <item quantity="one">Ontvangen van %1$d van %2$d bestand vanaf %3$s is mislukt</item>
+    <item quantity="other">Ontvangen van %1$d van %2$d bestanden vanaf %3$s is mislukt</item>
+  </plurals>
   <string name="received_file_text">Tap om \'%1s\' te openen</string>
   <string name="sent_file_title">Bestand verzonden naar %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-nn/strings.xml b/res/values-nn/strings.xml
index 7737761b..992e71cb 100644
--- a/res/values-nn/strings.xml
+++ b/res/values-nn/strings.xml
@@ -96,16 +96,12 @@
   <string name="pairing_request_from">Paringsførespurnad frå %1s</string>
   <string name="received_url_title">Fekk lenkje frå %1s</string>
   <string name="received_url_text">Trykk for å opna «%1s»</string>
-  <string name="incoming_file_title">Får fil frå %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Sender fil til %1s</string>
   <string name="outgoing_files_title">Sender filer til %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Sende %1$d fil</item>
     <item quantity="other">Sende %1$d av %2$d filer</item>
   </plurals>
-  <string name="received_file_title">Fekk fil frå %1s</string>
-  <string name="received_file_fail_title">Klarte ikkje ta imot fil frå %1s</string>
   <string name="received_file_text">Trykk for å opna «%1s»</string>
   <string name="sent_file_title">Send fil til %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7204fea4..c2e39103 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -96,8 +96,6 @@
   <string name="pairing_request_from">Żądanie parowania z %1s</string>
   <string name="received_url_title">Odebrano odsyłacz od %1s</string>
   <string name="received_url_text">Znacznik do otwarcia \'%1s\'</string>
-  <string name="incoming_file_title">Plik przychodzący od %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Wysyłanie pliku do %1s</string>
   <string name="outgoing_files_title">Wysyłanie pliku do %1s</string>
   <plurals name="outgoing_files_text">
@@ -106,8 +104,6 @@
     <item quantity="many">Wysłano %1$d z %2$d plików</item>
     <item quantity="other"/>
   </plurals>
-  <string name="received_file_title">Odebrano plik od %1s</string>
-  <string name="received_file_fail_title">Nieudane odbieranie pliku z %1s</string>
   <string name="received_file_text">Znacznik do otwarcia \'%1s\'</string>
   <string name="sent_file_title">Plik wysłano do %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 2371c03a..47acfe44 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -93,16 +93,12 @@
   <string name="pairing_request_from">Emparelhamento solicitado por %1s</string>
   <string name="received_url_title">Link recebido de %1s</string>
   <string name="received_url_text">Toque para abrir o \'%1s\'</string>
-  <string name="incoming_file_title">Arquivo recebido de %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Enviando arquivo para %1s</string>
   <string name="outgoing_files_title">Enviando arquivos para %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Enviado %1$d arquivo</item>
     <item quantity="other">Enviados %1$d de %2$d arquivos</item>
   </plurals>
-  <string name="received_file_title">Arquivo recebido de %1s</string>
-  <string name="received_file_fail_title">Falha ao receber o arquivo de %1s</string>
   <string name="received_file_text">Toque para abrir o \'%1s\'</string>
   <string name="sent_file_title">Enviar arquivo para %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9d13daa0..696386f2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -96,16 +96,12 @@
   <string name="pairing_request_from">Pedido de emparelhamento de %1s</string>
   <string name="received_url_title">Ligação recebida de %1s</string>
   <string name="received_url_text">Toque para abrir o \'%1s\'</string>
-  <string name="incoming_file_title">Ficheiro recebido de %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">A enviar o ficheiro para o %1s</string>
   <string name="outgoing_files_title">A enviar os ficheiros para o %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Foi enviado %1$d ficheiro</item>
     <item quantity="other">Foram enviados %1$d de %2$d ficheiros</item>
   </plurals>
-  <string name="received_file_title">Ficheiro recebido de %1s</string>
-  <string name="received_file_fail_title">Falhou a recepção do ficheiro de %1s</string>
   <string name="received_file_text">Toque para abrir o \'%1s\'</string>
   <string name="sent_file_title">O ficheiro foi enviado para %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6b2223a3..c9e3738e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -85,12 +85,8 @@
   <string name="pairing_request_from">Запрос на сопряжение от %1s</string>
   <string name="received_url_title">Получена ссылка от %1s</string>
   <string name="received_url_text">Нажмите, чтобы открыть «%1s»</string>
-  <string name="incoming_file_title">Входящий файл с %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Отправка файла на %1s</string>
   <string name="outgoing_files_title">Отправка файлов на %1s</string>
-  <string name="received_file_title">Получен файл с %1s</string>
-  <string name="received_file_fail_title">Не удалось получить файл с %1s</string>
   <string name="received_file_text">Нажмите, чтобы открыть «%1s»</string>
   <string name="sent_file_title">Файл отправлен на %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1f7d9b32..fe0157b0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -79,11 +79,7 @@
   <string name="pairing_request_from">Požiadavka na spárovanie od %1s</string>
   <string name="received_url_title">Prijatý odkaz od %1s</string>
   <string name="received_url_text">Ťuknite na otvorenie \'%1s\'</string>
-  <string name="incoming_file_title">Prichádzajúci súbor od %s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Posielam súbor pre %1s</string>
-  <string name="received_file_title">Prijatý súbor od %1s</string>
-  <string name="received_file_fail_title">Zlyhalo prijatie súboru od %1s</string>
   <string name="received_file_text">Ťuknite na otvorenie \'%1s\'</string>
   <string name="sent_file_title">Poslať súbor pre %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e6b9cc08..ec69f96f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -96,16 +96,12 @@
   <string name="pairing_request_from">Begäran om ihopparning från %1s</string>
   <string name="received_url_title">Tog emot länk från %1s</string>
   <string name="received_url_text">Rör för att öppna \'%1s\'</string>
-  <string name="incoming_file_title">Inkommande fil från %1s</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Skickar fil till %1s</string>
   <string name="outgoing_files_title">Skickar filer till %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="one">Skickade %1$d fil</item>
     <item quantity="other">Skickade %1$d av %2$d filer</item>
   </plurals>
-  <string name="received_file_title">Tog emot fil från %1s</string>
-  <string name="received_file_fail_title">Misslyckades ta emot fil från %1s</string>
   <string name="received_file_text">Rör för att öppna \'%1s\'</string>
   <string name="sent_file_title">Skickade fil till %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f1a95e13..1a4049c2 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -85,12 +85,8 @@
   <string name="pairing_request_from">%1s için eşleşme talebi</string>
   <string name="received_url_title">%1s üzerinden bağlantı alındı</string>
   <string name="received_url_text">\'%1s\' açmak için dokunun</string>
-  <string name="incoming_file_title">%1s üzerinden gelen dosya</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Dosya şuraya gönderiliyor, %1s</string>
   <string name="outgoing_files_title">Dosyalar şuraya gönderiliyor, %1s</string>
-  <string name="received_file_title">Şuradan dosya alındı, %1s</string>
-  <string name="received_file_fail_title">Şuradan dosya alma başarısız, %1s</string>
   <string name="received_file_text">\'%1s\' açmak için dokunun</string>
   <string name="sent_file_title">Dosyayı şuraya gönder, %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ca81cbca..862b09e6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -96,8 +96,18 @@
   <string name="pairing_request_from">Запит щодо пов’язування від %1s</string>
   <string name="received_url_title">Отримано посилання від %1s</string>
   <string name="received_url_text">Натисніть, щоб відкрити «%1s»</string>
-  <string name="incoming_file_title">Вхідний файл з %1s</string>
-  <string name="incoming_file_text">%1s</string>
+  <plurals name="incoming_file_title">
+    <item quantity="one">Отримуємо %1$d файл з %2$s</item>
+    <item quantity="few">Отримуємо %1$d файли з %2$s</item>
+    <item quantity="many">Отримуємо %1$d файлів з %2$s</item>
+    <item quantity="other">Отримуємо %1$d файл з %2$s</item>
+  </plurals>
+  <plurals name="incoming_files_text">
+    <item quantity="one">(Файл %2$d з %3$d): %1$s</item>
+    <item quantity="few">(Файл %2$d з %3$d): %1$s</item>
+    <item quantity="many">(Файл %2$d з %3$d): %1$s</item>
+    <item quantity="other">Файл: %1$s</item>
+  </plurals>
   <string name="outgoing_file_title">Надсилаємо файл до %1s</string>
   <string name="outgoing_files_title">Надсилаємо файли на %1s</string>
   <plurals name="outgoing_files_text">
@@ -106,8 +116,18 @@
     <item quantity="many">Надіслано %1$d з %2$d файлів</item>
     <item quantity="other">Надіслано %1$d файл</item>
   </plurals>
-  <string name="received_file_title">Отримано файл з %1s</string>
-  <string name="received_file_fail_title">Не вдалося отримати файл з %1s</string>
+  <plurals name="received_files_title">
+    <item quantity="one">Отримано %1$d файл з %2$s</item>
+    <item quantity="few">Отримано %1$d файли з %2$s</item>
+    <item quantity="many">Отримано %1$d файлів з %2$s</item>
+    <item quantity="other">Отримано %1$d файл з %2$s</item>
+  </plurals>
+  <plurals name="received_files_fail_title">
+    <item quantity="one">Не вдалося отримати %1$d з %2$d файла з %3$s</item>
+    <item quantity="few">Не вдалося отримати %1$d з %2$d файлів з %3$s</item>
+    <item quantity="many">Не вдалося отримати %1$d з %2$d файлів з %3$s</item>
+    <item quantity="other">Не вдалося отримати %1$d з %2$d файла з %3$s</item>
+  </plurals>
   <string name="received_file_text">Натисніть, щоб відкрити «%1s»</string>
   <string name="sent_file_title">Файл надіслано до %1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b315c9d1..297c4241 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -96,15 +96,11 @@
   <string name="pairing_request_from">来自%1s的配对请求</string>
   <string name="received_url_title">已从%1s接收链接</string>
   <string name="received_url_text">点击以打开“%1s”</string>
-  <string name="incoming_file_title">来自%1s的文件</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">正在向%1s发送文件</string>
   <string name="outgoing_files_title">正在向 %1s 发送文件</string>
   <plurals name="outgoing_files_text">
     <item quantity="other">已发送 %2$d 个文件中的 %1$d 个</item>
   </plurals>
-  <string name="received_file_title">已从%1s接收文件</string>
-  <string name="received_file_fail_title">未能从%1s接收文件</string>
   <string name="received_file_text">点击以打开“%1s”</string>
   <string name="sent_file_title">发送文件到%1s</string>
   <string name="sent_file_text">%1s</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0fad735d..ea4e7b94 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -96,15 +96,11 @@
   <string name="pairing_request_from">從 %1s 來的配對請求</string>
   <string name="received_url_title">已從 %1s 連線接收</string>
   <string name="received_url_text">點擊開啟 \'%1s\'</string>
-  <string name="incoming_file_title">從 %1s 傳來的檔案</string>
-  <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">正在將檔案發送到 %1s</string>
   <string name="outgoing_files_title">正在將檔案發送到 %1s</string>
   <plurals name="outgoing_files_text">
     <item quantity="other">傳送 %1$d 個檔案，共 %2$d 個檔案。</item>
   </plurals>
-  <string name="received_file_title">已從 %1s 接收檔案</string>
-  <string name="received_file_fail_title">從 %1s 接收檔案失敗</string>
   <string name="received_file_text">點擊開啟 \'%1s\'</string>
   <string name="sent_file_title">將檔案傳送到 %1s</string>
   <string name="sent_file_text">%1s</string>