From: David A. Velasco <dvelasco@owncloud.com>
Date: Tue, 3 Jun 2014 12:50:48 +0000 (+0200)
Subject: Merge pull request #508 from owncloud/vanish_notifications
X-Git-Tag: oc-android-1.7.0_signed~294
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cc7366348d0e3fc469297d6605a33a54cbe7a98c?hp=185aae4bc345f453479f94e2a78da62e8c9930b0

Merge pull request #508 from owncloud/vanish_notifications

Vanish succesful notifications
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4cd20c0a..acf695b4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="105006"
-    android:versionName="1.5.6" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="105007"
+    android:versionName="1.5.7" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index 0d6002ab..069a7d3a 100644
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100015"
-    android:versionName="1.0.15" >
+    android:versionCode="0100016"
+    android:versionName="1.0.16" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2e28635f..c581e30a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -164,12 +164,9 @@
   <string name="auth_unsupported_auth_method">الخادم لا يدعم طريقة التحقق هذه</string>
   <string name="auth_unsupported_multiaccount">%1$s لا يدعم الحسابات المتعددة </string>
   <string name="auth_fail_get_user_name">الخادم الخاص بك لم يعد الإتصال بهويتك الصحيحة, الرجاء الإتصال بالمسؤول\n\t</string>
-  <string name="auth_can_not_auth_against_server">لا يمكن المصادقة من الخادم</string>
   <string name="fd_keep_in_sync"> جعل الملف محدثا</string>
   <string name="common_rename">إعادة التسمية</string>
   <string name="common_remove">حذف</string>
-  <string name="confirmation_remove_alert">هل تود حقاَ إزالة %1$s ؟ </string>
-  <string name="confirmation_remove_folder_alert">هل ترغب حقا في إزالة %1$s و محتوياته ؟</string>
   <string name="confirmation_remove_local">محليا فقط</string>
   <string name="confirmation_remove_folder_local">المحتويات المحلية فقط</string>
   <string name="confirmation_remove_remote">الحذف من الخادم</string>
@@ -228,7 +225,6 @@
   <string name="conflict_overwrite">استبدال</string>
   <string name="conflict_dont_upload">عدم الرفع</string>
   <string name="preview_image_description">معاينة الصورة</string>
-  <string name="preview_image_error_unknown_format">هذه الصورة لا يمكن أن تظهر</string>
   <string name="error__upload__local_file_not_copied">%1$s تعذر نسخه %2$s للمجلد المحلي</string>
   <string name="actionbar_failed_instant_upload">فشل في محاولة الرفع الفوري</string>
   <string name="failed_upload_headline_text">فشل في الرفع الفوري</string>
@@ -237,7 +233,6 @@
   <string name="failed_upload_headline_retryall_btn">اعادة كل المختارات</string>
   <string name="failed_upload_headline_delete_all_btn">حذف كل المختارات من قائمة انتظار الرفع</string>
   <string name="failed_upload_retry_text">اعادة المحاولة لرفع الصورة:</string>
-  <string name="failed_upload_load_more_images">تحميل المزيد من الصور</string>
   <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>
   <string name="failed_upload_failure_text">رسالة خطا:</string>
   <string name="failed_upload_quota_exceeded_text">الرجاء التاكد من اعدادات الخادم, من الممكن انك تعديت الحد في quota</string>
@@ -249,5 +244,4 @@
   <string name="activity_chooser_send_file_title">أرسل</string>
   <string name="copy_link">نسخ الرابط</string>
   <string name="clipboard_text_copied">تم النسخ للحافظة</string>
-  <string name="error_cant_bind_to_operations_service">خطأ حرج: لا يمكن تنفيذ العمليات</string>
 </resources>
diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml
index feb8910a..3ce5ac8e 100644
--- a/res/values-bg-rBG/strings.xml
+++ b/res/values-bg-rBG/strings.xml
@@ -66,7 +66,6 @@
   <string name="fd_keep_in_sync">Дръж файлът обновен</string>
   <string name="common_rename">Преименуване</string>
   <string name="common_remove">Премахване</string>
-  <string name="confirmation_remove_alert">Наистина ли искате да изтриете %1$s ?</string>
   <string name="confirmation_remove_local">Само локално</string>
   <string name="confirmation_remove_remote">Премахни от сървъра</string>
   <string name="rename_server_fail_msg">Преименуването не може да се осъществи</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8a1d1d31..c6d538e4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -167,12 +167,9 @@
   <string name="auth_unsupported_auth_method">El serivdor no permet aquest mètode d\'autenticació</string>
   <string name="auth_unsupported_multiaccount">%1$s no permet comptes múltiples</string>
   <string name="auth_fail_get_user_name">El servidor no retorna una id d\'usuari correcta, contacteu amb l\'administrador.</string>
-  <string name="auth_can_not_auth_against_server">No es pot autenticar en aquest servidor</string>
   <string name="fd_keep_in_sync">Mantén el fitxer actualitzat</string>
   <string name="common_rename">Reanomena</string>
   <string name="common_remove">Elimina</string>
-  <string name="confirmation_remove_alert">Esteu segur que voleu eliminar %1$s?</string>
-  <string name="confirmation_remove_folder_alert">Estàs segur que vols esborrar %1$s i els seus continguts?</string>
   <string name="confirmation_remove_local">Només local</string>
   <string name="confirmation_remove_folder_local">Només contiguts locals</string>
   <string name="confirmation_remove_remote">Elimina del servidor</string>
@@ -232,7 +229,6 @@
   <string name="conflict_overwrite">Sobrescriu</string>
   <string name="conflict_dont_upload">No el pugis</string>
   <string name="preview_image_description">Visualització prèvia d\'imatge</string>
-  <string name="preview_image_error_unknown_format">Auquesta imatge no es pot mostrar</string>
   <string name="error__upload__local_file_not_copied">%1$s no s\'ha pogut copiar a la carpeta local %2$s</string>
   <string name="actionbar_failed_instant_upload">La pujada instantània ha fallat</string>
   <string name="failed_upload_headline_text">Fallada de pujades instantànies</string>
@@ -241,7 +237,6 @@
   <string name="failed_upload_headline_retryall_btn">reintenta els seleccionats</string>
   <string name="failed_upload_headline_delete_all_btn">elimina tots els seleccionats de la cua de pujada</string>
   <string name="failed_upload_retry_text">intenta pujar de nou la imatge:</string>
-  <string name="failed_upload_load_more_images">Carrega més imatges</string>
   <string name="failed_upload_retry_do_nothing_text">no facis res, no estàs en lína per la pujada instantània</string>
   <string name="failed_upload_failure_text">Missatge d\'Error:</string>
   <string name="failed_upload_quota_exceeded_text">Comproveu la configuració del servidor, potser heu excedit la quota.</string>
@@ -253,9 +248,7 @@
   <string name="activity_chooser_send_file_title">Envia</string>
   <string name="copy_link">Copia l\'enllaç</string>
   <string name="clipboard_text_copied">S\'ha copiat al porta-retalls</string>
-  <string name="error_cant_bind_to_operations_service">Error crític: no es poden realitzar operacions</string>
   <string name="network_error_socket_exception">Hi ha hagut un error mentre es connectava al servidor.</string>
   <string name="network_error_socket_timeout_exception">Hi ha hagut un error esperant al servidor, l\'operació no s\'ha pogut realitzar</string>
   <string name="network_error_connect_timeout_exception">Hi ha hagut un error esperant el servidor, l\'operació no s\'ha pogut realitzar</string>
-  <string name="network_host_not_available">La operació no s\'ha pogut completar, el servidor no està disponible</string>
 </resources>
diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index 1f1ebf57..03f68af7 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -165,12 +165,9 @@
   <string name="auth_unsupported_auth_method">Server nepodporuje tuto přihlašovací metodu</string>
   <string name="auth_unsupported_multiaccount">%1$s nepodporuje více účtů</string>
   <string name="auth_fail_get_user_name">Váš server nevrací správné přihlašovací ID, kontaktujte vašeho administrátora</string>
-  <string name="auth_can_not_auth_against_server">Není možné provést ověření vůči tomuto serveru</string>
   <string name="fd_keep_in_sync">Udržovat soubor aktuální</string>
   <string name="common_rename">Přejmenovat</string>
   <string name="common_remove">Odstranit</string>
-  <string name="confirmation_remove_alert">Opravdu si přejete odstranit %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Opravdu si přejete odstranit %1$s a jeho obsah?</string>
   <string name="confirmation_remove_local">Pouze místní</string>
   <string name="confirmation_remove_folder_local">Pouze místní obsah</string>
   <string name="confirmation_remove_remote">Odstranit ze serveru</string>
@@ -229,7 +226,6 @@
   <string name="conflict_overwrite">Přepsat</string>
   <string name="conflict_dont_upload">Nenahrávat</string>
   <string name="preview_image_description">Náhled obrázku</string>
-  <string name="preview_image_error_unknown_format">Obrázek nemůže být zobrazen</string>
   <string name="error__upload__local_file_not_copied">%1$s nelze zkopírovat do místního adresáře %2$s</string>
   <string name="actionbar_failed_instant_upload">Selhalo Okamžité odeslání</string>
   <string name="failed_upload_headline_text">Selhaná okamžitá odeslání</string>
@@ -238,7 +234,6 @@
   <string name="failed_upload_headline_retryall_btn">zkusit znovu vybrané</string>
   <string name="failed_upload_headline_delete_all_btn">smazat vybrané z fronty k nahrání</string>
   <string name="failed_upload_retry_text">zkusit znovu odeslat obrázek:</string>
-  <string name="failed_upload_load_more_images">Načíst více obrázků</string>
   <string name="failed_upload_retry_do_nothing_text">nic nedělat nejste připojeni pro okamžité odeslání</string>
   <string name="failed_upload_failure_text">Chybová zpráva:</string>
   <string name="failed_upload_quota_exceeded_text">Zkontrolujte prosím nastavení vašeho serveru, možná jste překročili kvótu.</string>
@@ -250,5 +245,4 @@
   <string name="activity_chooser_send_file_title">Odeslat</string>
   <string name="copy_link">Zkopírovat odkaz</string>
   <string name="clipboard_text_copied">Zkopírováno do schránky</string>
-  <string name="error_cant_bind_to_operations_service">Kritická chyba: operace nelze provést</string>
 </resources>
diff --git a/res/values-cy-rGB/strings.xml b/res/values-cy-rGB/strings.xml
index a71a4a6e..6983e1a7 100644
--- a/res/values-cy-rGB/strings.xml
+++ b/res/values-cy-rGB/strings.xml
@@ -96,8 +96,6 @@
   <string name="fd_keep_in_sync">Cadw\'r ffeil yn gyfredol</string>
   <string name="common_rename">Ailenwi</string>
   <string name="common_remove">Gwaredu</string>
-  <string name="confirmation_remove_alert">Ydych chi wir am gael gwared ar %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Ydych chi wir am waredu %1$s a\'i gynnwys?</string>
   <string name="confirmation_remove_local">Lleol yn unig</string>
   <string name="confirmation_remove_folder_local">Cynnwys lleol yn unig</string>
   <string name="confirmation_remove_remote">Gwaredu o\'r gweinydd</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5fd807b6..50d18320 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -155,12 +155,9 @@
   <string name="auth_connecting_auth_server">Forbinder til godkendelsesserver ...</string>
   <string name="auth_unsupported_auth_method">Serveren understøtter ikke denne godkendelsesmetode</string>
   <string name="auth_unsupported_multiaccount">%1$s understøtter ikke multiple konti</string>
-  <string name="auth_can_not_auth_against_server">Kan ikke autentificere mod denne server</string>
   <string name="fd_keep_in_sync">Hold fil opdateret</string>
   <string name="common_rename">Omdøb</string>
   <string name="common_remove">Fjern</string>
-  <string name="confirmation_remove_alert">Er du sikker på at du vil fjerne %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Ønsker du virkelig at %1$s og dets indhold skal fjernes</string>
   <string name="confirmation_remove_local">Kun lokal</string>
   <string name="confirmation_remove_folder_local">Lokalt indhold kun</string>
   <string name="confirmation_remove_remote">Fjern fra server</string>
@@ -217,7 +214,6 @@
   <string name="conflict_overwrite">Overskriv</string>
   <string name="conflict_dont_upload">Upload ikke</string>
   <string name="preview_image_description">Billede preview</string>
-  <string name="preview_image_error_unknown_format">Dette billede kan ikke vises</string>
   <string name="actionbar_failed_instant_upload">Fejlede Umiddelbar upload</string>
   <string name="failed_upload_headline_text">Øjeblikkelige uploads mislykkedes</string>
   <string name="failed_upload_headline_hint">Sammenfatning af alle mislykkede øjeblikkelige uploads</string>
@@ -225,7 +221,6 @@
   <string name="failed_upload_headline_retryall_btn">prøv alle markerede igen</string>
   <string name="failed_upload_headline_delete_all_btn">slet alle markerede fra uploadkøen</string>
   <string name="failed_upload_retry_text">prøv at uploade billedet igen:</string>
-  <string name="failed_upload_load_more_images">Indlæs flere billeder</string>
   <string name="failed_upload_retry_do_nothing_text">gør intet, du er ikke online til øjeblikkelig upload</string>
   <string name="failed_upload_failure_text">Fejlmeddelelse</string>
   <string name="failed_upload_quota_exceeded_text">Tjek din serverkonfiguration, måske er din kvota overskredet.</string>
diff --git a/res/values-de-rCH/strings.xml b/res/values-de-rCH/strings.xml
index 23792210..0c5e94ca 100644
--- a/res/values-de-rCH/strings.xml
+++ b/res/values-de-rCH/strings.xml
@@ -143,8 +143,6 @@
   <string name="fd_keep_in_sync">Datei aktuell halten</string>
   <string name="common_rename">Umbenennen</string>
   <string name="common_remove">Löschen</string>
-  <string name="confirmation_remove_alert">Möchten Sie %1$s wirklich löschen?</string>
-  <string name="confirmation_remove_folder_alert">Möchten Sie wirklich %1$s und dessen Inhalte entfernen?</string>
   <string name="confirmation_remove_local">Nur lokal</string>
   <string name="confirmation_remove_folder_local">Nur lokale Inhalte</string>
   <string name="confirmation_remove_remote">Vom Server entfernen</string>
@@ -196,14 +194,12 @@
   <string name="conflict_overwrite">Überschreiben</string>
   <string name="conflict_dont_upload">Nicht hochladen</string>
   <string name="preview_image_description">Bildvorschau</string>
-  <string name="preview_image_error_unknown_format">Dieses Bild kann nicht angezeigt werden</string>
   <string name="failed_upload_headline_text">Sofortige Uploads fehlgeschlagen</string>
   <string name="failed_upload_headline_hint">Zusammenfassung aller fehlgeschlagenen Uploads</string>
   <string name="failed_upload_all_cb">Alle auswählen</string>
   <string name="failed_upload_headline_retryall_btn">Versuche alle ausgewählten erneut</string>
   <string name="failed_upload_headline_delete_all_btn">Lösche alle ausgewählten aus der Uploadwarteschlange</string>
   <string name="failed_upload_retry_text">Bildupload erneut versuchen:</string>
-  <string name="failed_upload_load_more_images">Lade weitere Bilder</string>
   <string name="failed_upload_retry_do_nothing_text">Nicht durchgeführt - Nicht online für sofortigen Upload</string>
   <string name="failed_upload_failure_text">Fehlermeldung:</string>
   <string name="failed_upload_quota_exceeded_text">Bitte überprüfen Sie Ihre Serverkonfiguration. Vielleicht ist Ihr Nutzungslimit überschritten.</string>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index ed23515d..0106bc3f 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -241,7 +241,7 @@
   <string name="failed_upload_headline_retryall_btn">Versuche alle ausgewählten erneut</string>
   <string name="failed_upload_headline_delete_all_btn">Lösche alle ausgewählten aus der Uploadwarteschlange</string>
   <string name="failed_upload_retry_text">Bildupload erneut versuchen:</string>
-  <string name="failed_upload_load_more_images">Lade weitere Bilder</string>
+  <string name="failed_upload_load_more_images">Weitere Bilder laden</string>
   <string name="failed_upload_retry_do_nothing_text">Nicht durchgeführt - Nicht online für sofortigen Upload</string>
   <string name="failed_upload_failure_text">Fehlermeldung:</string>
   <string name="failed_upload_quota_exceeded_text">Bitte überprüfen Sie Ihre Serverkonfiguration. Vielleicht ist Ihr Nutzungslimit überschritten.</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a133cb82..3b96df41 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">Το %1$s μεταφορτώθηκε με επιτυχία</string>
   <string name="uploader_upload_failed_ticker">Η μεταφόρτωση απέτυχε</string>
   <string name="uploader_upload_failed_content_single">Η μεταφόρτωση του %1$s δεν ήταν δυνατόν να ολοκληρωθεί</string>
+  <string name="uploader_upload_failed_credentials_error">Η μεταφόρτωση απέτυχε, πρέπει να εισάγετε ξανά τον κωδικό σας</string>
   <string name="downloader_download_in_progress_ticker">Λήψη ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Λαμβάνονται %2$s</string>
   <string name="downloader_download_succeeded_ticker">Η λήψη ολοκληρώθηκε επιτυχώς</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Η λήψη απέτυχε</string>
   <string name="downloader_download_failed_content">Η λήψη του %1$s δεν μπόρεσε να ολοκληρωθεί με επιτυχία</string>
   <string name="downloader_not_downloaded_yet">Δεν έχει κατέβει ακόμα</string>
+  <string name="downloader_download_failed_credentials_error">Η λήψη απέτυχε, πρέπει να εισάγετε ξανά τον κωδικό σας</string>
   <string name="common_choose_account">Επιλογή λογαριασμού</string>
   <string name="sync_fail_ticker">Ο συγχρονισμός απέτυχε</string>
   <string name="sync_fail_content">Ο συγχρονισμός του %1$s  δεν μπόρεσε να ολοκληρωθεί</string>
@@ -165,12 +167,9 @@
   <string name="auth_unsupported_auth_method">Ο διακομιστής δεν υποστηρίζει αυτή τη μέθοδο πιστοποίησης</string>
   <string name="auth_unsupported_multiaccount">Ο %1$s  δεν υποστηρίζει πολλαπλούς λογαριασμούς</string>
   <string name="auth_fail_get_user_name">Ο διακομιστής σας δεν επιστρέφει το σωστό χαρακτηριστικό χρήστη, παρακαλώ επικοινωνήστε με έναν διαχειριστή\n</string>
-  <string name="auth_can_not_auth_against_server">Δεν είναι δυνατός ο έλεγχος ταυτότητας με αυτόν τον διακομιστή</string>
   <string name="fd_keep_in_sync">Διατήρηση αρχείου σε ενημέρωση</string>
   <string name="common_rename">Μετονομασία</string>
   <string name="common_remove">Διαγραφή</string>
-  <string name="confirmation_remove_alert">Θέλετε να αφαιρέσετε το  %1$s ;</string>
-  <string name="confirmation_remove_folder_alert">Θέλετε σίγουρα να διαγράψετε τον φάκελο %1$s και τα περιεχόμενά του;</string>
   <string name="confirmation_remove_local">Μόνο τοπικά</string>
   <string name="confirmation_remove_folder_local">Μόνο τοπικοί φάκελοι</string>
   <string name="confirmation_remove_remote">Διαγραφή από τον εξυπηρέτη</string>
@@ -230,7 +229,6 @@
   <string name="conflict_overwrite">Αντικατάσταση</string>
   <string name="conflict_dont_upload">Να μην μεταφορτωθεί</string>
   <string name="preview_image_description">Προεπισκόπηση εικόνας</string>
-  <string name="preview_image_error_unknown_format">Αυτή η εικόνε δεν μπόρεσε να προβληθεί</string>
   <string name="error__upload__local_file_not_copied">%1$s δεν μπόρεσε να αντιγραφεί %2$s στον τοπικό φάκελο</string>
   <string name="actionbar_failed_instant_upload">Αποτυχημένη στιγμιαία φόρτωση</string>
   <string name="failed_upload_headline_text">Αποτυχημένες στιγμιαίες φορτώσεις</string>
@@ -239,7 +237,6 @@
   <string name="failed_upload_headline_retryall_btn">επανάληψη για όλα τα επιλεγμένα</string>
   <string name="failed_upload_headline_delete_all_btn">διαγραφή όλων των επιλεγμένων από τη λίστα προς μεταφόρτωση</string>
   <string name="failed_upload_retry_text">επανάληψη προσπάθειας μεταφόρτωσης της εικόνας:</string>
-  <string name="failed_upload_load_more_images">Φόρτωση περισσότερων εικόνων</string>
   <string name="failed_upload_retry_do_nothing_text">μην κάνετε τίποτε, δεν είστε συνδεμένος για άμεση μεταφόρτωση</string>
   <string name="failed_upload_failure_text">Μήνυμα Αποτυχίας:</string>
   <string name="failed_upload_quota_exceeded_text">Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή σας, ίσως έχετε υπερβεί τη διαθέσιμη μερίδα σας.</string>
@@ -251,5 +248,7 @@
   <string name="activity_chooser_send_file_title">Αποστολή</string>
   <string name="copy_link">Αντιγραφή συνδέσμου</string>
   <string name="clipboard_text_copied">Αντιγραφθηκε στο clipboard</string>
-  <string name="error_cant_bind_to_operations_service">Κρίσιμο σφάλμα: αδύνατη η εκτέλεση λειτουργειών</string>
+  <string name="network_error_socket_exception">Συνέβη σφάλμα κατά την σύνδεση με τον διακομιστή.</string>
+  <string name="network_error_socket_timeout_exception">Συνέβη σφάλμα κατά την αναμονή για τον διακομιστή, η λειτουργία δεν ήταν επιτυχής</string>
+  <string name="network_error_connect_timeout_exception">Συνέβη σφάλμα κατά την αναμονή για τον διακομιστή, η λειτουργία δεν ήταν επιτυχής</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 642460ab..1b3138db 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -171,8 +171,8 @@
   <string name="fd_keep_in_sync">Keep file up to date</string>
   <string name="common_rename">Rename</string>
   <string name="common_remove">Remove</string>
-  <string name="confirmation_remove_alert">Do you really want to remove %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Do you really want to remove %1$s and its contents ?</string>
+  <string name="confirmation_remove_alert">Do you really want to remove %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Do you really want to remove %1$s and its contents?</string>
   <string name="confirmation_remove_local">Local only</string>
   <string name="confirmation_remove_folder_local">Local contents only</string>
   <string name="confirmation_remove_remote">Remove from server</string>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 0586b651..b5a99aca 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -95,8 +95,6 @@
   <string name="fd_keep_in_sync">Teni dosieron ĝisdatigita</string>
   <string name="common_rename">Alinomigi</string>
   <string name="common_remove">Forigi</string>
-  <string name="confirmation_remove_alert">Ĉu vi vere volas forigi %1$s?</string>
-  <string name="confirmation_remove_folder_alert">Ĉu vi vere volas forigi %1$s kaj sian enhavon?</string>
   <string name="confirmation_remove_local">Nur loka</string>
   <string name="confirmation_remove_folder_local">Nur lokaj enhavoj</string>
   <string name="confirmation_remove_remote">Forigi el la servilo</string>
diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml
index fb093f4f..4bb22bee 100644
--- a/res/values-es-rAR/strings.xml
+++ b/res/values-es-rAR/strings.xml
@@ -157,8 +157,6 @@
   <string name="fd_keep_in_sync">Mantener el archivo actualizado</string>
   <string name="common_rename">Renombrar</string>
   <string name="common_remove">Borrar</string>
-  <string name="confirmation_remove_alert">¿Estás seguro que querés borrar %1$s?</string>
-  <string name="confirmation_remove_folder_alert">¿Realmente quieres borrar %1$s y todos sus contenidos ?</string>
   <string name="confirmation_remove_local">Sólo local</string>
   <string name="confirmation_remove_folder_local">Solo archivos locales</string>
   <string name="confirmation_remove_remote">Borrar del servidor</string>
@@ -212,7 +210,6 @@
   <string name="conflict_overwrite">Sobrescribir</string>
   <string name="conflict_dont_upload">No subir</string>
   <string name="preview_image_description">Previsualización de imagen</string>
-  <string name="preview_image_error_unknown_format">No se puede mostrar la imagen</string>
   <string name="actionbar_failed_instant_upload">Falló InstantUpload</string>
   <string name="failed_upload_headline_text">Error en Cargas instantánea </string>
   <string name="failed_upload_headline_hint">Resumen de todas las cargas instantáneas con error</string>
@@ -220,7 +217,6 @@
   <string name="failed_upload_headline_retryall_btn">Reintentar con todos los seleccionados</string>
   <string name="failed_upload_headline_delete_all_btn">Eliminar todo de la cola de subida</string>
   <string name="failed_upload_retry_text">Reintentar subida de imagen:</string>
-  <string name="failed_upload_load_more_images">Cargar mas imágenes</string>
   <string name="failed_upload_retry_do_nothing_text">No hacer nada, no estás conectado para subida instantánea</string>
   <string name="failed_upload_failure_text">Mensaje de error:</string>
   <string name="failed_upload_quota_exceeded_text">Por favor, revisá la configuración de servidor, posiblemente tu cuota se haya excedido.</string>
diff --git a/res/values-es-rCL/strings.xml b/res/values-es-rCL/strings.xml
index 9185ea91..61360c2d 100644
--- a/res/values-es-rCL/strings.xml
+++ b/res/values-es-rCL/strings.xml
@@ -96,7 +96,6 @@
   <string name="fd_keep_in_sync">Mantener el archivo actualizado</string>
   <string name="common_rename">Renombrar</string>
   <string name="common_remove">Remover</string>
-  <string name="confirmation_remove_alert">Realmente desea remover %1$s?</string>
   <string name="confirmation_remove_local">Solo local</string>
   <string name="confirmation_remove_folder_local">solo contenidos locales </string>
   <string name="confirmation_remove_remote">Eliminar desde el servidor</string>
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index 54fb2d2e..441c54c8 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -157,8 +157,6 @@
   <string name="fd_keep_in_sync">Mantener el archivo actualizado</string>
   <string name="common_rename">Renombrar</string>
   <string name="common_remove">Borrar</string>
-  <string name="confirmation_remove_alert">¿Está seguro que desea borrar %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">¿Desea elimiar %1$s y sus descendientes?</string>
   <string name="confirmation_remove_local">Sólo local</string>
   <string name="confirmation_remove_folder_local">Sólo archivos locales</string>
   <string name="confirmation_remove_remote">Eliminar del servidor</string>
@@ -212,7 +210,6 @@
   <string name="conflict_overwrite">Sobrescribir</string>
   <string name="conflict_dont_upload">No subir</string>
   <string name="preview_image_description">Previsualización de imagen</string>
-  <string name="preview_image_error_unknown_format">No se puede mostrar la imagen</string>
   <string name="actionbar_failed_instant_upload">Carga instantánea fallida</string>
   <string name="failed_upload_headline_text">Cargas instantáneas fallidas</string>
   <string name="failed_upload_headline_hint">Resumen de todas las cargas instantáneas fallidas</string>
@@ -220,7 +217,6 @@
   <string name="failed_upload_headline_retryall_btn">Reintentar todos los seleccionados</string>
   <string name="failed_upload_headline_delete_all_btn">Eliminar todo de la cola de subida</string>
   <string name="failed_upload_retry_text">Reintentar subida de imagen:</string>
-  <string name="failed_upload_load_more_images">Cargar mas imágenes</string>
   <string name="failed_upload_retry_do_nothing_text">No hacer nada no está conectado para subida instantánea</string>
   <string name="failed_upload_failure_text">Mensaje de error:</string>
   <string name="failed_upload_quota_exceeded_text">Por favor revise su configuración de servidor, posiblemente su cuota se haya excedido.</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 41d7d7b5..311efa00 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -166,12 +166,12 @@
   <string name="auth_unsupported_auth_method">El servidor no soporta este método de autenticación</string>
   <string name="auth_unsupported_multiaccount">%1$s no soporta cuentas múltiples</string>
   <string name="auth_fail_get_user_name">Su servidor no está retornando una identificación de usuario correcta; contacte a un administrador\n\t</string>
-  <string name="auth_can_not_auth_against_server">No puede autenticarse en este servidor.</string>
+  <string name="auth_can_not_auth_against_server">No es posible autenticarse con este servidor</string>
   <string name="fd_keep_in_sync">Mantener el archivo actualizado</string>
   <string name="common_rename">Renombrar</string>
   <string name="common_remove">Borrar</string>
-  <string name="confirmation_remove_alert">¿Está seguro que desea borrar %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">¿Desea eliminar %1$s y sus descendientes?</string>
+  <string name="confirmation_remove_alert">¿Realmente desea eliminar %1$s?</string>
+  <string name="confirmation_remove_folder_alert">¿Realmente desea eliminar %1$s y todo su contenido?</string>
   <string name="confirmation_remove_local">Sólo local</string>
   <string name="confirmation_remove_folder_local">Sólo ficheros locales</string>
   <string name="confirmation_remove_remote">Eliminar del servidor</string>
@@ -231,7 +231,7 @@
   <string name="conflict_overwrite">Sobrescribir</string>
   <string name="conflict_dont_upload">No subir</string>
   <string name="preview_image_description">Previsualización de imagen</string>
-  <string name="preview_image_error_unknown_format">No se puede mostrar la imagen</string>
+  <string name="preview_image_error_unknown_format">Esta imagen no puede ser mostrada.</string>
   <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s</string>
   <string name="actionbar_failed_instant_upload">Carga instantánea fallida</string>
   <string name="failed_upload_headline_text">Cargas instantáneas fallidas</string>
@@ -240,7 +240,7 @@
   <string name="failed_upload_headline_retryall_btn">Reintentar todos los seleccionados</string>
   <string name="failed_upload_headline_delete_all_btn">Eliminar todo de la cola de subida</string>
   <string name="failed_upload_retry_text">Reintentar subida de imagen:</string>
-  <string name="failed_upload_load_more_images">Cargar mas imágenes</string>
+  <string name="failed_upload_load_more_images">Cargar más imágenes</string>
   <string name="failed_upload_retry_do_nothing_text">No hacer nada no está conectado para subida instantánea</string>
   <string name="failed_upload_failure_text">Mensaje de error:</string>
   <string name="failed_upload_quota_exceeded_text">Por favor revise su configuración de servidor, posiblemente su cuota se haya excedido.</string>
@@ -252,9 +252,9 @@
   <string name="activity_chooser_send_file_title">Enviar</string>
   <string name="copy_link">Copiar enlace</string>
   <string name="clipboard_text_copied">Copiado al portapapeles</string>
-  <string name="error_cant_bind_to_operations_service">Error crítico: no se pueden hacer operaciones</string>
+  <string name="error_cant_bind_to_operations_service">Error crítico: no es posible realizar operaciones</string>
   <string name="network_error_socket_exception">Ocurrió un error al conectarse con el servidor.</string>
   <string name="network_error_socket_timeout_exception">Ocurrió un error al esperar la respuesta del servidor, la operación no se pudo realizar</string>
   <string name="network_error_connect_timeout_exception">Ocurrió un error al esperar la respuesta del servidor, la operación no se pudo realizar</string>
-  <string name="network_host_not_available">La operación no se pudo completar; el servidor no está disponible </string>
+  <string name="network_host_not_available">La operación no se pudo completar; el servidor no está disponible</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 4f3e4e33..69f7e90b 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -167,12 +167,9 @@
   <string name="auth_unsupported_auth_method">See server ei toeta seda autentimise viisi</string>
   <string name="auth_unsupported_multiaccount">%1$s ei toeta mitme konto kasutamist</string>
   <string name="auth_fail_get_user_name">Server ei tagasta korrektset kasutaja ID-d. Palun kontakteeru administraatoriga.\n⇥</string>
-  <string name="auth_can_not_auth_against_server">Ei suuda autoriseerida selle serveriga.</string>
   <string name="fd_keep_in_sync">Hoia faili ajakohasena</string>
   <string name="common_rename">Nimeta ümber</string>
   <string name="common_remove">Eemalda</string>
-  <string name="confirmation_remove_alert">Oled sa kindel, et soovid %1$s eemaldada ?</string>
-  <string name="confirmation_remove_folder_alert">Kas sa tõesti soovid eemaldada %1$s ja selle sisu ?</string>
   <string name="confirmation_remove_local">Ainult kohalik</string>
   <string name="confirmation_remove_folder_local">Ainult kohalik sisu</string>
   <string name="confirmation_remove_remote">Eemalda serverist</string>
@@ -232,7 +229,6 @@
   <string name="conflict_overwrite">Kirjuta üle</string>
   <string name="conflict_dont_upload">Ära uuenda</string>
   <string name="preview_image_description">Pildi eelvaade</string>
-  <string name="preview_image_error_unknown_format">Seda pilti ei saa näidata</string>
   <string name="error__upload__local_file_not_copied">%1$s ei suudetud kopeerida kohalikku kataloogi %2$s</string>
   <string name="actionbar_failed_instant_upload">Ebaõnnestunud kohene üleslaadimine</string>
   <string name="failed_upload_headline_text">Ebaõnnestunud kohesed üleslaadimised</string>
@@ -241,7 +237,6 @@
   <string name="failed_upload_headline_retryall_btn">proovi uuesti kõik valitud</string>
   <string name="failed_upload_headline_delete_all_btn">eemalda kõik valitud üleslaadimise järjekorrast</string>
   <string name="failed_upload_retry_text">proovi uuesti pilti üles laadida:</string>
-  <string name="failed_upload_load_more_images">Lae veel pilte</string>
   <string name="failed_upload_retry_do_nothing_text">ära tee midagi, sa pole võrku ühendatud koheseks üleslaadimiseks</string>
   <string name="failed_upload_failure_text">Veateade:</string>
   <string name="failed_upload_quota_exceeded_text">Palun kontrolli oma serveri seadeid, võib-olla on mahulimiit ületatud.</string>
@@ -253,9 +248,7 @@
   <string name="activity_chooser_send_file_title">Saada</string>
   <string name="copy_link">Kopeeri link</string>
   <string name="clipboard_text_copied">Kopeeritud lõikepuhvrisse</string>
-  <string name="error_cant_bind_to_operations_service">Viga: ei suutnud operatsiooni lõpetada</string>
   <string name="network_error_socket_exception">Serveriga ühendumisel tekkis tõrge.</string>
   <string name="network_error_socket_timeout_exception">Serverilt vastuse ootamisel tekkis tõrge, toimingu sooritamine ebaõnnestus</string>
   <string name="network_error_connect_timeout_exception">Serverilt vastuse ootamisel tekkis tõrge, toimingu sooritamine ebaõnnestus</string>
-  <string name="network_host_not_available">Toimingu lõpetamine ebaõnnestus, server pole saadaval</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index cbe721ee..f5789c6f 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -158,8 +158,6 @@
   <string name="fd_keep_in_sync">Mantendu fitxategia eguneratuta</string>
   <string name="common_rename">Berrizendatu</string>
   <string name="common_remove">Ezabatu</string>
-  <string name="confirmation_remove_alert">Nahi duzu %1$s ezabatu?</string>
-  <string name="confirmation_remove_folder_alert">Benetan %1$s eta bere eduki guztiak ezabatu nahi dituzu?</string>
   <string name="confirmation_remove_local">Bertakoa bakarrik</string>
   <string name="confirmation_remove_folder_local">Eduki lokalak bakarrik</string>
   <string name="confirmation_remove_remote">Zerbitzaritik ezabatu</string>
@@ -214,7 +212,6 @@
   <string name="conflict_overwrite">Gainidatzi</string>
   <string name="conflict_dont_upload">Ez igo</string>
   <string name="preview_image_description">Irudi aurreikuspena</string>
-  <string name="preview_image_error_unknown_format">Ezin da irudi hau erakutsi</string>
   <string name="actionbar_failed_instant_upload">UnekoIgoerak huts egin du</string>
   <string name="failed_upload_headline_text">Uneko igoerek huts egin dute</string>
   <string name="failed_upload_headline_hint">Huts egindako igoeren laburpena</string>
@@ -222,7 +219,6 @@
   <string name="failed_upload_headline_retryall_btn">Berriz saiatu hautatutakoak</string>
   <string name="failed_upload_headline_delete_all_btn">kendu hautatutakoak igoera-ilaratik</string>
   <string name="failed_upload_retry_text">Berriz saiatu irudia igotzen:</string>
-  <string name="failed_upload_load_more_images">Kargatu irudi gehiago</string>
   <string name="failed_upload_retry_do_nothing_text">ez egin ezer ez zaude on-line uneko igoerarentzat</string>
   <string name="failed_upload_failure_text">Hutsegite mezua:</string>
   <string name="failed_upload_quota_exceeded_text">Egiaztatu zure konfigurazioa, agian zure kuota muga gainditu  duzu.</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6e2d4722..16121e03 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -157,8 +157,6 @@
   <string name="fd_keep_in_sync">فایل را به روز نگه دار</string>
   <string name="common_rename">تغییرنام</string>
   <string name="common_remove">حذف</string>
-  <string name="confirmation_remove_alert">آیا واقعا می خواهید %1$s حذف شود؟</string>
-  <string name="confirmation_remove_folder_alert">آیا واقعا می خواهید %1$s و محتوای آن را حذف کنید؟</string>
   <string name="confirmation_remove_local">فقط محلی</string>
   <string name="confirmation_remove_folder_local">فقط محتوای محلی</string>
   <string name="confirmation_remove_remote">پاک کردن از سرور</string>
@@ -213,7 +211,6 @@
   <string name="conflict_overwrite">دوباره نویسی</string>
   <string name="conflict_dont_upload">آپلود نکن</string>
   <string name="preview_image_description">پیش نمایش تصویر</string>
-  <string name="preview_image_error_unknown_format">این تصویر نمی تواند نمایش داده شود.</string>
   <string name="actionbar_failed_instant_upload">آپلود فوری انجام نشد</string>
   <string name="failed_upload_headline_text">آپلود های فوری انجام نشدند.</string>
   <string name="failed_upload_headline_hint">خلاصه ای از تمام ارسال های فور ی ناموفق.</string>
@@ -221,7 +218,6 @@
   <string name="failed_upload_headline_retryall_btn">تلاش مجدد بر روی همه موارد انتخاب شده</string>
   <string name="failed_upload_headline_delete_all_btn">حذف تمام انتخاب شده ها از صف ارسال.</string>
   <string name="failed_upload_retry_text">تلاش برای آپلود کردن تصویر:</string>
-  <string name="failed_upload_load_more_images">بارگذاری تصاویر بیشتر</string>
   <string name="failed_upload_retry_do_nothing_text">هیچ کاری انجام ندهید، شما برای آپلود فوری آنلاین نیستید.</string>
   <string name="failed_upload_failure_text">پیغام عدم موفقیت:</string>
   <string name="failed_upload_quota_exceeded_text">لطفا پیکربندی سرورتان را بررسی کنید، شاید سهمیه شما بیش از حد شده باشد.</string>
diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml
index 48c5db16..17622f6f 100644
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@ -143,12 +143,11 @@
   <string name="auth_connecting_auth_server">Yhdistetään tunnistautumispalvelimeen…</string>
   <string name="auth_unsupported_auth_method">Palvelin ei tue tätä tunnistautumistapaa</string>
   <string name="auth_unsupported_multiaccount">%1$s ei tue useita tilejä</string>
-  <string name="auth_can_not_auth_against_server">Tunnistautuminen palvelimeen ei onnistunut</string>
   <string name="fd_keep_in_sync">Pidä tiedosto ajan tasalla</string>
   <string name="common_rename">Nimeä uudelleen</string>
   <string name="common_remove">Poista</string>
-  <string name="confirmation_remove_alert">Haluatko poistaa kohteen %1$s?</string>
-  <string name="confirmation_remove_folder_alert">Haluatko poistaa kohteen %1$s ja sen sisällön?</string>
+  <string name="confirmation_remove_alert">Haluatko varmasti poistaa kohteen %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Haluatko varmasti poistaa kohteen %1$s ja sen sisällön?</string>
   <string name="confirmation_remove_local">Vain paikallinen</string>
   <string name="confirmation_remove_folder_local">Vain paikallinen sisältö</string>
   <string name="confirmation_remove_remote">Poista palvelimelta</string>
@@ -160,6 +159,7 @@
   <string name="rename_server_fail_msg">Nimen muutos epäonnistui</string>
   <string name="sync_file_fail_msg">Etäpään tiedostoa ei voitu tarkistaa</string>
   <string name="sync_file_nothing_to_do_msg">Tiedoston sisältö on jo synkronoitu</string>
+  <string name="create_dir_fail_msg">Kansion luominen epäonnistui</string>
   <string name="filename_forbidden_characters">Kielletyt merkit: / \\ &lt; &gt; : \" | ? *</string>
   <string name="filename_empty">Tiedoston nimi ei voi olla tyhjä</string>
   <string name="wait_a_moment">Odota hetki</string>
@@ -203,17 +203,13 @@
   <string name="conflict_overwrite">Korvaa</string>
   <string name="conflict_dont_upload">Älä lähetä</string>
   <string name="preview_image_description">Kuvan esikatselu</string>
-  <string name="preview_image_error_unknown_format">Kuvaa ei voi näyttää</string>
   <string name="failed_upload_all_cb">valitse kaikki</string>
   <string name="failed_upload_headline_retryall_btn">yritä uudelleen kaikkia valittuja</string>
-  <string name="failed_upload_load_more_images">Lataa lisää kuvia</string>
   <string name="failed_upload_failure_text">Virheviesti:</string>
   <string name="share_link_file_no_exist">Valitettavasti tämän tiedoston tai kansion jakaminen ei onnistu. Varmista että se on olemassa</string>
   <string name="share_link_file_error">Virhe tiedoston tai kansion jakamista yrittäessä</string>
   <string name="activity_chooser_send_file_title">Lähetä</string>
   <string name="copy_link">Kopioi linkki</string>
   <string name="clipboard_text_copied">Kopioitu leikepöydälle</string>
-  <string name="error_cant_bind_to_operations_service">Kriittinen virhe: toimintoja ei voi suorittaa</string>
   <string name="network_error_socket_exception">Virhe palvelimeen yhdistäessä</string>
-  <string name="network_host_not_available">Toimintoa ei voitu saattaa loppuun, palvelin ei ole käytettävissä</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 676a61fd..ac45b01a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">Le fichier %1$s a été envoyé avec succès</string>
   <string name="uploader_upload_failed_ticker">Échec de l\'envoi</string>
   <string name="uploader_upload_failed_content_single">L\'envoi de %1$s a échoué</string>
+  <string name="uploader_upload_failed_credentials_error">Le téléversement a échoué, vous devez vous connecter à nouveau</string>
   <string name="downloader_download_in_progress_ticker">Téléchargement en cours…</string>
   <string name="downloader_download_in_progress_content">Téléchargement en cours de %2$s, %1$d%% effectués</string>
   <string name="downloader_download_succeeded_ticker">Téléchargement réussi</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Le téléchargement a échoué</string>
   <string name="downloader_download_failed_content">Le téléchargement de %1$s a échoué</string>
   <string name="downloader_not_downloaded_yet">Pas encore téléchargé</string>
+  <string name="downloader_download_failed_credentials_error">Le téléchargement a échoué, vous devez vous connecter à nouveau</string>
   <string name="common_choose_account">Choisissez un compte</string>
   <string name="sync_fail_ticker">La synchronisation a échoué</string>
   <string name="sync_fail_content">La synchronisation de %1$s ne peut pas être complétée</string>
@@ -165,12 +167,9 @@
   <string name="auth_unsupported_auth_method">Le serveur ne supporte pas cette méthode d\'authentification</string>
   <string name="auth_unsupported_multiaccount">%1$s ne supporte pas les comptes multiples</string>
   <string name="auth_fail_get_user_name">Votre serveur a retourné un identifiant d\'utilisateur incorrect. Veuillez prendre contact avec votre administrateur\n</string>
-  <string name="auth_can_not_auth_against_server">Impossible de s\'authentifier sur ce serveur</string>
   <string name="fd_keep_in_sync">Maintenir le fichier à jour</string>
   <string name="common_rename">Renommer</string>
   <string name="common_remove">Supprimer</string>
-  <string name="confirmation_remove_alert">Voulez-vous vraiment supprimer %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Voulez-vous vraiment supprimer %1$s et son contenu ?</string>
   <string name="confirmation_remove_local">Local seulement</string>
   <string name="confirmation_remove_folder_local">Le contenu local uniquement</string>
   <string name="confirmation_remove_remote">Effacer du serveur</string>
@@ -230,7 +229,6 @@
   <string name="conflict_overwrite">Écraser</string>
   <string name="conflict_dont_upload">Ne pas téléverser</string>
   <string name="preview_image_description">Prévisualisation de l\'image</string>
-  <string name="preview_image_error_unknown_format">Cette image ne peut pas être affichée</string>
   <string name="error__upload__local_file_not_copied">%1$s n\'a pas pu être copié dans le dossier local %2$s</string>
   <string name="actionbar_failed_instant_upload">Échec du téléversement instantané</string>
   <string name="failed_upload_headline_text">Téléchargements instantanés échoués</string>
@@ -239,7 +237,6 @@
   <string name="failed_upload_headline_retryall_btn">réessayer de tous sélectionner</string>
   <string name="failed_upload_headline_delete_all_btn">Supprimez tous les sélectionnés de la file d\'attente de téléchargement</string>
   <string name="failed_upload_retry_text">Ré-essayer d\'envoyer l\'image :</string>
-  <string name="failed_upload_load_more_images">Charger plus d\'images</string>
   <string name="failed_upload_retry_do_nothing_text">Ne rien faire vous n\'êtes pas connecté pour le téléchargement instantané</string>
   <string name="failed_upload_failure_text">Message d\'échec:</string>
   <string name="failed_upload_quota_exceeded_text">Veuillez vérifier la configuration de votre serveur, peut-être que votre quota est dépassé.</string>
@@ -251,5 +248,7 @@
   <string name="activity_chooser_send_file_title">Envoyer</string>
   <string name="copy_link">Copier le lien</string>
   <string name="clipboard_text_copied">Copié dans le presse-papiers</string>
-  <string name="error_cant_bind_to_operations_service">Erreur critique : l\'opération n\'a pu être réalisée</string>
+  <string name="network_error_socket_exception">Une erreur s\'est produite pendant la connection au serveur</string>
+  <string name="network_error_socket_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée.</string>
+  <string name="network_error_connect_timeout_exception">Une erreur est survenue pendant l\'attente du serveur. L\'opération n\'a pas pu être effectuée.</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6a49d756..74c50ee4 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -167,12 +167,12 @@
   <string name="auth_unsupported_auth_method">O servidor non admite este método de autenticación</string>
   <string name="auth_unsupported_multiaccount">%1$s non admite contas múltipes</string>
   <string name="auth_fail_get_user_name">O seu servidor non devolveu un ID de usuario correcto, contacte cun administrador\n\t</string>
-  <string name="auth_can_not_auth_against_server">Non é posíbel autenticalo neste servidor</string>
+  <string name="auth_can_not_auth_against_server">Non pode autenticarse neste servidor</string>
   <string name="fd_keep_in_sync">Manter actualizado o ficheiro</string>
   <string name="common_rename">Renomear</string>
   <string name="common_remove">Retirar</string>
-  <string name="confirmation_remove_alert">Confirma que quere retirar %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Confirma que quere retirar %1$s e o seu contido ?</string>
+  <string name="confirmation_remove_alert">Confirma que quere retirar %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Confirma que quere retirar %1$s e o seu contido?</string>
   <string name="confirmation_remove_local">Só local</string>
   <string name="confirmation_remove_folder_local">Só contidos locais</string>
   <string name="confirmation_remove_remote">Retirar do servidor</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 10f1c73a..8e23ab44 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -110,8 +110,6 @@
   <string name="fd_keep_in_sync">לשמור על קובץ עדכני</string>
   <string name="common_rename">שינוי שם</string>
   <string name="common_remove">הסרה</string>
-  <string name="confirmation_remove_alert">האם אכן להסיר את </string>
-  <string name="confirmation_remove_folder_alert">האם אכן ברצונך להסיר את %1$s על כל תוכנו ?</string>
   <string name="confirmation_remove_local">מקומי בלבד</string>
   <string name="confirmation_remove_folder_local">תכנים מקומיים בלבד</string>
   <string name="confirmation_remove_remote">הסרה מהשרת</string>
@@ -163,7 +161,6 @@
   <string name="failed_upload_headline_retryall_btn">לנסות שוב את כל הנבחרים</string>
   <string name="failed_upload_headline_delete_all_btn">למחוק את כל הנבחרים מתור ההעלאה</string>
   <string name="failed_upload_retry_text">לנסות להעלות את התמונה מחדש:</string>
-  <string name="failed_upload_load_more_images">טעינת תמונות נוספות</string>
   <string name="failed_upload_failure_text">הודעת התקלה:</string>
   <string name="failed_upload_quota_exceeded_text">נא לבדוק את תצורת שרת שלך, יתכן שחרגת מהמיכסה שלך.</string>
   <string name="activity_chooser_send_file_title">שליחה</string>
diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml
index 316a8b4f..e26ddb46 100644
--- a/res/values-hu-rHU/strings.xml
+++ b/res/values-hu-rHU/strings.xml
@@ -155,12 +155,9 @@
   <string name="auth_connecting_auth_server">Kapcsolódás a felhasználóazonosítást végző kiszolgálóhoz...</string>
   <string name="auth_unsupported_auth_method">A kiszolgáló nem támogatja ezt a felhasználóazonosítási módszert</string>
   <string name="auth_unsupported_multiaccount">%1$s nem támogat több bejelenkezési jogosultságot</string>
-  <string name="auth_can_not_auth_against_server">Nem hiteleíthető a szerverrel szemben</string>
   <string name="fd_keep_in_sync">Automatikusan frissítse a fájlokat</string>
   <string name="common_rename">Átnevezés</string>
   <string name="common_remove">Eltávolítás</string>
-  <string name="confirmation_remove_alert">Tényleg szeretné törölni  ezt: %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Tényleg törölni akarja ezt a tartalmával együtt: %1$s?</string>
   <string name="confirmation_remove_local">Csak a helyi példány</string>
   <string name="confirmation_remove_folder_local">Csak a helyi tartalmat</string>
   <string name="confirmation_remove_remote">Törlés a szerverről</string>
@@ -217,7 +214,6 @@
   <string name="conflict_overwrite">Felülírás</string>
   <string name="conflict_dont_upload">Ne töltsük föl</string>
   <string name="preview_image_description">Előnézeti kép</string>
-  <string name="preview_image_error_unknown_format">Ez a kép nem jelenik meg</string>
   <string name="actionbar_failed_instant_upload">Sikertelen azonnali feltöltés\"</string>
   <string name="failed_upload_headline_text">Sikertelen Azonnali feltöltés</string>
   <string name="failed_upload_headline_hint">Összefoglaló az összes sikertelen instant feltöltésről</string>
@@ -225,7 +221,6 @@
   <string name="failed_upload_headline_retryall_btn">újra az összes kiválasztott</string>
   <string name="failed_upload_headline_delete_all_btn">törölje az összes kiválasztottat a feltöltési sorból</string>
   <string name="failed_upload_retry_text">újra feltölteni a képet:</string>
-  <string name="failed_upload_load_more_images">További képek betöltése</string>
   <string name="failed_upload_retry_do_nothing_text">nem vagyunk online üzemmódban az azonnali feltöltéshez</string>
   <string name="failed_upload_failure_text">Hibaüzenet</string>
   <string name="failed_upload_quota_exceeded_text">Kérjük ellenőrizd a szerver konfigurációt, mert lehet, hogy a kvótát túllépted.</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 639b68e3..31c72bb5 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -153,8 +153,6 @@
   <string name="fd_keep_in_sync">Biarkan berkas tetap terbaru</string>
   <string name="common_rename">Ubah nama</string>
   <string name="common_remove">Hapus</string>
-  <string name="confirmation_remove_alert">Apakah Anda yakin ingin menghapus %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Apakah Anda benar-benar ingin menghapus %1$s beserta isinya?</string>
   <string name="confirmation_remove_local">Lokal saja</string>
   <string name="confirmation_remove_folder_local">Konten lokal saja</string>
   <string name="confirmation_remove_remote">Hapus dari server</string>
@@ -208,7 +206,6 @@
   <string name="conflict_overwrite">Timpa</string>
   <string name="conflict_dont_upload">Jangan mengunggah</string>
   <string name="preview_image_description">Pratilik gambar</string>
-  <string name="preview_image_error_unknown_format">Gambar ini tidak dapat ditampilkan</string>
   <string name="actionbar_failed_instant_upload">UnggahInsatan Gagal</string>
   <string name="failed_upload_headline_text">Unggahan instan gagal</string>
   <string name="failed_upload_headline_hint">Ringkasan dari semua unggahan instan yang gagal</string>
@@ -216,7 +213,6 @@
   <string name="failed_upload_headline_retryall_btn">Ulangi semua yang terpilih</string>
   <string name="failed_upload_headline_delete_all_btn">hapus semua yang terpilih dari antrian unggahan</string>
   <string name="failed_upload_retry_text">ulangi unggah gambar:</string>
-  <string name="failed_upload_load_more_images">Muat Gambar selengkapnya</string>
   <string name="failed_upload_retry_do_nothing_text">Tidak melakukan apapun, Anda tidak sedang online</string>
   <string name="failed_upload_failure_text">Pesan Kegagalan:</string>
   <string name="failed_upload_quota_exceeded_text">Silakan periksa konfigurasi server Anda, kemungkinan kuota terlampaui.</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4883880e..44956981 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -167,12 +167,9 @@
   <string name="auth_unsupported_auth_method">Il server non supporta questo metodo di autenticazione</string>
   <string name="auth_unsupported_multiaccount">%1$s non supporta account multipli</string>
   <string name="auth_fail_get_user_name">Il tuo server non ha restituito un id utente corretto, contatta un amministratore\n\t</string>
-  <string name="auth_can_not_auth_against_server">Impossibile eseguire l\'autenticazione su questo server</string>
   <string name="fd_keep_in_sync">Tieni aggiornato il file</string>
   <string name="common_rename">Rinomina</string>
   <string name="common_remove">Rimuovi</string>
-  <string name="confirmation_remove_alert">Vuoi davvero rimuovere %1$s?</string>
-  <string name="confirmation_remove_folder_alert">Vuoi davvero rimuovere %1$s ed i suoi contenuti?</string>
   <string name="confirmation_remove_local">Solo localmente</string>
   <string name="confirmation_remove_folder_local">Solo contenuti locali</string>
   <string name="confirmation_remove_remote">Rimuovi dal server</string>
@@ -232,7 +229,6 @@
   <string name="conflict_overwrite">Sovrascrivi</string>
   <string name="conflict_dont_upload">Non inviare</string>
   <string name="preview_image_description">Anteprima dell\'immagine</string>
-  <string name="preview_image_error_unknown_format">Questa immagine non può essere mostrata</string>
   <string name="error__upload__local_file_not_copied">%1$s non può essere copiato nella cartella locale %2$s</string>
   <string name="actionbar_failed_instant_upload">Caricamento istantaneo non riuscito</string>
   <string name="failed_upload_headline_text">Caricamenti istantanei non riusciti</string>
@@ -241,7 +237,6 @@
   <string name="failed_upload_headline_retryall_btn">riprova tutti i selezionati</string>
   <string name="failed_upload_headline_delete_all_btn">elimina tutti i selezionati dalla coda di caricamento</string>
   <string name="failed_upload_retry_text">riprova a caricare l\'immagine:</string>
-  <string name="failed_upload_load_more_images">Carica altre immagini</string>
   <string name="failed_upload_retry_do_nothing_text">non fare niente, non sei collegato per i caricamenti istantanei</string>
   <string name="failed_upload_failure_text">Messaggio d\'errore:</string>
   <string name="failed_upload_quota_exceeded_text">Controlla la configurazione del server, forse hai superato la tua quota.</string>
@@ -253,9 +248,7 @@
   <string name="activity_chooser_send_file_title">Invia</string>
   <string name="copy_link">Copia collegamento</string>
   <string name="clipboard_text_copied">Copiato negli appunti</string>
-  <string name="error_cant_bind_to_operations_service">Errore critico: impossibile eseguire le operazioni</string>
   <string name="network_error_socket_exception">Si è verificato un errore durante la connessione al server.</string>
   <string name="network_error_socket_timeout_exception">Si è verificato un errore in attesa della risposta del server, l\'operazione non è stata completata</string>
   <string name="network_error_connect_timeout_exception">Si è verificato un errore in attesa della risposta del server, l\'operazione non è stata completata</string>
-  <string name="network_host_not_available">L\'operazione non è stata completata, il server non è disponibile</string>
 </resources>
diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index 49d52b3e..8540c065 100644
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -165,12 +165,9 @@
   <string name="auth_unsupported_auth_method">サーバーはこの認証方式をサポートしていません</string>
   <string name="auth_unsupported_multiaccount">%1$s は複数アカウントをサポートしていません</string>
   <string name="auth_fail_get_user_name">サーバーが正しいユーザーIDを返しませんでした。管理者にご連絡ください。\n\t</string>
-  <string name="auth_can_not_auth_against_server">このサーバーを認証できません</string>
   <string name="fd_keep_in_sync">ファイルを最新に保つ</string>
   <string name="common_rename">名前を変更</string>
   <string name="common_remove">削除</string>
-  <string name="confirmation_remove_alert">本当に %1$s を削除してもよろしいですか？</string>
-  <string name="confirmation_remove_folder_alert">本当に %1$s およびそのコンテンツを削除してもよろしいですか？</string>
   <string name="confirmation_remove_local">ローカルのみ</string>
   <string name="confirmation_remove_folder_local">ローカルコンテンツのみ</string>
   <string name="confirmation_remove_remote">サーバーから削除</string>
@@ -229,7 +226,6 @@
   <string name="conflict_overwrite">上書き</string>
   <string name="conflict_dont_upload">アップロードしない</string>
   <string name="preview_image_description">イメージプレビュー</string>
-  <string name="preview_image_error_unknown_format">この画像は表示できません</string>
   <string name="error__upload__local_file_not_copied">%1$s は、ローカルフォルダ %2$s  にコピーできませんでした。</string>
   <string name="actionbar_failed_instant_upload">インスタントアップロードに失敗</string>
   <string name="failed_upload_headline_text">インスタントアップロードに失敗</string>
@@ -238,7 +234,6 @@
   <string name="failed_upload_headline_retryall_btn">すべての選択を再試行</string>
   <string name="failed_upload_headline_delete_all_btn">アップロードキューからすべての選択を削除</string>
   <string name="failed_upload_retry_text">画像のアップロードを再試行:</string>
-  <string name="failed_upload_load_more_images">更に画像を読み込む</string>
   <string name="failed_upload_retry_do_nothing_text">オンラインでなく、インスタントアップロードのために何もしません</string>
   <string name="failed_upload_failure_text">失敗メッセージ:</string>
   <string name="failed_upload_quota_exceeded_text">サーバー設定を確認してください。クォータサイズを超えている可能性があります。</string>
@@ -250,5 +245,4 @@
   <string name="activity_chooser_send_file_title">送信</string>
   <string name="copy_link">リンクをコピー</string>
   <string name="clipboard_text_copied">クリップボードにコピー</string>
-  <string name="error_cant_bind_to_operations_service">致命的なエラー：操作を実行できません</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 8e1d84dd..0cc10abf 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -102,8 +102,6 @@
   <string name="fd_keep_in_sync">არ განაახლო ფაილი</string>
   <string name="common_rename">გადარქმევა</string>
   <string name="common_remove">წაშლა</string>
-  <string name="confirmation_remove_alert">ნამდვილად გინდათ წაშალოთ %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">თქვენ აუცილებლად გინდათ %1$s–ის წაშლა თავისი კონტენტით?</string>
   <string name="confirmation_remove_local">მხოლოდ ლოკალური</string>
   <string name="confirmation_remove_folder_local">მხოლოდ ლოკალური კონტენტი</string>
   <string name="confirmation_remove_remote">სერვერიდან წაშლა</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f3200858..73d01e58 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -157,8 +157,6 @@
   <string name="fd_keep_in_sync">파일을 최신 정보로 유지</string>
   <string name="common_rename">이름 바꾸기</string>
   <string name="common_remove">삭제</string>
-  <string name="confirmation_remove_alert">%1$s을(를) 삭제하시겠습니까?</string>
-  <string name="confirmation_remove_folder_alert">%1$s 및 그 내용을 삭제하시겠습니까?</string>
   <string name="confirmation_remove_local">로컬만</string>
   <string name="confirmation_remove_folder_local">로컬 콘텐츠만</string>
   <string name="confirmation_remove_remote">서버에서 삭제</string>
@@ -212,7 +210,6 @@
   <string name="conflict_overwrite">덮어쓰기</string>
   <string name="conflict_dont_upload">업로드하지 않음</string>
   <string name="preview_image_description">그림 미리보기</string>
-  <string name="preview_image_error_unknown_format">이 그림을 볼수 없습니다</string>
   <string name="actionbar_failed_instant_upload">자동 업로드가 실패했습니다</string>
   <string name="failed_upload_headline_text">자동 업로드 실패함</string>
   <string name="failed_upload_headline_hint">실패된 자동 업로드 전체 요약</string>
@@ -220,7 +217,6 @@
   <string name="failed_upload_headline_retryall_btn">전체 선택 재시도</string>
   <string name="failed_upload_headline_delete_all_btn">선택된 업로드 큐 전체 삭제</string>
   <string name="failed_upload_retry_text">이미지 업로드 재시도:</string>
-  <string name="failed_upload_load_more_images">더 많은 사진 불러오기</string>
   <string name="failed_upload_retry_do_nothing_text">현재 온라인이 아니셔서 자동 업로드를 할수 없습니다</string>
   <string name="failed_upload_failure_text">실패 메시지:</string>
   <string name="failed_upload_quota_exceeded_text">서버 설정을 확인해주세요, 아마 업로드 제한을 초과하셨을겁니다.</string>
diff --git a/res/values-lt-rLT/strings.xml b/res/values-lt-rLT/strings.xml
index f72412bc..66cfd464 100644
--- a/res/values-lt-rLT/strings.xml
+++ b/res/values-lt-rLT/strings.xml
@@ -150,8 +150,6 @@
   <string name="fd_keep_in_sync">Laikyti failą naujinamą</string>
   <string name="common_rename">Pervadinti</string>
   <string name="common_remove">Pašalinti</string>
-  <string name="confirmation_remove_alert">Ar tikrai norite pašalinti %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Ar tikrai norite pašalinti %1$s ir ten esantį turinį?</string>
   <string name="confirmation_remove_local">Tik vietiniai</string>
   <string name="confirmation_remove_folder_local">Tik vietinis turinys</string>
   <string name="confirmation_remove_remote">Pašalinti iš serverio</string>
@@ -202,13 +200,11 @@
   <string name="conflict_overwrite">Perrašyti</string>
   <string name="conflict_dont_upload">Nebesiųsti</string>
   <string name="preview_image_description">Paveikslėlio peržiūra</string>
-  <string name="preview_image_error_unknown_format">Neįmanoma parodyti paveikslėlio</string>
   <string name="failed_upload_headline_text">Nepavykę momentiniai įkėlimai</string>
   <string name="failed_upload_headline_hint">Suvestinė visų nepavykusių momentinių įkėlimų</string>
   <string name="failed_upload_all_cb">pažymėti viską</string>
   <string name="failed_upload_headline_retryall_btn">bandyti dar kartą su visais pažymėtais</string>
   <string name="failed_upload_retry_text">bandyti iš naujo nusiųsti paveikslėlį:</string>
-  <string name="failed_upload_load_more_images">Įkelti daugiau Nuotraukų</string>
   <string name="failed_upload_failure_text">Klaidos pranešimas:</string>
   <string name="failed_upload_quota_exceeded_text">Patikrinkite savo serverio nustatymus, tikėtina jog viršijote savo limitą.</string>
   <string name="activity_chooser_send_file_title">Siųsti</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index fc04d334..7b867e27 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -96,8 +96,6 @@
   <string name="fd_keep_in_sync">Uzturēt datni aktuālu</string>
   <string name="common_rename">Pārsaukt</string>
   <string name="common_remove">Izņemt</string>
-  <string name="confirmation_remove_alert">Vai tiešām vēlaties izņemt %1$s?</string>
-  <string name="confirmation_remove_folder_alert">Vai vēlaties izņemt %1$s un tā saturu?</string>
   <string name="confirmation_remove_local">Tikai lokālos</string>
   <string name="confirmation_remove_folder_local">Tikai lokālo saturu</string>
   <string name="confirmation_remove_remote">Izņemt no servera</string>
diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index 63e28b86..01ead7ce 100644
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s ble lastet opp</string>
   <string name="uploader_upload_failed_ticker">Opplasting feilet</string>
   <string name="uploader_upload_failed_content_single">Opplasting av %1$s kunne ikke fullføres</string>
+  <string name="uploader_upload_failed_credentials_error">Opplasting feilet. Du må logge inn på nytt</string>
   <string name="downloader_download_in_progress_ticker">Laster ned...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Laster ned %2$s</string>
   <string name="downloader_download_succeeded_ticker">Nedlasting fullført</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Nedlasting feilet</string>
   <string name="downloader_download_failed_content">Nedlasting av %1$s kunne ikke fullføres</string>
   <string name="downloader_not_downloaded_yet">Ikke lastet ned enda</string>
+  <string name="downloader_download_failed_credentials_error">Nedlasting feilet. Du må logge inn på nytt</string>
   <string name="common_choose_account">Velg konto</string>
   <string name="sync_fail_ticker">Synkronisering feilet</string>
   <string name="sync_fail_content">Synkronisering av %1$s kunne ikke fullføres</string>
@@ -165,12 +167,12 @@
   <string name="auth_unsupported_auth_method">Serveren støtter ikke denne autorisasjonsmetoden</string>
   <string name="auth_unsupported_multiaccount">%1$s støtter ikke flere kontoer</string>
   <string name="auth_fail_get_user_name">Tjeneren din svarer ikke med korrekt bruker-ID, vennligst ta kontakt med en administrator\n\t</string>
-  <string name="auth_can_not_auth_against_server">Kan ikke autentisere mot denne tjeneren</string>
+  <string name="auth_can_not_auth_against_server">Kan ikke autentisere mot denne serveren</string>
   <string name="fd_keep_in_sync">Hold filen oppdatert</string>
   <string name="common_rename">Endre navn</string>
   <string name="common_remove">Fjern</string>
-  <string name="confirmation_remove_alert">Er du sikker på at du vil fjerne %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Vil du virkelig fjerne %1$s og dens innhold?</string>
+  <string name="confirmation_remove_alert">Vil du virkelig fjerne %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Vil du virkelig fjerne %1$s inkludert innholdet?</string>
   <string name="confirmation_remove_local">Kun lokalt</string>
   <string name="confirmation_remove_folder_local">Kun lokalt innhold</string>
   <string name="confirmation_remove_remote">Fjern fra server</string>
@@ -184,6 +186,7 @@
   <string name="sync_file_nothing_to_do_msg">filinnhold er allerede synkronisert</string>
   <string name="create_dir_fail_msg">Mappe kunne ikke opprettes</string>
   <string name="filename_forbidden_characters">Forbudte tegn: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">Filnavn kan ikke være tomt</string>
   <string name="wait_a_moment">Vent et øyeblikk</string>
   <string name="filedisplay_unexpected_bad_get_content">Uforventet problem; vennligst velg filen fra en annen applikasjon</string>
   <string name="filedisplay_no_file_selected">Ingen fil ble valgt</string>
@@ -250,5 +253,9 @@
   <string name="activity_chooser_send_file_title">Send</string>
   <string name="copy_link">Kopier lenke</string>
   <string name="clipboard_text_copied">Kopiert til utklippstavlen</string>
-  <string name="error_cant_bind_to_operations_service">Kritisk feil: kan ikke utføre handlinger</string>
+  <string name="error_cant_bind_to_operations_service">Kritisk feil: kan ikke utføre operasjonene</string>
+  <string name="network_error_socket_exception">En feil oppstod ved oppretting av forbindelse til serveren.</string>
+  <string name="network_error_socket_timeout_exception">En feil oppstod ved venting på svar fra serveren. Operasjonen kunne ikke utføres</string>
+  <string name="network_error_connect_timeout_exception">En feil oppstod ved venting på svar fra serveren. Operasjonen kunne ikke utføres</string>
+  <string name="network_host_not_available">Operasjonen kunne ikke fullføres. Server utilgjengelig</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 95b37193..4d8d4daa 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s is met succes ge-upload</string>
   <string name="uploader_upload_failed_ticker">Upload mislukt</string>
   <string name="uploader_upload_failed_content_single">Upload van %1$s kon niet voltooid worden</string>
+  <string name="uploader_upload_failed_credentials_error">Update mislukt, u moet opnieuw inloggen</string>
   <string name="downloader_download_in_progress_ticker">Downloaden ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Aan het downloaden %2$s</string>
   <string name="downloader_download_succeeded_ticker">Downloaden gelukt</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Downloaden mislukt</string>
   <string name="downloader_download_failed_content">Download van %1$s kon niet worden voltooid</string>
   <string name="downloader_not_downloaded_yet">Nog niet gedownload</string>
+  <string name="downloader_download_failed_credentials_error">Download mislukt, u moet opnieuw inloggen</string>
   <string name="common_choose_account">Kies account</string>
   <string name="sync_fail_ticker">Synchronisatie mislukt</string>
   <string name="sync_fail_content">Synchronisatie van %1$s kon niet worden voltooid</string>
@@ -165,12 +167,9 @@
   <string name="auth_unsupported_auth_method">De server ondersteunt deze authenticatiemethode niet</string>
   <string name="auth_unsupported_multiaccount">%1$s ondersteunt het gebruik van meerdere accounts niet</string>
   <string name="auth_fail_get_user_name">Uw server geeft geen goede userid terug, neem contact op met uw beheerder\n\t</string>
-  <string name="auth_can_not_auth_against_server">Kan niet authenticeren tegen deze server</string>
   <string name="fd_keep_in_sync">Houd bestand actueel</string>
   <string name="common_rename">Hernoemen</string>
   <string name="common_remove">Verwijderen</string>
-  <string name="confirmation_remove_alert">Wilt je werkelijk %1$s verwijderen?</string>
-  <string name="confirmation_remove_folder_alert">Wil je echt %1$s ende inhoud daarvan verwijderen ?</string>
   <string name="confirmation_remove_local">Alleen lokaal</string>
   <string name="confirmation_remove_folder_local">Alleen lokale inhoud </string>
   <string name="confirmation_remove_remote">Verwijder van server</string>
@@ -230,7 +229,6 @@
   <string name="conflict_overwrite">Overschrijven</string>
   <string name="conflict_dont_upload">Niet uploaden</string>
   <string name="preview_image_description">Afbeelding voorbeeld</string>
-  <string name="preview_image_error_unknown_format">Deze afbeelding kan niet weergegeven worden</string>
   <string name="error__upload__local_file_not_copied">%1$s kon niet worden gekopieerd naar de %2$s lokale map</string>
   <string name="actionbar_failed_instant_upload">Mislukt InstantUpload</string>
   <string name="failed_upload_headline_text">Mislukte directe uploads</string>
@@ -239,7 +237,6 @@
   <string name="failed_upload_headline_retryall_btn">opnieuw proberen alles te selecteren</string>
   <string name="failed_upload_headline_delete_all_btn">verwijderen alle geselecteerde van de upload wachtrij</string>
   <string name="failed_upload_retry_text">probeer de afbeelding opnieuw te uploaden:</string>
-  <string name="failed_upload_load_more_images">Laadt meer Afbeeldingen</string>
   <string name="failed_upload_retry_do_nothing_text">doe niks, u bent niet online voor directe upload</string>
   <string name="failed_upload_failure_text">Mislukkings Bericht:</string>
   <string name="failed_upload_quota_exceeded_text">Controleer uw server instellingen, misschien is uw quota overschreden.</string>
@@ -251,5 +248,7 @@
   <string name="activity_chooser_send_file_title">Versturen</string>
   <string name="copy_link">Link kopiëren</string>
   <string name="clipboard_text_copied">Gekopieerd naar het klembord</string>
-  <string name="error_cant_bind_to_operations_service">Kritieke fout: kan de acties niet uitvoeren</string>
+  <string name="network_error_socket_exception">Er trad een fout op bij het verbinden met de server.</string>
+  <string name="network_error_socket_timeout_exception">Er trad een fout op bij het wachten op de server, de verwerking kon niet plaatsvinden</string>
+  <string name="network_error_connect_timeout_exception">Er trad een fout op bij het wachten op de server, de verwerking kon niet plaatsvinden</string>
 </resources>
diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml
index b452c154..0dffdcf2 100644
--- a/res/values-nn-rNO/strings.xml
+++ b/res/values-nn-rNO/strings.xml
@@ -88,7 +88,6 @@
   <string name="fd_keep_in_sync">Hald fila oppdatert</string>
   <string name="common_rename">Endra namn</string>
   <string name="common_remove">Fjern</string>
-  <string name="confirmation_remove_alert">Vil du verkeleg fjerna %1$s?</string>
   <string name="confirmation_remove_local">Berre lokalt</string>
   <string name="confirmation_remove_remote">Fjern frå tenaren</string>
   <string name="confirmation_remove_remote_and_local">Ekstern og lokal</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 87ce75b1..b650db88 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -84,7 +84,6 @@
   <string name="fd_keep_in_sync">ਫਾਇਲ ਨੂੰ ਅੱਪ ਟੂ ਡੇਟ ਰੱਖੋ</string>
   <string name="common_rename">ਨਾਂ ਬਦਲੋ</string>
   <string name="common_remove">ਹਟਾਓ</string>
-  <string name="confirmation_remove_alert">ਕੀ ਤੁਸੀਂ %1$s ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
   <string name="confirmation_remove_local">ਕੇਵਲ ਲੋਕਲ</string>
   <string name="confirmation_remove_remote">ਸਰਵਰ ਤੋਂ ਹਟਾਓ</string>
   <string name="confirmation_remove_remote_and_local">ਰਿਮੋਟ ਤੇ ਲੋਕਲ</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c3c1dc15..0305b53f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -165,12 +165,9 @@
   <string name="auth_unsupported_auth_method">Serwer nie obsługuje tej metody autoryzacji</string>
   <string name="auth_unsupported_multiaccount">%1$s nie wspiera multikont</string>
   <string name="auth_fail_get_user_name">Twój serwer nie zwraca prawidłowego id użytkownika, proszę skontaktuj się z administratorem\n\t</string>
-  <string name="auth_can_not_auth_against_server">Nie można autoryzować z tym serwerem</string>
   <string name="fd_keep_in_sync">Automatyczne aktualizuj plik</string>
   <string name="common_rename">Zmień nazwę</string>
   <string name="common_remove">Usuń</string>
-  <string name="confirmation_remove_alert">Czy na pewno chcesz usunąć %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Czy usunąć %1$s oraz jego zawartość?</string>
   <string name="confirmation_remove_local">Tylko lokalnie</string>
   <string name="confirmation_remove_folder_local">Tylko zasoby lokalne</string>
   <string name="confirmation_remove_remote">Usuń z serwera</string>
@@ -230,7 +227,6 @@
   <string name="conflict_overwrite">Zastąp</string>
   <string name="conflict_dont_upload">Nie wysyłaj</string>
   <string name="preview_image_description">Podgląd</string>
-  <string name="preview_image_error_unknown_format">Obraz nie może zostać wyświetlony</string>
   <string name="error__upload__local_file_not_copied">%1$s nie może zostać skopiowany do lokalnego folderu %2$s</string>
   <string name="actionbar_failed_instant_upload">InstantUpload nie powiódł się</string>
   <string name="failed_upload_headline_text">Błąd automatycznego przesyłania</string>
@@ -239,7 +235,6 @@
   <string name="failed_upload_headline_retryall_btn">spróbuj zaznaczyć wszystkie</string>
   <string name="failed_upload_headline_delete_all_btn">usuń wszystko z kolejki wysyłania</string>
   <string name="failed_upload_retry_text">ponów wysyłanie obrazu:</string>
-  <string name="failed_upload_load_more_images">Wczytaj więcej obrazów</string>
   <string name="failed_upload_retry_do_nothing_text">nic nie rób, ponieważ nie jesteś online, nie możesz przesyłać plików</string>
   <string name="failed_upload_failure_text">Komunikat błędu:</string>
   <string name="failed_upload_quota_exceeded_text">Proszę sprawdź ustawienia serwera, możliwe że przekroczyłes limit wielkości pliku</string>
@@ -251,5 +246,4 @@
   <string name="activity_chooser_send_file_title">Wyślij</string>
   <string name="copy_link">Skopiuj link</string>
   <string name="clipboard_text_copied">Skopiuj do schowka</string>
-  <string name="error_cant_bind_to_operations_service">Błąd krytyczny: nie można przeprowadzić operacji</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 94910e78..e569a382 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -171,8 +171,8 @@
   <string name="fd_keep_in_sync">Manter arquivo atualizado</string>
   <string name="common_rename">Renomear</string>
   <string name="common_remove">Remover</string>
-  <string name="confirmation_remove_alert">Você realmente quer remover %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Você deseja realmente apagar %1$s e seu conteúdo?</string>
+  <string name="confirmation_remove_alert">Você realmente deseja remover %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Você realmente deseja remover %1$s e seus conteúdos?</string>
   <string name="confirmation_remove_local">Somente local</string>
   <string name="confirmation_remove_folder_local">Somente conteúdo local</string>
   <string name="confirmation_remove_remote">Remover do servidor</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6bb69421..2265e79a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -167,12 +167,9 @@
   <string name="auth_unsupported_auth_method">O servidor não suporta este método de autenticação</string>
   <string name="auth_unsupported_multiaccount">%1$s não suporta contas múltiplas</string>
   <string name="auth_fail_get_user_name">O seu servidor não transmite o ID correcto. Por favor contacte o administrador.</string>
-  <string name="auth_can_not_auth_against_server">Não foi possível autenticar no servidor</string>
   <string name="fd_keep_in_sync">manter ficheiro actualizado</string>
   <string name="common_rename">Renomear</string>
   <string name="common_remove">Remover</string>
-  <string name="confirmation_remove_alert">Tem a certeza que deseja remover %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Deseja realmente remover %1$s e o seu conteúdo?</string>
   <string name="confirmation_remove_local">Apenas localmente</string>
   <string name="confirmation_remove_folder_local">So conteúdos locais</string>
   <string name="confirmation_remove_remote">Apagar do servidor</string>
@@ -232,7 +229,6 @@
   <string name="conflict_overwrite">Sobrepor</string>
   <string name="conflict_dont_upload">Não enviar.</string>
   <string name="preview_image_description">Pré-Visualização da imagem</string>
-  <string name="preview_image_error_unknown_format">Esta imagem não pode ser mostrada</string>
   <string name="error__upload__local_file_not_copied">Não foi possível copiar %1$s para a pasta local %2$s</string>
   <string name="actionbar_failed_instant_upload">O envio rápido falhou</string>
   <string name="failed_upload_headline_text">Falharam os Uploads-Instantâneos</string>
@@ -241,7 +237,6 @@
   <string name="failed_upload_headline_retryall_btn">Tentar todos os seleccionados</string>
   <string name="failed_upload_headline_delete_all_btn">Eliminar todos os seleccionados da lista de envio</string>
   <string name="failed_upload_retry_text">Tentar envio da imagem:</string>
-  <string name="failed_upload_load_more_images">Carregar mais imagens</string>
   <string name="failed_upload_retry_do_nothing_text">não fazer nada, nao está online para o Upload-Instantâneo</string>
   <string name="failed_upload_failure_text">Mensagem de erro:</string>
   <string name="failed_upload_quota_exceeded_text">Por favor verifique a configuração do servidor, talvez tenha excedido a sua quota</string>
@@ -253,9 +248,7 @@
   <string name="activity_chooser_send_file_title">Enviar</string>
   <string name="copy_link">Copiar ligação</string>
   <string name="clipboard_text_copied">Copiado para a área de transferência</string>
-  <string name="error_cant_bind_to_operations_service">Erro crítico: não é possível executar as operações</string>
   <string name="network_error_socket_exception">Ocorreu um erro durante a ligação ao servidos.</string>
   <string name="network_error_socket_timeout_exception">Ocorreu um erro durante a ligação ao servidor, não foi possível realizar a operação.</string>
   <string name="network_error_connect_timeout_exception">Ocorreu um erro durante a ligação ao servidor, não foi possível realizar a operação.</string>
-  <string name="network_host_not_available">A operação não foi concluída, o servidor está inacessível.</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4bef32fc..b74d8c31 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -101,7 +101,6 @@
   <string name="fd_keep_in_sync">Păstrează fișierul actualizat</string>
   <string name="common_rename">Redenumește</string>
   <string name="common_remove">Elimină</string>
-  <string name="confirmation_remove_alert">Sigur dorești să elimini %1$s ?</string>
   <string name="confirmation_remove_local">Doar local</string>
   <string name="confirmation_remove_remote">Elimină de pe server</string>
   <string name="remove_success_msg">Eliminat cu succes</string>
@@ -129,6 +128,5 @@
   <string name="ssl_validator_no_info_about_error">- Nu exista nici o informaţie pentru aceasta eroare</string>
   <string name="instant_upload_path">/Încărcare instanta</string>
   <string name="conflict_dont_upload">Nu încarcă</string>
-  <string name="preview_image_error_unknown_format">Aceasta imagine nu poate fi accesata </string>
   <string name="activity_chooser_send_file_title">Expediază</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3783094f..75a1943a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -167,12 +167,9 @@
   <string name="auth_unsupported_auth_method">Сервер не поддерживает выбранный метод аутентификации</string>
   <string name="auth_unsupported_multiaccount">%1$s не поддерживает сразу несколько учётных записей</string>
   <string name="auth_fail_get_user_name">Ваш сервер не возвращает корректный пользовательский идентификатор, пожалуйста свяжитесь с администратором</string>
-  <string name="auth_can_not_auth_against_server">Не могу авторизоваться на этом сервере </string>
   <string name="fd_keep_in_sync">Обновлять файл</string>
   <string name="common_rename">Переименовать</string>
   <string name="common_remove">Удалить</string>
-  <string name="confirmation_remove_alert">Вы действительно хотите удалить %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Вы действительно хотите удалить %1$s и его содержимое?</string>
   <string name="confirmation_remove_local">Только локально</string>
   <string name="confirmation_remove_folder_local">Только локальные данные</string>
   <string name="confirmation_remove_remote">Удалить с сервера</string>
@@ -232,7 +229,6 @@
   <string name="conflict_overwrite">Заменить</string>
   <string name="conflict_dont_upload">Не загружать</string>
   <string name="preview_image_description">Предпросмотр</string>
-  <string name="preview_image_error_unknown_format">Это изображение не может быть показано</string>
   <string name="error__upload__local_file_not_copied">%1$s не возможно скопировать в локальною папку %2$s </string>
   <string name="actionbar_failed_instant_upload">Сбой немедленной загрузки</string>
   <string name="failed_upload_headline_text">Сбой немедленной загрузки</string>
@@ -241,7 +237,6 @@
   <string name="failed_upload_headline_retryall_btn">Ещё раз попробовать всё выделенное</string>
   <string name="failed_upload_headline_delete_all_btn">Удалить выбранное из очереди загрузки</string>
   <string name="failed_upload_retry_text">попробовать ещё раз загрузить изображение:</string>
-  <string name="failed_upload_load_more_images">Загрузить больше картинок</string>
   <string name="failed_upload_retry_do_nothing_text">Ничего не делать, если нет подключения к сети</string>
   <string name="failed_upload_failure_text">Сообщение об ошибке:</string>
   <string name="failed_upload_quota_exceeded_text">Проверьте настройки сервера, возможно ваш лимит исчерпан</string>
@@ -253,9 +248,7 @@
   <string name="activity_chooser_send_file_title">Отправить</string>
   <string name="copy_link">Копировать ссылку</string>
   <string name="clipboard_text_copied">Скопировано в буфер обмена</string>
-  <string name="error_cant_bind_to_operations_service">Критическая ошибка: не возможно выполнить операции</string>
   <string name="network_error_socket_exception">При подключении к серверу возникла ошибка</string>
   <string name="network_error_socket_timeout_exception">Во время ожидания сервера возникла ошибка, операция не может быть завершена</string>
   <string name="network_error_connect_timeout_exception">Во время ожидания сервера возникла ошибка, операция не может быть завершена</string>
-  <string name="network_host_not_available">Операция не может быть завершена, сервер недоступен</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 02e50d18..4bf2eec8 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -60,7 +60,6 @@
   <string name="fd_keep_in_sync">ගොනුව යාවත්කාලීනව තබාගන්න</string>
   <string name="common_rename">නැවත නම් කරන්න</string>
   <string name="common_remove">ඉවත් කරන්න </string>
-  <string name="confirmation_remove_alert">%1$s සැබැවින්ම ඉවත්කිරීමට අවශ්‍යද?</string>
   <string name="confirmation_remove_local">පෙදෙසි පමණක්</string>
   <string name="confirmation_remove_remote">සේවාදායකයාගෙන් ඉවත් කරන්න</string>
   <string name="confirmation_remove_remote_and_local">දුරස්ථ හා පෙදෙසි </string>
diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml
index 9b1332b8..cef7b351 100644
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@ -163,12 +163,9 @@
   <string name="auth_unsupported_auth_method">Server nepodporuje túto autentifikačnú metódu</string>
   <string name="auth_unsupported_multiaccount">%1$s nepodporuje viacero účtov</string>
   <string name="auth_fail_get_user_name">Váš server nevracia správne používateľské id, kontaktujte prosím správcu systému\n\t</string>
-  <string name="auth_can_not_auth_against_server">Nie je možné urobiť overenie voči tomuto serveru</string>
   <string name="fd_keep_in_sync">Udržiavať súbor aktuálny.</string>
   <string name="common_rename">Premenuj</string>
   <string name="common_remove">Odober</string>
-  <string name="confirmation_remove_alert">Naozaj odstrániť %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Chcete odstrániť %1$s a jeho obsah?</string>
   <string name="confirmation_remove_local">Iba lokálne</string>
   <string name="confirmation_remove_folder_local">Len lokálny obsah</string>
   <string name="confirmation_remove_remote">Zmazať zo servera</string>
@@ -227,7 +224,6 @@
   <string name="conflict_overwrite">Prepísať</string>
   <string name="conflict_dont_upload">Nenahrávajte</string>
   <string name="preview_image_description">Ukážka obrazu</string>
-  <string name="preview_image_error_unknown_format">Obraz nemôže byť zobrazený</string>
   <string name="actionbar_failed_instant_upload">Okamžité odoslanie zlyhalo</string>
   <string name="failed_upload_headline_text">Zlyhané instantné nahratia</string>
   <string name="failed_upload_headline_hint">Zhrnutie všetkých zlyhaných nahratí</string>
@@ -235,7 +231,6 @@
   <string name="failed_upload_headline_retryall_btn">opakovať všetky vybrané</string>
   <string name="failed_upload_headline_delete_all_btn">zmazať všetky vybrané z radu pre nahratie</string>
   <string name="failed_upload_retry_text">opakovať nahratie obrazu:</string>
-  <string name="failed_upload_load_more_images">Načítať viac Obrázkov</string>
   <string name="failed_upload_retry_do_nothing_text">nevykonať nič, nie ste online pre instantné nahratie</string>
   <string name="failed_upload_failure_text">Chybová správa:</string>
   <string name="failed_upload_quota_exceeded_text">Prosím skontrolujte nastavenie vášho servera, možno bola prekročená disková kvóta.</string>
@@ -246,5 +241,4 @@
   <string name="activity_chooser_send_file_title">Odoslať</string>
   <string name="copy_link">Kopíruj odkaz</string>
   <string name="clipboard_text_copied">Skopírované do \"clipboard\"</string>
-  <string name="error_cant_bind_to_operations_service">Kritická chyba: nemožno vykonať operácie</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 41f02248..30776df6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -165,12 +165,9 @@
   <string name="auth_unsupported_auth_method">Strežnik ne podpira tega načina overitve</string>
   <string name="auth_unsupported_multiaccount">%1$s ne omogoča podpore več računom</string>
   <string name="auth_fail_get_user_name">Strežnik ne vrača ustreznega ID uporabnika. Stopite v stik s skrbnikom sistema.\n\t</string>
-  <string name="auth_can_not_auth_against_server">S tem strežnikom overitev ni mogoča</string>
   <string name="fd_keep_in_sync">Datoteka naj bo posodobljena</string>
   <string name="common_rename">Preimenuj</string>
   <string name="common_remove">Odstrani</string>
-  <string name="confirmation_remove_alert">Ali res želite odstraniti %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Ali ste prepričani, da želite odstraniti %1$s in njeno vsebino?</string>
   <string name="confirmation_remove_local">Le krajevno</string>
   <string name="confirmation_remove_folder_local">Le krajevno vsebino</string>
   <string name="confirmation_remove_remote">Odstrani s strežnika</string>
@@ -229,7 +226,6 @@
   <string name="conflict_overwrite">Prepiši</string>
   <string name="conflict_dont_upload">Ne pošlji</string>
   <string name="preview_image_description">Predogled slike</string>
-  <string name="preview_image_error_unknown_format">Te slike ni mogoče prikazati</string>
   <string name="error__upload__local_file_not_copied">Datoteke %1$s ni mogoče kopirati v krajevno mapo %2$s</string>
   <string name="actionbar_failed_instant_upload">Spodletelo takojšnje pošiljanje</string>
   <string name="failed_upload_headline_text">Spodletela takojšnja pošiljanja</string>
@@ -238,7 +234,6 @@
   <string name="failed_upload_headline_retryall_btn">vse izbrane poskusi znova</string>
   <string name="failed_upload_headline_delete_all_btn">izbriši izbrane iz vrste za pošiljanje</string>
   <string name="failed_upload_retry_text">poskusi poslati sliko:</string>
-  <string name="failed_upload_load_more_images">Naloži več slik</string>
   <string name="failed_upload_retry_do_nothing_text">ne pošlji takoj, saj je povezava v omrežje ni dejavna</string>
   <string name="failed_upload_failure_text">Sporočilo o napaki:</string>
   <string name="failed_upload_quota_exceeded_text">Preverite nastavitve strežnika. Morda je presežena vrednost količinske omejitve.</string>
@@ -250,5 +245,4 @@
   <string name="activity_chooser_send_file_title">Pošlji</string>
   <string name="copy_link">Kopiraj povezavo</string>
   <string name="clipboard_text_copied">Kopirano v odložišče</string>
-  <string name="error_cant_bind_to_operations_service">Kritična napaka: ni mogoče izvesti opravila.</string>
 </resources>
diff --git a/res/values-sr-rSP/strings.xml b/res/values-sr-rSP/strings.xml
index b674903f..72d3f1a1 100644
--- a/res/values-sr-rSP/strings.xml
+++ b/res/values-sr-rSP/strings.xml
@@ -38,7 +38,6 @@
   <string name="auth_connection_established">Konekcija uspostavljena</string>
   <string name="common_rename">Preimenij</string>
   <string name="common_remove">Ukloni</string>
-  <string name="confirmation_remove_alert">Da li želite da uklonite %1$s ?</string>
   <string name="remove_success_msg">Uklanjanje je uspelo</string>
   <string name="remove_fail_msg">Uklanjanje nije uspelo</string>
   <string name="wait_a_moment">Molim pričekajte</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c6f33954..6437eef2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -74,7 +74,6 @@
   <string name="fd_keep_in_sync">Редовно ажурирај датотеку</string>
   <string name="common_rename">Преименуј</string>
   <string name="common_remove">Уклони</string>
-  <string name="confirmation_remove_alert">Желите ли да уклоните %1$s?</string>
   <string name="confirmation_remove_local">Само локално</string>
   <string name="confirmation_remove_remote">Уклони са сервера</string>
   <string name="confirmation_remove_remote_and_local">Удаљено и локално</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 69adffac..35db3f12 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,9 +18,9 @@
   <string name="prefs_pincode">applikation PIN</string>
   <string name="prefs_pincode_summary">Skydda applikation-klienten</string>
   <string name="prefs_instant_upload">Direktuppladdning av kamerabilder</string>
-  <string name="prefs_instant_upload_summary">Direktuppladning utav bilder tagna med kameran</string>
-  <string name="prefs_instant_video_upload">Direktuppladning utav videos</string>
-  <string name="prefs_instant_video_upload_summary">Direktuppladdning utav videos inspelade med kameran</string>
+  <string name="prefs_instant_upload_summary">Direktuppladning av bilder tagna med kameran</string>
+  <string name="prefs_instant_video_upload">Direktuppladning av video</string>
+  <string name="prefs_instant_video_upload_summary">Direktuppladdning av video inspelade med kameran</string>
   <string name="prefs_log_title">Aktivera loggning</string>
   <string name="prefs_log_summary">Används för att logga problem</string>
   <string name="prefs_log_title_history">Logghistorik</string>
@@ -28,7 +28,7 @@
   <string name="prefs_log_delete_history_button">Radera historik</string>
   <string name="prefs_help">Hjälp</string>
   <string name="prefs_recommend">Rekommendera till en vän</string>
-  <string name="prefs_feedback">Återkoppling</string>
+  <string name="prefs_feedback">Feedback</string>
   <string name="prefs_imprint">Imprint</string>
   <string name="recommend_subject">Försök %1$s på din smarttelefon!</string>
   <string name="recommend_text">\"Jag vill bjuda in dig att använda %1$s på din smartphone\nLadda ner här: %2$s\"\n\t</string>
@@ -167,12 +167,12 @@
   <string name="auth_unsupported_auth_method">Servern har inte stöd för denna autentiseringsmetod</string>
   <string name="auth_unsupported_multiaccount">%1$s har inte stöd för multipla konton</string>
   <string name="auth_fail_get_user_name">Din server returnerar inte ett korrekt användare id, vänligen kontakta en administratör\n\t</string>
-  <string name="auth_can_not_auth_against_server">Kan inte autentisera mot denna servern</string>
+  <string name="auth_can_not_auth_against_server">Kan inte autentisera mot servern</string>
   <string name="fd_keep_in_sync">HÃ¥ll filen uppdaterad</string>
   <string name="common_rename">Byt namn</string>
   <string name="common_remove">Radera</string>
-  <string name="confirmation_remove_alert">Vill du verkligen radera: %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Vill du verkligen radera %1$s och dess innehåll?</string>
+  <string name="confirmation_remove_alert">Vill du verkligen ta bort %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Vill du verkligen ta bort %1$s och dess innehåll?</string>
   <string name="confirmation_remove_local">Endast lokalt</string>
   <string name="confirmation_remove_folder_local">Endast lokalt innehåll</string>
   <string name="confirmation_remove_remote">Radera från server</string>
@@ -253,9 +253,9 @@
   <string name="activity_chooser_send_file_title">Skicka</string>
   <string name="copy_link">Kopiera länk</string>
   <string name="clipboard_text_copied">Kopierat till urklipp</string>
-  <string name="error_cant_bind_to_operations_service">Kritiskt fel: kan inte utföra operationer</string>
+  <string name="error_cant_bind_to_operations_service">Kritiskt fel: kan inte utföra åtgärden</string>
   <string name="network_error_socket_exception">Ett fel uppstod vid anslutning till servern.</string>
   <string name="network_error_socket_timeout_exception">Ett fel uppstod i väntan på servern, operationen kunde inte ha gjorts</string>
   <string name="network_error_connect_timeout_exception">Ett fel uppstod i väntan på servern, operationen kunde inte ha gjorts</string>
-  <string name="network_host_not_available">Åtgärden kunde inte slutföras, är servern ej kontaktbar</string>
+  <string name="network_host_not_available">Åtgärden kunte inte slutföras, servern är ej tillgänglig</string>
 </resources>
diff --git a/res/values-ta-rLK/strings.xml b/res/values-ta-rLK/strings.xml
index 0e153adf..9d605a27 100644
--- a/res/values-ta-rLK/strings.xml
+++ b/res/values-ta-rLK/strings.xml
@@ -91,8 +91,6 @@
   <string name="fd_keep_in_sync">நவீன கோப்பை வைத்திருக்கவும்</string>
   <string name="common_rename">பெயர்மாற்றம்</string>
   <string name="common_remove">அகற்றுக</string>
-  <string name="confirmation_remove_alert">உங்களுக்கு உண்மையாக %1$s ஐ அகற்றவேண்டுமா?</string>
-  <string name="confirmation_remove_folder_alert">உங்களுக்கு%1$s ஐயும் அதன் உள்ளடக்கங்களையும் அகற்ற வேண்டுமா?</string>
   <string name="confirmation_remove_local">உள்ளூர் மட்டும்</string>
   <string name="confirmation_remove_folder_local">இடத்துரி உள்ளடக்கங்கள் மட்டும்</string>
   <string name="confirmation_remove_remote">சேவையகத்திலிருந்து அகற்றுக</string>
diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml
index 6fbf7b93..ba6d8115 100644
--- a/res/values-th-rTH/strings.xml
+++ b/res/values-th-rTH/strings.xml
@@ -103,8 +103,6 @@
   <string name="fd_keep_in_sync">ปรับปรุงไฟล์ให้ทันสมัยอยู่เสมอ</string>
   <string name="common_rename">เปลี่ยนชื่อ</string>
   <string name="common_remove">ลบออก</string>
-  <string name="confirmation_remove_alert">คุณแน่ใจแล้วหรือว่าต้องการลบ %1$s?</string>
-  <string name="confirmation_remove_folder_alert">คุณแน่ใจแล้วหรือว่าต้องการลบ %1$s และเนื้อหาที่อยู่ข้างในทิ้งไป?</string>
   <string name="confirmation_remove_local">เฉพาะเซิร์ฟเวอร์ภายในเท่านั้น</string>
   <string name="confirmation_remove_folder_local">เนื้อหาที่อยู่ในเครื่องเท่านั้น</string>
   <string name="confirmation_remove_remote">ลบออกจากเซิร์ฟเวอร์</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 43e634c4..cb7f5380 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -172,7 +172,7 @@
   <string name="common_rename">Yeniden adlandır</string>
   <string name="common_remove">Kaldır</string>
   <string name="confirmation_remove_alert">Gerçekten %1$s dosyasını kaldırmak istiyor musunuz?</string>
-  <string name="confirmation_remove_folder_alert">Gerçekten %1s ve içeriğini silmek istediğinizden emin misiniz?</string>
+  <string name="confirmation_remove_folder_alert">Gerçekten %1$s ve içeriğini kaldırmak istediğinizden emin misiniz?</string>
   <string name="confirmation_remove_local">Sadece yerel</string>
   <string name="confirmation_remove_folder_local">Sadece yerel içerik</string>
   <string name="confirmation_remove_remote">Sunucudan kaldır</string>
@@ -232,7 +232,7 @@
   <string name="conflict_overwrite">Üzerine yaz</string>
   <string name="conflict_dont_upload">Yükleme</string>
   <string name="preview_image_description">Resim önizleme</string>
-  <string name="preview_image_error_unknown_format">Bu resim gösterilemez</string>
+  <string name="preview_image_error_unknown_format">Bu resim gösterilemiyor</string>
   <string name="error__upload__local_file_not_copied">%1$s, %2$s yerel klasörüne kopyalanamadı</string>
   <string name="actionbar_failed_instant_upload">AnındaYükleme başarısız</string>
   <string name="failed_upload_headline_text">Anında yüklemeler başarısız</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 21b20b09..260e756f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -106,8 +106,6 @@
   <string name="fd_keep_in_sync">Оновлювати файл</string>
   <string name="common_rename">Перейменувати</string>
   <string name="common_remove">Видалити</string>
-  <string name="confirmation_remove_alert">Ви дійсно бажаєте видалити %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Ви дійсно бажаєте видалити %1$s і його зміст ?</string>
   <string name="confirmation_remove_local">Лише локально</string>
   <string name="confirmation_remove_folder_local">Лише локальний зміст</string>
   <string name="confirmation_remove_remote">Видалити із серверу</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b4283ffb..d5a4bedc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -158,8 +158,6 @@
   <string name="fd_keep_in_sync">Giữ tập tin cập nhật</string>
   <string name="common_rename">Sửa tên</string>
   <string name="common_remove">Xóa</string>
-  <string name="confirmation_remove_alert">Bạn có thực sự muốn xóa %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">Bạn có thật sự muốn xóa %1$s và nội dung của nó ?</string>
   <string name="confirmation_remove_local">Chỉ cục bộ</string>
   <string name="confirmation_remove_folder_local">Chỉ nội dung trên máy</string>
   <string name="confirmation_remove_remote">Xóa từ máy chủ</string>
@@ -214,7 +212,6 @@
   <string name="conflict_overwrite">Ghi đè lên</string>
   <string name="conflict_dont_upload">Không tải lên</string>
   <string name="preview_image_description">Xem trước hình ảnh</string>
-  <string name="preview_image_error_unknown_format">Không thể hiển thị hình ảnh</string>
   <string name="actionbar_failed_instant_upload">Tải lên nhanh bị lỗi</string>
   <string name="failed_upload_headline_text">Tải lên nhanh bị lỗi</string>
   <string name="failed_upload_headline_hint">Tóm tắt tất cả các tải lên nhanh bị lỗi</string>
@@ -222,7 +219,6 @@
   <string name="failed_upload_headline_retryall_btn">thử lại với tất cả các đối tượng được chọn</string>
   <string name="failed_upload_headline_delete_all_btn">xóa tất cả khỏi các đối tượng được chọn trong hàng đợi chờ tải lên</string>
   <string name="failed_upload_retry_text">thử lại việc tải lên hình ảnh:</string>
-  <string name="failed_upload_load_more_images">Tải thêm nhiều hình ảnh</string>
   <string name="failed_upload_retry_do_nothing_text">không thực hiện thao tác gì nêu bạn không có kết nối mạng dành cho tải lên nhanh</string>
   <string name="failed_upload_failure_text">Thông điệp lỗi:</string>
   <string name="failed_upload_quota_exceeded_text">Vui lòng kiểm tra cấu hình máy chủ của bạn, có thể hạn ngạch dữ liệu đã quá hạn.</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fc38ae47..16e4af22 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -157,12 +157,9 @@
   <string name="auth_unsupported_auth_method">服务器不支持这种验证方式</string>
   <string name="auth_unsupported_multiaccount">%1$s不支持多个账户</string>
   <string name="auth_fail_get_user_name">您的服务器没有返回一个正确的用户 id，请联系管理员\n\t</string>
-  <string name="auth_can_not_auth_against_server">当前服务器验证失败</string>
   <string name="fd_keep_in_sync">保证文件更新</string>
   <string name="common_rename">重命名</string>
   <string name="common_remove">删除</string>
-  <string name="confirmation_remove_alert">是否要删除%1$s ?</string>
-  <string name="confirmation_remove_folder_alert">您确定要删除 %1$s 及其内容吗？</string>
   <string name="confirmation_remove_local">仅本地</string>
   <string name="confirmation_remove_folder_local">仅本地内容</string>
   <string name="confirmation_remove_remote">从服务器删除</string>
@@ -220,7 +217,6 @@
   <string name="conflict_overwrite">覆盖</string>
   <string name="conflict_dont_upload">不上传</string>
   <string name="preview_image_description">图片预览</string>
-  <string name="preview_image_error_unknown_format">不能显示图片</string>
   <string name="actionbar_failed_instant_upload">即时上传失败</string>
   <string name="failed_upload_headline_text">限时上传失败</string>
   <string name="failed_upload_headline_hint">限时上传失败汇总</string>
@@ -228,7 +224,6 @@
   <string name="failed_upload_headline_retryall_btn">重试全选</string>
   <string name="failed_upload_headline_delete_all_btn">从上传列表删除所有选定项</string>
   <string name="failed_upload_retry_text">重试上传图片</string>
-  <string name="failed_upload_load_more_images">载入更多图片</string>
   <string name="failed_upload_retry_do_nothing_text">不在线时不开启即时上传</string>
   <string name="failed_upload_failure_text">失败消息</string>
   <string name="failed_upload_quota_exceeded_text">请检查服务器设置。可能走出配额。</string>
@@ -240,5 +235,4 @@
   <string name="activity_chooser_send_file_title">发送</string>
   <string name="copy_link">复制链接</string>
   <string name="clipboard_text_copied">复制到剪贴板</string>
-  <string name="error_cant_bind_to_operations_service">关键性错误：无法执行相关操作</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 031ceaa4..c065c881 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -158,8 +158,6 @@
   <string name="fd_keep_in_sync">讓檔案保持最新的</string>
   <string name="common_rename">重新命名</string>
   <string name="common_remove">移除</string>
-  <string name="confirmation_remove_alert">您真的要移除 %1$s ?</string>
-  <string name="confirmation_remove_folder_alert">您真的要移除 %1$s 與裡頭的檔案?</string>
   <string name="confirmation_remove_local">只有本地</string>
   <string name="confirmation_remove_folder_local">只有本地</string>
   <string name="confirmation_remove_remote">從伺服器移除</string>
@@ -215,7 +213,6 @@
   <string name="conflict_overwrite">覆寫</string>
   <string name="conflict_dont_upload">不要上載</string>
   <string name="preview_image_description">圖片預覽</string>
-  <string name="preview_image_error_unknown_format">無法顯示圖片</string>
   <string name="actionbar_failed_instant_upload">即時上傳失敗</string>
   <string name="failed_upload_headline_text">即時上傳失敗</string>
   <string name="failed_upload_headline_hint">所有即時上傳失敗的記錄</string>
@@ -223,7 +220,6 @@
   <string name="failed_upload_headline_retryall_btn">重新上傳選取的檔案</string>
   <string name="failed_upload_headline_delete_all_btn">刪除所有被選取的檔案</string>
   <string name="failed_upload_retry_text">重新上傳這個檔案: </string>
-  <string name="failed_upload_load_more_images">載入更多的檔案</string>
   <string name="failed_upload_retry_do_nothing_text">未連線, 所以無法使用上傳功能</string>
   <string name="failed_upload_failure_text">失敗訊息: </string>
   <string name="failed_upload_quota_exceeded_text">請檢查你的伺服器設定, 可能你的額度已超過.</string>
diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 1614ba1c..450cd4a7 100644
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -53,33 +53,63 @@ public class SynchronizeFileOperation extends SyncOperation {
     private Context mContext;
     
     private boolean mTransferWasRequested = false;
+
     
+    /**
+     * Constructor.
+     * 
+     * Uses remotePath to retrieve all the data in local cache and remote server when the operation
+     * is executed, instead of reusing {@link OCFile} instances.
+     * 
+     * @param 
+     * @param account               ownCloud account holding the file.
+     * @param syncFileContents      When 'true', transference of data will be started by the 
+     *                              operation if needed and no conflict is detected.
+     * @param context               Android context; needed to start transfers.
+     */
     public SynchronizeFileOperation(
-            OCFile localFile,
-            OCFile serverFile,          // make this null to let the operation checks the server; added to reuse info from SynchronizeFolderOperation 
+            String remotePath,  
             Account account, 
             boolean syncFileContents,
             Context context) {
         
-        mLocalFile = localFile;
-        mServerFile = serverFile;
+        mRemotePath = remotePath;
+        mLocalFile = null;
+        mServerFile = null;
         mAccount = account;
         mSyncFileContents = syncFileContents;
         mContext = context;
     }
 
+    
+    /**
+     * Constructor allowing to reuse {@link OCFile} instances just queried from cache or network.
+     * 
+     * Useful for folder / account synchronizations.
+     * 
+     * @param localFile             Data of file currently hold in device cache. MUSTN't be null.
+     * @param serverFile            Data of file just retrieved from network. If null, will be
+     *                              retrieved from network by the operation when executed.
+     * @param account               ownCloud account holding the file.
+     * @param syncFileContents      When 'true', transference of data will be started by the 
+     *                              operation if needed and no conflict is detected.
+     * @param context               Android context; needed to start transfers.
+     */
     public SynchronizeFileOperation(
-            String remotePath,  
+            OCFile localFile,
+            OCFile serverFile, 
             Account account, 
             boolean syncFileContents,
             Context context) {
         
-        mRemotePath = remotePath;
-        mServerFile = null;
+        mLocalFile = localFile;
+        mServerFile = serverFile;
+        mRemotePath = localFile.getRemotePath();
         mAccount = account;
         mSyncFileContents = syncFileContents;
         mContext = context;
     }
+    
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
@@ -87,8 +117,10 @@ public class SynchronizeFileOperation extends SyncOperation {
         RemoteOperationResult result = null;
         mTransferWasRequested = false;
         
-        // Get local file from the DB
-        mLocalFile = getStorageManager().getFileByPath(mRemotePath);
+        if (mLocalFile == null) {
+            // Get local file from the DB
+            mLocalFile = getStorageManager().getFileByPath(mRemotePath);
+        }
         
         if (!mLocalFile.isDown()) {
             /// easy decision
@@ -99,8 +131,7 @@ public class SynchronizeFileOperation extends SyncOperation {
             /// local copy in the device -> need to think a bit more before do anything
 
             if (mServerFile == null) {
-                String remotePath = mLocalFile.getRemotePath();
-                ReadRemoteFileOperation operation = new ReadRemoteFileOperation(remotePath);
+                ReadRemoteFileOperation operation = new ReadRemoteFileOperation(mRemotePath);
                 result = operation.execute(client);
                 if (result.isSuccess()){
                     mServerFile = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));