Merge pull request #897 from SamWhited/download_file_fixes

Correct the download file string on notifications

6 files changed, 4 insertions, 9 deletions

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 1240da79..b81f440d 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -337,7 +337,6 @@
     <string name="pref_keep_foreground_service_summary">Verhindert, dass Android die Verbindung unterbricht</string>
     <string name="choose_file">Datei auswählen</string>
     <string name="receiving_file">Empfange %1$s Datei (%2$d%% heruntergeladen)</string>
-    <string name="download_file">Download %s Datei</string>
     <string name="open_file">Öffne %s Datei</string>
     <string name="sending_file">Sende (%1$d%% gesendet)</string>
     <string name="preparing_file">Bereite Datei für die Übertragung vor</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index fba7dbc8..f792b3f7 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -338,7 +338,6 @@
     <string name="pref_keep_foreground_service_summary">Mantener el servicio en primer plano previene que el sistema cierre la conexión</string>
     <string name="choose_file">Seleccionar archivo</string>
     <string name="receiving_file">Recibiendo archivo %1$s (%2$d%% completado)</string>
-    <string name="download_file">Descargar archivo %s</string>
     <string name="open_file">Abrir archivo %s</string>
     <string name="sending_file">Enviando (%1$d%% completado)</string>
     <string name="preparing_file">Preparando transferencia de archivo</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 04388f4f..a1218bb2 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -311,7 +311,6 @@
     <string name="pref_keep_foreground_service_summary">Sistema eragileak zure konexioa hiltzea galarazten du</string>
     <string name="choose_file">Fitxategia aukeratu</string>
     <string name="receiving_file">%1$s fitxategia jasotzen (%2$d%% osatua)</string>
-    <string name="download_file">%s fitxategia deskargatu</string>
     <string name="open_file">%s fitxategia ireki</string>
     <string name="sending_file">bidaltzen (%1$d%% osatua)</string>
     <string name="preparing_file">Fitxategia transmisiorako prestatzen</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index daae6076..7876ef3e 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -306,7 +306,6 @@
 <string name="pref_keep_foreground_service_summary">Evite que le système ferme votre connexion</string>
 <string name="choose_file">Choix d\'un fichier</string>
 <string name="receiving_file">Réception %1$s fichier (%2$d%% complété)</string>
-<string name="download_file">Télecharger %s fichier</string>
 <string name="open_file">Ouvrir %s fichier</string>
 <string name="sending_file">envoi (%1$d%% complété)</string>
 <string name="preparing_file">Préparation du fichier pour l\'envoi</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 91484794..965af37a 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -338,7 +338,6 @@
     <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem van je verbinding te onderbreken</string>
     <string name="choose_file">Kies bestand</string>
     <string name="receiving_file">Ontvange van %1$s bestand (%2$d%% voltooid)</string>
-    <string name="download_file">Download %s bestand</string>
     <string name="open_file">Open %s bestand</string>
     <string name="sending_file">versturen (%1$d%% voltooid)</string>
     <string name="preparing_file">Bestand klaarmaken voor versturen</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e6776a60..fb6878ce 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -85,7 +85,6 @@
     <string name="send_pgp_message">Send OpenPGP encrypted message</string>
     <string name="your_nick_has_been_changed">Your nickname has been changed</string>
     <string name="download_image">Download Image</string>
-    <string name="download_file">Download File</string>
     <string name="image_offered_for_download"><i>Image file offered for download</i></string>
     <string name="send_unencrypted">Send unencrypted</string>
     <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string>
@@ -439,9 +438,10 @@
 	<string name="pref_display_enter_key_summary">Change the emoticons key to an enter key</string>
 	<string name="audio">audio file</string>
 	<string name="video">video file</string>
+	<string name="image">image file</string>
 	<string name="pdf_document">PDF document</string>
 	<string name="received_x_file">Received %s</string>
-    <string name="disable_foreground_service">Disable foreground service</string>
-    <string name="touch_to_open_conversations">Touch to open Conversations</string>
-    <string name="avatar_has_been_published">Avatar has been published!</string>
+	<string name="disable_foreground_service">Disable foreground service</string>
+	<string name="touch_to_open_conversations">Touch to open Conversations</string>
+	<string name="avatar_has_been_published">Avatar has been published!</string>
 </resources>