Merge remote-tracking branch 'origin/master'

kontalk · Apr 7, 2016 · c1a5eb1 · c1a5eb1
2 parents 6429917 + 80b09e9
commit c1a5eb1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -445,4 +445,13 @@
     <string name="pref_show_blocked_users">Zobrazit blokované uživatele</string>
     <string name="button_load_next_page">Načíst více zpráv</string>
 
+    <string name="pref_media_autodownload_threshold">Práh pro automatické stažení</string>
+    <string name="pref_title_media_autodownload_threshold">Soubory menší než tato velikost budou staženy automaticky</string>
+    <string name="pref_msg_media_autodownload_threshold">Zadejte velikost v kB. Nastavte 0, pokud se nemá nikdy stahovat automaticky.</string>
+
+    <string name="pref_media_autodownload">Stahovat automaticky</string>
+    <string name="pref_media_autodownload_label_never">Nikdy</string>
+    <string name="pref_media_autodownload_label_wifi">Pouze na Wi-Fi</string>
+    <string name="pref_media_autodownload_label_always">Vždy</string>
+
     </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -445,4 +445,13 @@
     <string name="mark_read">Gelesen</string>
     <string name="button_load_next_page">Weitere Nachrichten laden</string>
 
+    <string name="pref_media_autodownload_threshold">Schwellenwert für automatischen Download</string>
+    <string name="pref_title_media_autodownload_threshold">Dateien die kleiner als der festgelegte Wert sind werden immer automatisch heruntergeladen</string>
+    <string name="pref_msg_media_autodownload_threshold">Legen Sie einen Wert in KB fest. Auf 0 (Null) setzen um nichts automatisch herunterzuladen.</string>
+
+    <string name="pref_media_autodownload">Automatischer Download</string>
+    <string name="pref_media_autodownload_label_never">Niemals</string>
+    <string name="pref_media_autodownload_label_wifi">Nur im WLAN</string>
+    <string name="pref_media_autodownload_label_always">Immer</string>
+
     </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -445,4 +445,13 @@
 
     <string name="button_load_next_page">Carica altri messaggi</string>
 
+    <string name="pref_media_autodownload_threshold">Soglia download automatico</string>
+    <string name="pref_title_media_autodownload_threshold">File più piccoli di questa dimensione saranno sempre scaricati automaticamente</string>
+    <string name="pref_msg_media_autodownload_threshold">Inserisci un valore in KB. Imposta a 0 per non scaricare mai automaticamente.</string>
+
+    <string name="pref_media_autodownload">Scarica automaticamente</string>
+    <string name="pref_media_autodownload_label_never">Mai</string>
+    <string name="pref_media_autodownload_label_wifi">Solo in Wi-Fi</string>
+    <string name="pref_media_autodownload_label_always">Sempre</string>
+
     </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -444,4 +444,13 @@
     <string name="button_load_next_page">Laad meer berichten</string>
 
     <string name="mark_read">Gelezen</string>
+    <string name="pref_media_autodownload_threshold">Limiet automatisch downloaden</string>
+    <string name="pref_title_media_autodownload_threshold">Bestanden kleiner dan deze grootte zullen altijd automatisch gedownload worden</string>
+    <string name="pref_msg_media_autodownload_threshold">Geef een waarde in KB op. Zet op 0 om nooit automatisch te downloaden.</string>
+
+    <string name="pref_media_autodownload">Automatisch downloaden</string>
+    <string name="pref_media_autodownload_label_never">Nooit</string>
+    <string name="pref_media_autodownload_label_wifi">Alleen op Wi-Fi</string>
+    <string name="pref_media_autodownload_label_always">Altijd</string>
+
     </resources>