From: David A. Velasco <dvelasco@owncloud.com>
Date: Mon, 9 Jun 2014 06:43:37 +0000 (+0200)
Subject: Merge pull request #535 from owncloud/fix_keep_up_to_date_when_sync
X-Git-Tag: oc-android-1.7.0_signed~286
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d152a97a6721113f4fdf50c6524f44b0da3d1112?hp=8e75ed8415ee91d7e4a57712c5cc0f5dc1af93ec

Merge pull request #535 from owncloud/fix_keep_up_to_date_when_sync

Fixed update of kept-in-sync files when full account is refreshed
---

diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index 03f68af7..c8999012 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s byl úspěšně odeslán</string>
   <string name="uploader_upload_failed_ticker">Odesílání selhalo</string>
   <string name="uploader_upload_failed_content_single">Odesílání %1$s nemohlo být dokončeno</string>
+  <string name="uploader_upload_failed_credentials_error">Nahrávání selhalo. Je třeba se přihlásit znovu.</string>
   <string name="downloader_download_in_progress_ticker">Stahuji ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Stahuji %2$s</string>
   <string name="downloader_download_succeeded_ticker">Stažení úspěšné</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Stažení selhalo</string>
   <string name="downloader_download_failed_content">Stažení %1$s nemohlo být dokončeno</string>
   <string name="downloader_not_downloaded_yet">Ještě nestaženo</string>
+  <string name="downloader_download_failed_credentials_error">Stahování selhalo. Je třeba se přihlásit znovu.</string>
   <string name="common_choose_account">Vybrat účet</string>
   <string name="sync_fail_ticker">Synchronizace selhala</string>
   <string name="sync_fail_content">Synchronizaci %1$s nelze dokončit</string>
@@ -165,9 +167,11 @@
   <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í  </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 chcete odstranit %1$s ?</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>
@@ -181,6 +185,7 @@
   <string name="sync_file_nothing_to_do_msg">Obsah souboru je již synchronizován</string>
   <string name="create_dir_fail_msg">Adresář nemohl být vytvořen</string>
   <string name="filename_forbidden_characters">Zakázané znaky: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">Název souboru nemůže být prázdný.</string>
   <string name="wait_a_moment">Počkejte chvíli</string>
   <string name="filedisplay_unexpected_bad_get_content">Neočekávaný problém - zkuste zvolit soubor jinou aplikací</string>
   <string name="filedisplay_no_file_selected">Žádný soubor nebyl vybrán</string>
@@ -226,6 +231,7 @@
   <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 nelze zobrazit</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>
@@ -234,6 +240,7 @@
   <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">Nahrát 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>
@@ -245,4 +252,9 @@
   <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>
+  <string name="network_error_socket_exception">Při pokusu o připojení k serveru došlo k chybě.</string>
+  <string name="network_error_socket_timeout_exception">Při čekání na odpověď serveru se vyskytla chyba, operace nemohla být dokončena</string>
+  <string name="network_error_connect_timeout_exception">Při čekání na odpověď serveru se vyskytla chyba, operace nemohla být dokončena</string>
+  <string name="network_host_not_available">Operace nemohla být dokončena. Server není dostupný</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 50d18320..b25fbc77 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,6 +17,10 @@
   <string name="prefs_manage_accounts">Administrer konti</string>
   <string name="prefs_pincode">App PIN</string>
   <string name="prefs_pincode_summary">Beskyt din klient</string>
+  <string name="prefs_instant_upload">Upload billeder straks</string>
+  <string name="prefs_instant_upload_summary">Upload straks billeder taget med kameraet</string>
+  <string name="prefs_instant_video_upload">Upload videoer straks</string>
+  <string name="prefs_instant_video_upload_summary">Upload straks videor optaget med kameraet</string>
   <string name="prefs_log_title">Aktiver Logning</string>
   <string name="prefs_log_summary">Dette bruges til at logge problemer</string>
   <string name="prefs_log_title_history">Logger Historik</string>
@@ -27,6 +31,7 @@
   <string name="prefs_feedback">Feedback</string>
   <string name="prefs_imprint">Imprint</string>
   <string name="recommend_subject">Prøv %1$s på din smartphone!</string>
+  <string name="recommend_text">\"Jeg ønsker at invitere dig til at bruge %1$s på din smartphone!\nHent den her: %2$s\"</string>
   <string name="auth_check_server">Check Server</string>
   <string name="auth_host_url">Server addresse https://…</string>
   <string name="auth_username">Brugernavn</string>
@@ -35,6 +40,7 @@
   <string name="sync_string_files">Filer</string>
   <string name="setup_btn_connect">Tilslut</string>
   <string name="uploader_btn_upload_text">Upload</string>
+  <string name="uploader_top_message">Vælg upload mappe:</string>
   <string name="uploader_wrn_no_account_title">Ingen konto fundet</string>
   <string name="uploader_wrn_no_account_text">Der er ingen %1$s brugere på din enhed. Sæt venligst en bruger op først.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Opsætning</string>
@@ -76,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s blev uploadet med success</string>
   <string name="uploader_upload_failed_ticker">Upload fejlede</string>
   <string name="uploader_upload_failed_content_single">Upload af %1$s kunne ikke gennemføres</string>
+  <string name="uploader_upload_failed_credentials_error">Upload mislykkedes, du kan logge ind på ny</string>
   <string name="downloader_download_in_progress_ticker">Downloader ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Downloader %2$s</string>
   <string name="downloader_download_succeeded_ticker">Download fuldført</string>
@@ -83,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Download fejlede</string>
   <string name="downloader_download_failed_content">Download af %1$s kunne ikke fuldføres</string>
   <string name="downloader_not_downloaded_yet">Endnu ikke downloadet</string>
+  <string name="downloader_download_failed_credentials_error">Download mislykkedes, du skal logge ind på ny</string>
   <string name="common_choose_account">Vælg konto</string>
   <string name="sync_fail_ticker">Synkronisering fejlede</string>
   <string name="sync_fail_content">Synkronisering af %1$s kunne ikke gennemføres</string>
@@ -92,6 +100,8 @@
   <string name="sync_fail_in_favourites_ticker">Hold-synkroniseret filer mislykkedes</string>
   <string name="sync_fail_in_favourites_content">Indholdet af %1$d filer ikke kunne synkroniseres (%2$d konflikter)</string>
   <string name="sync_foreign_files_forgotten_ticker">Visse lokale filer blev glemt</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d filer ud af %2$s mappe kunne ikke kopieres ind i</string>
+  <string name="sync_foreign_files_forgotten_explanation">Fra version 1.3.16 bliver filer uploadet fra denne enhed kopieret til mappen %1$s for at forhindre datatab når en enkelt fil synkroniseres med flere konti.\n\nPå grund af denne ændring er alle filer som var uploadet i tidligere versioner af denne app kopieret til mappen %2$s. Imidlertid forhindrede en fejl færdiggørelsen af denne operation under konto-synkronisering. Du kan enten lade filerne være som de er og fjerne linket til %3$s eller flytte filerne til mappen %1$s og beholde linket til %4$s.\n\nHerunder er en liste med de lokale og eksterne filer i %5$s, som de var knyttet til.</string>
   <string name="sync_current_folder_was_removed">Mappen %1$s eksistere ikke længere</string>
   <string name="foreign_files_move">Flyt alle</string>
   <string name="foreign_files_success">Alle filer blev flyttet</string>
@@ -127,6 +137,7 @@
   <string name="media_rewind_description">Tilbagespolings knap</string>
   <string name="media_play_pause_description">Afspil eller pause knap</string>
   <string name="media_forward_description">Hurtigt fremad kanp</string>
+  <string name="auth_getting_authorization">Forsøger godkendelse...</string>
   <string name="auth_trying_to_login">Forsøger at logge ind...</string>
   <string name="auth_no_net_conn_title">Ingen netværksforbindelse</string>
   <string name="auth_nossl_plain_ok_title">Sikker forbindelse ikke tilgængelig.</string>
@@ -155,9 +166,13 @@
   <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_fail_get_user_name">Din server retunere ikke et korrekt bruger-id. Kontakt venligst din administrator</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 slette %1$s og dets indhold?</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>
@@ -169,7 +184,9 @@
   <string name="rename_server_fail_msg">Omdøbning kunne ikke gennemføres</string>
   <string name="sync_file_fail_msg">Ekstern fil kunne ikke kontrolleres</string>
   <string name="sync_file_nothing_to_do_msg">Filindholdet allerede synkroniseret</string>
+  <string name="create_dir_fail_msg">Kunne ikke oprette mappe</string>
   <string name="filename_forbidden_characters">Ugyldige tegn: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">Filnavnet kan ikke stå tomt.</string>
   <string name="wait_a_moment">Vent et øjeblik</string>
   <string name="filedisplay_unexpected_bad_get_content">Uforventet problem; prøv venligst anden applikation til at vælge filen</string>
   <string name="filedisplay_no_file_selected">Ingen fil blev valgt</string>
@@ -207,6 +224,7 @@
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Upload billeder kun via WiFi </string>
+  <string name="instant_video_upload_on_wifi">Upload kun videoer via WiFi</string>
   <string name="instant_upload_path">/Øjeblikkelig upload</string>
   <string name="conflict_title">Opdaterings konflikt</string>
   <string name="conflict_message">Ekstern fil %s er ikke synkroniseret med lokal fil. At fortsætte vil erstatte indholdet af filen på serveren.</string>
@@ -214,6 +232,8 @@
   <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="error__upload__local_file_not_copied">%1$s kunne ikke kopieres til %2$s lokale mappe</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>
@@ -221,9 +241,11 @@
   <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>
+  <string name="share_link_no_support_share_api">Beklager, deling er ikke slået til på din server. Kontakt venligst din administrator.</string>
   <string name="share_link_file_no_exist">Kan ikke dele denne fil eller mappe. Find venligst ud af om den eksisterer</string>
   <string name="share_link_file_error">Der opstod en fejl ved deling af denne fil eller mappe</string>
   <string name="unshare_link_file_no_exist">Kan ikke fjerne delingen af denne fil eller mappe. Den findes ikke.</string>
@@ -231,4 +253,9 @@
   <string name="activity_chooser_send_file_title">Send</string>
   <string name="copy_link">Kopier link</string>
   <string name="clipboard_text_copied">Kopieret til udklipsholder</string>
+  <string name="error_cant_bind_to_operations_service">Kritisk fejl: kan ikke udføre handlingerne</string>
+  <string name="network_error_socket_exception">Der opstod en fejl under tilslutningen til serveren.</string>
+  <string name="network_error_socket_timeout_exception">Der opstod en fejl mens vi ventede på serveren, handlingen kunne ikke gennemføres</string>
+  <string name="network_error_connect_timeout_exception">Der opstod en fejl mens vi ventede på serveren, handlingen kunne ikke gennemføres</string>
+  <string name="network_host_not_available">Handlingen kunne ikke gennemføres, serveren er utilgængelig</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3b96df41..bf084e1a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -167,9 +167,12 @@
   <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>
@@ -229,6 +232,7 @@
   <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,6 +241,7 @@
   <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>
@@ -248,7 +253,9 @@
   <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>
+  <string name="network_host_not_available">Η λειτουργία δεν ήταν δυνατό να ολοκληρωθεί, ο διακομιστής δεν είναι διαθέσιμος</string>
 </resources>
diff --git a/res/values-es-rCL/strings.xml b/res/values-es-rCL/strings.xml
index 61360c2d..74b5fc86 100644
--- a/res/values-es-rCL/strings.xml
+++ b/res/values-es-rCL/strings.xml
@@ -17,16 +17,20 @@
   <string name="auth_host_url">Dirección del servidor https://...</string>
   <string name="auth_username">Usuario</string>
   <string name="auth_password">Clave</string>
+  <string name="auth_register">¿Nuevo en %1$s?</string>
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
+  <string name="uploader_top_message">Elija el directorio donde subir los archivos:</string>
   <string name="uploader_wrn_no_account_title">No se encuentra la cuenta</string>
   <string name="uploader_wrn_no_account_text">No existe la cuenta %1$s en su dispositivo. Por favor configure una cuenta primero.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuración</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>
   <string name="uploader_wrn_no_content_title">ningun contenido para subir</string>
+  <string name="uploader_wrn_no_content_text">No se ha recibido ningún contenido. No hay nada para subir.</string>
   <string name="uploader_error_forbidden_content">%1$s no esta autorizado para acceder al contenido compartido</string>
   <string name="uploader_info_uploading">Subiendo</string>
+  <string name="file_list_empty">No hay archivos en esta carpeta.\nPuede añadir archivos nuevos con la opción \"Subir\" del menú.</string>
   <string name="filedetails_select_file">Seleccione un archivo para desplegar información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
   <string name="filedetails_type">Tipo:</string>
@@ -34,6 +38,7 @@
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Descargar</string>
   <string name="filedetails_sync_file">refrescar archivo</string>
+  <string name="filedetails_renamed_in_upload_msg">El archivo fue renombrado a %1$s durante la subida</string>
   <string name="common_yes">Si</string>
   <string name="common_no">No</string>
   <string name="common_ok">OK</string>
@@ -42,6 +47,8 @@
   <string name="common_cancel">Cancelar</string>
   <string name="common_save_exit">Guardar&amp;Salir</string>
   <string name="common_error">Error</string>
+  <string name="common_loading">Cargando ...</string>
+  <string name="common_error_unknown">Error desconocido</string>
   <string name="about_title">Acerca de</string>
   <string name="delete_account">Eliminar cuenta</string>
   <string name="create_account">Crear cuenta</string>
@@ -59,23 +66,40 @@
   <string name="downloader_download_succeeded_content">%1$s fue descargado correctamente</string>
   <string name="downloader_download_failed_ticker">Descarga fallida</string>
   <string name="downloader_download_failed_content">La descarga de %1$s no pudo ser completada</string>
+  <string name="downloader_not_downloaded_yet">Aun no se ha descargado</string>
   <string name="common_choose_account">Elija una cuenta</string>
   <string name="sync_fail_ticker">sincronización fallida</string>
+  <string name="sync_fail_content">La sincronización de %1$s no pudo ser completada</string>
   <string name="sync_conflicts_in_favourites_ticker">conflictos encontrados</string>
+  <string name="sync_foreign_files_forgotten_ticker">Algunos archivos fueron olvidados</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d archivos fuera de la carpeta %2$s no pudieron ser copiados dentro</string>
+  <string name="sync_foreign_files_forgotten_explanation">Desde la versión 1.3.16, los archivos subidos desde este dispositivo son copiados a la carpeta local %1$s para prevenir perdidas de datos cuando un solo archivo es sincronizado con múltiples cuentas.\n\nDebido a este cambio, todos los archivos copiados en versiones anteriores de esta aplicación fueron copiados en la carpeta %2$s. De todas maneras, un error evitó que se completara la operación durante la sincronización de la cuenta. Usted puede dejar el(los) archivo(s) tal cual y remover el enlace a %3$s, ó mover el(los) archivo(s) dentro de la carpeta %1$s y mantener el link a %4$s.\n\nMás abajo hay un listado de los archivos locales, y los archivos remotos en %5$s hacia donde están enlazados.</string>
   <string name="foreign_files_move">mover todo</string>
   <string name="foreign_files_success">todos los archivos fueron transferidos</string>
   <string name="foreign_files_fail">algunos archivos no pueden ser transferidos</string>
+  <string name="foreign_files_local_text">Local: %1$s</string>
+  <string name="foreign_files_remote_text">Remoto: %1$s</string>
   <string name="upload_query_move_foreign_files">No hay espacio suficiente para copiar los archivos seleccionados en la %1$s carpeta. Le gustaria que los trasladaran en su lugar?</string>
   <string name="pincode_enter_pin_code">Por favor, ingreses su PIN de aplicación</string>
   <string name="pincode_configure_your_pin">Ingrese su PIN de aplicación</string>
+  <string name="pincode_configure_your_pin_explanation">El PIN será solicitado cada vez que la aplicación se inicie</string>
   <string name="pincode_reenter_your_pincode">Por favor, reingrese su PIN de aplicación</string>
   <string name="pincode_remove_your_pincode">Remover el PIN de su aplicación</string>
   <string name="pincode_mismatch">Los PINs de su aplicación no coinciden</string>
   <string name="pincode_wrong">PIN de aplicación incorrecto</string>
   <string name="pincode_removed">PIN de aplicación removido</string>
   <string name="pincode_stored">PIN de aplicación almacenada</string>
+  <string name="media_notif_ticker">Reproductor de música %1$s</string>
+  <string name="media_state_playing">(sonando) %1$s</string>
+  <string name="media_state_loading">(cargando) %1$s</string>
+  <string name="media_event_done">La reproducción de %1$s ha terminado</string>
   <string name="media_err_nothing_to_play">ningun archivo multimedia encontrado</string>
   <string name="media_err_no_account">ninguna cuenta provista</string>
+  <string name="media_err_not_in_owncloud">El archivo no es de una cuenta válida</string>
+  <string name="media_err_unsupported">Codificador de medios no soportado</string>
+  <string name="media_err_io">El archivo multi media no se pudo leer</string>
+  <string name="media_err_malformed">El archivo multimedia no está correctamente codificado</string>
+  <string name="media_err_timeout">Se excedió el tiempo al intentar reproducir</string>
   <string name="auth_trying_to_login">Intentando entrar...</string>
   <string name="auth_no_net_conn_title">Sin conexión de red</string>
   <string name="auth_nossl_plain_ok_title">Conexión segura no disponible.</string>
@@ -96,6 +120,8 @@
   <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 eliminar %1$s?</string>
+  <string name="confirmation_remove_folder_alert">¿Realmente desea eliminar el archivo %1$s y su contenido?</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>
@@ -105,11 +131,19 @@
   <string name="rename_dialog_title">ingresar un nuevo nombre</string>
   <string name="rename_local_fail_msg">La copia local no se pudo renombrar, pruebe un nombre diferente</string>
   <string name="rename_server_fail_msg">Renombrar no pudo ser completado</string>
+  <string name="sync_file_fail_msg">El archivo remoto no se pudo chequear</string>
   <string name="sync_file_nothing_to_do_msg">contenido de los archivos ya sincronizados</string>
   <string name="create_dir_fail_msg">El directorio no pudo ser creado</string>
   <string name="wait_a_moment">espera un momento</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inesperado ; por favor seleccione el archivo desde una aplicación diferente</string>
   <string name="filedisplay_no_file_selected">ningun archivo electo</string>
+  <string name="ssl_validator_header">La identidad del sitio no pudo ser verificada</string>
+  <string name="ssl_validator_reason_cert_not_trusted">-El certificado del servidor no es confiable</string>
+  <string name="ssl_validator_reason_cert_expired">-El certificado del servidor está expirado</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">-Las fechas validas para el certificado del servidor son futuras.</string>
+  <string name="ssl_validator_reason_hostname_not_verified">-  La URL no corresponde al nombre del servidor en el certificado</string>
+  <string name="ssl_validator_question">¿Desea confiar en el certificado de todas manera?</string>
+  <string name="ssl_validator_not_saved">El certificado no se pudo guardar</string>
   <string name="ssl_validator_btn_details_see">detalles</string>
   <string name="ssl_validator_btn_details_hide">esconder</string>
   <string name="ssl_validator_label_subject">emitido para</string>
@@ -120,7 +154,16 @@
   <string name="ssl_validator_label_C">pais</string>
   <string name="ssl_validator_label_ST">estado</string>
   <string name="ssl_validator_label_L">locacion</string>
+  <string name="ssl_validator_label_validity">Validez:</string>
   <string name="ssl_validator_label_validity_from">desde</string>
   <string name="ssl_validator_label_validity_to">para</string>
+  <string name="ssl_validator_label_signature">Firma:</string>
   <string name="ssl_validator_label_signature_algorithm">algoritmo</string>
+  <string name="instant_upload_on_wifi">Solo subir fotos vía WiFi</string>
+  <string name="conflict_title">Conflicto al actualizar</string>
+  <string name="conflict_message">El archivo remoto %s no está sincronizado con la copia local. Si continua, se reemplazará el archivo en el servidor.</string>
+  <string name="conflict_keep_both">Mantener ambos</string>
+  <string name="conflict_overwrite">Sobre-escribir</string>
+  <string name="conflict_dont_upload">No subir</string>
+  <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index f5789c6f..c951d93e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -17,6 +17,10 @@
   <string name="prefs_manage_accounts">Kontuak kudeatu</string>
   <string name="prefs_pincode">App PIN</string>
   <string name="prefs_pincode_summary">Babestu zure bezeroa</string>
+  <string name="prefs_instant_upload">Uneko irudi igoerak</string>
+  <string name="prefs_instant_upload_summary">Igo berehala kamerak ateratako argazkiak</string>
+  <string name="prefs_instant_video_upload">Uneko bideo igoerak</string>
+  <string name="prefs_instant_video_upload_summary">Igo berehala kamerak filmatutako bideoak</string>
   <string name="prefs_log_title">Gaitu erregistroa</string>
   <string name="prefs_log_summary">Arazoen erregistroa gordetzeko erabiltzen da</string>
   <string name="prefs_log_title_history">Erregistro historia</string>
@@ -27,6 +31,7 @@
   <string name="prefs_feedback">Oharrak</string>
   <string name="prefs_imprint">Imprint</string>
   <string name="recommend_subject">Probatu %1$s zure telefono adimentsuan!</string>
+  <string name="recommend_text">Nik %1$s zure telefono adimentsuan erabiltzera gonbidatu nahi zaitut! Deskargatu hemen: %2$s</string>
   <string name="auth_check_server">Egiaztatu zerbitzaria</string>
   <string name="auth_host_url">Zerbitzariaren helbidea https://</string>
   <string name="auth_username">Erabiltzaile izena</string>
@@ -35,6 +40,7 @@
   <string name="sync_string_files">Fitxategiak</string>
   <string name="setup_btn_connect">Konektatu</string>
   <string name="uploader_btn_upload_text">Igo</string>
+  <string name="uploader_top_message">Hautatu igoera karpeta:</string>
   <string name="uploader_wrn_no_account_title">Ez da konturik aurkitu</string>
   <string name="uploader_wrn_no_account_text">Zure gailuan ez dago %1$s konturik. Mesedez konfiguratu kontu bat lehenengo.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Konfiguratu</string>
@@ -76,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s ongi igo da</string>
   <string name="uploader_upload_failed_ticker">igotzeak huts egin du</string>
   <string name="uploader_upload_failed_content_single">%1$s fitxategiaren igoera ezin izan da burutu</string>
+  <string name="uploader_upload_failed_credentials_error">Huts egin du igotzen, berriro sartu behar duzu</string>
   <string name="downloader_download_in_progress_ticker">Deskargatzen ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% Deskargatzen %2$s</string>
   <string name="downloader_download_succeeded_ticker">Deskarga ongi burutu da</string>
@@ -83,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Deskargak huts egin du</string>
   <string name="downloader_download_failed_content">%1$s fitxategiaren deskarga ezin izan da burutu</string>
   <string name="downloader_not_downloaded_yet">Oraindik deskargatu gabe</string>
+  <string name="downloader_download_failed_credentials_error">Huts egin du deskargatzen, berriro sartu behar duzu</string>
   <string name="common_choose_account">Hautatu kontua</string>
   <string name="sync_fail_ticker">Sinkronizazioak huts egin du</string>
   <string name="sync_fail_content">%1$s fitxategiaren sinkronizazioa ezin da burutu</string>
@@ -92,6 +100,8 @@
   <string name="sync_fail_in_favourites_ticker">edukien sinkronizazioak huts egin du</string>
   <string name="sync_fail_in_favourites_content">%1$d fitxategien edukiak ezin dira sinkronizatu (%2$d gatazka)</string>
   <string name="sync_foreign_files_forgotten_ticker">Bertako fitxategi batzuk ahaztu dira</string>
+  <string name="sync_foreign_files_forgotten_content">%2$s karpetako %1$d fitxategi ezin dira dira kopiatu</string>
+  <string name="sync_foreign_files_forgotten_explanation">1.3.16 bertsioan, gailu honetatik igotzen diren fitxategiak bertako %1$s karpetara mugitzen dira datu galera ekiditeko fitxategi bat kontu ezberdinekin sinkronizatzen denean. Aldaketa hau dela eta, programa honen aurreko bertsioetan igotako fitxategi guztiak %2$s karpetara kopiatu dira. Hala ere, errore batek hau burutzea ekidin du kontuaren sinkronizazioa egiten ari zen bitartean. Orain fitxategiak dauden bezala utz ditzakezu eta %3$s rako lotura ezabatu, edo fitxategiak %1$s karpetara mugi ditzakezu eta %4$srako lotura mantendu. Behean bertako fitxategien zerrenda eta %5$s era lotuta zeuden urruneko fitxategiena.</string>
   <string name="sync_current_folder_was_removed">%1$s karpeta dagoeneko ez da existitzen</string>
   <string name="foreign_files_move">Mugitu denak</string>
   <string name="foreign_files_success">Fitxategi guztiak mugitu dira</string>
@@ -127,6 +137,7 @@
   <string name="media_rewind_description">Atzeratu botoia</string>
   <string name="media_play_pause_description">Erreproduzitu edo pausatu botoia</string>
   <string name="media_forward_description">Azkar aurreratu botoia</string>
+  <string name="auth_getting_authorization">Baimena eskuratzen...</string>
   <string name="auth_trying_to_login">Saioa hasten saiatzen...</string>
   <string name="auth_no_net_conn_title">Ez dago sare konexiorik</string>
   <string name="auth_nossl_plain_ok_title">Konexio segurua ez dago eskuragarri</string>
@@ -155,9 +166,13 @@
   <string name="auth_connecting_auth_server">Konektatzen autentikazio zerbitzarira...</string>
   <string name="auth_unsupported_auth_method">Zerbitzariak ez du autentikazio metodo hau onartzen</string>
   <string name="auth_unsupported_multiaccount">%1$s ez du kontu anitzak onartzen</string>
+  <string name="auth_fail_get_user_name">Zure zerbitzariak ez du bueltatzen erabiltzailearen id egokia, mesedez jarri harremanetan administratzailearekin.</string>
+  <string name="auth_can_not_auth_against_server">Ezin da autentikatu zerbitzarian.</string>
   <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">Ziur zaude %1$s ezabatu nahi duzula?</string>
+  <string name="confirmation_remove_folder_alert">Ziru zaude %1$s eta bere edukiak ezabatu nahi dituzula?</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>
@@ -169,7 +184,9 @@
   <string name="rename_server_fail_msg">Izen aldaketa ezin izan da burutu</string>
   <string name="sync_file_fail_msg">Urruneko fitxategia ezin izan da arakatu</string>
   <string name="sync_file_nothing_to_do_msg">Fitxategi edukiak dagoeneko sinkronizaturik</string>
+  <string name="create_dir_fail_msg">Ezin izan da karpeta sortu</string>
   <string name="filename_forbidden_characters">Debekatutako karaktereak: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">Fitxategi izena ezin da hutsa izan</string>
   <string name="wait_a_moment">Itxaron momentu bat</string>
   <string name="filedisplay_unexpected_bad_get_content">Ezusteko arazoa; mesedez, saiatu beste app batekin fitxategia hautatzeko</string>
   <string name="filedisplay_no_file_selected">Ez da fitxategirik hautatu</string>
@@ -198,6 +215,8 @@
   <string name="ssl_validator_label_validity_to">Noiz arte:</string>
   <string name="ssl_validator_label_signature">Sinadura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritmoa:</string>
+  <string name="ssl_validator_null_cert">Ezin da ziurtagiria erakutsi.</string>
+  <string name="ssl_validator_no_info_about_error">- Ez dago errorearen gaineko informaziorik.</string>
   <string name="placeholder_sentence">Hau leku-marka da</string>
   <string name="placeholder_filename">kokalekua.txt</string>
   <string name="placeholder_filetype">PNG Irudia</string>
@@ -205,6 +224,7 @@
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
   <string name="instant_upload_on_wifi">Igo irudiak bakarrik WIFIren bidez</string>
+  <string name="instant_video_upload_on_wifi">Igo bideoak bakarrik WIFIren bidez</string>
   <string name="instant_upload_path">/BerehalakoIgoerak</string>
   <string name="conflict_title">Igoera konfliktoa</string>
   <string name="conflict_message">Urruneko %s fitxategia ez dago bertako fitxategiarekin sinkronizatuta. Jarraituz gero zerbitzariko fitxategiaren edukia ordeztuko da.</string>
@@ -212,6 +232,8 @@
   <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="error__upload__local_file_not_copied">%1$s ezin da %2$s karpeta lokalera kopiatu</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>
@@ -219,9 +241,11 @@
   <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">Igo argazki 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>
+  <string name="share_link_no_support_share_api">Sentitzen dut, partekatzea ez dago zure zerbitzarian gaituta. Mesedez jarri harremanetan zure administratzailearekin.</string>
   <string name="share_link_file_no_exist">Ezin izan da karpeta edo fitxategi hau partekatu. Mesedez, ziurtatu existitzen dela</string>
   <string name="share_link_file_error">Errore bat egon da fitxategaia edo karpeta partekatzerakoan</string>
   <string name="unshare_link_file_no_exist">Ezin izan da karpeta edo fitxategi honen partekatzeari utzi. Ez da existitzen.</string>
@@ -229,4 +253,9 @@
   <string name="activity_chooser_send_file_title">Bidali</string>
   <string name="copy_link">Lotura kopiatu</string>
   <string name="clipboard_text_copied">Arbelera kopiatua</string>
+  <string name="error_cant_bind_to_operations_service">Errore larria: ezin dira egin eragiketak</string>
+  <string name="network_error_socket_exception">Errore bat gertatu da zerbitzariarekin konektatzean.</string>
+  <string name="network_error_socket_timeout_exception">Errore bat gertatu da zerbitzariaren zain egon bitartean, ezin izan da eragiketa burutu</string>
+  <string name="network_error_connect_timeout_exception">Errore bat gertatu da zerbitzariaren zain egon bitartean, ezin izan da eragiketa burutu</string>
+  <string name="network_host_not_available">Eragiketa ezin izan da burutu, zerbitzaria ez dago erabilgarri</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 74c50ee4..725f5b5e 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -218,7 +218,7 @@
   <string name="ssl_validator_null_cert">Non é posíbel amosar o certificado.</string>
   <string name="ssl_validator_no_info_about_error">- Non hai información sobre este erro</string>
   <string name="placeholder_sentence">Isto é un marcador de posición</string>
-  <string name="placeholder_filename">marcador_de_posición.txt</string>
+  <string name="placeholder_filename">placeholder.txt</string>
   <string name="placeholder_filetype">Imaxe PNG</string>
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index 9e6c7295..4278f487 100644
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -167,10 +167,12 @@
   <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>
@@ -184,6 +186,7 @@
   <string name="sync_file_nothing_to_do_msg">ファイルコンテンツはすでに同期されています</string>
   <string name="create_dir_fail_msg">フォルダーを作成できませんでした</string>
   <string name="filename_forbidden_characters">使用できない文字: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">ファイル名を空にすることはできません。</string>
   <string name="wait_a_moment">しばらくお待ちください</string>
   <string name="filedisplay_unexpected_bad_get_content">予期せぬ問題；他のアプリでファイルを選択してみてください。</string>
   <string name="filedisplay_no_file_selected">ファイルは選択されていません</string>
@@ -238,6 +241,7 @@
   <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>
@@ -249,6 +253,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>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index dc166886..01d226fe 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -3,6 +3,7 @@
   <string name="actionbar_upload">Подигни</string>
   <string name="actionbar_upload_files">Датотеки</string>
   <string name="actionbar_open_with">Отвори со</string>
+  <string name="actionbar_mkdir">Нова папка</string>
   <string name="actionbar_settings">Параметри</string>
   <string name="actionbar_see_details">Детали:</string>
   <string name="actionbar_send_file">Прати</string>
@@ -16,6 +17,7 @@
   <string name="prefs_help">Помош</string>
   <string name="prefs_recommend">Препорачај на пријател</string>
   <string name="prefs_feedback">Повратен одговор</string>
+  <string name="auth_host_url">Адреса на серверот https://…</string>
   <string name="auth_username">Корисничко име</string>
   <string name="auth_password">Лозинка</string>
   <string name="sync_string_files">Датотеки</string>
@@ -42,7 +44,10 @@
   <string name="change_password">Смени лозинка</string>
   <string name="delete_account">Избриши ја сметката</string>
   <string name="create_account">Креирај сметка</string>
+  <string name="upload_chooser_title">подигни од ...</string>
   <string name="uploader_info_dirname">Име на папка</string>
+  <string name="uploader_upload_in_progress_ticker">Подигнувам...</string>
+  <string name="uploader_upload_succeeded_ticker">Подигањето беше успешно</string>
   <string name="downloader_download_in_progress_ticker">Преземање...</string>
   <string name="downloader_download_succeeded_ticker">Преземањето е успешно</string>
   <string name="downloader_download_failed_ticker">Преземањето не беше успешно</string>
@@ -60,22 +65,33 @@
   <string name="pincode_stored">Апликативниот ПИН е снимен</string>
   <string name="auth_trying_to_login">Обиди се да се најавиш...</string>
   <string name="auth_no_net_conn_title">Нема мрежна конекција</string>
+  <string name="auth_nossl_plain_ok_title">Нема безбедна конекција.</string>
+  <string name="auth_connection_established">Конекцијата е воспоставена</string>
   <string name="auth_testing_connection">Ја тестирам врската...</string>
+  <string name="auth_unknown_error_title">Се појави непознаа грешка!</string>
+  <string name="auth_unknown_host_title">Не можев да го најдам хостот</string>
   <string name="auth_incorrect_path_title">Серверската инстанца не е пронајдена</string>
   <string name="auth_timeout_title">На серверот му треба премногу време за да одговори</string>
   <string name="auth_ssl_general_error_title">Неуспешна SSL иницијализација</string>
+  <string name="auth_ssl_unverified_server_title">Не можев да го проверам SSL серверскиот идентитет</string>
   <string name="auth_bad_oc_version_title">Верзијата на серверот не е препознаена</string>
+  <string name="auth_wrong_connection_title">Не може да се воспостави конекција</string>
+  <string name="auth_secure_connection">Воспоставена е безбедна конекција</string>
   <string name="auth_unauthorized">Погрешно корисничко име или лозинка</string>
   <string name="auth_oauth_error">Неуспешна авторизација</string>
   <string name="auth_expired_basic_auth_toast">Внесете ја вашата тековна лозинка:</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_local">Само локално</string>
   <string name="confirmation_remove_remote">Отстрани од серверот</string>
   <string name="confirmation_remove_remote_and_local">Далечинско и локално</string>
   <string name="remove_success_msg">Одстранувањето е успешно</string>
   <string name="remove_fail_msg">Одстранувањето е неуспешно</string>
   <string name="rename_dialog_title">Внеси ново име</string>
+  <string name="rename_server_fail_msg">Преименувањето не можеше да се комплетира</string>
+  <string name="create_dir_fail_msg">Папката не можеше да се креира</string>
   <string name="wait_a_moment">Почекајте малку</string>
   <string name="filedisplay_unexpected_bad_get_content">Неочекуван проблем ; ве молам одберете датотека од друга апликација</string>
   <string name="filedisplay_no_file_selected">Нема избрано датотека</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4d8d4daa..96caa442 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -167,9 +167,12 @@
   <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 u %1$s werkelijk verwijderen?</string>
+  <string name="confirmation_remove_folder_alert">Wilt u %1$s en de inhoud ervan werkelijk 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>
@@ -229,6 +232,7 @@
   <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 worden getoond</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>
@@ -237,6 +241,7 @@
   <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">Laad 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>
@@ -248,7 +253,9 @@
   <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>
+  <string name="network_host_not_available">De verwerking kon niet plaatsvinden, de server is niet beschikbaar</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index e569a382..9ccfc86c 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -45,11 +45,11 @@
   <string name="uploader_wrn_no_account_text">Não existem contas %1$s no seu dispositivo. Por favor, configure uma conta primeiro.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalação</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Sair</string>
-  <string name="uploader_wrn_no_content_title">Sem conteúdo para enviar</string>
-  <string name="uploader_wrn_no_content_text">Nenhum foi recebido. Nada para enviar.</string>
+  <string name="uploader_wrn_no_content_title">Nenhum conteúdo para enviar</string>
+  <string name="uploader_wrn_no_content_text">Nenhum conteúdo foi recebido. Nada para enviar.</string>
   <string name="uploader_error_forbidden_content">%1$s não é permitido acessar o conteúdo compartilhado</string>
   <string name="uploader_info_uploading">Enviando</string>
-  <string name="file_list_empty">Não existe arquivos nesta pasta\nNovos arquivos podem ser adicionados com a opção do menu \"Enviar\"</string>
+  <string name="file_list_empty">Não existe arquivos nesta pasta\nNovos arquivos podem ser adicionados com a opção \"Enviar\" do menu</string>
   <string name="filedetails_select_file">Toque em um arquivo para mostrar informações adicionais.</string>
   <string name="filedetails_size">Tamanho:</string>
   <string name="filedetails_type">Tipo:</string>
@@ -57,14 +57,14 @@
   <string name="filedetails_modified">Modificado:</string>
   <string name="filedetails_download">Baixar</string>
   <string name="filedetails_sync_file">Atualizar arquivo</string>
-  <string name="filedetails_renamed_in_upload_msg">Arquivo foi renomeado para %1$s durante o upload</string>
+  <string name="filedetails_renamed_in_upload_msg">Arquivo foi renomeado para %1$s durante o envio</string>
   <string name="action_share_file">Compartilhar link</string>
   <string name="action_unshare_file">Descompartilhar o link</string>
   <string name="common_yes">Sim</string>
   <string name="common_no">Não</string>
   <string name="common_ok">OK</string>
-  <string name="common_cancel_download">Cancelar download</string>
-  <string name="common_cancel_upload">Cancelar upload</string>
+  <string name="common_cancel_download">Cancelar o download</string>
+  <string name="common_cancel_upload">Cancelar envio</string>
   <string name="common_cancel">Cancelar</string>
   <string name="common_save_exit">Salvar &amp; Sair</string>
   <string name="common_error">Erro</string>
@@ -100,7 +100,7 @@
   <string name="sync_fail_in_favourites_ticker">Falha ao manter arquivos sincronizados</string>
   <string name="sync_fail_in_favourites_content">O conteúdo de %1$d arquivos não puderam ser sincronizados (%2$d conflitos)</string>
   <string name="sync_foreign_files_forgotten_ticker">Alguns arquivos locais foram esquecidos</string>
-  <string name="sync_foreign_files_forgotten_content">%1$d arquivos de %2$s não puderam ser copiados para pasta</string>
+  <string name="sync_foreign_files_forgotten_content">%1$d arquivos de %2$s não puderam ser copiados para a pasta</string>
   <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os arquivos enviados a partir deste dispositivo são copiados para a pasta local %1$s para evitar a perda de dados quando um único arquivo é sincronizado com várias contas.\nDevido a essa mudança, todos os arquivos carregados em versões anteriores deste aplicativo foram copiados para a pasta %2$s. No entanto, um erro impediu a conclusão desta operação durante a sincronização da conta. Você pode tanto deixar o arquivo(s) como é e remover o link para %3$s, ou mover o arquivo(s) para a pasta %1$s e manter o link para  %4$s.\nListados abaixo estão o arquivo(s) locais, e o arquivo(s) remotos %5$s em que estavam vinculados.</string>
   <string name="sync_current_folder_was_removed">Pasta %1s não existe mais</string>
   <string name="foreign_files_move">Mover todos</string>
@@ -153,7 +153,7 @@
   <string name="auth_incorrect_address_title">URL mal formada</string>
   <string name="auth_ssl_general_error_title">Inicialização SSL falhou</string>
   <string name="auth_ssl_unverified_server_title">Não foi possível verificar a identidade do servidor SSL</string>
-  <string name="auth_bad_oc_version_title">Versão do servidor é irreconhecível</string>
+  <string name="auth_bad_oc_version_title">Versão do servidor desconhecida</string>
   <string name="auth_wrong_connection_title">Não foi possível estabelecer conexão</string>
   <string name="auth_secure_connection">Conexão segura estabelecida</string>
   <string name="auth_unauthorized">Nome de usuário e/ou senha está errada!</string>
@@ -180,8 +180,8 @@
   <string name="remove_success_msg">Removido com sucesso</string>
   <string name="remove_fail_msg">Erro ao remover</string>
   <string name="rename_dialog_title">Digite um novo nome</string>
-  <string name="rename_local_fail_msg">Cópia local não pôde ser renomeada, tente outro nome</string>
-  <string name="rename_server_fail_msg">Renomeação não pôde ser completada</string>
+  <string name="rename_local_fail_msg">Cópia local não pôde ser renomeada; tente outro nome</string>
+  <string name="rename_server_fail_msg">Renomeação não pôde ser finalizada</string>
   <string name="sync_file_fail_msg">Arquivo remoto não pode ser verificado</string>
   <string name="sync_file_nothing_to_do_msg">Conteúdo do arquivo já foi sincronizado</string>
   <string name="create_dir_fail_msg">A pasta não pode ser criada</string>
@@ -196,9 +196,9 @@
   <string name="ssl_validator_header">A identidade do site não pode ser verificada</string>
   <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor não é confiável</string>
   <string name="ssl_validator_reason_cert_expired">- O certificado do servidor expirou</string>
-  <string name="ssl_validator_reason_cert_not_yet_valid">- O certificado do servidor é muito recente</string>
+  <string name="ssl_validator_reason_cert_not_yet_valid">- O datas de validade do certificado do servidor estão no futuro</string>
   <string name="ssl_validator_reason_hostname_not_verified">- O URL do host não confere com o host do certificado</string>
-  <string name="ssl_validator_question">Você confia nesse certificado mesmo assim?</string>
+  <string name="ssl_validator_question">Você mesmo assim confia nesse certificado?</string>
   <string name="ssl_validator_not_saved">O certificado não pode ser salvo</string>
   <string name="ssl_validator_btn_details_see">Detalhes</string>
   <string name="ssl_validator_btn_details_hide">Ocultar</string>
@@ -223,14 +223,14 @@
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
-  <string name="instant_upload_on_wifi">Fazer upload de fotos somente via WiFi</string>
+  <string name="instant_upload_on_wifi">Fazer envio de fotos somente via WiFi</string>
   <string name="instant_video_upload_on_wifi">Enviar vídeos somente via WiFi</string>
   <string name="instant_upload_path">/Upload instantâneo</string>
   <string name="conflict_title">Conflito de atualização</string>
-  <string name="conflict_message">O arquivo remoto %s não está soncronizado com o arquivo local. Prosseguir irá substituir o arquivo no servidor.</string>
+  <string name="conflict_message">O arquivo remoto %s não está sincronizado com o arquivo local. Prosseguir irá substituir o arquivo no servidor.</string>
   <string name="conflict_keep_both">Manter ambos</string>
   <string name="conflict_overwrite">Sobrescrever</string>
-  <string name="conflict_dont_upload">Não fazer upload</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">%1$s não pôde ser copiado para pasta local %2$s</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 30776df6..42bff0f6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -82,6 +82,7 @@
   <string name="uploader_upload_succeeded_content_single">%1$s je uspešno poslan</string>
   <string name="uploader_upload_failed_ticker">Pošiljanje je spodletelo</string>
   <string name="uploader_upload_failed_content_single">Pošiljanja %1$s ni mogoče dokončati</string>
+  <string name="uploader_upload_failed_credentials_error">Napaka pri nalaganju, ponovno se prijavite!</string>
   <string name="downloader_download_in_progress_ticker">Prejemanje …</string>
   <string name="downloader_download_in_progress_content">%1$d%% Prejemanje %2$s</string>
   <string name="downloader_download_succeeded_ticker">Prejemanje je uspešno končano</string>
@@ -89,6 +90,7 @@
   <string name="downloader_download_failed_ticker">Prejemanje je spodletelo</string>
   <string name="downloader_download_failed_content">Prejemanja %1$s ni mogoče dokončati</string>
   <string name="downloader_not_downloaded_yet">Prejem še ni zaključen</string>
+  <string name="downloader_download_failed_credentials_error">Napaka pri prenosu, ponovno se prijavite!</string>
   <string name="common_choose_account">Izbor računa</string>
   <string name="sync_fail_ticker">Usklajevanje je spodletelo</string>
   <string name="sync_fail_content">Usklajevanja %1$s ni mogoče dokončati</string>
@@ -165,9 +167,12 @@
   <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">Preverjanje pristnosti s tem strežnikom ni uspela</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">Resnično želite odstraniti %1$s?</string>
+  <string name="confirmation_remove_folder_alert">Resnično želite odstraniti %1$s in 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>
@@ -181,6 +186,7 @@
   <string name="sync_file_nothing_to_do_msg">Vsebina datoteke je že usklajena</string>
   <string name="create_dir_fail_msg">Mape ni mogoče ustvariti</string>
   <string name="filename_forbidden_characters">Nedovoljeni znaki: characters: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_empty">Ime datoteke ne sme biti prazno</string>
   <string name="wait_a_moment">Počakajte trenutek ...</string>
   <string name="filedisplay_unexpected_bad_get_content">Prišlo je do nepričakovane napake. Poskusite datoteko izbrati z drugim programom.</string>
   <string name="filedisplay_no_file_selected">Ni izbranih datotek</string>
@@ -226,6 +232,7 @@
   <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">Slike se ne da 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>
@@ -234,6 +241,7 @@
   <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>
@@ -245,4 +253,9 @@
   <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: dejanj ni možno izvesti</string>
+  <string name="network_error_socket_exception">Pri povezavi s tem strežnikom je prišlo do napake.</string>
+  <string name="network_error_socket_timeout_exception">Med čakanjem na strežnik je prišlo do napake. Zahtevanega dejanja ni bilo moč izvesti.</string>
+  <string name="network_error_connect_timeout_exception">Med čakanjem na strežnik je prišlo do napake. Zahtevanega dejanja ni bilo moč izvesti.</string>
+  <string name="network_host_not_available">Zahtevanega dejanja se ne da izvesti ker strežnik ni dosegljiv.</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cb7f5380..baa450ad 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -54,7 +54,7 @@
   <string name="filedetails_size">Boyut:</string>
   <string name="filedetails_type">Tür:</string>
   <string name="filedetails_created">Oluşturulma:</string>
-  <string name="filedetails_modified">Değiştirme:</string>
+  <string name="filedetails_modified">Değiştirilme:</string>
   <string name="filedetails_download">Ä°ndir</string>
   <string name="filedetails_sync_file">Dosyayı yenile</string>
   <string name="filedetails_renamed_in_upload_msg">Dosya adı, yükleme sırasında %1$s olarak değiştirildi</string>
diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
index c5bda8ce..7da60b92 100644
--- a/src/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
@@ -62,7 +62,8 @@ public class ErrorMessageAdapter {
                 if (result.getCode() == ResultCode.LOCAL_STORAGE_FULL
                         || result.getCode() == ResultCode.LOCAL_STORAGE_NOT_COPIED) {
                     message = String.format(res.getString(R.string.error__upload__local_file_not_copied), 
-                            ((UploadFileOperation) operation).getFileName());
+                            ((UploadFileOperation) operation).getFileName(), 
+                            res.getString(R.string.app_name));
                     
                 } else if (result.getCode() == ResultCode.QUOTA_EXCEEDED) {
                     message = res.getString(R.string.failed_upload_quota_exceeded_text);