From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 31 Oct 2013 16:10:09 +0000 (+0100)
Subject: Merge branch 'develop' into clean_up
X-Git-Tag: oc-android-1.5.5~144^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bb34e0f480f65e3a773df107b5d2267999e463cb?ds=inline

Merge branch 'develop' into clean_up
---

bb34e0f480f65e3a773df107b5d2267999e463cb
diff --cc res/values-ca/strings.xml
index 926a2d59,b726e381..525044a5
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@@ -142,9 -210,23 +148,15 @@@
    <string name="auth_unauthorized">Nom d\'usuari o contrasenya incorrectes</string>
    <string name="auth_oauth_error">Autorització sense èxit</string>
    <string name="auth_oauth_error_access_denied">El servidor d\'autenticació us ha denegat l\'accés</string>
 -  <string name="auth_not_found">Camí equivocat</string>
 -  <string name="auth_internal">Error intern del servidor, codi %1$d</string>
    <string name="auth_wtf_reenter_URL">Estat inesperat; escriviu l\'adreça de nou</string>
+   <string name="auth_expired_oauth_token_toast">La vostra autorització ha vençut. Acrediteu-vos de nou</string>
    <string name="auth_expired_basic_auth_toast">Escriviu la contrasenya actual</string>
+   <string name="auth_expired_saml_sso_token_toast">La sessió ha vençut. Connecteu-vos de nou</string>
+   <string name="auth_connecting_auth_server">S\'està connectant a un servidor d\'autenticació...</string>
+   <string name="auth_follow_auth_server">Seguiu les instruccions a dalt per acreditar-vos</string>
+   <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="crashlog_message">L\'aplicació s\'ha aturat de manera imprevista. Voleu enviar el registre d\'errors?</string>
 -  <string name="crashlog_send_report">Envia el registre d\'errors</string>
 -  <string name="crashlog_dont_send_report">No envïis el registre d\'errors</string>
 -  <string name="extensions_avail_title">Hi ha extensions disponibles!</string>
 -  <string name="extensions_avail_message">Sembla que la instància del servidor està donant suport per extensions avançades. Voleu veure les extensions disponibles per Android?</string>
    <string name="fd_keep_in_sync">Mantén el fitxer actualitzat</string>
 -  <string name="common_share">Comparteix</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>
diff --cc res/values-de-rDE/strings.xml
index fa1cc247,b27dec15..a37d0031
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@@ -143,9 -210,23 +148,15 @@@
    <string name="auth_unauthorized">Falscher Benutzername oder Passwort</string>
    <string name="auth_oauth_error">Autorisierung nicht erfolgreich</string>
    <string name="auth_oauth_error_access_denied">Zugriff durch den Autorisierungsserver abgelehnt</string>
 -  <string name="auth_not_found">Falsche Pfadangabe</string>
 -  <string name="auth_internal">Interner Server Fehler, Fehlercode %1$d</string>
    <string name="auth_wtf_reenter_URL">Unerwarteter Zustand; bitte geben Sie die URL des Servers nochmals ein</string>
+   <string name="auth_expired_oauth_token_toast">Ihre Autorisierung ist abgelaufen. Bitte Autorisierung nochmals durchführen</string>
    <string name="auth_expired_basic_auth_toast">Bitte geben Sie Ihr aktuelles Passwort ein</string>
+   <string name="auth_expired_saml_sso_token_toast">Ihre Sitzung ist abgelaufen. Bitte Anmeldung nochmals durchführen</string>
+   <string name="auth_connecting_auth_server">Verbinde mit dem Authentifizierung-Server…</string>
+   <string name="auth_follow_auth_server">Folgen Sie den obigen Anweisungen, um Sie zu authentifizieren</string>
+   <string name="auth_unsupported_auth_method">Der Server unterstützt diese Authentifizierung-Methode nicht</string>
+   <string name="auth_unsupported_multiaccount">%1$s unterstützt nicht mehrere Benutzerkonten</string>
 -  <string name="crashlog_message">Die Anwendung ist abgestürzt. Möchten Sie einen Bericht senden?</string>
 -  <string name="crashlog_send_report">Bericht senden</string>
 -  <string name="crashlog_dont_send_report">Keinen Bericht senden</string>
 -  <string name="extensions_avail_title">Erweiterung verfügbar!</string>
 -  <string name="extensions_avail_message">Scheinbar unterstützt Ihr Server weitere Erweiterungen. Möchten Sie die verfügbaren Erweiterungen für Android sehen?</string>
    <string name="fd_keep_in_sync">Datei aktuell halten</string>
 -  <string name="common_share">Teilen</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>
diff --cc res/values-de/strings.xml
index 82614e00,004121d8..bb68bee4
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@@ -143,9 -210,23 +148,15 @@@
    <string name="auth_unauthorized">Benutzername oder Passwort stimmen nicht!</string>
    <string name="auth_oauth_error">Autorisierung nicht erfolgreich</string>
    <string name="auth_oauth_error_access_denied">Zugriff durch den Autorisierungsserver abgelehnt</string>
 -  <string name="auth_not_found">Falsche Pfadangabe</string>
 -  <string name="auth_internal">Interner Server Fehler, Fehlercode %1$d</string>
    <string name="auth_wtf_reenter_URL">Unerwarteter Zustand; bitte gib die URL des Servers nochmals ein</string>
+   <string name="auth_expired_oauth_token_toast">Ihre Autorisierung ist abgelaufen. Bitte Autorisierung nochmals durchführen</string>
    <string name="auth_expired_basic_auth_toast">Bitte gib dein aktuelles Passwort ein</string>
+   <string name="auth_expired_saml_sso_token_toast">Ihre Sitzung ist abgelaufen. Bitte Anmeldung nochmals durchführen</string>
+   <string name="auth_connecting_auth_server">Verbinde mit dem Authentifizierung-Server…</string>
+   <string name="auth_follow_auth_server">Folge den obigen Anweisungen, um Dich zu authentifizieren</string>
+   <string name="auth_unsupported_auth_method">Der Server unterstützt diese Authentifizierung-Methode nicht</string>
+   <string name="auth_unsupported_multiaccount">%1$s unterstützt nicht mehrere Benutzerkonten</string>
 -  <string name="crashlog_message">Die Anwendung ist abgestürzt. Möchtest Du einen Bericht senden?</string>
 -  <string name="crashlog_send_report">Bericht senden</string>
 -  <string name="crashlog_dont_send_report">Keinen Bericht senden</string>
 -  <string name="extensions_avail_title">Erweiterung verfügbar!</string>
 -  <string name="extensions_avail_message">Scheinbar unterstützt Dein Server weitere Erweiterungen. Möchtest Du die verfügbaren Erweiterungen für Android sehen?</string>
    <string name="fd_keep_in_sync">Datei aktuell halten</string>
 -  <string name="common_share">Teilen</string>
    <string name="common_rename">Umbenennen</string>
    <string name="common_remove">Löschen</string>
    <string name="confirmation_remove_alert">Möchtest Du %1$s wirklich löschen?</string>
diff --cc res/values-en-rGB/strings.xml
index a8ba8ccb,09747157..f7adb5d2
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@@ -143,9 -210,23 +148,15 @@@
    <string name="auth_unauthorized">Wrong username or password</string>
    <string name="auth_oauth_error">Unsuccessful authorisation</string>
    <string name="auth_oauth_error_access_denied">Access denied by authorisation server</string>
 -  <string name="auth_not_found">Wrong path given</string>
 -  <string name="auth_internal">Internal server error, code %1$d</string>
    <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
+   <string name="auth_expired_oauth_token_toast">Your authorisation expired. Please, authorise again</string>
    <string name="auth_expired_basic_auth_toast">Please enter the current password</string>
+   <string name="auth_expired_saml_sso_token_toast">Your session expired. Please connect again</string>
+   <string name="auth_connecting_auth_server">Connecting to authentication server…</string>
+   <string name="auth_follow_auth_server">Follow instructions above to get authenticated</string>
+   <string name="auth_unsupported_auth_method">The server does not support this authentication method</string>
+   <string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
 -  <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
 -  <string name="crashlog_send_report">Send report</string>
 -  <string name="crashlog_dont_send_report">Don\'t send report</string>
 -  <string name="extensions_avail_title">Extensions available!</string>
 -  <string name="extensions_avail_message">Looks like your server instance supports advanced extensions. Would you like to see extensions available for android ?</string>
    <string name="fd_keep_in_sync">Keep file up to date</string>
 -  <string name="common_share">Share</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>
diff --cc res/values-es/strings.xml
index 9317b24a,dd8ef913..51395c83
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@@ -143,9 -198,21 +146,14 @@@
    <string name="auth_unauthorized">Nombre de usuario o contraseña incorrecta</string>
    <string name="auth_oauth_error">Autorización no satisfactoria</string>
    <string name="auth_oauth_error_access_denied">Acceso denegado por servidor de autorización</string>
 -  <string name="auth_not_found">Ruta errónea</string>
 -  <string name="auth_internal">Error interno en el servidor, código %1$d</string>
    <string name="auth_wtf_reenter_URL">Estado inesperado; por favor, introduzca la URL del servidor de nuevo</string>
+   <string name="auth_expired_oauth_token_toast">Su autorización ha expirado. Por favor, autorice de nuevo</string>
    <string name="auth_expired_basic_auth_toast">Por favor, introduzca la contraseña actual.</string>
+   <string name="auth_expired_saml_sso_token_toast">Su sesión ha expirado. Favor de conectarse de nuevo</string>
+   <string name="auth_connecting_auth_server">Conectando al servidor de autenticación...</string>
+   <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="crashlog_send_report">Enviar reporte</string>
 -  <string name="crashlog_dont_send_report">No enviar reporte</string>
 -  <string name="extensions_avail_title">¡Extensiones disponibles!</string>
 -  <string name="extensions_avail_message">Parece que su servidor soporta extensiones avanzadas. ¿Desea ver las extensiones disponibles para Android?</string>
    <string name="fd_keep_in_sync">Mantener el archivo actualizado</string>
 -  <string name="common_share">Compartir</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>
diff --cc res/values-et-rEE/strings.xml
index e42e1f4d,6e491c67..549fb2f1
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@@ -117,16 -153,30 +120,16 @@@
    <string name="media_err_unsupported">Mittetoetatud meedia koodek</string>
    <string name="media_err_io">Ei suuda lugeda meediafaili</string>
    <string name="media_err_malformed">Meediafail pole korralikult kodeeritud</string>
 -  <string name="media_err_timeout">Liiga palju kordi püüti mängida</string>
    <string name="media_err_invalid_progressive_playback">Ei suuda voogesitada meediafaili</string>
    <string name="media_err_unknown">Meediafaili ei saa mängida Stock Media Player-iga</string>
 -  <string name="media_err_security_ex">Turbe viga %1$s esitamisel</string>
 -  <string name="media_err_io_ex">Sisendi viga %1$s esitamisel</string>
 -  <string name="media_err_unexpected">Ootamatu viga %1$s esitamisel</string>
 -  <string name="media_previous_description">Eelmise loo nupp</string>
 +  <string name="media_err_security_ex">Turbe viga  %1$s esitamisel</string>
 +  <string name="media_err_io_ex">Sisendi viga  %1$s esitamisel</string>
 +  <string name="media_err_unexpected">Ootamatu viga  %1$s esitamisel</string>
    <string name="media_rewind_description">Tagasikerimise nupp</string>
-   <string name="media_play_pause_description">Mägi või pausi nupp</string>
+   <string name="media_play_pause_description">Mängimise või pausi nupp</string>
    <string name="media_forward_description">Kiire kerimise nupp</string>
 -  <string name="media_next_description">Järgmise pala nupp</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minutit</item>
 -    <item>30 minutit</item>
 -    <item>60 minutit</item>
 -  </string-array>
 -  <string-array name="prefs_trackmydevice_intervall_values">
 -    <item>15</item>
 -    <item>30</item>
 -    <item>60</item>
 -  </string-array>
    <string name="auth_trying_to_login">Proovitakse sisse logida...</string>
    <string name="auth_no_net_conn_title">Võrguühendust pole</string>
 -  <string name="auth_connect_anyway">Ühenda sellegipoolest</string>
    <string name="auth_nossl_plain_ok_title">Turvaline ühendus pole saadaval</string>
    <string name="auth_connection_established">Saadi ühendus</string>
    <string name="auth_testing_connection">Ühenduse testimine...</string>
@@@ -143,9 -199,22 +147,14 @@@
    <string name="auth_unauthorized">Vale kasutajanimi või parool</string>
    <string name="auth_oauth_error">Autoriseerimine ebaõnnestus</string>
    <string name="auth_oauth_error_access_denied">Ligipääs keelatud autoriseeriva serveri poolt</string>
 -  <string name="auth_not_found">Sisestati vale asukoht</string>
 -  <string name="auth_internal">Sisemine serveri viga, kood %1$d</string>
    <string name="auth_wtf_reenter_URL">Ootamatu seisund; palun sisesta serveri URL uuesti</string>
+   <string name="auth_expired_oauth_token_toast">Sinu autoriseerimine aegus. Palun autoriseeri uuesti</string>
    <string name="auth_expired_basic_auth_toast">Palun sisesta kehtiv parool</string>
+   <string name="auth_expired_saml_sso_token_toast">Sinu sessioon aegus. Palun ühenda uuesti</string>
+   <string name="auth_connecting_auth_server">Autentimisserveriga ühendumine ...</string>
+   <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="crashlog_message">Rakndus suleti ootamatult. Kas sa sooviksid saata kokkujooksmise kohta teavitust arendajale?</string>
 -  <string name="crashlog_send_report">Saada veateade</string>
 -  <string name="crashlog_dont_send_report">Ära saada veateadet</string>
 -  <string name="extensions_avail_title">Saadaval on lisaprogrammid!</string>
 -  <string name="extensions_avail_message">Näib, et sinu server toetab laienduste kasutamist. Kas sa sooviksid näha Androidile saada olevaid lisaprogramme ?</string>
    <string name="fd_keep_in_sync">Hoia faili ajakohasena</string>
 -  <string name="common_share">Jaga</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>
diff --cc res/values-fi-rFI/strings.xml
index d7a6755f,6eb8327e..26a0e16c
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@@ -79,8 -113,10 +82,9 @@@
    <string name="downloader_download_failed_ticker">Lataus epäonnistui</string>
    <string name="downloader_download_failed_content">%1$s :n latausta ei pystytty suorittamaan loppuun asti</string>
    <string name="common_choose_account">Valitse tili</string>
 -  <string name="sync_string_contacts">Yhteystiedot</string>
    <string name="sync_fail_ticker">Synkronointi epäonnistui</string>
    <string name="sync_fail_content">Kohteen %1$s synkronointia ei voitu suorittaa loppuun</string>
+   <string name="sync_fail_content_unauthorized">Virheellinen salasana tilille %1$s</string>
    <string name="sync_conflicts_in_favourites_ticker">Ristiriitoja löytynyt</string>
    <string name="sync_conflicts_in_favourites_content">%1$d \"pidä synkronoituna\" tiedostoja ei voitu synkronoida</string>
    <string name="sync_fail_in_favourites_ticker">\"Pidä synkronoituna\" epäonnistui</string>
diff --cc res/values-fr/strings.xml
index 5ce97989,29a154dd..cb6309a7
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@@ -143,9 -210,23 +148,15 @@@
    <string name="auth_unauthorized">Nom d\'utilisateur ou mot de passe invalide</string>
    <string name="auth_oauth_error">Echec d\'autorisation</string>
    <string name="auth_oauth_error_access_denied">Accès refusé par le serveur d\'autorisation</string>
 -  <string name="auth_not_found">Le chemin fourni est erroné</string>
 -  <string name="auth_internal">Erreur interne du serveur, code %1$d</string>
    <string name="auth_wtf_reenter_URL">État inattendu ; veuillez entrer à nouveau l\'URL du serveur</string>
+   <string name="auth_expired_oauth_token_toast">Votre autorisation a expiré. Merci de vous authentifier à nouveau</string>
    <string name="auth_expired_basic_auth_toast">Veuillez saisir le mot de passe courant</string>
+   <string name="auth_expired_saml_sso_token_toast">Votre session a expiré. Merci de vous reconnecter</string>
+   <string name="auth_connecting_auth_server">Connexion au serveur d\'authentification...</string>
+   <string name="auth_follow_auth_server">Suivre les instructions ci-dessus pour être authentifié</string>
+   <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="crashlog_message">L\'application s\'est fermée de façon inattendue. Voulez-vous envoyer un rapport d\'erreur ?</string>
 -  <string name="crashlog_send_report">Envoyer un rapport</string>
 -  <string name="crashlog_dont_send_report">Ne rien envoyer</string>
 -  <string name="extensions_avail_title">Des extensions sont disponibles !</string>
 -  <string name="extensions_avail_message">Il semblerait que votre du serveur supporte les extensions avancées. Voulez-vous afficher les extensions disponibles pour android ?</string>
    <string name="fd_keep_in_sync">Maintenir le fichier à jour</string>
 -  <string name="common_share">Partager</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>
diff --cc res/values-gl/strings.xml
index ca019d58,ec95519f..50ce25f9
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@@ -143,9 -210,23 +148,15 @@@
    <string name="auth_unauthorized">Nome de usuario ou contrasinal incorrecto</string>
    <string name="auth_oauth_error">A autorización non foi aceptada</string>
    <string name="auth_oauth_error_access_denied">O acceso foi denegado polo servidor de autorización</string>
 -  <string name="auth_not_found">Deuse unha ruta incorrecta</string>
 -  <string name="auth_internal">Produciuse un erro interno do servidor, código %1$d</string>
    <string name="auth_wtf_reenter_URL">Estado inesperado, introduza de novo o enderezo URL do servidor</string>
+   <string name="auth_expired_oauth_token_toast">A súa autorización caducou. Autorícese de novo</string>
    <string name="auth_expired_basic_auth_toast">Introduza o contrasinal actual</string>
+   <string name="auth_expired_saml_sso_token_toast">A súa sesión caducou. Autorícese de novo</string>
+   <string name="auth_connecting_auth_server">Conectando co servidor de autenticación…</string>
+   <string name="auth_follow_auth_server">Siga as instrucións anteriores para autenticarse</string>
+   <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="crashlog_message">O aplicativo deixou de funcionar de xeito inesperado. Quere enviar un informe desta quebra?</string>
 -  <string name="crashlog_send_report">Enviar un informe</string>
 -  <string name="crashlog_dont_send_report">Non enviar un informe</string>
 -  <string name="extensions_avail_title">Extensión dispoñíbel!</string>
 -  <string name="extensions_avail_message">Semella que a súa instancia do servidor admite extensións avanzadas. Quere ver se hai extensións dispoñíbeis para Android ?</string>
    <string name="fd_keep_in_sync">Manter actualizado o ficheiro</string>
 -  <string name="common_share">Compartir</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>
diff --cc res/values-it/strings.xml
index 3f3b6ed8,529efcc1..07520053
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@@ -143,9 -210,23 +148,15 @@@
    <string name="auth_unauthorized">Nome utente o password errati</string>
    <string name="auth_oauth_error">Autorizzazione non riuscita</string>
    <string name="auth_oauth_error_access_denied">Accesso negato dal server di autorizzazione</string>
 -  <string name="auth_not_found">Il percorso fornito non è valido</string>
 -  <string name="auth_internal">Errore interno del server, codice %1$d</string>
    <string name="auth_wtf_reenter_URL">Stato inatteso; inserisci nuovamente l\'URL del server</string>
+   <string name="auth_expired_oauth_token_toast">Autorizzazione scaduta. Richiedi l\'autorizzazione</string>
    <string name="auth_expired_basic_auth_toast">Inserisci la password attuale</string>
+   <string name="auth_expired_saml_sso_token_toast">Sessione scaduta. Riconnettiti</string>
+   <string name="auth_connecting_auth_server">Connessione al server di autenticazione in corso...</string>
+   <string name="auth_follow_auth_server">Segui le istruzioni qui sopra per venire autenticato</string>
+   <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="crashlog_message">Applicazione terminata in modo inatteso. Vuoi inviare una segnalazione del problema?</string>
 -  <string name="crashlog_send_report">Invia segnalazione</string>
 -  <string name="crashlog_dont_send_report">Non inviare la segnalazione</string>
 -  <string name="extensions_avail_title">Estensioni disponibili!</string>
 -  <string name="extensions_avail_message">Sembra che la tua istanza di il server supporti le estensioni avanzate. Vuoi vedere le estensioni disponibili per Android?</string>
    <string name="fd_keep_in_sync">Tieni aggiornato il file</string>
 -  <string name="common_share">Condividi</string>
    <string name="common_rename">Rinomina</string>
    <string name="common_remove">Rimuovi</string>
    <string name="confirmation_remove_alert">Vuoi davvero rimuovere %1$s?</string>
diff --cc res/values-ja-rJP/strings.xml
index 277af579,4c8316f9..da9923e8
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@@ -143,9 -198,21 +146,14 @@@
    <string name="auth_unauthorized">間違ったユーザー名もしくはパスワード</string>
    <string name="auth_oauth_error">認証失敗</string>
    <string name="auth_oauth_error_access_denied">認証サーバーによってアクセスが拒否されました</string>
 -  <string name="auth_not_found">誤ったパスが指定されました</string>
 -  <string name="auth_internal">内部サーバエラー、コード %1$d</string>
    <string name="auth_wtf_reenter_URL">予期しない状態。もう一度サーバーのURLを入力してください</string>
+   <string name="auth_expired_oauth_token_toast">認証情報は有効期限切れです。再度認証を行ってください。</string>
    <string name="auth_expired_basic_auth_toast">現在のパスワードを入力してください</string>
+   <string name="auth_expired_saml_sso_token_toast">セッションの有効期限切れです。再度接続してください。</string>
+   <string name="auth_connecting_auth_server">認証サーバに接続中 ...</string>
+   <string name="auth_unsupported_auth_method">サーバはこの認証方式をサポートしていません</string>
+   <string name="auth_unsupported_multiaccount">%1$s は複数アカウントをサポートしていません</string>
 -  <string name="crashlog_send_report">レポートを送信</string>
 -  <string name="crashlog_dont_send_report">レポートを送信しない</string>
 -  <string name="extensions_avail_title">拡張機能が利用可能です！</string>
 -  <string name="extensions_avail_message">サーバーは拡張機能がサポートされているようです。androidで利用できる拡張機能を見ますか？</string>
    <string name="fd_keep_in_sync">ファイルを最新に保つ</string>
 -  <string name="common_share">共有</string>
    <string name="common_rename">名前を変更</string>
    <string name="common_remove">削除</string>
    <string name="confirmation_remove_alert">本当に %1$s を削除してもよろしいですか？</string>
diff --cc res/values-lt-rLT/strings.xml
index 012eba07,944981cd..1496347a
--- a/res/values-lt-rLT/strings.xml
+++ b/res/values-lt-rLT/strings.xml
@@@ -1,9 -1,26 +1,13 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Slaptažodis:</string>
 -  <string name="main_login">Prisijungimo vardas:</string>
 -  <string name="main_button_login">Prisijungti</string>
 -  <string name="main_welcome">Sveiki prisijungę</string>
 -  <string name="main_files">Failai</string>
 -  <string name="main_music">Muzika</string>
 -  <string name="main_contacts">Kontaktai</string>
 -  <string name="main_calendar">Kalendorius</string>
 -  <string name="main_bookmarks">Žymekliai</string>
 -  <string name="main_settings">Nustatymai</string>
 -  <string name="main_tit_accsetup">Nustatyti paskyrą</string>
 -  <string name="main_wrn_accsetup">Jūsų prietaise nėra nė vienos paskyros. Kad galėtumėte naudoti šią programą, turite sukurti paskyrą.</string>
+   <string name="about_android">%1$s Android programėlė</string>
+   <string name="about_version">versija %1$s</string>
+   <string name="actionbar_sync">Atnaujinti paskyrą</string>
    <string name="actionbar_upload">Įkelti</string>
    <string name="actionbar_upload_from_apps">Turinys iš kitų programų</string>
    <string name="actionbar_upload_files">Failai</string>
+   <string name="actionbar_open_with">Atverti naudojant</string>
    <string name="actionbar_mkdir">Kurti aplanką</string>
 -  <string name="actionbar_search">Ieškoti</string>
    <string name="actionbar_settings">Nustatymai</string>
    <string name="actionbar_see_details">Informacija</string>
    <string name="prefs_category_general">Bendras</string>
@@@ -36,6 -82,9 +44,7 @@@
    <string name="filedetails_created">Sukurta:</string>
    <string name="filedetails_modified">Modifikuota:</string>
    <string name="filedetails_download">Atsisiųsti</string>
+   <string name="filedetails_sync_file">Atnaujinti failą</string>
 -  <string name="filedetails_redownload">Parsisiųsti iš naujo</string>
 -  <string name="filedetails_renamed_in_upload_msg">Įkėlimo metu failas buvo pervadintas į %1$s</string>
    <string name="common_yes">Taip</string>
    <string name="common_no">Ne</string>
    <string name="common_ok">Gerai</string>
@@@ -66,14 -117,23 +75,19 @@@
    <string name="downloader_download_failed_content">Nepavyko baigti %1$s atsiuntimo</string>
    <string name="downloader_not_downloaded_yet">Dar neatsiųsta</string>
    <string name="common_choose_account">Pasirinkite paskyrą</string>
 -  <string name="sync_string_contacts">Kontaktai</string>
    <string name="sync_fail_ticker">Sinchronizacija nepavyko</string>
+   <string name="sync_fail_content">%1$s sinchronizacija nepavyko</string>
+   <string name="sync_fail_content_unauthorized">Netinkamas slaptažodis %1$s</string>
    <string name="sync_conflicts_in_favourites_ticker">Rastas konfliktas</string>
+   <string name="sync_fail_in_favourites_content">Nepavyko sinchronizuoti %1$d failų turinio (%2$d konfliktų)</string>
    <string name="sync_foreign_files_forgotten_ticker">Keli vietiniai failai buvo užmiršti</string>
+   <string name="sync_current_folder_was_removed">Aplankas %1$s nebeegzistuoja</string>
    <string name="foreign_files_move">Perkelti visus</string>
    <string name="foreign_files_success">Visi failai buvo perkelti</string>
+   <string name="foreign_files_fail">Kai kurių failų negalima perkelti</string>
    <string name="foreign_files_local_text">Vietinis: %1$s</string>
    <string name="foreign_files_remote_text">Nuotolinis: %1$s</string>
 -  <string name="use_ssl">Naudoti saugų prisijungimą</string>
 -  <string name="location_no_provider">%1$s negali sekti jūsų prietaiso. Patinkrinkite vietos nustatymo paslaugas</string>
    <string name="pincode_enter_pin_code">Prašome įvesti savo programos PIN kodą</string>
 -  <string name="pincode_enter_new_pin_code">Prašome įvesti naują programos PIN kodą</string>
    <string name="pincode_configure_your_pin">Įveskite taikymas programos PIN kodą</string>
    <string name="pincode_configure_your_pin_explanation">PIN bus prašomas kiekvieną kartą paleidus programą</string>
    <string name="pincode_reenter_your_pincode">Prašome pakartoti taikymas PIN kodą</string>
@@@ -99,10 -181,27 +115,26 @@@
    <string name="auth_timeout_title">Serveris per ilgai neatsako</string>
    <string name="auth_incorrect_address_title">URL adrese yra klaidų</string>
    <string name="auth_ssl_general_error_title">Nepavyko aktyvuoti SSL</string>
 +  <string name="auth_bad_oc_version_title">Nežinoma serverio versija</string>
 +  <string name="auth_wrong_connection_title">Nepavyko užmegzti ryšio</string>
 +  <string name="auth_secure_connection">Užmegztas saugus ryšys</string>
+   <string name="auth_ssl_unverified_server_title">Nepatikrinta SSL serverio tapatybė</string>
+   <string name="auth_bad_oc_version_title">Nežinoma serverio versija</string>
+   <string name="auth_wrong_connection_title">Nepavyko užmegzti ryšio</string>
+   <string name="auth_secure_connection">Užmegztas saugus ryšys</string>
+   <string name="auth_unauthorized">Neteisingas naudotojo vardas arba slaptažodis</string>
+   <string name="auth_oauth_error">Autorizacija nesėkminga</string>
+   <string name="auth_oauth_error_access_denied">Autorizacijos serveris draudžia priėjimą</string>
+   <string name="auth_not_found">Duotas neteisingas kelias</string>
+   <string name="auth_internal">Vidinė serverio klaida, kodas %1$d</string>
+   <string name="auth_wtf_reenter_URL">Netikėta būsena, prašome įvesti serverio URL dar kartą</string>
+   <string name="auth_expired_oauth_token_toast">Autorizacijos laikas baigėsi. Prašome autorizuotis iš naujo</string>
+   <string name="auth_expired_basic_auth_toast">Prašome įvesti dabartinį slaptažodį</string>
+   <string name="auth_expired_saml_sso_token_toast">Jūsų sesijos laikas baigėsi. Prašome prisijungti iš naujo</string>
+   <string name="auth_connecting_auth_server">Jungiamasi prie autentikacijos serverio...</string>
+   <string name="auth_unsupported_auth_method">Serveris nepalaiko Å¡io autentikacijos metodo</string>
+   <string name="auth_unsupported_multiaccount">%1$s nepalaiko kelių paskyrų iš karto</string>
 -  <string name="crashlog_send_report">Siųsti ataskaitą </string>
 -  <string name="crashlog_dont_send_report">Nesiųsti ataskaitos</string>
 -  <string name="extensions_avail_title">Yra naujų papildinių!</string>
    <string name="fd_keep_in_sync">Laikyti failą naujinamą</string>
 -  <string name="common_share">Dalintis</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>
@@@ -119,7 -219,14 +152,8 @@@
    <string name="sync_file_nothing_to_do_msg">Failo turinys jau sunchronizuotas</string>
    <string name="create_dir_fail_msg">Aplanko sukurti nepavyko</string>
    <string name="wait_a_moment">Truputį palaukite</string>
+   <string name="filedisplay_unexpected_bad_get_content">Netikėta problema ; prašome pasirinkti failą iš kitos programėlės</string>
    <string name="filedisplay_no_file_selected">Joks failas nebuvo pasirinktas</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Prisijungti naudojant oAuth2</string>
 -  <string name="oauth_login_connection">Jungiamasi prie oAuth2 serverio...</string>
 -  <string name="oauth_connection_url_unavailable">Neįmanoma prisijungti prie šio URL adreso.</string>
 -  <string name="ssl_validator_title">Įspėjimas</string>
 -  <string name="ssl_validator_header">Serverio tapatybė negali būti patikrinta</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Nepatikimas serverio sertifikatas</string>
    <string name="ssl_validator_reason_cert_expired">- Serverio sertifikatas galiojimo laikas pasibaigęs</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Serverio sertifikatas yra pernelyg naujas</string>
@@@ -146,4 -259,13 +185,12 @@@
    <string name="conflict_keep_both">Palikti abu</string>
    <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="preview_image_error_out_of_memory">\"Nepakanka atminties parodyti šį paveikslėlį</string>
 -  <!--we need to improve the communication of errors to the user-->
+   <string name="failed_upload_all_cb">pažymėti viską</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>
  </resources>
diff --cc res/values-mk/strings.xml
index 13c8b219,c6c1eaa6..f21cfbc9
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@@ -1,18 -1,55 +1,28 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Лозинка:</string>
 -  <string name="main_login">Корисник:</string>
 -  <string name="main_button_login">Најава</string>
 -  <string name="main_welcome">Добредојде</string>
 -  <string name="main_files">Датотеки</string>
 -  <string name="main_music">Музика</string>
 -  <string name="main_contacts">Контакти</string>
 -  <string name="main_calendar">Календар</string>
 -  <string name="main_bookmarks">Обележувачи</string>
 -  <string name="main_settings">Подесувања</string>
 -  <string name="main_tit_accsetup">Постави сметка</string>
 -  <string name="main_wrn_accsetup">Нема конфигурирано сметка на овој уред, за да можете да ја користите апликацијава треба да направите сметка.</string>
    <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_search">Барај</string>
    <string name="actionbar_settings">Параметри</string>
+   <string name="actionbar_see_details">Детали:</string>
    <string name="prefs_category_general">Општо</string>
    <string name="prefs_category_more">Повеќе</string>
 -  <string name="prefs_add_session">Додади нова сесија</string>
 -  <string name="prefs_create_img_thumbnails">Направи мали слики</string>
 -  <string name="prefs_select_oc_account">Избери сметка</string>
 -  <string name="prefs_summary_select_oc_account">Избери која од вашите сметки</string>
 -  <string name="prefs_trackmydevice">Следење на уред</string>
 -  <string name="prefs_trackmydevice_summary_off">Овозможи ја оваа апликација за да ја следите локацијата на вашиот уред</string>
 -  <string name="prefs_trackmydevice_summary_on">Оваа апликација го следи вашиот уред</string>
 -  <string name="prefs_trackmydevice_interval">Интервал на ажурирање</string>
 -  <string name="prefs_trackmydevice_interval_summary">Ажурирај секои %1$s минути</string>
--  <string name="prefs_accounts">Сметки</string>
 +  <string name="prefs_help">Помош</string>
+   <string name="prefs_manage_accounts">Управување со сметки</string>
+   <string name="prefs_pincode">Апликативен ПИН</string>
+   <string name="prefs_pincode_summary">Заштитете го вашиот клиент</string>
+   <string name="prefs_log_title">Овозможи логирање</string>
+   <string name="prefs_help">Помош</string>
+   <string name="prefs_recommend">Препорачај на пријател</string>
+   <string name="prefs_feedback">Повратен одговор</string>
    <string name="auth_host_url">Адреса на сервер</string>
    <string name="auth_username">Корисничко име</string>
    <string name="auth_password">Лозинка</string>
 -  <string name="new_session_uri_error">Дадена неточна адреса</string>
 -  <string name="new_session_session_name_error">Неточно име на сесија</string>
    <string name="sync_string_files">Датотеки</string>
 -  <string name="setup_hint_username">Корисничко име</string>
 -  <string name="setup_hint_password">Лозинка</string>
 -  <string name="setup_btn_connect">Поврзи се</string>
    <string name="uploader_btn_upload_text">Подигни</string>
+   <string name="uploader_wrn_no_account_title">Не е пронајдена сметка</string>
+   <string name="uploader_wrn_no_account_setup_btn_text">Нагодување</string>
    <string name="uploader_wrn_no_account_quit_btn_text">Прекини</string>
    <string name="filedetails_size">Големина:</string>
    <string name="filedetails_type">Тип:</string>
@@@ -25,7 -62,72 +35,71 @@@
    <string name="common_cancel_upload">Откажи прикачување</string>
    <string name="common_cancel">Откажи</string>
    <string name="common_error">Грешка</string>
+   <string name="common_loading">Вчитувам ...</string>
+   <string name="common_error_unknown">Непозната грешка</string>
+   <string name="about_title">За</string>
    <string name="change_password">Смени лозинка</string>
+   <string name="delete_account">Избриши ја сметката</string>
+   <string name="create_account">Креирај сметка</string>
+   <string name="uploader_info_dirname">Име на папката</string>
+   <string name="downloader_download_in_progress_ticker">Преземање...</string>
+   <string name="downloader_download_succeeded_ticker">Преземањето е успешно</string>
+   <string name="downloader_download_failed_ticker">Преземањето не беше успешно</string>
+   <string name="common_choose_account">Одбери сметка</string>
+   <string name="sync_string_contacts">Контакти</string>
+   <string name="sync_fail_ticker">Синхронизацијата беше неуспешна</string>
+   <string name="sync_conflicts_in_favourites_ticker">Пронајден е конфликт</string>
+   <string name="foreign_files_move">Префрли ги сите</string>
+   <string name="pincode_enter_pin_code">Ве молам внесето го вашиот апликативен ПИН</string>
+   <string name="pincode_configure_your_pin">Внесето го вашиот апликативен ПИН</string>
+   <string name="pincode_reenter_your_pincode">Ве молам повторно внесето го вашиот апликативен ПИН</string>
+   <string name="pincode_remove_your_pincode">Одстранете го го вашиот апликативен ПИН</string>
+   <string name="pincode_mismatch">Апликативните ПИН-ови не се исти</string>
+   <string name="pincode_wrong">Грешен апликативен ПИН</string>
+   <string name="pincode_removed">Апликативниот ПИН е одстранет</string>
+   <string name="pincode_stored">Апликативниот ПИН е снимен</string>
+   <string name="auth_trying_to_login">Обиди се да се најавиш...</string>
+   <string name="auth_no_net_conn_title">Нема мрежна конекција</string>
+   <string name="auth_testing_connection">Ја тестирам врската...</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_bad_oc_version_title">Верзијата на серверот не е препознаена</string>
+   <string name="auth_unauthorized">Погрешно корисничко име или лозинка</string>
+   <string name="auth_oauth_error">Неуспешна авторизација</string>
+   <string name="auth_expired_basic_auth_toast">Внесете ја вашата тековна лозинка:</string>
+   <string name="common_share">Сподели</string>
    <string name="common_rename">Преименувај</string>
    <string name="common_remove">Отстрани</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="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>
+   <string name="ssl_validator_title">Предупредување</string>
+   <string name="ssl_validator_btn_details_see">Детали</string>
+   <string name="ssl_validator_btn_details_hide">Сокриј</string>
+   <string name="ssl_validator_label_subject">Издаден на:</string>
+   <string name="ssl_validator_label_issuer">Издаден од:</string>
+   <string name="ssl_validator_label_O">Организација</string>
+   <string name="ssl_validator_label_C">Земја:</string>
+   <string name="ssl_validator_label_ST">Држава:</string>
+   <string name="ssl_validator_label_L">Локација:</string>
+   <string name="ssl_validator_label_validity">Валидност:</string>
+   <string name="ssl_validator_label_validity_from">Од:</string>
+   <string name="ssl_validator_label_validity_to">До:</string>
+   <string name="ssl_validator_label_signature">Потпис:</string>
+   <string name="ssl_validator_label_signature_algorithm">Алгоритам:</string>
+   <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="conflict_title">Конфликт при надградбата</string>
+   <string name="conflict_keep_both">Задржи ги и двете</string>
+   <string name="conflict_overwrite">Препиши</string>
 -  <!--we need to improve the communication of errors to the user-->
+   <string name="failed_upload_all_cb">избери се</string>
  </resources>
diff --cc res/values-ms-rMY/strings.xml
index 63ef1d05,8edd82a8..81142f28
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@@ -6,7 -18,13 +6,8 @@@
    <string name="actionbar_settings">Set</string>
    <string name="prefs_category_general">Umum</string>
    <string name="prefs_category_more">Lanjutan</string>
 -  <string name="prefs_add_session">Tambah sesi baru</string>
 -  <string name="prefs_create_img_thumbnails">Bina lakaran kecil imej </string>
 -  <string name="prefs_select_oc_account">Pilih akaun</string>
 -  <string name="prefs_trackmydevice_interval_summary">Kemaskini setiap %1$s minit</string>
    <string name="prefs_accounts">Akaun</string>
+   <string name="prefs_pincode">PIN App</string>
    <string name="prefs_help">Bantuan</string>
    <string name="auth_host_url">Alamat pelayan</string>
    <string name="auth_username">Nama pengguna</string>
@@@ -30,7 -54,22 +31,17 @@@
    <string name="common_cancel">Batal</string>
    <string name="common_save_exit">Simpan &amp; Keluar</string>
    <string name="common_error">Ralat</string>
+   <string name="about_title">Mengenai</string>
    <string name="change_password">Ubah kata laluan</string>
+   <string name="delete_account">Padam akaun</string>
    <string name="uploader_info_dirname">Nama direktori</string>
+   <string name="uploader_upload_succeeded_ticker">Muatnaik berjaya</string>
+   <string name="uploader_upload_failed_ticker">Muatnaik gagal</string>
+   <string name="downloader_download_in_progress_ticker">Muatturun....</string>
    <string name="common_choose_account">Pilih akaun</string>
 -  <string name="sync_string_contacts">Hubungi </string>
+   <string name="pincode_configure_your_pin">Masukkan PIN App anda</string>
+   <string name="pincode_reenter_your_pincode">Sila, memasukkan semula PIN App anda</string>
+   <string name="pincode_stored">PIN App disimpan</string>
 -  <string name="auth_no_net_conn_title">Tiada sambungan rangkaian</string>
 -  <string name="common_share">Kongsi</string>
 -  <string name="common_rename">Namakan</string>
+   <string name="confirmation_remove_local">Lokal sahaja</string>
+   <string name="ssl_validator_title">Amaran</string>
 -  <!--we need to improve the communication of errors to the user-->
  </resources>
diff --cc res/values-nl/strings.xml
index ce619254,1b6d27f7..6bd230c5
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@@ -143,9 -199,21 +146,14 @@@
    <string name="auth_unauthorized">Verkeerde gebruikersnaam of wachtwoord</string>
    <string name="auth_oauth_error">Authorisatie niet succesvol</string>
    <string name="auth_oauth_error_access_denied">Toegang geweigerd door authorizatieserver</string>
 -  <string name="auth_not_found">Verkeerde pad opgegeven</string>
 -  <string name="auth_internal">Interne server fout, code %1$d</string>
    <string name="auth_wtf_reenter_URL">Onverwachte toestand; voer a.u.b de server-URL nogmaals in.</string>
+   <string name="auth_expired_oauth_token_toast">Uw autorisatie is verstreken. Autoriseer opnieuw.</string>
    <string name="auth_expired_basic_auth_toast">Geef het huidige wachtwoord op</string>
+   <string name="auth_expired_saml_sso_token_toast">Uw sessie is verstreken. Verbind opnieuw</string>
+   <string name="auth_connecting_auth_server">Verbinden met authenticatieserver...</string>
+   <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="crashlog_send_report">Rapport verzenden</string>
 -  <string name="crashlog_dont_send_report">Rapport niet verzenden</string>
 -  <string name="extensions_avail_title">Uitbreidingen aanwezig!</string>
 -  <string name="extensions_avail_message">Zo te zien ondersteunt je server instantie geavanceerde uitbreidingen. Wilt je deze uitbreidingen in Android zichtbaar maken?</string>
    <string name="fd_keep_in_sync">Houd bestand actueel</string>
 -  <string name="common_share">Delen</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>
diff --cc res/values-pt-rBR/strings.xml
index 1e0c8e49,5d75bc41..5a71ff1c
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@@ -143,9 -201,22 +146,14 @@@
    <string name="auth_unauthorized">Nome de usuário e/ou senha está errada!</string>
    <string name="auth_oauth_error">Autorização sem sucesso</string>
    <string name="auth_oauth_error_access_denied">Acesso negado pelo servidor de autorização</string>
 -  <string name="auth_not_found">Caminho dado está errado</string>
 -  <string name="auth_internal">Erro interno do servidor, código %1$d</string>
    <string name="auth_wtf_reenter_URL">Estado inesperado, por favor, digite a URL do servidor novamente</string>
+   <string name="auth_expired_oauth_token_toast">Sua autorização expirou. Por favor, solicite autorizar novamente</string>
    <string name="auth_expired_basic_auth_toast">Por favor, digite sua senha</string>
+   <string name="auth_expired_saml_sso_token_toast">Sua sessão expirou. Por favor, conecte-se novamente</string>
+   <string name="auth_connecting_auth_server">Conectando ao servidor de autenticação ...</string>
+   <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 múltiplas contas</string>
 -  <string name="crashlog_message">O aplicativo terminou inesperadamente. Gostaria de enviar um relatório de erros?</string>
 -  <string name="crashlog_send_report">Enviar relatório</string>
 -  <string name="crashlog_dont_send_report">Não enviar relatório</string>
 -  <string name="extensions_avail_title">Extensões disponíveis!</string>
 -  <string name="extensions_avail_message">Parece que sua instância du servidor está suportando extensões avançadas. Gostaria de ver extensões disponíveis para Android?</string>
    <string name="fd_keep_in_sync">Manter arquivo atualizado</string>
 -  <string name="common_share">Compartilhar</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>
diff --cc res/values-pt-rPT/strings.xml
index 514e60c9,a29e8e09..56267b02
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@@ -98,7 -127,9 +98,8 @@@
    <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">Não existe espaço suficiente para copiar os ficheiros seleccionados para a pasta %1$s . Deseja move-los?</string>
+   <string name="use_ssl">Usar Ligação Segura</string>
    <string name="pincode_enter_pin_code">Por favor escreva o PIN da Aplicação</string>
 -  <string name="pincode_enter_new_pin_code">Por favor escreva o novo PIN da Aplicação</string>
    <string name="pincode_configure_your_pin">Escreva o PIN da Aplicação</string>
    <string name="pincode_configure_your_pin_explanation">O PIN vai ser pedido todas as vezes que iniciar a aplicação.</string>
    <string name="pincode_reenter_your_pincode">Volte a inserir o App PIN, por favor</string>
diff --cc res/values-ru/strings.xml
index 4114f464,fc93e945..069953b0
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@@ -143,9 -198,21 +146,14 @@@
    <string name="auth_unauthorized">Неверное имя пользователя или пароль</string>
    <string name="auth_oauth_error">Ошибка авторизации</string>
    <string name="auth_oauth_error_access_denied">Сервер отказал в доступе</string>
 -  <string name="auth_not_found">Указан неверный путь</string>
 -  <string name="auth_internal">Внутренняя ошибка сервера, код %1$d</string>
    <string name="auth_wtf_reenter_URL">Неожиданный ответ; пожалуйста, введите адрес сервера ещё раз</string>
+   <string name="auth_expired_oauth_token_toast">Ваша авторизация истекла. Пожалуйста, авторизуйтесь снова</string>
    <string name="auth_expired_basic_auth_toast">Пожалуйста, введите пароль</string>
+   <string name="auth_expired_saml_sso_token_toast">Ваша сессия истекла. Пожалуйста, подключитесь снова</string>
+   <string name="auth_connecting_auth_server">Подключение к серверу аутентификации...</string>
+   <string name="auth_unsupported_auth_method">Сервер не поддерживает выбранный метод аутентификации</string>
+   <string name="auth_unsupported_multiaccount">%1$s не поддерживает множественные учётные записи</string>
 -  <string name="crashlog_send_report">Отправить отчёт</string>
 -  <string name="crashlog_dont_send_report">Не отправлять отчёт</string>
 -  <string name="extensions_avail_title">Доступны расширения!</string>
 -  <string name="extensions_avail_message">Похоже, ваш экземпляр сервер поддерживает дополнительные расширения. Хотите посмотреть доступные для андроида обновления?</string>
    <string name="fd_keep_in_sync">Обновлять файл</string>
 -  <string name="common_share">Открыть доступ</string>
    <string name="common_rename">Переименовать</string>
    <string name="common_remove">Удалить</string>
    <string name="confirmation_remove_alert">Вы в самом деле хотите удалить %1$s ?</string>
diff --cc res/values-si-rLK/strings.xml
index 59a85318,c9d8d88f..6dad11a1
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@@ -75,5 -119,7 +75,6 @@@
    <string name="wait_a_moment">ස්වල්ප මොහොතක් සිටින්න</string>
    <string name="filedisplay_unexpected_bad_get_content">නොසිතු ප්‍රශ්ණයක්; කරුණාකර වෙනත් යෙදුමක් භාවිතා කර ගොනුව තෝරන්න</string>
    <string name="filedisplay_no_file_selected">ගොනුවක් තෝරා නැත</string>
+   <string name="ssl_validator_title">අවවාදය</string>
    <string name="ssl_validator_btn_details_hide">සඟවන්න</string>
 -  <!--we need to improve the communication of errors to the user-->
  </resources>
diff --cc res/values-sk-rSK/strings.xml
index b3434aaa,cc6ba21b..7714e73c
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@@ -143,9 -199,22 +145,14 @@@
    <string name="auth_unauthorized">Neprávne používateľské meno alebo heslo</string>
    <string name="auth_oauth_error">Neúspešná autorizácia</string>
    <string name="auth_oauth_error_access_denied">Prístup odmietnutý autorizačným serverom</string>
 -  <string name="auth_not_found">Je zadaná neplatná cesta</string>
 -  <string name="auth_internal">Interná chyba servera, kód %1$d</string>
    <string name="auth_wtf_reenter_URL">Nečakaný stav; prosím, opätovne vložte URL adresu servera</string>
+   <string name="auth_expired_oauth_token_toast">Vaša autorizácia expirovala. Prosím autorizujte sa znovu prosím</string>
    <string name="auth_expired_basic_auth_toast">Prosím, zadajte aktuálne heslo</string>
+   <string name="auth_expired_saml_sso_token_toast">Vaše pripojenie expirovalo. Pripojte sa znovu prosím</string>
+   <string name="auth_connecting_auth_server">Pripájam sa na autentifikačný server...</string>
+   <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="crashlog_message">Aplikácia neočakávane ukončila činnosť. Chcete poslať správu o chybe?</string>
 -  <string name="crashlog_send_report">Poslať výpis</string>
 -  <string name="crashlog_dont_send_report">Neposlať výpis</string>
 -  <string name="extensions_avail_title">Sú dostupné rozšírenia.</string>
 -  <string name="extensions_avail_message">Vaša inštancia servera podporuje rozšírené nastavenia. Chcete zobraziť rozšírené nastavenia dosupné pre android?</string>
    <string name="fd_keep_in_sync">Udržiavať súbor aktuálny.</string>
 -  <string name="common_share">Zdieľať</string>
    <string name="common_rename">Premenuj</string>
    <string name="common_remove">Odober</string>
    <string name="confirmation_remove_alert">Naozaj odstrániť %1$s ?</string>
@@@ -165,7 -234,12 +172,8 @@@
    <string name="wait_a_moment">Počkať chvíľu</string>
    <string name="filedisplay_unexpected_bad_get_content">Neočakávaný problém; skúste vybrať súbor inou aplikáciou</string>
    <string name="filedisplay_no_file_selected">Nebol vybraný súbor</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Prihlásiť prostredníctvom oAuth2.</string>
    <string name="oauth_login_connection">Pripájam sa na oAuth2 server…</string>
 -  <string name="oauth_code_validation_message">Prosím, otvorte prehliadač a choďte na:\n%1$s.\nOverte tento kód tu:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Spojenie z danou URL adresou neúspešné.</string>
+   <string name="ssl_validator_title">Varovanie</string>
    <string name="ssl_validator_header">Identitu stránky nemožno overiť</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Certifikát servera nie je overený</string>
    <string name="ssl_validator_reason_cert_expired">- Platnosť certifikátu servera vypršala</string>
diff --cc res/values-tr/strings.xml
index 620422a2,43126492..d16b8fe5
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@@ -7,7 -19,8 +7,7 @@@
    <string name="actionbar_upload_from_apps">Diğer uygulamalardan içerik</string>
    <string name="actionbar_upload_files">Dosyalar</string>
    <string name="actionbar_open_with">ile aç</string>
-   <string name="actionbar_mkdir">Klasör yarat</string>
+   <string name="actionbar_mkdir">Klasör oluştur</string>
 -  <string name="actionbar_search">Arama</string>
    <string name="actionbar_settings">Ayarlar</string>
    <string name="actionbar_see_details">Detaylar</string>
    <string name="prefs_category_general">Genel</string>
@@@ -142,9 -210,23 +148,15 @@@
    <string name="auth_unauthorized">Hatalı kullanıcı adı veya parola</string>
    <string name="auth_oauth_error">Kimlik doğrulama başarısız oldu</string>
    <string name="auth_oauth_error_access_denied">Erişim, kimlik doğrulama sunucusu tarafından reddedildi</string>
 -  <string name="auth_not_found">Hatalı dosya yolu</string>
 -  <string name="auth_internal">İç sunucu hatası, kod %1$d</string>
    <string name="auth_wtf_reenter_URL">Beklenmedik durum. Lütfen, sunucu URL\'sini yeniden girin</string>
+   <string name="auth_expired_oauth_token_toast">Kimlik doğrulamanızın süresi doldu. Lütfen tekrar kimlik doğrulayın</string>
    <string name="auth_expired_basic_auth_toast">Lütfen mevcut parolanızı girin</string>
+   <string name="auth_expired_saml_sso_token_toast">Oturumuzun süresi doldu. Lütfen tekrar bağlanın</string>
+   <string name="auth_connecting_auth_server">Kimlik doğrulama sunucusuna bağlanılıyor...</string>
+   <string name="auth_follow_auth_server">Kimliğinizi doğrulamak için yukarıdaki talimatları izleyin</string>
+   <string name="auth_unsupported_auth_method">Sunucu bu kimlik doğrulama yöntemini desteklemiyor</string>
+   <string name="auth_unsupported_multiaccount">%1$s çoklu hesapları desteklemiyor</string>
 -  <string name="crashlog_message">Uygulama beklenmedik bir şekilde sonlandı. Hata raporu göndermek ister misiniz?</string>
 -  <string name="crashlog_send_report">Rapor gönder</string>
 -  <string name="crashlog_dont_send_report">Rapor gönderme</string>
 -  <string name="extensions_avail_title">Eklentiler mevcut!</string>
 -  <string name="extensions_avail_message">Görünen o ki sunucu servisiniz gelişmiş eklentileri desteklemektedir. Android için mevcut olan eklentileri görmek ister misiniz ?</string>
    <string name="fd_keep_in_sync">Dosyayı güncel tut </string>
 -  <string name="common_share">Paylaş</string>
    <string name="common_rename">İsim değiştir.</string>
    <string name="common_remove">Kaldır</string>
    <string name="confirmation_remove_alert"> %1$s ları gerçekten kaldırmak istiyor musunuz ?</string>
diff --cc res/values-uk/strings.xml
index 749321ea,c7df14a7..c50ed04d
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@@ -105,7 -151,15 +105,9 @@@
    <string name="auth_bad_oc_version_title">Не вдалося визначити версію сервер серверу</string>
    <string name="auth_wrong_connection_title">Не вдалося встановити з\'єднання</string>
    <string name="auth_secure_connection">Встановлено захищене з\'єднання</string>
+   <string name="auth_not_found">Вказано невірний шлях</string>
+   <string name="auth_internal">Внутрішня помилка серверу, код %1$d</string>
 -  <string name="crashlog_send_report">Надіслати доповідь</string>
 -  <string name="crashlog_dont_send_report">Не  відсилати доповідь</string>
 -  <string name="extensions_avail_title">Розширення доступні!</string>
 -  <string name="extensions_avail_message">Здається, що Ваш примірник сервер підтримує додаткові розширення. Чи бажаєте Ви переглянути розширення, доступні для Андроід?</string>
    <string name="fd_keep_in_sync">Оновлювати файл</string>
 -  <string name="common_share">Поділитися</string>
    <string name="common_rename">Перейменувати</string>
    <string name="common_remove">Видалити</string>
    <string name="confirmation_remove_alert">Ви дійсно бажаєте видалити %1$s ?</string>