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;hp=-c

Merge branch 'develop' into clean_up
---

bb34e0f480f65e3a773df107b5d2267999e463cb
diff --combined res/values-ca/strings.xml
index 926a2d59,b726e381..525044a5
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Contrasenya:</string>
 -  <string name="main_login">Usuari:</string>
 -  <string name="main_button_login">Inici de sessió</string>
 -  <string name="main_welcome">Benvingut</string>
 -  <string name="main_files">Fitxers</string>
 -  <string name="main_music">Música</string>
 -  <string name="main_contacts">Contactes</string>
 -  <string name="main_calendar">Calendari</string>
 -  <string name="main_bookmarks">Adreces d\'interès</string>
 -  <string name="main_settings">Arranjament</string>
 -  <string name="main_tit_accsetup">Configuració de comptes</string>
 -  <string name="main_wrn_accsetup">No hi ha comptes en el dispositiu. Per usar l\'aplicació, n\'heu de crear un.</string>
    <string name="about_android">%1$s aplicació per Android</string>
    <string name="about_version">versió %1$s</string>
    <string name="actionbar_sync">Actualitza compte</string>
@@@ -8,10 -20,20 +8,10 @@@
    <string name="actionbar_upload_files">Fitxers</string>
    <string name="actionbar_open_with">Obre amb</string>
    <string name="actionbar_mkdir">Crea una carpeta</string>
 -  <string name="actionbar_search">Cerca</string>
    <string name="actionbar_settings">Configuració</string>
    <string name="actionbar_see_details">Detalls</string>
    <string name="prefs_category_general">General</string>
    <string name="prefs_category_more">Més</string>
 -  <string name="prefs_add_session">Afegeix una sessió nova</string>
 -  <string name="prefs_create_img_thumbnails">Crea miniatures d\'imatges</string>
 -  <string name="prefs_select_oc_account">Seleccioneu un compte</string>
 -  <string name="prefs_summary_select_oc_account">Escolliu quin dels comptes hauria d\'usar l\'aplicació.</string>
 -  <string name="prefs_trackmydevice">Seguiment del dispositiu</string>
 -  <string name="prefs_trackmydevice_summary_off">Permet que l\'aplicació faci el seguiment del dispositiu</string>
 -  <string name="prefs_trackmydevice_summary_on">L\'aplicació manté el seguiment d\'aquest dispositiu</string>
 -  <string name="prefs_trackmydevice_interval">Actualitza l\'interval</string>
 -  <string name="prefs_trackmydevice_interval_summary">Actualitza cada %1$s minuts</string>
    <string name="prefs_accounts">Comptes</string>
    <string name="prefs_manage_accounts">Gestió de comptes</string>
    <string name="prefs_pincode">PIN de l\'aplicació</string>
@@@ -24,13 -46,26 +24,18 @@@
    <string name="prefs_log_summary_history">Això mostra els registres desats</string>
    <string name="prefs_log_delete_history_button">Esborra la història</string>
    <string name="prefs_help">Ajuda</string>
+   <string name="prefs_recommend">Recomana a un amic</string>
+   <string name="prefs_feedback">Comentaris</string>
    <string name="prefs_imprint">Imprint</string>
+   <string name="recommend_subject">Proveu %1$s a un telèfon avançat!</string>
+   <string name="recommend_text">Vull convidar-te a usar l\'aplicació %1$s al teu telèfon avançat!\nBaixa\'l aquí: %2$s</string>
    <string name="auth_check_server">Comprova el servidor</string>
+   <string name="auth_account_name">Nom del compte</string>
    <string name="auth_host_url">Adreça del servidor</string>
    <string name="auth_username">Nom d\'usuari</string>
    <string name="auth_password">Contrasenya</string>
    <string name="auth_register">Nou a %1$s?</string>
 -  <string name="new_session_uri_error">L\'adreça proporcionada no és correcta</string>
 -  <string name="new_session_session_name_error">El nom de la sessió no és correcte</string>
    <string name="sync_string_files">Fitxers</string>
 -  <string name="uploader_no_file_selected">No heu seleccionat cap fitxer per a la pujada</string>
 -  <string name="setup_hint_username">Nom d\'usuari</string>
 -  <string name="setup_hint_password">Contrasenya</string>
 -  <string name="setup_hint_address">Adreça web</string>
 -  <string name="setup_hint_show_password">Mostra la contrasenya</string>
 -  <string name="setup_title">Connecta amb %1$s</string>
    <string name="setup_btn_connect">Connecta</string>
    <string name="uploader_btn_upload_text">Puja</string>
    <string name="uploader_top_message">Seleccioneu la carpeta de pujada:</string>
@@@ -42,6 -77,7 +47,6 @@@
    <string name="uploader_wrn_no_content_text">No s\'ha rebut cap contingut. Res per pujar</string>
    <string name="uploader_error_forbidden_content">%1$s no pot accedir al contingut compartit</string>
    <string name="uploader_info_uploading">S\'està pujant</string>
 -  <string name="uploader_btn_create_dir_text">Crea una carpeta per les pujades</string>
    <string name="file_list_empty">No hi ha fitxers en aquesta carpeta.\nPodeu afegir fitxers a través de l\'opció \"Puja\"  del menú.</string>
    <string name="filedetails_select_file">Feu clic en un fitxer per mostrar informació addicional.</string>
    <string name="filedetails_size">Mida:</string>
@@@ -50,6 -86,7 +55,6 @@@
    <string name="filedetails_modified">Modificat:</string>
    <string name="filedetails_download">Baixa</string>
    <string name="filedetails_sync_file">Actualitza el fitxer</string>
 -  <string name="filedetails_redownload">Baixa de nou</string>
    <string name="filedetails_renamed_in_upload_msg">L\'arxiu s\'ha canviat de nom a %1$s durant la càrrega</string>
    <string name="common_yes">Sí</string>
    <string name="common_no">No</string>
@@@ -58,6 -95,7 +63,6 @@@
    <string name="common_cancel_upload">Cancel·la la pujada</string>
    <string name="common_cancel">Cancel·la</string>
    <string name="common_save_exit">Desa &amp; Surt</string>
 -  <string name="common_exit">Surt de %1$s</string>
    <string name="common_error">Error</string>
    <string name="common_loading">Carregant...</string>
    <string name="common_error_unknown">Error desconegut</string>
@@@ -71,8 -109,10 +76,8 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% Pujant %2$s</string>
    <string name="uploader_upload_succeeded_ticker">La pujada ha estat correcte</string>
    <string name="uploader_upload_succeeded_content_single">%1$s s\'ha pujat correctament</string>
 -  <string name="uploader_upload_succeeded_content_multiple">%1$d fitxers s\'han pujat correctament</string>
    <string name="uploader_upload_failed_ticker">La pujada ha fallat</string>
    <string name="uploader_upload_failed_content_single">La pujada de %1$s no s\'ha pogut acabar</string>
 -  <string name="uploader_upload_failed_content_multiple">La pujada ha fallat: s\'han pujat %1$d/%2$d fitxers</string>
    <string name="downloader_download_in_progress_ticker">S\'està baixant ...</string>
    <string name="downloader_download_in_progress_content">%1$d%% pujant %2$s</string>
    <string name="downloader_download_succeeded_ticker">La baixada ha estat correcte</string>
@@@ -81,6 -121,7 +86,6 @@@
    <string name="downloader_download_failed_content">La baixada de %1$s no s\'ha pogut acabar</string>
    <string name="downloader_not_downloaded_yet">No baixat encara</string>
    <string name="common_choose_account">Escolliu el compte</string>
 -  <string name="sync_string_contacts">Contactes</string>
    <string name="sync_fail_ticker">La sincronització ha fallat</string>
    <string name="sync_fail_content">La sincronització de %1$s no s\'ha pogut acabar</string>
    <string name="sync_fail_content_unauthorized">Contrasenya no vàlida per %1$s</string>
@@@ -91,13 -132,17 +96,14 @@@
    <string name="sync_foreign_files_forgotten_ticker">S\'han oblidat alguns fitxers locals</string>
    <string name="sync_foreign_files_forgotten_content">%1$d fitxers no s\'han pogut copiar dins de %2$s carpetes</string>
    <string name="sync_foreign_files_forgotten_explanation">Des de la versió 1.3.16, els fitxers pujats des d\'aquest dispositiu es copien a la carpeta local %1$s per prevenir pèrdues de dades quan es sincronitza un únic fitxer amb diversos comptes.\n\nDegut a aquest canvi, tots els fitxers pujats en versions anteriors d\'aquesta aplicació es copiaven a la carpeta %2$s. Malgrat tot, un error impedia aquesta operació durant la sinconització del compte. Podeu deixar els fitxer(s) tal i com estan i eliminar l\'enllaç a %3$2, o moure els fitxer(s) a la carpeta %1$s i retenir l\'enllaç a %4$s.\n\nA baix hi ha els fitxers local(s) i els fitxer(s) remots a %5$s als que estaven enllaçats.</string>
+   <string name="sync_current_folder_was_removed">La carpeta %1$s ja no existeix</string>
    <string name="foreign_files_move">Mou-los tots</string>
    <string name="foreign_files_success">S\'han mogut tots els fitxers</string>
    <string name="foreign_files_fail">Alguns fitxers no s\'han pogut moure</string>
    <string name="foreign_files_local_text">Local: %1$s</string>
    <string name="foreign_files_remote_text">Remot: %1$s</string>
    <string name="upload_query_move_foreign_files">No hi ha prou espai per copiar els fitxers seleccionats a la carpeta %1$s. Els hi voleu moure?</string>
 -  <string name="use_ssl">Usa connexió segura</string>
 -  <string name="location_no_provider">%1$s no pot fer el seguiment de l\'equip. Comproveu la configuració d\'ubicuació</string>
    <string name="pincode_enter_pin_code">Escriviu el PIN de l\'aplicació</string>
 -  <string name="pincode_enter_new_pin_code">Escriviu el nou PIN de l\'aplicació</string>
    <string name="pincode_configure_your_pin">Escriviu el PIN de l\'aplicació</string>
    <string name="pincode_configure_your_pin_explanation">es requerirà el PIN cada vegada que s\'iniciï l\'aplicació</string>
    <string name="pincode_reenter_your_pincode">Torneu a escriure el PIN de l\'aplicació </string>
@@@ -116,35 -161,72 +122,41 @@@
    <string name="media_err_unsupported">El codec multimèdia no és compatible</string>
    <string name="media_err_io">El fitxer multimèdia no es pot llegir</string>
    <string name="media_err_malformed">El fitxer multimèdia no està codificat correctament</string>
 -  <string name="media_err_timeout">Massa temps intentant reprduïr-lo</string>
    <string name="media_err_invalid_progressive_playback">El fitxer multimèdia no es pot transmetre</string>
    <string name="media_err_unknown">El fitxer multimèdia no es pot reproduir amb el reproductor per defecte</string>
    <string name="media_err_security_ex">Error de seguretat en intentar reproduir %1$s</string>
    <string name="media_err_io_ex">Error d\'entrada intentant reproduir %1$s</string>
    <string name="media_err_unexpected">Error inesperat intentant reproduir %1$s</string>
 -  <string name="media_previous_description">Botó de cançó anterior</string>
    <string name="media_rewind_description">Botó de rebobinat</string>
    <string name="media_play_pause_description">Botó de reproducció o pausa</string>
    <string name="media_forward_description">Botó de reproducció ràpida</string>
 -  <string name="media_next_description">Botó de cançó següent</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 Minuts</item>
 -    <item>30 Minuts</item>
 -    <item>60 Minuts</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">S\'està intentant acreditar-vos...</string>
    <string name="auth_no_net_conn_title">Sense connexió de xarxa</string>
 -  <string name="auth_no_net_conn_message">No s\'ha detectat cap connexió, comproveu la connexió i torneu a intentar-ho.</string>
 -  <string name="auth_connect_anyway">Connecta igualment</string>
    <string name="auth_nossl_plain_ok_title">La connexió segura no està disponible.</string>
 -  <string name="auth_nossl_plain_ok_message">L\'aplicació no ha pogut establir una connexió segura amb el servidor. Malgrat tot, una connexió no segura està disponible. Podeu continuar o cancel·lar.</string>
    <string name="auth_connection_established">S\'ha establert la connexió</string>
    <string name="auth_testing_connection">S\'està comprovant la connexió...</string>
    <string name="auth_not_configured_title">La configuració del servidor està malformada</string>
 -  <string name="auth_not_configured_message">Sembla que la instància del sevidor no està configurada correctament. Per més detalls contacteu amb l\'administrador.</string>
 -  <string name="auth_account_not_new">Ja hi ha un compte al dispositiu pel mateix usuari i mateix servidor</string>
 -  <string name="auth_account_not_the_same">L\'usuari introduït no coincideix amb l\'usuari d\'aquest compte</string>
    <string name="auth_unknown_error_title">S\'ha produït un error desconegut</string>
 -  <string name="auth_unknown_error_message">S\'ha produït un error desconegut. Contacteu els autors i inclogueu els registres del dispositiu.</string>
    <string name="auth_unknown_host_title">No s\'ha trobat el servidor</string>
 -  <string name="auth_unknown_host_message">No s\'ha trobat el servidor. Comproveu el nom del servidor i la seva disponibilitat i intenteu-ho de nou.</string>
    <string name="auth_incorrect_path_title">No s\'ha trobat la instància del servidor</string>
 -  <string name="auth_incorrect_path_message">L\'aplicació no ha trobat la instància del servidor al camí indicat. Comproveu el camí i torneu-ho a intentar.</string>
    <string name="auth_timeout_title">El servidor ha trigat massa en respondre</string>
    <string name="auth_incorrect_address_title">La URL esà malformada</string>
    <string name="auth_ssl_general_error_title">La inicialització SSL ha fallat</string>
 -  <string name="auth_ssl_unverified_server_title">No s\'ha pogut verificar la identitat SSL del servidor</string>
    <string name="auth_bad_oc_version_title">Versió del servidor desconeguda</string>
    <string name="auth_wrong_connection_title">No s\'ha pogut establir la connexió</string>
    <string name="auth_secure_connection">S\'ha establert la connexió segura</string>
    <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>
@@@ -164,12 -246,18 +176,12 @@@
    <string name="wait_a_moment">Espereu</string>
    <string name="filedisplay_unexpected_bad_get_content">S\'ha produït un problema inesperat; proveu una altra aplicació per seleccionar el fitxer</string>
    <string name="filedisplay_no_file_selected">No heu seleccionat cap fitxer</string>
 -  <string name="oauth_host_url">URL de oAuth2</string>
 -  <string name="oauth_check_onoff">Accés per oAuth2.</string>
    <string name="oauth_login_connection">Connectant amb el servidor oAuth2...</string>
 -  <string name="oauth_code_validation_message">Obriu un navegador i accediu a:\n%1$s.\nValideu-hi aquest codi:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">La connexió amb la URL no està disponible.</string>
 -  <string name="ssl_validator_title">Avís</string>
    <string name="ssl_validator_header">No s\'ha pogut verificar la identitat del lloc web</string>
    <string name="ssl_validator_reason_cert_not_trusted">- El certificat del servidor no està autenticat</string>
    <string name="ssl_validator_reason_cert_expired">- El certificat del servidor ha expirat</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- El certificat del servidor és massa jove</string>
    <string name="ssl_validator_reason_hostname_not_verified">- La URL no coincideix el nom del servidor en el certificat</string>
 -  <string name="ssl_validator_certificate_not_available">No s\'ha pogut obtenir el certificat del servidor</string>
    <string name="ssl_validator_question">Voleu confiar en aquest certificat igualment?</string>
    <string name="ssl_validator_not_saved">El certificat no s\'ha pogu desar</string>
    <string name="ssl_validator_btn_details_see">Detalls</string>
@@@ -202,6 -290,8 +214,6 @@@
    <string name="conflict_dont_upload">No el pugis</string>
    <string name="preview_image_description">Visualització prèvia d\'imatge</string>
    <string name="preview_image_error_unknown_format">Auquesta imatge no es pot mostrar</string>
 -  <string name="preview_image_error_out_of_memory">\"No teniu suficient memòria per mostrar aquesta imatge</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s no s\'ha pogut copiar a la carpeta local %2$s</string>
    <string name="actionbar_failed_instant_upload">ha fallat la pujada instantània\"</string>
    <string name="failed_upload_headline_text">Fallada de pujades instantànies</string>
diff --combined res/values-de-rDE/strings.xml
index fa1cc247,b27dec15..a37d0031
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Passwort:</string>
 -  <string name="main_login">Benutzername:</string>
 -  <string name="main_button_login">Anmelden</string>
 -  <string name="main_welcome">Willkommen</string>
 -  <string name="main_files">Dateien</string>
 -  <string name="main_music">Musik</string>
 -  <string name="main_contacts">Kontakte</string>
 -  <string name="main_calendar">Kalender</string>
 -  <string name="main_bookmarks">Lesezeichen</string>
 -  <string name="main_settings">Einstellungen</string>
 -  <string name="main_tit_accsetup">Konto einrichten</string>
 -  <string name="main_wrn_accsetup">Auf Ihrem Gerät sind keine Konten eingerichtet. Bitte erstellen Sie ein Konto, um diese App zu nutzen.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">Version %1$s</string>
    <string name="actionbar_sync">Konto aktualisieren</string>
@@@ -8,10 -20,20 +8,10 @@@
    <string name="actionbar_upload_files">Dateien</string>
    <string name="actionbar_open_with">Öffnen mit</string>
    <string name="actionbar_mkdir">Ordner anlegen</string>
 -  <string name="actionbar_search">Suche</string>
    <string name="actionbar_settings">Einstellungen</string>
    <string name="actionbar_see_details">Details</string>
    <string name="prefs_category_general">Allgemein</string>
    <string name="prefs_category_more">Mehr</string>
 -  <string name="prefs_add_session">Neue Sitzung hinzufügen</string>
 -  <string name="prefs_create_img_thumbnails">Bildvorschau erstellen</string>
 -  <string name="prefs_select_oc_account">Account auswählen</string>
 -  <string name="prefs_summary_select_oc_account">Bitte wählen Sie, welches Konto von der App verwendet werden soll.</string>
 -  <string name="prefs_trackmydevice">Gerät verfolgen</string>
 -  <string name="prefs_trackmydevice_summary_off">Geräteverfolgung in dieser App aktivieren</string>
 -  <string name="prefs_trackmydevice_summary_on">Ihre App verfolgt dieses Gerät</string>
 -  <string name="prefs_trackmydevice_interval">Aktualisierungsintervall</string>
 -  <string name="prefs_trackmydevice_interval_summary">Alle %1$s Minuten aktualisieren</string>
    <string name="prefs_accounts">Konten</string>
    <string name="prefs_manage_accounts">Konten verwalten</string>
    <string name="prefs_pincode">App-PIN</string>
@@@ -24,14 -46,26 +24,18 @@@
    <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokollierungen</string>
    <string name="prefs_log_delete_history_button">Verlauf löschen</string>
    <string name="prefs_help">Hilfe</string>
+   <string name="prefs_recommend">Empfehlen Sie dies einem Freund</string>
    <string name="prefs_feedback">Rückmeldungen</string>
    <string name="prefs_imprint">Impressum</string>
+   <string name="recommend_subject">Probieren Sie %1$s auf Ihrem Smartphone!</string>
+   <string name="recommend_text">Ich möchte Sie zum Benutzen von %1$s auf Ihrem Smartphone einladen!\nLaden Sie es hier herunter: %2$s</string>
    <string name="auth_check_server">Server überprüfen</string>
+   <string name="auth_account_name">Name des Nutzerkontos</string>
    <string name="auth_host_url">Adresse des Servers</string>
    <string name="auth_username">Benutzername</string>
    <string name="auth_password">Passwort</string>
    <string name="auth_register">Ist %1$s neu für Sie?</string>
 -  <string name="new_session_uri_error">Falsche Adresse angegeben</string>
 -  <string name="new_session_session_name_error">Falscher Sitzungsname</string>
    <string name="sync_string_files">Dateien</string>
 -  <string name="uploader_no_file_selected">Sie haben keine Datei zum Hochladen ausgewählt</string>
 -  <string name="setup_hint_username">Benutzername</string>
 -  <string name="setup_hint_password">Passwort</string>
 -  <string name="setup_hint_address">Internetadresse</string>
 -  <string name="setup_hint_show_password">Passwort anzeigen?</string>
 -  <string name="setup_title">Mit Ihrer %1$s verbinden</string>
    <string name="setup_btn_connect">Verbinden</string>
    <string name="uploader_btn_upload_text">Hochladen</string>
    <string name="uploader_top_message">Wähle Zielordner:</string>
@@@ -43,6 -77,7 +47,6 @@@
    <string name="uploader_wrn_no_content_text">Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen.</string>
    <string name="uploader_error_forbidden_content">%1$s darf den freigegebenen Inhalt nicht nutzen.</string>
    <string name="uploader_info_uploading">Lade hoch</string>
 -  <string name="uploader_btn_create_dir_text">Verzeichnis für hochzuladene Dateien erstellen</string>
    <string name="file_list_empty">Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien können mit der Menüfunktion \"Hochladen\" hinzugefügt werden.</string>
    <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
    <string name="filedetails_size">Größe:</string>
@@@ -51,6 -86,7 +55,6 @@@
    <string name="filedetails_modified">Geändert:</string>
    <string name="filedetails_download">Herunterladen</string>
    <string name="filedetails_sync_file">Datei aktualisieren</string>
 -  <string name="filedetails_redownload">Erneut herunterladen</string>
    <string name="filedetails_renamed_in_upload_msg">Datei wurde wärend des Uploads zu %1$s umbenannt</string>
    <string name="common_yes">Ja</string>
    <string name="common_no">Nein</string>
@@@ -59,6 -95,7 +63,6 @@@
    <string name="common_cancel_upload">Upload abbrechen</string>
    <string name="common_cancel">Abbrechen</string>
    <string name="common_save_exit">Speichern &amp; Schließen</string>
 -  <string name="common_exit">%1$s verlassen</string>
    <string name="common_error">Fehler</string>
    <string name="common_loading">Lade …</string>
    <string name="common_error_unknown">Unbekannter Fehler</string>
@@@ -72,8 -109,10 +76,8 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% Hochladen %2$s</string>
    <string name="uploader_upload_succeeded_ticker">Hochladen erfolgreich</string>
    <string name="uploader_upload_succeeded_content_single">%1$s wurde(n) erfolgreich hochgeladen</string>
 -  <string name="uploader_upload_succeeded_content_multiple">%1$d Datei(en) wurde(n) erfolgreich hochgeladen</string>
    <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
    <string name="uploader_upload_failed_content_single">Hochladen von  %1$s konnte nicht abgeschlossen werden</string>
 -  <string name="uploader_upload_failed_content_multiple">Hochladen fehlgeschlagen: %1$d/%2$d Dateien wurden hochgeladen</string>
    <string name="downloader_download_in_progress_ticker">Herunterladen...</string>
    <string name="downloader_download_in_progress_content">%1$d%% Herunterladen %2$s</string>
    <string name="downloader_download_succeeded_ticker">Herunterladen erfolgreich</string>
@@@ -82,6 -121,7 +86,6 @@@
    <string name="downloader_download_failed_content">Herunterladen von %1$s konnte nicht abgeschlossen werden</string>
    <string name="downloader_not_downloaded_yet">Noch nicht heruntergeladen</string>
    <string name="common_choose_account">Konto auswählen</string>
 -  <string name="sync_string_contacts">Kontakte</string>
    <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
    <string name="sync_fail_content">Bei der Synchronisation konnte %1$s nicht übertragen werden</string>
    <string name="sync_fail_content_unauthorized">Ungültiges Passwort für %1$s</string>
@@@ -92,13 -132,17 +96,14 @@@
    <string name="sync_foreign_files_forgotten_ticker">Einige lokale Dateien wurden vergessen</string>
    <string name="sync_foreign_files_forgotten_content">%1$d Dateien aus dem Verzeichnis %2$s konnten nicht kopiert werden nach</string>
    <string name="sync_foreign_files_forgotten_explanation">\"Mit Version 1.3.16 werden Dateien die von diesem Gerät aus hochgeladen werden in den lokalen Ordner %1$s kopiert um Datenverlust zu vermeiden, wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden, in den Ordner %2$s verschoben. Jedoch ist während der Account-Synchronisation ein Fehler aufgetreten, der das Abschließen dieses Vorgangs verhindert. Sie können die Datei(en) entweder wie sie sind belassen und den Link zu %3$s entfernen oder die Datei(en) in den %1$s Ordner verschieben und  den Link zu %4$s beibehalten.\n\nUnten befindet sich eine Liste der lokalen Datei(en) und der mit ihnen verbundenen Remote-Datei(en) in %5$s.</string>
+   <string name="sync_current_folder_was_removed">Das Verzeichnis %1$s existiert nicht mehr</string>
    <string name="foreign_files_move">Verschiebe alle</string>
    <string name="foreign_files_success">Alle Dateien wurden verschoben</string>
    <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
    <string name="foreign_files_local_text">Lokal: %1$s</string>
    <string name="foreign_files_remote_text">Remote: %1$s</string>
    <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung, um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchten Sie sie stattdessen verschieben?</string>
 -  <string name="use_ssl">Sichere Verbindung benutzen</string>
 -  <string name="location_no_provider">%1$s kann Ihr Gerät nicht verfolgen. Bitte überprüfen Sie Ihre Standorteinstellungen.</string>
    <string name="pincode_enter_pin_code">Bitte geben Sie Ihre App-PIN ein</string>
 -  <string name="pincode_enter_new_pin_code">Bitte geben Sie Ihre neue App-PIN ein</string>
    <string name="pincode_configure_your_pin">Bitte geben Sie Ihre App-PIN ein</string>
    <string name="pincode_configure_your_pin_explanation">PIN-Abfrage erfolgt nach Starten der App.</string>
    <string name="pincode_reenter_your_pincode">Bitte geben Sie Ihre App-PIN erneut ein.</string>
@@@ -117,35 -161,72 +122,41 @@@
    <string name="media_err_unsupported">Nicht unterstützter Media-codec</string>
    <string name="media_err_io">Mediendatei konnte nicht gelesen werden</string>
    <string name="media_err_malformed">Mediendatei nicht korrekt kodiert</string>
 -  <string name="media_err_timeout">Zu lange schon versucht abzuspielen</string>
    <string name="media_err_invalid_progressive_playback">Mediendatei kann nicht gestreamt werden</string>
    <string name="media_err_unknown">Die Mediendatei kann nicht mit dem vorinstallierten Media Player abgespielt werden</string>
    <string name="media_err_security_ex">Sicherheitsfehler beim abspielen von %1$s</string>
    <string name="media_err_io_ex">Eingabefehler beim Versuch %1$s abzuspielen</string>
    <string name="media_err_unexpected">Unerwarteter Fehler beim Versuch %1$s abzuspielen</string>
 -  <string name="media_previous_description">Vorheriger Titel Button</string>
    <string name="media_rewind_description">Zurückspulen Button</string>
    <string name="media_play_pause_description">Abspielen oder Pausieren Button</string>
    <string name="media_forward_description">Vorspulen Button</string>
 -  <string name="media_next_description">Nächster Titel Button</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 Minuten</item>
 -    <item>30 Minuten</item>
 -    <item>60 Minuten</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">Anmeldungsversuch...</string>
    <string name="auth_no_net_conn_title">Keine Netzwerkverbindung</string>
 -  <string name="auth_no_net_conn_message">Es konnte keine Netzwerkverbindung gefunden werden, bitte überprüfen Sie Ihre Internetverbindung.</string>
 -  <string name="auth_connect_anyway">Trotzdem verbinden</string>
    <string name="auth_nossl_plain_ok_title">Sichere Verbindung nicht verfügbar.</string>
 -  <string name="auth_nossl_plain_ok_message">Die App konnte keine sichere Verbindung zum Server herstellen. Eine unsichere Verbindung ist verfügbar. Möchten Sie fortfahren oder abbrechen?</string>
    <string name="auth_connection_established">Verbindung hergestellt</string>
    <string name="auth_testing_connection">Verbindung testen...</string>
    <string name="auth_not_configured_title">Fehlerhafte Server Konfiguration</string>
 -  <string name="auth_not_configured_message">Es scheint, als wäre Ihre Server-Installation nicht richtig konfiguriert. Bitte kontaktieren Sie Ihren Administrator, um weitere Details zu erhalten.</string>
 -  <string name="auth_account_not_new">Ein Benutzerkonto für den gleichen Benutzer und Server existiert auf diesem Gerät bereits</string>
 -  <string name="auth_account_not_the_same">Der eingegebene Benutzer passt nicht zu dem Benutzer dieses Benutzerkontos</string>
    <string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
 -  <string name="auth_unknown_error_message">Ein unbekannter Fehler ist aufgetreten. Bitte kontaktieren Sie Ihren Administrator unter Zu­hil­fe­nah­me der Log-Dateien Ihres Gerätes.</string>
    <string name="auth_unknown_host_title">Konnte den Host nicht finden.</string>
 -  <string name="auth_unknown_host_message">Konnte den eingetragenen Host nicht finden. Bitte prüfen Sie den Hostnamen und die Verfügbarkeit des Servers und versuchen es erneut.</string>
    <string name="auth_incorrect_path_title">Server-Installation nicht gefunden</string>
 -  <string name="auth_incorrect_path_message">Die App konnte den Server unter dem angegebenen Pfad nicht finden. Bitte überprüfen Sie den Pfad und versuchen es erneut.</string>
    <string name="auth_timeout_title">Der Server braucht zu lange für eine Antwort.</string>
    <string name="auth_incorrect_address_title">Fehlerhafte URL</string>
    <string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen.</string>
 -  <string name="auth_ssl_unverified_server_title">Nichtüberprüfte SSL-Server-Identität</string>
    <string name="auth_bad_oc_version_title">Unbekannte Server-Version</string>
    <string name="auth_wrong_connection_title">Konnte keine Verbindung aufbauen.</string>
    <string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
    <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>
@@@ -165,12 -246,18 +176,12 @@@
    <string name="wait_a_moment">Bitte warten Sie einen Moment.</string>
    <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuchen Sie, die Datei in einer anderen App zu öffnen.</string>
    <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Anmelden mit oAuth2.</string>
    <string name="oauth_login_connection">Verbinde mit dem oAuth2-Server…</string>
 -  <string name="oauth_code_validation_message">Bitte öffnen Sie einen Web-Browser und gehen Sie zu:\n%1$s.\nBestätigen Sie diesen Code dort:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Die Verbindung zu dieser URL ist nicht verfügbar.</string>
 -  <string name="ssl_validator_title">Warnung</string>
    <string name="ssl_validator_header">Die Identität der Website konnte nicht überprüft werden</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Das Zertifikat des Servers ist nicht vertrauenswürdig</string>
    <string name="ssl_validator_reason_cert_expired">- Das Zertifikat des Servers ist abgelaufen</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Das Gültigkeitsdatum des Serverzertifikats liegt in der Zukunft</string>
    <string name="ssl_validator_reason_hostname_not_verified">- Die Adresse stimmt nicht mit dem im Zertifikat angegebenen Hostnamen überein</string>
 -  <string name="ssl_validator_certificate_not_available">Das Zertifikat des Servers konnte nicht abgerufen werden</string>
    <string name="ssl_validator_question">Möchten Sie diesem Zertifikat trotzdem vertrauen?</string>
    <string name="ssl_validator_not_saved">Das Zertifikat konnte nicht gespeichert werden</string>
    <string name="ssl_validator_btn_details_see">Details</string>
@@@ -203,6 -290,8 +214,6 @@@
    <string name="conflict_dont_upload">Nicht hochladen</string>
    <string name="preview_image_description">Bildvorschau</string>
    <string name="preview_image_error_unknown_format">Dieses Bild kann nicht angezeigt werden</string>
 -  <string name="preview_image_error_out_of_memory">\"Nicht genügend Arbeitsspeicher um dieses Bild anzuzeigen</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s konnte nicht in den lokalen %2$s Ordner kopiert werden</string>
    <string name="actionbar_failed_instant_upload">Sofort Upload fehlgeschlagen\"</string>
    <string name="failed_upload_headline_text">Sofortige Uploads fehlgeschlagen</string>
diff --combined res/values-de/strings.xml
index 82614e00,004121d8..bb68bee4
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Passwort:</string>
 -  <string name="main_login">Benutzername:</string>
 -  <string name="main_button_login">Anmelden</string>
 -  <string name="main_welcome">Willkommen</string>
 -  <string name="main_files">Dateien</string>
 -  <string name="main_music">Musik</string>
 -  <string name="main_contacts">Kontakte</string>
 -  <string name="main_calendar">Kalender</string>
 -  <string name="main_bookmarks">Lesezeichen</string>
 -  <string name="main_settings">Einstellungen</string>
 -  <string name="main_tit_accsetup">Account einrichten</string>
 -  <string name="main_wrn_accsetup">Auf Deinem Gerät sind keine Konten eingerichtet. Bitte erstelle ein Konto, um diese App zu nutzen.</string>
    <string name="about_android">%1$s Android-App</string>
    <string name="about_version">Version %1$s</string>
    <string name="actionbar_sync">Konto aktualisieren</string>
@@@ -8,10 -20,20 +8,10 @@@
    <string name="actionbar_upload_files">Dateien</string>
    <string name="actionbar_open_with">Öffnen mit</string>
    <string name="actionbar_mkdir">Ordner anlegen</string>
 -  <string name="actionbar_search">Suche</string>
    <string name="actionbar_settings">Einstellungen</string>
    <string name="actionbar_see_details">Details</string>
    <string name="prefs_category_general">Allgemein</string>
    <string name="prefs_category_more">Mehr</string>
 -  <string name="prefs_add_session">Neue Sitzung hinzufügen</string>
 -  <string name="prefs_create_img_thumbnails">Bildvorschau erstellen</string>
 -  <string name="prefs_select_oc_account">Account auswählen</string>
 -  <string name="prefs_summary_select_oc_account">Bitte wähle, welches Konto von der App verwendet werden soll.</string>
 -  <string name="prefs_trackmydevice">Gerät verfolgen</string>
 -  <string name="prefs_trackmydevice_summary_off">Geräteverfolgung in dieser App aktivieren</string>
 -  <string name="prefs_trackmydevice_summary_on">Deine App verfolgt dieses Gerät</string>
 -  <string name="prefs_trackmydevice_interval">Aktualisierungsintervall</string>
 -  <string name="prefs_trackmydevice_interval_summary">Alle %1$s Minuten aktualisieren</string>
    <string name="prefs_accounts">Konten</string>
    <string name="prefs_manage_accounts">Konten verwalten</string>
    <string name="prefs_pincode">App-PIN</string>
@@@ -24,14 -46,26 +24,18 @@@
    <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokollierungen</string>
    <string name="prefs_log_delete_history_button">Verlauf löschen</string>
    <string name="prefs_help">Hilfe</string>
+   <string name="prefs_recommend">Empfehle dies einem Freund</string>
    <string name="prefs_feedback">Rückmeldungen</string>
    <string name="prefs_imprint">Impressum</string>
+   <string name="recommend_subject">Probiere %1$s auf Deinem Smartphone!</string>
+   <string name="recommend_text">Ich möchte Dich zum Benutzen von %1$s auf Deinem Smartphone einladen!\nLade es hier herunter: %2$s</string>
    <string name="auth_check_server">Überprüfe den Server</string>
+   <string name="auth_account_name">Name des Nutzerkontos</string>
    <string name="auth_host_url">Adresse des Servers</string>
    <string name="auth_username">Benutzername</string>
    <string name="auth_password">Passwort</string>
    <string name="auth_register">Ist %1$s neu für dich?</string>
 -  <string name="new_session_uri_error">Falsche Adresse angegeben</string>
 -  <string name="new_session_session_name_error">Falscher Sitzungsname</string>
    <string name="sync_string_files">Dateien</string>
 -  <string name="uploader_no_file_selected">Du hast keine Datei zum Hochladen ausgewählt</string>
 -  <string name="setup_hint_username">Benutzername</string>
 -  <string name="setup_hint_password">Passwort</string>
 -  <string name="setup_hint_address">Internetadresse</string>
 -  <string name="setup_hint_show_password">Passwort anzeigen?</string>
 -  <string name="setup_title">Mit Deiner %1$s verbinden</string>
    <string name="setup_btn_connect">Verbinden</string>
    <string name="uploader_btn_upload_text">Hochladen</string>
    <string name="uploader_top_message">Wähle einen Ordner zum hochladen:</string>
@@@ -43,6 -77,7 +47,6 @@@
    <string name="uploader_wrn_no_content_text">Es wurden keine Inhalte empfangen. Es gibt nichts zum Hochladen.</string>
    <string name="uploader_error_forbidden_content">%1$s darf den freigegebenen Inhalt nicht nutzen.</string>
    <string name="uploader_info_uploading">Lade hoch</string>
 -  <string name="uploader_btn_create_dir_text">Ordner für hochzuladene Dateien erstellen</string>
    <string name="file_list_empty">Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien können mit der \"Hochladen\" Menüfunktion hinzugefügt werden.</string>
    <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
    <string name="filedetails_size">Größe:</string>
@@@ -51,6 -86,7 +55,6 @@@
    <string name="filedetails_modified">Geändert:</string>
    <string name="filedetails_download">Herunterladen</string>
    <string name="filedetails_sync_file">Datei aktualisieren</string>
 -  <string name="filedetails_redownload">Erneut herunterladen</string>
    <string name="filedetails_renamed_in_upload_msg">Datei wurde wärend des Uploads zu %1$s umbenannt</string>
    <string name="common_yes">Ja</string>
    <string name="common_no">Nein</string>
@@@ -59,6 -95,7 +63,6 @@@
    <string name="common_cancel_upload">Upload abbrechen</string>
    <string name="common_cancel">Abbrechen</string>
    <string name="common_save_exit">Speichern &amp; schließen</string>
 -  <string name="common_exit">%1$s verlasse</string>
    <string name="common_error">Fehler</string>
    <string name="common_loading">Lädt ...</string>
    <string name="common_error_unknown">Unbekannter Fehler</string>
@@@ -72,8 -109,10 +76,8 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% Hochladen %2$s</string>
    <string name="uploader_upload_succeeded_ticker">Hochladen erfolgreich</string>
    <string name="uploader_upload_succeeded_content_single">%1$s wurde(n) erfolgreich hochgeladen</string>
 -  <string name="uploader_upload_succeeded_content_multiple">%1$d Datei(en) wurde(n) erfolgreich hochgeladen</string>
    <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
    <string name="uploader_upload_failed_content_single">Hochladen von  %1$s konnte nicht abgeschlossen werden</string>
 -  <string name="uploader_upload_failed_content_multiple">Hochladen fehlgeschlagen: %1$d/%2$d Dateien wurden hochgeladen</string>
    <string name="downloader_download_in_progress_ticker">Herunterladen...</string>
    <string name="downloader_download_in_progress_content">%1$d%% Herunterladen %2$s</string>
    <string name="downloader_download_succeeded_ticker">Herunterladen erfolgreich</string>
@@@ -82,6 -121,7 +86,6 @@@
    <string name="downloader_download_failed_content">Herunterladen von %1$s konnte nicht abgeschlossen werden</string>
    <string name="downloader_not_downloaded_yet">Noch nicht Heruntergeladen</string>
    <string name="common_choose_account">Account auswählen</string>
 -  <string name="sync_string_contacts">Kontakte</string>
    <string name="sync_fail_ticker">Synchronisation fehlgeschlagen</string>
    <string name="sync_fail_content">Bei der Synchronisation konnte %1$s nicht übertragen werden</string>
    <string name="sync_fail_content_unauthorized">Falsches Passwort für %1$s</string>
@@@ -92,13 -132,17 +96,14 @@@
    <string name="sync_foreign_files_forgotten_ticker">Einige lokale Dateien wurden vergessen</string>
    <string name="sync_foreign_files_forgotten_content">%1$d Dateien aus dem Verzeichnis %2$s konnten nicht kopiert werden nach</string>
    <string name="sync_foreign_files_forgotten_explanation">\"Mit Version 1.3.16 werden Dateien die von diesem Gerät aus hochgeladen werden in den lokalen Ordner %1$s kopiert um Datenverlust zu vermeiden, wenn eine einzelne Datei mit mehreren Accounts synchronisiert wird.\n\nInfolge dieser Änderung wurden alle Dateien, die mit vorherigen Versionen dieser App hochgeladen wurden, in den Ordner %2$s verschoben. Jedoch ist während der Account-Synchronisation ein Fehler aufgetreten, der das Abschließen dieses Vorgangs verhindert. Du kannst die Datei(en) entweder wie sie sind belassen und den Link zu %3$s entfernen oder die Datei(en) in den %1$s Ordner verschieben und  den Link zu %4$s beibehalten.\n\nUnten befindet sich eine Liste der lokalen Datei(en) und der mit ihnen verbundenen Remote-Datei(en) in %5$s.</string>
+   <string name="sync_current_folder_was_removed">Das Verzeichnis %1$s existiert nicht mehr</string>
    <string name="foreign_files_move">Verschiebe alle</string>
    <string name="foreign_files_success">Alle Dateien wurden verschoben</string>
    <string name="foreign_files_fail">Einige Dateien konnten nicht verschoben werden</string>
    <string name="foreign_files_local_text">Lokal: %1$s</string>
    <string name="foreign_files_remote_text">Remote: %1$s</string>
    <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung, um die ausgewählten Dateien in den %1$s Ordner zu kopieren. Möchtest Du sie stattdessen verschieben?</string>
 -  <string name="use_ssl">Sichere Verbindung benutzen</string>
 -  <string name="location_no_provider">%1$s kann Dein Gerät nicht verfolgen. Bitte überprüfe Deine Standorteinstellungen</string>
    <string name="pincode_enter_pin_code">Bitte gib Deine App-PIN ein</string>
 -  <string name="pincode_enter_new_pin_code">Bitte gib eine neue App-PIN ein</string>
    <string name="pincode_configure_your_pin">Bitte gib Deine App-PIN ein</string>
    <string name="pincode_configure_your_pin_explanation">PIN-Abfrage erfolgt nach Starten der App.</string>
    <string name="pincode_reenter_your_pincode">Bitte gib Deine App-PIN erneut ein.</string>
@@@ -117,35 -161,72 +122,41 @@@
    <string name="media_err_unsupported">Codierung wird nicht unterstützt</string>
    <string name="media_err_io">Fehler beim Lesen der Datei</string>
    <string name="media_err_malformed">Mediendatei nicht korrekt encodiert</string>
 -  <string name="media_err_timeout">Zeitüberschreitung beim spielen</string>
    <string name="media_err_invalid_progressive_playback">Mediendatei konnte nicht gestreamt werden</string>
    <string name="media_err_unknown">Diese Mediendatei konnte nicht mit dem Standardplayer geöffnet werden</string>
    <string name="media_err_security_ex">Sicherheitsfehler beim Versuch %1$s zu spielen</string>
    <string name="media_err_io_ex">Eingabefehler beim Versuch %1$s zu spielen</string>
    <string name="media_err_unexpected">Ein unerwarteter Fehler ist aufgetreten beim Versuch %1$s abzuspielen</string>
 -  <string name="media_previous_description">Vorheriges Lied Knopf</string>
    <string name="media_rewind_description">Zurückspielen Knopf</string>
    <string name="media_play_pause_description">Play-/Pause Knopf</string>
    <string name="media_forward_description">Vorspulen Knopf</string>
 -  <string name="media_next_description">Nächster Titel Knopf</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 Minuten</item>
 -    <item>30 Minuten</item>
 -    <item>60 Minuten</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">Anmeldungsversuch...</string>
    <string name="auth_no_net_conn_title">Keine Netzwerkverbindung</string>
 -  <string name="auth_no_net_conn_message">Es konnte keine Netzwerkverbindung gefunden werden, bitte überprüfe Deine Internetverbindung.</string>
 -  <string name="auth_connect_anyway">Trotzdem verbinden</string>
    <string name="auth_nossl_plain_ok_title">Sichere Verbindung nicht verfügbar.</string>
 -  <string name="auth_nossl_plain_ok_message">Die App konnte keine sichere Verbindung zum Server herstellen. Eine unsichere Verbindung ist verfügbar. Möchtest Du fortfahren oder abbrechen?</string>
    <string name="auth_connection_established">Verbindung hergestellt</string>
    <string name="auth_testing_connection">Verbindung testen...</string>
    <string name="auth_not_configured_title">Fehlerhafte Server Konfiguration</string>
 -  <string name="auth_not_configured_message">Es scheint, als wäre Deine Server-Installation nicht richtig konfiguriert. Bitte kontaktiere Deinen Administrator, um weitere Details zu erhalten.</string>
 -  <string name="auth_account_not_new">Ein Benutzerkonto für den gleichen Benutzer und Server existiert auf diesem Gerät bereits</string>
 -  <string name="auth_account_not_the_same">Der eingegebene Benutzer passt nicht zu dem Benutzer dieses Benutzerkontos</string>
    <string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
 -  <string name="auth_unknown_error_message">Ein unbekannter Fehler ist aufgetreten. Bitte kontaktiere Deinen Administrator unter Zu­hil­fe­nah­me der Log-Dateien Deines Gerätes.</string>
    <string name="auth_unknown_host_title">Konnte den Host nicht finden.</string>
 -  <string name="auth_unknown_host_message">Konnte den eingetragenen Host nicht finden. Bitte prüfe den Hostnamen und die Verfügbarkeit des Servers und versuche es erneut.</string>
    <string name="auth_incorrect_path_title">Server-Installation nicht gefunden</string>
 -  <string name="auth_incorrect_path_message">Die App konnte den Server unter dem angegebenen Pfad nicht finden. Bitte überprüfe den Pfad und versuche es erneut.</string>
    <string name="auth_timeout_title">Der Server braucht zu lange für eine Antwort.</string>
    <string name="auth_incorrect_address_title">Fehlerhafte URL</string>
    <string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen.</string>
 -  <string name="auth_ssl_unverified_server_title">Nichtüberprüfte SSL-Server-Identität</string>
    <string name="auth_bad_oc_version_title">Unbekannte Server-Version</string>
    <string name="auth_wrong_connection_title">Konnte keine Verbindung aufbauen.</string>
    <string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
    <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>
@@@ -165,12 -246,18 +176,12 @@@
    <string name="wait_a_moment">Bitte warte einen Moment.</string>
    <string name="filedisplay_unexpected_bad_get_content">Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu öffnen</string>
    <string name="filedisplay_no_file_selected">Es wurde keine Datei ausgewählt.</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Anmelden mit oAuth2.</string>
    <string name="oauth_login_connection">Verbinde mit dem oAuth2-Server.</string>
 -  <string name="oauth_code_validation_message">Bitte öffne einen Web-Browser und gehe zu:\n%1$s.\nBestätige diesen Code dort:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Die Verbindung zu dieser URL ist nicht verfügbar.</string>
 -  <string name="ssl_validator_title">Warnung</string>
    <string name="ssl_validator_header">Die Identität der Website konnte nicht überprüft werden</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Das Zertifikat des Servers ist nicht vertrauenswürdig</string>
    <string name="ssl_validator_reason_cert_expired">- Das Zertifikat des Servers ist abgelaufen</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Das Gültigkeitsdatum des Serverzertifikats liegt in der Zukunft</string>
    <string name="ssl_validator_reason_hostname_not_verified">- Die Adresse stimmt nicht mit dem im Zertifikat angegebenen Hostnamen  überein</string>
 -  <string name="ssl_validator_certificate_not_available">Das Zertifikat des Servers konnte nicht abgerufen werden</string>
    <string name="ssl_validator_question">Möchtest Du diesem Zertifikat trotzdem vertrauen?</string>
    <string name="ssl_validator_not_saved">Das Zertifikat konnte nicht gespeichert werden</string>
    <string name="ssl_validator_btn_details_see">Details</string>
@@@ -203,6 -290,8 +214,6 @@@
    <string name="conflict_dont_upload">Nicht hochladen</string>
    <string name="preview_image_description">Bildvorschau</string>
    <string name="preview_image_error_unknown_format">Dieses Bild kann nicht angezeigt werden</string>
 -  <string name="preview_image_error_out_of_memory">Nicht genügend Speicher um das Bild anzuzueigen</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s konnte nicht in den lokalen %2$s Ordner kopiert werden</string>
    <string name="actionbar_failed_instant_upload">Fehlgeschlagener SofortUpload\"</string>
    <string name="failed_upload_headline_text">SofortUpload fehlgeschlagen</string>
diff --combined res/values-en-rGB/strings.xml
index a8ba8ccb,09747157..f7adb5d2
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Password:</string>
 -  <string name="main_login">Username:</string>
 -  <string name="main_button_login">Login</string>
 -  <string name="main_welcome">Welcome</string>
 -  <string name="main_files">Files</string>
 -  <string name="main_music">Music</string>
 -  <string name="main_contacts">Contacts</string>
 -  <string name="main_calendar">Calendar</string>
 -  <string name="main_bookmarks">Bookmarks</string>
 -  <string name="main_settings">Settings</string>
 -  <string name="main_tit_accsetup">Setup Account</string>
 -  <string name="main_wrn_accsetup">There is no account set up on your device. In order to use this App, you need to create one.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">version %1$s</string>
    <string name="actionbar_sync">Refresh account</string>
@@@ -8,10 -20,20 +8,10 @@@
    <string name="actionbar_upload_files">Files</string>
    <string name="actionbar_open_with">Open with</string>
    <string name="actionbar_mkdir">Create directory</string>
 -  <string name="actionbar_search">Search</string>
    <string name="actionbar_settings">Settings</string>
    <string name="actionbar_see_details">Details</string>
    <string name="prefs_category_general">General</string>
    <string name="prefs_category_more">More</string>
 -  <string name="prefs_add_session">Add new session</string>
 -  <string name="prefs_create_img_thumbnails">Create image thumbnails</string>
 -  <string name="prefs_select_oc_account">Select an account</string>
 -  <string name="prefs_summary_select_oc_account">Choose which of your accounts the app should use.</string>
 -  <string name="prefs_trackmydevice">Device Tracking</string>
 -  <string name="prefs_trackmydevice_summary_off">Enable this App to track your device location</string>
 -  <string name="prefs_trackmydevice_summary_on">This App is tracking this device</string>
 -  <string name="prefs_trackmydevice_interval">Update Interval</string>
 -  <string name="prefs_trackmydevice_interval_summary">Update every %1$s minutes</string>
    <string name="prefs_accounts">Accounts</string>
    <string name="prefs_manage_accounts">Manage Accounts</string>
    <string name="prefs_pincode">App PIN</string>
@@@ -24,14 -46,26 +24,18 @@@
    <string name="prefs_log_summary_history">This shows the recorded logs</string>
    <string name="prefs_log_delete_history_button">Delete History</string>
    <string name="prefs_help">Help</string>
+   <string name="prefs_recommend">Recommend to a friend</string>
    <string name="prefs_feedback">Feedback</string>
    <string name="prefs_imprint">Imprint</string>
+   <string name="recommend_subject">Try %1$s on your smartphone!</string>
+   <string name="recommend_text">I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s</string>
    <string name="auth_check_server">Check Server</string>
+   <string name="auth_account_name">Account name</string>
    <string name="auth_host_url">Server address</string>
    <string name="auth_username">Username</string>
    <string name="auth_password">Password</string>
    <string name="auth_register">New to %1$s?</string>
 -  <string name="new_session_uri_error">Incorrect address given</string>
 -  <string name="new_session_session_name_error">Incorrect session name</string>
    <string name="sync_string_files">Files</string>
 -  <string name="uploader_no_file_selected">No file selected for upload</string>
 -  <string name="setup_hint_username">Username</string>
 -  <string name="setup_hint_password">Password</string>
 -  <string name="setup_hint_address">Web address</string>
 -  <string name="setup_hint_show_password">Show password?</string>
 -  <string name="setup_title">Connect to your %1$s</string>
    <string name="setup_btn_connect">Connect</string>
    <string name="uploader_btn_upload_text">Upload</string>
    <string name="uploader_top_message">Choose upload directory:</string>
@@@ -43,6 -77,7 +47,6 @@@
    <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
    <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
    <string name="uploader_info_uploading">Uploading</string>
 -  <string name="uploader_btn_create_dir_text">Create directory for upload</string>
    <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>
    <string name="filedetails_select_file">Tap on a file to display additional information.</string>
    <string name="filedetails_size">Size:</string>
@@@ -51,6 -86,7 +55,6 @@@
    <string name="filedetails_modified">Modified:</string>
    <string name="filedetails_download">Download</string>
    <string name="filedetails_sync_file">Refresh file</string>
 -  <string name="filedetails_redownload">Redownload</string>
    <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
    <string name="common_yes">Yes</string>
    <string name="common_no">No</string>
@@@ -59,6 -95,7 +63,6 @@@
    <string name="common_cancel_upload">Cancel upload</string>
    <string name="common_cancel">Cancel</string>
    <string name="common_save_exit">Save &amp; Exit</string>
 -  <string name="common_exit">Leave %1$s</string>
    <string name="common_error">Error</string>
    <string name="common_loading">Loading …</string>
    <string name="common_error_unknown">Unknown error</string>
@@@ -72,8 -109,10 +76,8 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>
    <string name="uploader_upload_succeeded_ticker">Upload succeeded</string>
    <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
 -  <string name="uploader_upload_succeeded_content_multiple">%1$d files were successfully uploaded</string>
    <string name="uploader_upload_failed_ticker">Upload failed</string>
    <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
 -  <string name="uploader_upload_failed_content_multiple">Upload failed: %1$d/%2$d files were uploaded</string>
    <string name="downloader_download_in_progress_ticker">Downloading …</string>
    <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
    <string name="downloader_download_succeeded_ticker">Download succeeded</string>
@@@ -82,6 -121,7 +86,6 @@@
    <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
    <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
    <string name="common_choose_account">Choose account</string>
 -  <string name="sync_string_contacts">Contacts</string>
    <string name="sync_fail_ticker">Synchronisation failed</string>
    <string name="sync_fail_content">Synchronisation of %1$s could not be completed</string>
    <string name="sync_fail_content_unauthorized">Invalid password for %1$s</string>
@@@ -92,13 -132,17 +96,14 @@@
    <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
    <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
    <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronisation. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
+   <string name="sync_current_folder_was_removed">Folder %1$s does not exist anymore</string>
    <string name="foreign_files_move">Move all</string>
    <string name="foreign_files_success">All files were moved</string>
    <string name="foreign_files_fail">Some files could not be moved</string>
    <string name="foreign_files_local_text">Local: %1$s</string>
    <string name="foreign_files_remote_text">Remote: %1$s</string>
    <string name="upload_query_move_foreign_files">There is not enough space to copy the selected files into the %1$s folder. Would you like to move them instead? </string>
 -  <string name="use_ssl">Use Secure Connection</string>
 -  <string name="location_no_provider">%1$s cannot track your device. Please check your location settings</string>
    <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
 -  <string name="pincode_enter_new_pin_code">Please, insert your new App PIN</string>
    <string name="pincode_configure_your_pin">Enter your App PIN</string>
    <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string>
    <string name="pincode_reenter_your_pincode">Please, re-enter your App PIN</string>
@@@ -117,35 -161,72 +122,41 @@@
    <string name="media_err_unsupported">Unsupported media codec</string>
    <string name="media_err_io">Media file could not be read</string>
    <string name="media_err_malformed">Media file not correctly encoded</string>
 -  <string name="media_err_timeout">Too much time trying to play</string>
    <string name="media_err_invalid_progressive_playback">Media file cannot be streamed</string>
    <string name="media_err_unknown">Media file cannot be played with the stock media player</string>
    <string name="media_err_security_ex">Security error trying to play %1$s</string>
    <string name="media_err_io_ex">Input error trying to play %1$s</string>
    <string name="media_err_unexpected">Unexpected error trying to play %1$s</string>
 -  <string name="media_previous_description">Previous track button</string>
    <string name="media_rewind_description">Rewind button</string>
    <string name="media_play_pause_description">Play or pause button</string>
    <string name="media_forward_description">Fast-forward button</string>
 -  <string name="media_next_description">Next track button</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 Minutes</item>
 -    <item>30 Minutes</item>
 -    <item>60 Minutes</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">Trying to login…</string>
    <string name="auth_no_net_conn_title">No network connection</string>
 -  <string name="auth_no_net_conn_message">No network connection has been detected, check your Internet connection and try again.</string>
 -  <string name="auth_connect_anyway">Connect anyway</string>
    <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
 -  <string name="auth_nossl_plain_ok_message">The Application cannot establish a secured connection to the server. An unsecured connection is available. You may continue or cancel.</string>
    <string name="auth_connection_established">Connection established</string>
    <string name="auth_testing_connection">Testing connection…</string>
    <string name="auth_not_configured_title">Malformed server configuration</string>
 -  <string name="auth_not_configured_message">It seems that your server instance is not configured correctly. Contact your administrator for more details.</string>
 -  <string name="auth_account_not_new">An account for the same user and server already exists on the device</string>
 -  <string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
    <string name="auth_unknown_error_title">Unknown error occurred!</string>
 -  <string name="auth_unknown_error_message">An unknown error occurred. Please contact support and include logs from your device.</string>
    <string name="auth_unknown_host_title">Couldn\'t find host</string>
 -  <string name="auth_unknown_host_message">Couldn\'t find the entered host. Please check hostname and server availability and try again.</string>
    <string name="auth_incorrect_path_title">Server instance not found</string>
 -  <string name="auth_incorrect_path_message">Application couldn\'t find a server instance at the given path. Please check your path and try again.</string>
    <string name="auth_timeout_title">The server took too long to respond</string>
    <string name="auth_incorrect_address_title">Malformed URL</string>
    <string name="auth_ssl_general_error_title">SSL initialisation failed</string>
 -  <string name="auth_ssl_unverified_server_title">Unverified SSL server\'s identity</string>
    <string name="auth_bad_oc_version_title">Unrecognised server version</string>
    <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
    <string name="auth_secure_connection">Secure connection established</string>
    <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>
@@@ -165,12 -246,18 +176,12 @@@
    <string name="wait_a_moment">Wait a moment</string>
    <string name="filedisplay_unexpected_bad_get_content">Unexpected problem; please select the file from a different app</string>
    <string name="filedisplay_no_file_selected">No file was selected</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Login with oAuth2.</string>
    <string name="oauth_login_connection">Connecting to oAuth2 server…</string>
 -  <string name="oauth_code_validation_message">Please, open a web browser and go to:\n%1$s.\nValidate this code there:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Connection to this URL not available.</string>
 -  <string name="ssl_validator_title">Warning</string>
    <string name="ssl_validator_header">The identity of the site could not be verified</string>
    <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>
    <string name="ssl_validator_reason_cert_expired">- The server certificate expired</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- The server certificate valid dates are in the future</string>
    <string name="ssl_validator_reason_hostname_not_verified">- The URL does not match the hostname in the certificate</string>
 -  <string name="ssl_validator_certificate_not_available">The server certificate could not be obtained</string>
    <string name="ssl_validator_question">Do you want to trust this certificate anyway?</string>
    <string name="ssl_validator_not_saved">The certificate could not be saved</string>
    <string name="ssl_validator_btn_details_see">Details</string>
@@@ -203,6 -290,8 +214,6 @@@
    <string name="conflict_dont_upload">Don\'t upload</string>
    <string name="preview_image_description">Image preview</string>
    <string name="preview_image_error_unknown_format">This image cannot be shown</string>
 -  <string name="preview_image_error_out_of_memory">\"Not enough memory to show this image</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local directory</string>
    <string name="actionbar_failed_instant_upload">Failed InstantUpload\"</string>
    <string name="failed_upload_headline_text">Failed instant uploads</string>
diff --combined res/values-es/strings.xml
index 9317b24a,dd8ef913..51395c83
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Contraseña:</string>
 -  <string name="main_login">Nombre de usuario:</string>
 -  <string name="main_button_login">Iniciar sesión</string>
 -  <string name="main_welcome">Bienvenido</string>
 -  <string name="main_files">Archivos</string>
 -  <string name="main_music">Música</string>
 -  <string name="main_contacts">Contactos</string>
 -  <string name="main_calendar">Calendario</string>
 -  <string name="main_bookmarks">Marcadores</string>
 -  <string name="main_settings">Ajustes</string>
 -  <string name="main_tit_accsetup">Configuración de cuenta</string>
 -  <string name="main_wrn_accsetup">No hay cuentas en tu dispositivo. Para usar esta aplicación, necesitas crear una.</string>
    <string name="about_android">App Android %1$s</string>
    <string name="about_version">versión %1$s</string>
    <string name="actionbar_sync">Actualizar cuenta</string>
@@@ -8,10 -20,17 +8,10 @@@
    <string name="actionbar_upload_files">Archivos</string>
    <string name="actionbar_open_with">Abrir con</string>
    <string name="actionbar_mkdir">Crear directorio</string>
 -  <string name="actionbar_search">Buscar</string>
    <string name="actionbar_settings">Ajustes</string>
    <string name="actionbar_see_details">Detalles</string>
    <string name="prefs_category_general">General</string>
    <string name="prefs_category_more">Más</string>
 -  <string name="prefs_add_session">Agregar nueva sesión</string>
 -  <string name="prefs_create_img_thumbnails">Crear miniaturas de imagen</string>
 -  <string name="prefs_select_oc_account">Seleccionar una cuenta</string>
 -  <string name="prefs_trackmydevice_summary_off">Permitir la localización de tu dispositivo</string>
 -  <string name="prefs_trackmydevice_summary_on">La app realiza un seguimiento de este dispositivo</string>
 -  <string name="prefs_trackmydevice_interval_summary">Actualizar cada %1$s minutos</string>
    <string name="prefs_accounts">Cuentas</string>
    <string name="prefs_manage_accounts">Gestionar cuentas</string>
    <string name="prefs_pincode">PIN de aplicación </string>
@@@ -24,14 -43,23 +24,17 @@@
    <string name="prefs_log_summary_history">Esto muestra los registros grabados</string>
    <string name="prefs_log_delete_history_button">Eliminar Historial</string>
    <string name="prefs_help">Ayuda</string>
+   <string name="prefs_recommend">Recomendar a un amigo</string>
    <string name="prefs_feedback">Mensajes de retroalimentación</string>
    <string name="prefs_imprint">Imprint</string>
+   <string name="recommend_subject">Prueba  %1$s en tu smarthphone!</string>
+   <string name="recommend_text">Quiero invitarte a usar %1$s en tu smarthphone!⏎\nDescargalo aquí: %2$s</string>
    <string name="auth_check_server">Compruebe el servidor.</string>
    <string name="auth_host_url">Dirección del servidor</string>
    <string name="auth_username">Nombre de usuario</string>
    <string name="auth_password">Contraseña</string>
    <string name="auth_register">New to %1$s?</string>
    <string name="sync_string_files">Archivos</string>
 -  <string name="uploader_no_file_selected">No se seleccionaron archivos para enviar</string>
 -  <string name="setup_hint_username">Nombre de usuario</string>
 -  <string name="setup_hint_password">Contraseña</string>
 -  <string name="setup_hint_address">Dirección web</string>
 -  <string name="setup_hint_show_password">¿Mostrar contraseña?</string>
 -  <string name="setup_title">Conectar a tu %1$s</string>
    <string name="setup_btn_connect">Conectar</string>
    <string name="uploader_btn_upload_text">Subir</string>
    <string name="uploader_top_message">Escoja el directorio de carga:</string>
@@@ -51,6 -79,7 +54,6 @@@
    <string name="filedetails_modified">Modificado:</string>
    <string name="filedetails_download">Descargar</string>
    <string name="filedetails_sync_file">Actualizar archivo</string>
 -  <string name="filedetails_redownload">Volver a descargar</string>
    <string name="filedetails_renamed_in_upload_msg">El fichero fue renombrado como %1$s durante la subida</string>
    <string name="common_yes">Sí</string>
    <string name="common_no">No</string>
@@@ -59,6 -88,7 +62,6 @@@
    <string name="common_cancel_upload">Cancelar subida</string>
    <string name="common_cancel">Cancelar</string>
    <string name="common_save_exit">Guardar &amp; Salir</string>
 -  <string name="common_exit">Salir de %1$s</string>
    <string name="common_error">Error</string>
    <string name="common_loading">Cargando ...</string>
    <string name="common_error_unknown">Error desconocido</string>
@@@ -74,6 -104,7 +77,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s se ha subido con éxito</string>
    <string name="uploader_upload_failed_ticker">Error en la subida</string>
    <string name="uploader_upload_failed_content_single">La subida de %1$s no se pudo completar</string>
 -  <string name="uploader_upload_failed_content_multiple">Error de subida: %1$d/%2$d archivos fueron cargados</string>
    <string name="downloader_download_in_progress_ticker">Descargando ...</string>
    <string name="downloader_download_in_progress_content">%1$s Descargada de %2$s</string>
    <string name="downloader_download_succeeded_ticker">Descarga completa</string>
@@@ -82,6 -113,7 +85,6 @@@
    <string name="downloader_download_failed_content">La descarga de %1$s no se pudo completar</string>
    <string name="downloader_not_downloaded_yet">No descargado</string>
    <string name="common_choose_account">Elige una cuenta</string>
 -  <string name="sync_string_contacts">Contactos</string>
    <string name="sync_fail_ticker">Falló la sincronización</string>
    <string name="sync_fail_content">La sincronización de %1$s s no se pudo completar</string>
    <string name="sync_fail_content_unauthorized">Contraseña no válida para %1$s</string>
@@@ -98,7 -130,10 +101,7 @@@
    <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 suficiente espacio para copiar los archivos seleccionados en la carpeta %1$s. ¿Quiere moverlos en lugar de copiarlos?</string>
 -  <string name="use_ssl">Usar conexión segura</string>
 -  <string name="location_no_provider">%1$s no puede rastear tu dispositivo. Por favor chequea tu configuración de localización</string>
    <string name="pincode_enter_pin_code">Por favor, inserta tu PIN de aplicación</string>
 -  <string name="pincode_enter_new_pin_code">Por favor, inserta tu nuevo PIN de aplicación</string>
    <string name="pincode_configure_your_pin">Introduzca un PIN para la aplicación</string>
    <string name="pincode_configure_your_pin_explanation">Se solicitará el PIN cada vez que se inicie la aplicación</string>
    <string name="pincode_reenter_your_pincode">Repita el PIN para la aplicación, por favor</string>
@@@ -117,35 -152,67 +120,40 @@@
    <string name="media_err_unsupported">Codec No Soportado</string>
    <string name="media_err_io">El archivo de medios no pudo ser leído </string>
    <string name="media_err_malformed">Archivo no codificado correctamente</string>
 -  <string name="media_err_timeout">Demasiado tiempo intentando reproducir</string>
    <string name="media_err_invalid_progressive_playback">Archivo de medio no puede ser transmitido</string>
    <string name="media_err_unknown">El archivo de medios no se puede reproducir con el reproductor de medios por defecto </string>
    <string name="media_err_security_ex">Error de seguridad al intentar reproducir %1$s</string>
    <string name="media_err_io_ex">Error de entrada al intentar reproducir %1$s</string>
    <string name="media_err_unexpected">Error inesperado intentando reproducir %1$s</string>
 -  <string name="media_previous_description">Botón de canción anterior </string>
    <string name="media_rewind_description">Botón Rebobinado</string>
    <string name="media_play_pause_description">Botón de reproducción o pausa </string>
    <string name="media_forward_description">Botón avance rápido</string>
 -  <string name="media_next_description">Botón de siguiente canción </string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minutos</item>
 -    <item>30 minutos</item>
 -    <item>60 minutos</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">Intentado iniciar sesión...</string>
    <string name="auth_no_net_conn_title">Sin conexión de red</string>
 -  <string name="auth_connect_anyway">Conectar de todos modos</string>
    <string name="auth_nossl_plain_ok_title">Conexión segura no disponible.</string>
    <string name="auth_connection_established">Conexión establecida</string>
    <string name="auth_testing_connection">Probando conexión...</string>
    <string name="auth_not_configured_title">Configuración de servidor en formato incorrecto</string>
 -  <string name="auth_not_configured_message">Parece que tu servidor no está correctamente configurado. Contacta a tu administrador para más detalles.</string>
 -  <string name="auth_account_not_new">Una cuenta para el mismo usuario y servidor ya existen en el dispositivo</string>
 -  <string name="auth_account_not_the_same">El usuario introducido no concuerda con el usuario de esta cuenta</string>
    <string name="auth_unknown_error_title">Ocurrió un error desconocido</string>
    <string name="auth_unknown_host_title">No se pudo encontrar la dirección</string>
 -  <string name="auth_unknown_host_message">No se pudo encontrar el dirección introducida. Consulte la disponibilidad del servidor y la dirección e intenta nuevamete.</string>
    <string name="auth_incorrect_path_title">Instancia de servidor no encontrada</string>
 -  <string name="auth_incorrect_path_message">La aplicación no pudo encontrar la instancia del servidor en la ruta de acceso dada. Por favor, compruebe la ruta de acceso e inténtelo de nuevo.</string>
    <string name="auth_timeout_title">El servidor ha tardado demasiado en responder</string>
    <string name="auth_incorrect_address_title">URL no válida</string>
    <string name="auth_ssl_general_error_title">Falló la inicialización SSL</string>
 -  <string name="auth_ssl_unverified_server_title">Identidad del Servidor SSL no verificada</string>
    <string name="auth_bad_oc_version_title">No se reconoce  la versión del servidor </string>
    <string name="auth_wrong_connection_title">No se ha podido establecer la conexión</string>
    <string name="auth_secure_connection">Conexión segura establecida</string>
    <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>
@@@ -165,12 -232,18 +173,12 @@@
    <string name="wait_a_moment">Espere un momento</string>
    <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, prueba otra app para seleccionar el archivo</string>
    <string name="filedisplay_no_file_selected">No fué seleccionado ningún archivo</string>
 -  <string name="oauth_host_url">URL oAuth2</string>
 -  <string name="oauth_check_onoff">Ingresar con oAuth2.</string>
    <string name="oauth_login_connection">Conectando al servidor oAuth2...</string>
 -  <string name="oauth_code_validation_message">Por favor, abra un navegador web y vaya a:\n%1$s.\nValidarse ahí con este código:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Conexión a está URL no disponible.</string>
 -  <string name="ssl_validator_title">Precaución</string>
    <string name="ssl_validator_header">La identidad del sitio no puede ser verificada</string>
    <string name="ssl_validator_reason_cert_not_trusted">- El certificado del servidor no es de confianza</string>
    <string name="ssl_validator_reason_cert_expired">- El certificado del servidor expiró</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- El certificado del servidor es demasiado reciente</string>
    <string name="ssl_validator_reason_hostname_not_verified">- La URL no coincide con el nombre de dominio del certificado</string>
 -  <string name="ssl_validator_certificate_not_available">No se pudo obtener el certificado del servidor</string>
    <string name="ssl_validator_question">¿Confías de todas formas en este certificado?</string>
    <string name="ssl_validator_not_saved">El certificado no pudo ser guardado</string>
    <string name="ssl_validator_btn_details_see">Detalles</string>
@@@ -203,6 -276,8 +211,6 @@@
    <string name="conflict_dont_upload">No subir</string>
    <string name="preview_image_description">Previsualización de imagen</string>
    <string name="preview_image_error_unknown_format">No se puede mostrar la imagen</string>
 -  <string name="preview_image_error_out_of_memory">No hay suficiente memoria para mostrar esta imagen</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s no puede ser copiado al %2$s directorio local </string>
    <string name="actionbar_failed_instant_upload">Carga instantánea fallida</string>
    <string name="failed_upload_headline_text">Cargas instantáneas fallidas</string>
diff --combined res/values-et-rEE/strings.xml
index e42e1f4d,6e491c67..549fb2f1
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Parool:</string>
 -  <string name="main_login">Kasutajanimi:</string>
 -  <string name="main_button_login">Logi sisse</string>
 -  <string name="main_welcome">Teretulemast</string>
 -  <string name="main_files">Failid</string>
 -  <string name="main_music">Muusika</string>
 -  <string name="main_contacts">Kontaktid</string>
 -  <string name="main_calendar">Kalender</string>
 -  <string name="main_bookmarks">Järjehoidjad</string>
 -  <string name="main_settings">Seaded</string>
 -  <string name="main_tit_accsetup">Konto seadistamine</string>
 -  <string name="main_wrn_accsetup">Sinu seadmes pole ühtegi kontot. Selle rakenduse kasutamiseks pead sa ühe looma.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">versioon %1$s</string>
    <string name="actionbar_sync">Värskenda kontot</string>
@@@ -8,10 -20,17 +8,10 @@@
    <string name="actionbar_upload_files">Failid</string>
    <string name="actionbar_open_with">Ava rakendusega</string>
    <string name="actionbar_mkdir">Loo kaust</string>
 -  <string name="actionbar_search">Otsi</string>
    <string name="actionbar_settings">Seaded</string>
    <string name="actionbar_see_details">Üksikasjad</string>
    <string name="prefs_category_general">Üldine</string>
    <string name="prefs_category_more">Rohkem</string>
 -  <string name="prefs_add_session">Lisa uus sessioon</string>
 -  <string name="prefs_create_img_thumbnails">Loo pisipildid</string>
 -  <string name="prefs_select_oc_account">Vali konto</string>
 -  <string name="prefs_trackmydevice_summary_off">Luba jälgida oma seadme asukohta</string>
 -  <string name="prefs_trackmydevice_summary_on">Sinu jälgib seda seadet</string>
 -  <string name="prefs_trackmydevice_interval_summary">Uuenda iga %1$s minuti tagant</string>
    <string name="prefs_accounts">Kontod</string>
    <string name="prefs_manage_accounts">Halda kontosid</string>
    <string name="prefs_pincode">Rakenduse PIN</string>
@@@ -24,14 -43,23 +24,17 @@@
    <string name="prefs_log_summary_history">See näitab salvestatud logisid</string>
    <string name="prefs_log_delete_history_button">Kustuta ajalugu</string>
    <string name="prefs_help">Abiinfo</string>
+   <string name="prefs_recommend">Soovita sõbrale</string>
    <string name="prefs_feedback">Tagasiside</string>
    <string name="prefs_imprint">Impressum</string>
+   <string name="recommend_subject">Proovi oma nutitelefonil rakendust %1$s!</string>
+   <string name="recommend_text">Soovin sind kutsuda kasutama oma nutitelefonil rakendust %1$s!\nLae alla siit: %2$s</string>
    <string name="auth_check_server">Kontrolli serverit</string>
    <string name="auth_host_url">Serveri aadress</string>
    <string name="auth_username">Kasutajanimi</string>
    <string name="auth_password">Parool</string>
    <string name="auth_register">Uus %1$s kasutaja?</string>
    <string name="sync_string_files">Failid</string>
 -  <string name="uploader_no_file_selected">Üleslaadimiseks pole ühtegi faili valitud</string>
 -  <string name="setup_hint_username">Kasutajanimi</string>
 -  <string name="setup_hint_password">Parool</string>
 -  <string name="setup_hint_address">Veebiaadress</string>
 -  <string name="setup_hint_show_password">Näita parooli?</string>
 -  <string name="setup_title">Ühenda oma %1$siga</string>
    <string name="setup_btn_connect">Ühenda</string>
    <string name="uploader_btn_upload_text">Lae üles</string>
    <string name="uploader_top_message">Vali kataloog serveris: </string>
@@@ -43,6 -71,7 +46,6 @@@
    <string name="uploader_wrn_no_content_text">Sisu ei saadud. Pole midagi üles laadida.</string>
    <string name="uploader_error_forbidden_content">%1$sile pole lubatud ligipääs jagatud sisule</string>
    <string name="uploader_info_uploading">Üleslaadimine</string>
 -  <string name="uploader_btn_create_dir_text">Loo üleslaadimise jaoks kaust</string>
    <string name="file_list_empty">Selles kaustas pole ühtegi faili.\nUusi faile saab lisada kasutades menüü valikut \"Lae üles\".</string>
    <string name="filedetails_select_file">Lisainfo vaatamiseks vajuta failile.</string>
    <string name="filedetails_size">Suurus:</string>
@@@ -51,6 -80,7 +54,6 @@@
    <string name="filedetails_modified">Muudetud:</string>
    <string name="filedetails_download">Lae alla</string>
    <string name="filedetails_sync_file">Värskenda faili</string>
 -  <string name="filedetails_redownload">Lae uuesti alla</string>
    <string name="filedetails_renamed_in_upload_msg">Fail nimetati üleslaadimise käigus ümber %1$ </string>
    <string name="common_yes">Jah</string>
    <string name="common_no">Ei</string>
@@@ -59,6 -89,7 +62,6 @@@
    <string name="common_cancel_upload">Tühista üleslaadimine</string>
    <string name="common_cancel">Loobu</string>
    <string name="common_save_exit">Salvesta &amp; Välju</string>
 -  <string name="common_exit">Lahku %1$sist</string>
    <string name="common_error">Viga</string>
    <string name="common_loading">Laadimine ...</string>
    <string name="common_error_unknown">Tundmatu viga</string>
@@@ -74,6 -105,7 +77,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s laeti üles</string>
    <string name="uploader_upload_failed_ticker">Üleslaadimine ebaõnnestus</string>
    <string name="uploader_upload_failed_content_single">%1$s üleslaadimise lõpetamine ebaõnnestus</string>
 -  <string name="uploader_upload_failed_content_multiple">Üleslaadimine ebaõnnestus: %1$d/%2$d faili laeti üles</string>
    <string name="downloader_download_in_progress_ticker">Allalaadimine ...</string>
    <string name="downloader_download_in_progress_content">%1$d%% allalaadimine %2$s</string>
    <string name="downloader_download_succeeded_ticker">Allalaadimine oli edukas</string>
@@@ -82,6 -114,7 +85,6 @@@
    <string name="downloader_download_failed_content">%1$s allalaadimist ei õnnestunud lõpetada</string>
    <string name="downloader_not_downloaded_yet">Allalaadimata</string>
    <string name="common_choose_account">Vali konto</string>
 -  <string name="sync_string_contacts">Kontaktid</string>
    <string name="sync_fail_ticker">Sünkroniseerimine ebaõnnestus</string>
    <string name="sync_fail_content">%1$s sünkroniseerimise lõpetamine ebaõnnestus</string>
    <string name="sync_fail_content_unauthorized">Vigane parool %1$s jaoks</string>
@@@ -98,7 -131,10 +101,7 @@@
    <string name="foreign_files_local_text">Kohalik: %1$s</string>
    <string name="foreign_files_remote_text">Serveris: %1$s</string>
    <string name="upload_query_move_foreign_files">Pole piisavalt ruumi kopeerimaks valitud faile kataloogi %1$s. Soovid kopeerimise asemel neid ümber tõsta?</string>
 -  <string name="use_ssl">Kasuta turvalist ühendust</string>
 -  <string name="location_no_provider">%1$s ei saa sinu seadet jälgida. Palun kontrolli oma asukoha seadeid</string>
    <string name="pincode_enter_pin_code">Palun sisesta oma rakenduse PIN</string>
 -  <string name="pincode_enter_new_pin_code">Palun sisesta oma rakenduse uus PIN</string>
    <string name="pincode_configure_your_pin">Sisesta oma rakenduse PIN</string>
    <string name="pincode_configure_your_pin_explanation">PIN-i nõutakse iga kord, kui rakendus käivitatakse</string>
    <string name="pincode_reenter_your_pincode">Palun sisesta oma rakenduse PIN uuesti</string>
@@@ -117,35 -153,68 +120,41 @@@
    <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>
    <string name="auth_not_configured_title">Vigases vormingus server seadistus</string>
 -  <string name="auth_not_configured_message">Näib, et sinu server pole korralikult seadistatud. Lisainfo saamiseks võta ühendust oma administraatoriga.</string>
 -  <string name="auth_account_not_new">Sama konto  kasutaja ja server on juba selles seadmes olemas</string>
 -  <string name="auth_account_not_the_same">Sisestatud kasutaja ei kattu selle konto kasutajaga</string>
    <string name="auth_unknown_error_title">Tekkis tundmatu tõrge!</string>
    <string name="auth_unknown_host_title">Hosti ei leitud</string>
 -  <string name="auth_unknown_host_message">Sisestatud hosti ei leitud. Palun kontrolli hostiinme ja serveri kättesaadavust ning proovi seejärel uuesti.</string>
    <string name="auth_incorrect_path_title">server protsessi ei leitud</string>
 -  <string name="auth_incorrect_path_message">Rakendus antud asukohast serverit. Palun kontrolli asukohta ja proovi uuesti.</string>
    <string name="auth_timeout_title">Serveri vastus võttis liiga kaua aega</string>
    <string name="auth_incorrect_address_title">Vigases vormingus URL</string>
    <string name="auth_ssl_general_error_title">SSL-i käivitamine ebaõnnestus</string>
+   <string name="auth_ssl_unverified_server_title">Kinnitamata SSL serveri identiteet</string>
    <string name="auth_bad_oc_version_title">Tundmatu serveri versioon</string>
    <string name="auth_wrong_connection_title">Ühenduse loomine ebaõnnestus</string>
    <string name="auth_secure_connection">Saavutati turvaline ühendus</string>
    <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>
@@@ -165,12 -234,18 +174,12 @@@
    <string name="wait_a_moment">Oota hetk</string>
    <string name="filedisplay_unexpected_bad_get_content">Ootamatu tõrge ; palun kasuta faili valimiseks mõnda teist rakendust</string>
    <string name="filedisplay_no_file_selected">Ühtegi faili pole valitud</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Logi sisse oAuth2 kasutades.</string>
    <string name="oauth_login_connection">Ühendun oAuth2 serverisse...</string>
 -  <string name="oauth_code_validation_message">Palun ava veebibrauser ning mine:⏎\n%1$s.⏎\nKontrolli seda koodi seal:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Ühendus sellel aadressile pole saadaval</string>
 -  <string name="ssl_validator_title">Hoiatus</string>
    <string name="ssl_validator_header">Saidi identiteeti ei suudetud kinnitada</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Serveri sertifikaat pole usaldusväärne</string>
    <string name="ssl_validator_reason_cert_expired">- Serveri sertifikaat on aegunud</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Serveri sertifikaat kehtivad kuupäevad on alles tulevikus</string>
    <string name="ssl_validator_reason_hostname_not_verified">- URL ei kattu sertifikaadis oleva hostinimega</string>
 -  <string name="ssl_validator_certificate_not_available">Serveri sertifikaati ei õnnestunud hankida</string>
    <string name="ssl_validator_question">Kas sa soovid siiski seda sertifikaati usaldada?</string>
    <string name="ssl_validator_not_saved">Sertifikaadi salvestamine ebaõnnestus</string>
    <string name="ssl_validator_btn_details_see">Üksikasjad</string>
@@@ -203,6 -278,8 +212,6 @@@
    <string name="conflict_dont_upload">Ära uuenda</string>
    <string name="preview_image_description">Pildi eelvaade</string>
    <string name="preview_image_error_unknown_format">Seda pilti ei saa näidata</string>
 -  <string name="preview_image_error_out_of_memory">Pole piisavat mälu pildi näitamiseks</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s ei suudetud kopeerida kohalikku kataloogi failina %2$s</string>
    <string name="actionbar_failed_instant_upload">Ebaõnnestunud kohene üleslaadimine</string>
    <string name="failed_upload_headline_text">Ebaõnnestunud kohesed üleslaadimised</string>
diff --combined res/values-fi-rFI/strings.xml
index d7a6755f,6eb8327e..26a0e16c
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Salasana:</string>
 -  <string name="main_login">Käyttäjätunnus:</string>
 -  <string name="main_button_login">Kirjaudu</string>
 -  <string name="main_welcome">Tervetuloa </string>
 -  <string name="main_files">Tiedostot</string>
 -  <string name="main_music">Musiikki</string>
 -  <string name="main_contacts">Yhteystiedot</string>
 -  <string name="main_calendar">Kalenteri</string>
 -  <string name="main_bookmarks">Kirjanmerkit</string>
 -  <string name="main_settings">Asetukset</string>
 -  <string name="main_tit_accsetup">Aseta tili</string>
 -  <string name="main_wrn_accsetup">Laitteessasi ei ole tilejä. Luo tili käyttääksesi tätä sovellusta.</string>
    <string name="about_android">%1$s-Android-sovellus</string>
    <string name="about_version">versio %1$s</string>
    <string name="actionbar_sync">Päivitä tili</string>
@@@ -8,16 -20,27 +8,18 @@@
    <string name="actionbar_upload_files">Tiedostot</string>
    <string name="actionbar_open_with">Avaa sovelluksella</string>
    <string name="actionbar_mkdir">Luo kansio</string>
 -  <string name="actionbar_search">Etsi</string>
    <string name="actionbar_settings">Asetukset</string>
    <string name="actionbar_see_details">Tiedot</string>
    <string name="prefs_category_general">Yleiset</string>
    <string name="prefs_category_more">Enemmän</string>
 -  <string name="prefs_add_session">Lisää uusi istunto</string>
 -  <string name="prefs_create_img_thumbnails">Luo kuvista pikkukuvat</string>
 -  <string name="prefs_select_oc_account">Valitse tili</string>
 -  <string name="prefs_trackmydevice">Laitteen jäljitys</string>
 -  <string name="prefs_trackmydevice_summary_off">Salli jäljittää laitteesi sijainti</string>
 -  <string name="prefs_trackmydevice_summary_on">Jäljittää tätä laitetta</string>
 -  <string name="prefs_trackmydevice_interval">Päivitysväli</string>
 -  <string name="prefs_trackmydevice_interval_summary">Päivitä %1$s minuutin välein</string>
    <string name="prefs_accounts">Tilit</string>
    <string name="prefs_manage_accounts">Tilien hallinta</string>
    <string name="prefs_pincode">Sovelluksen PIN-koodi</string>
    <string name="prefs_pincode_summary">Suojaa Asiakasohjelmasi</string>
    <string name="prefs_instant_upload">Käytä välitöntä lähetystä</string>
    <string name="prefs_instant_upload_summary">Lähetä kameralla otetut kuvat välittömästi</string>
+   <string name="prefs_log_title">Käytä lokitusta</string>
+   <string name="prefs_log_summary_history">Tämä näyttää tallennetut lokit</string>
    <string name="prefs_log_delete_history_button">Poista historia</string>
    <string name="prefs_help">Ohje</string>
    <string name="prefs_recommend">Suosittele kaverille</string>
@@@ -25,11 -48,18 +27,12 @@@
    <string name="recommend_subject">Kokeile %1$sia älypuhelimellasi!</string>
    <string name="recommend_text">Ota %1$s käyttöösi älypuhelimessa!\nLataa tästä: %2$s</string>
    <string name="auth_check_server">Tarkista palvelin</string>
+   <string name="auth_account_name">Tilin nimi</string>
    <string name="auth_host_url">Palvelimen osoite</string>
    <string name="auth_username">Käyttäjätunnus</string>
    <string name="auth_password">Salasana</string>
    <string name="auth_register">Onko %1$s uusi tuttavuus sinulle?</string>
    <string name="sync_string_files">Tiedostot</string>
 -  <string name="uploader_no_file_selected">Tiedostoa ei valittu lähetettäväksi</string>
 -  <string name="setup_hint_username">Käyttäjätunnus</string>
 -  <string name="setup_hint_password">Salasana</string>
 -  <string name="setup_hint_address">Verkko-osoite</string>
 -  <string name="setup_hint_show_password">Näytä salasana</string>
 -  <string name="setup_title">Yhdistä omaan %1$siin</string>
    <string name="setup_btn_connect">Yhdistä</string>
    <string name="uploader_btn_upload_text">Lähetä</string>
    <string name="uploader_top_message">Valitse lähetyskansio:</string>
@@@ -41,6 -71,7 +44,6 @@@
    <string name="uploader_wrn_no_content_text">Sisältöä ei saatu. Ei lähetettävää palvelimelle.</string>
    <string name="uploader_error_forbidden_content">%1$silla ei ole oikeuksia jaettuun sisältöön</string>
    <string name="uploader_info_uploading">Lähetetään</string>
 -  <string name="uploader_btn_create_dir_text">Luo kansio latausta varten</string>
    <string name="file_list_empty">Tässä kansiossa ei ole tiedostoja.\nUusia tiedostoja voi lisätä käyttäen valikon \"Lähetä\"-toimintoa.</string>
    <string name="filedetails_select_file">Napauta tiedostoa nähdäksesi lisätietoja.</string>
    <string name="filedetails_size">Koko:</string>
@@@ -49,6 -80,7 +52,6 @@@
    <string name="filedetails_modified">Muokattu:</string>
    <string name="filedetails_download">Lataa</string>
    <string name="filedetails_sync_file">Päivitä tiedosto</string>
 -  <string name="filedetails_redownload">Lataa uudelleen</string>
    <string name="filedetails_renamed_in_upload_msg">Tiedoston nimeksi muutettiin %1$s siirron yhteydessä</string>
    <string name="common_yes">Kyllä</string>
    <string name="common_no">Ei</string>
@@@ -57,6 -89,7 +60,6 @@@
    <string name="common_cancel_upload">Peru lähetys</string>
    <string name="common_cancel">Peru</string>
    <string name="common_save_exit">Tallenna ja poistu</string>
 -  <string name="common_exit">Jätä %1$s</string>
    <string name="common_error">Virhe</string>
    <string name="common_loading">Ladataan…</string>
    <string name="common_error_unknown">Tuntematon virhe</string>
@@@ -72,6 -105,7 +75,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s lähetettiin onnistuneesti</string>
    <string name="uploader_upload_failed_ticker">Lähetys epäonnistui</string>
    <string name="uploader_upload_failed_content_single">%1$s :n lähetys palvelimelle jäi kesken</string>
 -  <string name="uploader_upload_failed_content_multiple">Lähetys epäonnistui: %1$d/%2$d tiedostoa lähetettiin</string>
    <string name="downloader_download_in_progress_ticker">Ladataan...</string>
    <string name="downloader_download_in_progress_content">%1$d%% ladataan palvelimelta %2$s</string>
    <string name="downloader_download_succeeded_ticker">Lataus tänne onnistui</string>
@@@ -79,18 -113,24 +82,20 @@@
    <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>
    <string name="sync_fail_in_favourites_content">Hakemiston %1$d tiedostoja ei voitu synkronoida (%2$d konfliktia)</string>
+   <string name="sync_current_folder_was_removed">Kansiota %1$s ei ole enää olemassa</string>
    <string name="foreign_files_move">Siirrä kaikki</string>
    <string name="foreign_files_success">Kaikki tiedostot siirrettiin</string>
    <string name="foreign_files_fail">Joidenkin tiedostojen siirtäminen epäonnistui</string>
    <string name="foreign_files_local_text">Paikallinen: %1$s</string>
    <string name="foreign_files_remote_text">Etä: %1$s</string>
 -  <string name="use_ssl">Käytä salattua yhteyttä</string>
 -  <string name="location_no_provider">%1$s ei voi jäljittää laitettasi. Tarkista laitteesi sijaintiasetukset</string>
    <string name="pincode_enter_pin_code">Aseta sovelluksesi PIN</string>
 -  <string name="pincode_enter_new_pin_code">Anna uuden sovelluksesi PIN-koodi</string>
    <string name="pincode_configure_your_pin">Anna sovelluksen PIN</string>
    <string name="pincode_configure_your_pin_explanation">PIN kysytään joka kerta, kun sovellus käynnistetään</string>
    <string name="pincode_reenter_your_pincode">Anna sovelluksen PIN uudestaan</string>
@@@ -103,35 -143,59 +108,35 @@@
    <string name="media_state_loading">%1$s (ladataan)</string>
    <string name="media_err_nothing_to_play">Mediatiedostoa ei löytynyt</string>
    <string name="media_err_io">Mediatiedoston luku ei onnistunut</string>
 -  <string name="media_previous_description">Edellinen kappale -painike</string>
    <string name="media_rewind_description">Taaksepäin kelaus -painike</string>
    <string name="media_play_pause_description">Toisto tai keskeytys -painike</string>
    <string name="media_forward_description">Eteenpäin kelaus -painike</string>
 -  <string name="media_next_description">Seuraava kappale -painike</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minuuttia</item>
 -    <item>30 minuuttia</item>
 -    <item>60 minuuttia</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">Yritetään kirjautua...</string>
    <string name="auth_no_net_conn_title">Ei verkkoyhteyttä</string>
 -  <string name="auth_connect_anyway">Yhdistä silti</string>
    <string name="auth_nossl_plain_ok_title">Salattu yhteys ei ole käytettävissä.</string>
    <string name="auth_connection_established">Yhteys muodostettu</string>
    <string name="auth_testing_connection">Testataan yhteyttä...</string>
    <string name="auth_not_configured_title">Väärin tehdyt palvelin-asetukset</string>
 -  <string name="auth_not_configured_message">Vaikuttaa ettei palvelin ole oikein määritetty. Ota yhteyttä ylläpitäjään.</string>
    <string name="auth_account_not_new">Laitteella on jo tili samalle käyttäjälle ja palvelimelle</string>
    <string name="auth_unknown_error_title">Tuntematon virhe</string>
    <string name="auth_unknown_host_title">Isäntää ei löydy</string>
 -  <string name="auth_unknown_host_message">Annettua isäntää ei löydy. Tarkista nimi ja onko palvelin käytettävissä, yritä sitten uudestaan.</string>
    <string name="auth_incorrect_path_title">Palvelin-instanssia ei löydetty</string>
 -  <string name="auth_incorrect_path_message">Sovellus ei löydä palvelin-instanssia annetusta polusta. Tarkista polku ja yritä uudestaan.</string>
    <string name="auth_timeout_title">Palvelimen vastaus viipyy liian kauan</string>
    <string name="auth_incorrect_address_title">Väärin annettu osoite</string>
    <string name="auth_ssl_general_error_title">SSL:n alustus epäonnistui</string>
 -  <string name="auth_ssl_unverified_server_title">SSL-palvelimen identiteettiä ei voida varmistaa</string>
    <string name="auth_bad_oc_version_title">Tuntematon palvelimen versio</string>
    <string name="auth_wrong_connection_title">Yhteyden muodostus epäonnistui</string>
    <string name="auth_secure_connection">Salattu yhteys muodostettu</string>
    <string name="auth_unauthorized">Väärä käyttäjätunnus tai salasana</string>
    <string name="auth_oauth_error">Epäonnistunut valtuutus</string>
    <string name="auth_oauth_error_access_denied">Valtuutuspalvelun esti käytön</string>
 -  <string name="auth_not_found">Väärä polku</string>
 -  <string name="auth_internal">Sisäinen palvelinvirhe, koodi %1$d</string>
    <string name="auth_wtf_reenter_URL">Odottamaton tila; anna palvelimen osoite uudelleen</string>
    <string name="auth_expired_oauth_token_toast">Valtuutus vanhentui. Valtuuta uudelleen</string>
    <string name="auth_expired_basic_auth_toast">Anna nykyinen salasana</string>
    <string name="auth_expired_saml_sso_token_toast">Istunto vanhentui. Yhdistä uudelleen</string>
    <string name="auth_connecting_auth_server">Yhdistetään tunnistautumispalvelimeen…</string>
    <string name="auth_unsupported_auth_method">Palvelin ei tue tätä tunnistautumistapaa</string>
 -  <string name="crashlog_send_report">Lähetä ilmoitus</string>
 -  <string name="crashlog_dont_send_report">Älä lähetä ilmoitusta</string>
 -  <string name="extensions_avail_title">Laajennuksia saatavilla!</string>
 -  <string name="extensions_avail_message">Palvelin-instanssisi näyttäisi tukevan laajennuksia. Haluatko nähdä Androidille saatavilla olevat laajennukset?</string>
    <string name="fd_keep_in_sync">Pidä tiedosto ajan tasalla</string>
 -  <string name="common_share">Jaa</string>
    <string name="common_rename">Nimeä uudelleen</string>
    <string name="common_remove">Poista</string>
    <string name="confirmation_remove_alert">Haluatko poistaa kohteen %1$s?</string>
@@@ -151,13 -215,15 +156,13 @@@
    <string name="wait_a_moment">Odota hetki</string>
    <string name="filedisplay_unexpected_bad_get_content">Odottamaton ongelma; kokeile valita tiedosto toisella sovelluksella</string>
    <string name="filedisplay_no_file_selected">Tiedostoa ei valittu</string>
 -  <string name="oauth_check_onoff">Kirjaudu oAuth2:lla.</string>
 +  <string name="oauth_check_onoff">Kirjaudu oAuth2:lla</string>
    <string name="oauth_login_connection">Yhdistetään oAuth2-palvelimeen…</string>
 -  <string name="ssl_validator_title">Varoitus</string>
    <string name="ssl_validator_header">Sivuston identiteetin vahvistaminen ei onnistunut</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Palvelimen varmenteeseen ei luoteta</string>
    <string name="ssl_validator_reason_cert_expired">- Palvelimen varmenne on vanhentunut</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Palvelimen varmenteen kelvolliset päivät ovat tulevaisuudessa</string>
    <string name="ssl_validator_reason_hostname_not_verified">- Osoite ei vastaa sertifikaatissa mainittua isäntänimeä</string>
 -  <string name="ssl_validator_certificate_not_available">Palvelimen varmenteen noutaminen epäonnistui</string>
    <string name="ssl_validator_question">Haluatko silti luottaa tähän varmenteeseen?</string>
    <string name="ssl_validator_not_saved">Varmenteen tallennus epäonnistui</string>
    <string name="ssl_validator_btn_details_see">Tiedot</string>
@@@ -185,6 -251,8 +190,6 @@@
    <string name="conflict_overwrite">Korvaa</string>
    <string name="conflict_dont_upload">Älä lähetä</string>
    <string name="preview_image_error_unknown_format">Kuvaa ei voi näyttää</string>
 -  <string name="preview_image_error_out_of_memory">\"Muisti ei riitä tämän kuvan näyttämiseen</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="failed_upload_all_cb">valitse kaikki</string>
    <string name="failed_upload_headline_retryall_btn">yritä uudelleen kaikkia valittuja</string>
    <string name="failed_upload_load_more_images">Lataa lisää kuvia</string>
diff --combined res/values-fr/strings.xml
index 5ce97989,29a154dd..cb6309a7
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Mot de passe FTP :</string>
 -  <string name="main_login">Nom d\'utilisateur</string>
 -  <string name="main_button_login">Connexion</string>
 -  <string name="main_welcome">Bienvenue</string>
 -  <string name="main_files">Fichiers</string>
 -  <string name="main_music">Musique</string>
 -  <string name="main_contacts">Contacts</string>
 -  <string name="main_calendar">Calendrier</string>
 -  <string name="main_bookmarks">Favoris</string>
 -  <string name="main_settings">Paramètres</string>
 -  <string name="main_tit_accsetup">Paramètres du compte</string>
 -  <string name="main_wrn_accsetup">Aucun compte n\'est encore paramétré. Pour utiliser cette application, il vous faut en ajouter un.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">version %1$s</string>
    <string name="actionbar_sync">Actualiser le compte</string>
@@@ -8,10 -20,20 +8,10 @@@
    <string name="actionbar_upload_files">Fichiers</string>
    <string name="actionbar_open_with">Ouvrir avec</string>
    <string name="actionbar_mkdir">Créer un répertoire</string>
 -  <string name="actionbar_search">Rechercher</string>
    <string name="actionbar_settings">Paramètres</string>
    <string name="actionbar_see_details">Détails</string>
    <string name="prefs_category_general">Général</string>
    <string name="prefs_category_more">Plus</string>
 -  <string name="prefs_add_session">Ajouter une nouvelle session</string>
 -  <string name="prefs_create_img_thumbnails">Créer les miniatures d\'images</string>
 -  <string name="prefs_select_oc_account">Sélectionnez un compte</string>
 -  <string name="prefs_summary_select_oc_account">Choisir lequel de vos comptes l\'application doit utiliser.</string>
 -  <string name="prefs_trackmydevice">Recherche de périphérique</string>
 -  <string name="prefs_trackmydevice_summary_off">Permettre à l\'application de suivre votre position</string>
 -  <string name="prefs_trackmydevice_summary_on">Votre application trace actuellement cet appareil</string>
 -  <string name="prefs_trackmydevice_interval">Intervalle de mise à jour</string>
 -  <string name="prefs_trackmydevice_interval_summary">Mettre à jour toutes les %1$s minutes</string>
    <string name="prefs_accounts">Comptes</string>
    <string name="prefs_manage_accounts">Gestion des comptes utilisateur</string>
    <string name="prefs_pincode">Utilisation d\'un code de sécurité</string>
@@@ -24,14 -46,26 +24,18 @@@
    <string name="prefs_log_summary_history">Cela affiche les logs enregistrés</string>
    <string name="prefs_log_delete_history_button">Supprimer l\'historique</string>
    <string name="prefs_help">Aide</string>
+   <string name="prefs_recommend">Recommander à un ami</string>
    <string name="prefs_feedback">Commentaires</string>
    <string name="prefs_imprint">Empreinte</string>
+   <string name="recommend_subject">Essayez %1$s sur votre smartphone !</string>
+   <string name="recommend_text">J\'aimerais vous inviter à utiliser %1$s sur votre smartphone !\nTéléchargez-le ici : %2$s</string>
    <string name="auth_check_server">Vérifier le serveur</string>
+   <string name="auth_account_name">Nom de compte</string>
    <string name="auth_host_url">Adresse du serveur</string>
    <string name="auth_username">Nom d\'utilisateur</string>
    <string name="auth_password">Mot de passe</string>
    <string name="auth_register">Nouveau dans %1$s ?</string>
 -  <string name="new_session_uri_error">Adresse donnée incorrecte</string>
 -  <string name="new_session_session_name_error">Nom de session incorrect</string>
    <string name="sync_string_files">Fichiers</string>
 -  <string name="uploader_no_file_selected">Aucun fichier n\'est sélectionné pour le téléversement</string>
 -  <string name="setup_hint_username">Nom d\'utilisateur</string>
 -  <string name="setup_hint_password">Mot de passe</string>
 -  <string name="setup_hint_address">Adresse web</string>
 -  <string name="setup_hint_show_password">Afficher le mot de passe ?</string>
 -  <string name="setup_title">Me connecter à mon %1$s</string>
    <string name="setup_btn_connect">Connecter</string>
    <string name="uploader_btn_upload_text">Téléverser</string>
    <string name="uploader_top_message">Choisissez le répertoire de destination:</string>
@@@ -43,6 -77,7 +47,6 @@@
    <string name="uploader_wrn_no_content_text">Aucun contenu reçu. Rien à envoyer</string>
    <string name="uploader_error_forbidden_content">%1$s n\'est pas autorisé à accéder au contenu partagé</string>
    <string name="uploader_info_uploading">Téléversement</string>
 -  <string name="uploader_btn_create_dir_text">Créer un répertoire pour le téléversement</string>
    <string name="file_list_empty">Ce répertoire ne contient aucun fichier.\nDe nouveaux fichiers peuvent être importés en cliquant sur le bouton « Téléverser un fichier » du menu des options</string>
    <string name="filedetails_select_file">Effleurez un fichier pour afficher les informations complémentaires</string>
    <string name="filedetails_size">Taille :</string>
@@@ -51,6 -86,7 +55,6 @@@
    <string name="filedetails_modified">Modifié le :</string>
    <string name="filedetails_download">Télécharger</string>
    <string name="filedetails_sync_file">Actualiser le fichier</string>
 -  <string name="filedetails_redownload">Télécharger à nouveau</string>
    <string name="filedetails_renamed_in_upload_msg">Le fichier a été renommé en %s pendant le téléversement</string>
    <string name="common_yes">Oui</string>
    <string name="common_no">Non</string>
@@@ -59,6 -95,7 +63,6 @@@
    <string name="common_cancel_upload">Annuler l\'envoi</string>
    <string name="common_cancel">Annuler</string>
    <string name="common_save_exit">Sauvegarder &amp; Quitter</string>
 -  <string name="common_exit">Quitter %1$s</string>
    <string name="common_error">Erreur</string>
    <string name="common_loading">Chargement ...</string>
    <string name="common_error_unknown">Erreur Inconnue </string>
@@@ -72,8 -109,10 +76,8 @@@
    <string name="uploader_upload_in_progress_content">Envoi du fichier %2$s en cours, %1$d%% effectués</string>
    <string name="uploader_upload_succeeded_ticker">Téléversement réussi</string>
    <string name="uploader_upload_succeeded_content_single">Le fichier %1$s a été envoyé avec succès</string>
 -  <string name="uploader_upload_succeeded_content_multiple">Les fichiers %1$d ont été téléversés avec succès</string>
    <string name="uploader_upload_failed_ticker">Échec de l\'envoi</string>
    <string name="uploader_upload_failed_content_single">L\'envoi de %1$s a échoué</string>
 -  <string name="uploader_upload_failed_content_multiple">Échec de l\'envoi : %1$d sur %2$d fichiers ont été importés</string>
    <string name="downloader_download_in_progress_ticker">Téléchargement en cours…</string>
    <string name="downloader_download_in_progress_content">Téléchargement en cours de %2$s, %1$d%% effectués</string>
    <string name="downloader_download_succeeded_ticker">Téléchargement réussi</string>
@@@ -82,6 -121,7 +86,6 @@@
    <string name="downloader_download_failed_content">Le téléchargement de %1$s a échoué</string>
    <string name="downloader_not_downloaded_yet">Pas encore téléchargé</string>
    <string name="common_choose_account">Choisissez un compte</string>
 -  <string name="sync_string_contacts">Contacts</string>
    <string name="sync_fail_ticker">La synchronisation a échoué</string>
    <string name="sync_fail_content">La synchronisation de %1$s ne peut pas être complétée</string>
    <string name="sync_fail_content_unauthorized">Mot de passe invalide pour %1$s</string>
@@@ -92,13 -132,17 +96,14 @@@
    <string name="sync_foreign_files_forgotten_ticker">Certains fichiers locaux ont été oubliés</string>
    <string name="sync_foreign_files_forgotten_content">%1$d fichiers du dossier %2$s n\'ont pas pu être copiés dans</string>
    <string name="sync_foreign_files_forgotten_explanation">Depuis la version 1.3.16, les fichiers téléversés depuis cet équipement sont copiés dans le dossier local %1$s pour éviter toute perte de données lorsqu\'un fichier est synchronisé avec plusieurs comptes.\n\nEn raison de ce changement, tous les fichiers téléversés avec une version antérieure de cette application étaient copiés dans le dossier %2$s. Cependant, une erreur empêchait l\'achèvement de cette opération pendant la synchronisation. Vous pouvez soit laisser les fichiers tels quels et supprimer le lien à %3$s, soit déplacer les fichiers dans le dossier %1$s et garder le lien vers %4$s.\n\nCi-dessous la liste des fichiers locaux, et les fichiers distants de %5$s auxquels ils étaient liés.</string>
+   <string name="sync_current_folder_was_removed">Le dossier %1$s n\'existe plus</string>
    <string name="foreign_files_move">Tout déplacer</string>
    <string name="foreign_files_success">Tous les fichiers ont été déplacés</string>
    <string name="foreign_files_fail">Certains fichiers n\'ont pu être déplacés</string>
    <string name="foreign_files_local_text">Local: %1$s</string>
    <string name="foreign_files_remote_text">Distant: %1$s</string>
    <string name="upload_query_move_foreign_files">Il n\'y a pas assez de place disponible pour copier les fichiers sélectionnés dans le dossier %1$s. Voulez-vous les déplacer à la place ?</string>
 -  <string name="use_ssl">Utiliser une connexion sécurisée</string>
 -  <string name="location_no_provider">%1$s ne peut pister votre appareil, veuillez vérifier vos paramètres de localisation</string>
    <string name="pincode_enter_pin_code">Veuillez saisir votre code de sécurité</string>
 -  <string name="pincode_enter_new_pin_code">Veuillez saisir votre nouveau code de sécurité</string>
    <string name="pincode_configure_your_pin">Veuillez saisir votre code de sécurité </string>
    <string name="pincode_configure_your_pin_explanation">Le code PIN vous sera demandé à chaque lancement de l\'application</string>
    <string name="pincode_reenter_your_pincode">Veuillez saisir à nouveau votre code de sécurité</string>
@@@ -117,35 -161,72 +122,41 @@@
    <string name="media_err_unsupported">Le codec de ce média n\'est pas supporté </string>
    <string name="media_err_io">Le fichier média ne peut pas être lu</string>
    <string name="media_err_malformed">Le fichier média n\'est pas correctement encodé</string>
 -  <string name="media_err_timeout">Trop de temps a essayer de jouer</string>
    <string name="media_err_invalid_progressive_playback">Le fichier média ne peut pas être diffusé</string>
    <string name="media_err_unknown">Fichier média ne peut être joué avec le stock de media player</string>
    <string name="media_err_security_ex">taux %1$s erreurs de sécurité essayant de jouer</string>
    <string name="media_err_io_ex">Taux %1$s d\'erreurs de saisie essayant de jouer</string>
    <string name="media_err_unexpected">Taux %1$s d\'erreurs inattendues essayant de jouer</string>
 -  <string name="media_previous_description">Chanson précédente</string>
    <string name="media_rewind_description">Bouton de rem-bobinage</string>
    <string name="media_play_pause_description">Bouton de Lecture ou de Pause</string>
    <string name="media_forward_description">Bouton d\'avance rapide</string>
 -  <string name="media_next_description">Chanson suivante</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minutes</item>
 -    <item>30 minutes</item>
 -    <item>60 minutes</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">Tentative de connexion …</string>
    <string name="auth_no_net_conn_title">Pas de connexion réseau</string>
 -  <string name="auth_no_net_conn_message">Aucune connexion réseau n\'a été détectée, vérifiez votre connexion Internet et réessayez.</string>
 -  <string name="auth_connect_anyway">Se connecter malgré tout</string>
    <string name="auth_nossl_plain_ok_title">Connexion sécurisée non disponible</string>
 -  <string name="auth_nossl_plain_ok_message">L\'application ne peut pas établir de connexion sécurisée avec le serveur. Une connexion non sécurisée est disponible. Vous pouvez continuer ou annuler.</string>
    <string name="auth_connection_established">Connexion établie</string>
    <string name="auth_testing_connection">Test de la connexion…</string>
    <string name="auth_not_configured_title">Configuration du serveur erronée</string>
 -  <string name="auth_not_configured_message">Il semblerait que votre instance du serveur ne soit pas correctement configurée. Veuillez contacter votre administrateur pour plus de détails.</string>
 -  <string name="auth_account_not_new">Un compte pour le même utilisateur et serveur existe déjà sur ce périphérique</string>
 -  <string name="auth_account_not_the_same">L\'utilisateur entré ne correspond pas à l\'utilisateur de ce compte</string>
    <string name="auth_unknown_error_title">Une erreur inconnue s\'est produite</string>
 -  <string name="auth_unknown_error_message">Une erreur inconnue s\'est produite. Merci de contacter le support et d\'inclure les logs de votre périphérique.</string>
    <string name="auth_unknown_host_title">Impossible de trouver l\'hôte</string>
 -  <string name="auth_unknown_host_message">Impossible de trouver l\'hôte spécifié. Veuillez vérifier le nom du serveur, qu\'il est disponible, et essayer à nouveau.</string>
    <string name="auth_incorrect_path_title">Aucune instance du serveur n\'a été trouvée</string>
 -  <string name="auth_incorrect_path_message">L\'application n\'a pu trouver une instance du serveur à cette adresse. Veuillez vérifier l\'adresse et essayez à nouveau</string>
    <string name="auth_timeout_title">Le serveur met trop longtemps à répondre</string>
    <string name="auth_incorrect_address_title">Adresse invalide</string>
    <string name="auth_ssl_general_error_title">Échec de l\'initialisation SSL</string>
 -  <string name="auth_ssl_unverified_server_title">L\'identité SSL du serveur n\'a pu être vérifiée</string>
    <string name="auth_bad_oc_version_title">La version du serveur n\'est pas reconnue</string>
    <string name="auth_wrong_connection_title">Impossible d\'établir la connexion</string>
    <string name="auth_secure_connection">Connexion sécurisée établie</string>
    <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>
@@@ -165,12 -246,18 +176,12 @@@
    <string name="wait_a_moment">Veuillez patienter</string>
    <string name="filedisplay_unexpected_bad_get_content">Problème inattendu ; veuillez essayer une autre app pour la sélection du fichier</string>
    <string name="filedisplay_no_file_selected">Aucun fichier sélectionné</string>
 -  <string name="oauth_host_url">URL d\'aAuth2</string>
 -  <string name="oauth_check_onoff">Connexion avec aAuth2.</string>
    <string name="oauth_login_connection">Connexion au serveur aAuth2...</string>
 -  <string name="oauth_code_validation_message">Veuillez ouvrir un navigateur web et dirigez-vous à l\'adresse :\n%1$s.\nPuis validez ce code :\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Connexion impossible à cet URL.</string>
 -  <string name="ssl_validator_title">Attention</string>
    <string name="ssl_validator_header">L\'identité du site ne peut être vérifiée</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Le certificat du serveur n\'est pas sûr</string>
    <string name="ssl_validator_reason_cert_expired">- Le certificat du serveur a expiré</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Le certificat du serveur n\'est pas encore valide</string>
    <string name="ssl_validator_reason_hostname_not_verified">- L\'URL ne correspond pas au nom d\'hôte du certificat</string>
 -  <string name="ssl_validator_certificate_not_available">Impossible d\'obtenir le certificat du serveur</string>
    <string name="ssl_validator_question">Voulez-vous tout de même faire confiance à ce certificat ?</string>
    <string name="ssl_validator_not_saved">Impossible de sauvegarder le certificat</string>
    <string name="ssl_validator_btn_details_see">Détails</string>
@@@ -203,6 -290,8 +214,6 @@@
    <string name="conflict_dont_upload">Ne pas téléverser</string>
    <string name="preview_image_description">Prévisualisation de l\'image</string>
    <string name="preview_image_error_unknown_format">Cette image ne peut pas être affichée</string>
 -  <string name="preview_image_error_out_of_memory">\"Mémoire insuffisante pour afficher cette image</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s n\'a pas pu être copié vers le dossier local suivant %2$s</string>
    <string name="actionbar_failed_instant_upload">Téléchargement instantané échoué</string>
    <string name="failed_upload_headline_text">Téléchargements instantanés échoués</string>
diff --combined res/values-gl/strings.xml
index ca019d58,ec95519f..50ce25f9
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Contrasinal:</string>
 -  <string name="main_login">Nome de usuario:</string>
 -  <string name="main_button_login">Acceso</string>
 -  <string name="main_welcome">Benvido/a</string>
 -  <string name="main_files">Ficheiros</string>
 -  <string name="main_music">Música</string>
 -  <string name="main_contacts">Contactos</string>
 -  <string name="main_calendar">Calendario</string>
 -  <string name="main_bookmarks">Marcadores</string>
 -  <string name="main_settings">Axustes</string>
 -  <string name="main_tit_accsetup">Activar a conta</string>
 -  <string name="main_wrn_accsetup">Non hai ningunha conta configurada no seu dispositivo. Para empregar o aplicativo necesita crear unha.</string>
    <string name="about_android">Aplicativo Android %1$s</string>
    <string name="about_version">versión %1$s</string>
    <string name="actionbar_sync">Actualizar a conta</string>
@@@ -8,10 -20,20 +8,10 @@@
    <string name="actionbar_upload_files">Ficheiros</string>
    <string name="actionbar_open_with">Abrir con</string>
    <string name="actionbar_mkdir">Crear un directorio</string>
 -  <string name="actionbar_search">Buscar</string>
    <string name="actionbar_settings">Preferencias</string>
    <string name="actionbar_see_details">Detalles</string>
    <string name="prefs_category_general">Xeral</string>
    <string name="prefs_category_more">Máis</string>
 -  <string name="prefs_add_session">Engadir unha nova sesión</string>
 -  <string name="prefs_create_img_thumbnails">Crear miniaturas das imaxes</string>
 -  <string name="prefs_select_oc_account">Escoller unha conta</string>
 -  <string name="prefs_summary_select_oc_account">Escolla cal das súas contas ten que usar o aplicativo.</string>
 -  <string name="prefs_trackmydevice">Rastrexado de dispositivos</string>
 -  <string name="prefs_trackmydevice_summary_off">Permitir que este aplicativo rexistre as posicións do seu dispositivo</string>
 -  <string name="prefs_trackmydevice_summary_on">Este aplicativo mantén o rexistro de posicións do seu dispositivo</string>
 -  <string name="prefs_trackmydevice_interval">Intervalo de actualizacións</string>
 -  <string name="prefs_trackmydevice_interval_summary">Actualizar cada %1$s minutos</string>
    <string name="prefs_accounts">Contas</string>
    <string name="prefs_manage_accounts">Xestionar as contas</string>
    <string name="prefs_pincode">PIN do aplicativo</string>
@@@ -24,14 -46,26 +24,18 @@@
    <string name="prefs_log_summary_history">Isto amosa os rexistros gravados</string>
    <string name="prefs_log_delete_history_button">Eliminar o historial</string>
    <string name="prefs_help">Axuda</string>
+   <string name="prefs_recommend">Recomendar a un amigo</string>
    <string name="prefs_feedback">Comentarios</string>
    <string name="prefs_imprint">Impresión</string>
+   <string name="recommend_subject">Tente %1$s no seu teléfono intelixente!</string>
+   <string name="recommend_text">Quero convidalo a empregar %1$s no seu teléfono intelixente!⏎\nDescárgueo de aquí:%2$s</string>
    <string name="auth_check_server">Comprobar o servidor</string>
+   <string name="auth_account_name">Nome da conta</string>
    <string name="auth_host_url">Enderezo do servidor</string>
    <string name="auth_username">Nome de usuario</string>
    <string name="auth_password">Contrasinal</string>
    <string name="auth_register">Novo en %1$s?</string>
 -  <string name="new_session_uri_error">Deuse un enderezo incorrecto</string>
 -  <string name="new_session_session_name_error">Nome de sesión incorrecto</string>
    <string name="sync_string_files">Ficheiros</string>
 -  <string name="uploader_no_file_selected">Non se escolleron ficheiros para enviar</string>
 -  <string name="setup_hint_username">Nome de usuario</string>
 -  <string name="setup_hint_password">Contrasinal</string>
 -  <string name="setup_hint_address">Enderezo web</string>
 -  <string name="setup_hint_show_password">Amosar o contrasinal?</string>
 -  <string name="setup_title">Conectar co seu %1$s</string>
    <string name="setup_btn_connect">Conectar</string>
    <string name="uploader_btn_upload_text">Enviar</string>
    <string name="uploader_top_message">Escolla o directorio para o envío:</string>
@@@ -43,6 -77,7 +47,6 @@@
    <string name="uploader_wrn_no_content_text">Non se recibiu contido. Non hai nada para enviar.</string>
    <string name="uploader_error_forbidden_content">%1$s non ten permiso para acceder ao contido compartido</string>
    <string name="uploader_info_uploading">Enviando</string>
 -  <string name="uploader_btn_create_dir_text">Crear un directorio para os envíos</string>
    <string name="file_list_empty">Non hai ficheiros neste cartafol.\nOs novos ficheiros pódense engadir ca opción do menú «Enviar».</string>
    <string name="filedetails_select_file">Prema nun ficheiro para que amose a información adicional.</string>
    <string name="filedetails_size">Tamaño:</string>
@@@ -51,6 -86,7 +55,6 @@@
    <string name="filedetails_modified">Modificado:</string>
    <string name="filedetails_download">Descargar</string>
    <string name="filedetails_sync_file">Actualizar o ficheiro</string>
 -  <string name="filedetails_redownload">Descargar de novo</string>
    <string name="filedetails_renamed_in_upload_msg">O ficheiro foi renomeado a %1$s durante o envío</string>
    <string name="common_yes">Si</string>
    <string name="common_no">Non</string>
@@@ -59,6 -95,7 +63,6 @@@
    <string name="common_cancel_upload">Cancelar o envío</string>
    <string name="common_cancel">Cancelar</string>
    <string name="common_save_exit">Gardar e saír</string>
 -  <string name="common_exit">Abandonar %1$s</string>
    <string name="common_error">Erro</string>
    <string name="common_loading">Cargando ...</string>
    <string name="common_error_unknown">Produciuse un erro descoñecido</string>
@@@ -72,8 -109,10 +76,8 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% enviando %2$s</string>
    <string name="uploader_upload_succeeded_ticker">Enviado correctamente</string>
    <string name="uploader_upload_succeeded_content_single">%1$s foi enviado correctamente</string>
 -  <string name="uploader_upload_succeeded_content_multiple">%1$d ficheiros foron enviados correctamente</string>
    <string name="uploader_upload_failed_ticker">Produciuse un fallou no envío</string>
    <string name="uploader_upload_failed_content_single">Non foi posíbel completar o envío de %1$s</string>
 -  <string name="uploader_upload_failed_content_multiple">Produciuse un fallou no envío: enviáronse %1$d/%2$d ficheiros</string>
    <string name="downloader_download_in_progress_ticker">Descargando…</string>
    <string name="downloader_download_in_progress_content">%1$d%% descargando %2$s</string>
    <string name="downloader_download_succeeded_ticker">Completouse a descarga</string>
@@@ -82,6 -121,7 +86,6 @@@
    <string name="downloader_download_failed_content">Non foi posíbel completar a descarga de %1$s</string>
    <string name="downloader_not_downloaded_yet">Non descargado aínda</string>
    <string name="common_choose_account">Escoller unha conta</string>
 -  <string name="sync_string_contacts">Contactos</string>
    <string name="sync_fail_ticker">Produciuse un fallo na sincronización</string>
    <string name="sync_fail_content">Non foi posíbel completar a sincronización de %1$s</string>
    <string name="sync_fail_content_unauthorized">Contrasinal incorrecto para %1$s</string>
@@@ -92,13 -132,17 +96,14 @@@
    <string name="sync_foreign_files_forgotten_ticker">Algúns ficheiros locais foron esquecidos</string>
    <string name="sync_foreign_files_forgotten_content">Non é posíbel copiar %1$d ficheiros do directorio %2$s en</string>
    <string name="sync_foreign_files_forgotten_explanation">Desde a versión 1.3.16, os ficheiros enviados desde este dispositivo cópianse no cartafol local %1$s para evitar a perda de datos cando se sincroniza un ficheiro con varias contas.\n\nPor mor deste cambio, todos os ficheiros enviados nas versións anteriores deste aplicativo cópianse no cartafol %2$s. Porén, un erro impediu a finalización desta operación durante a sincronización da conta. É posíbel deixar o(s) ficheiro(s) como está(n) e retirar a ligazón a %3$s, ou mover o(s) ficheiro(s) ao directorio %1$s e manter a ligazón a %4$s.\n\nA seguir enuméranse o(s) fichero(s) local(is), e o(s) fichero(s) remoto(s) en %5$s co(s) que estaba(n) ligados.</string>
+   <string name="sync_current_folder_was_removed">O cartafol %1$s xa non existe</string>
    <string name="foreign_files_move">Mover todo</string>
    <string name="foreign_files_success">Foron movidos todos os ficheiros</string>
    <string name="foreign_files_fail">Algúns ficheiros non puideron seren movidos</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">Non hai espazo abondo para copiar os ficheiros seleccionados no cartafol %1$s. Quere movelos no canto de copialos?</string>
 -  <string name="use_ssl">Empregar a conexión segura</string>
 -  <string name="location_no_provider">%1$s non pode rastrexar o seu dispositivo. Comprobe as configuracións de localización.</string>
    <string name="pincode_enter_pin_code">Insira o seu PIN do aplicativo</string>
 -  <string name="pincode_enter_new_pin_code">Insira o seu novo PIN do aplicativo</string>
    <string name="pincode_configure_your_pin">Introduza o seu PIN do aplicativo</string>
    <string name="pincode_configure_your_pin_explanation">Pediráselle o PIN cada vez que se inicie o aplicativo</string>
    <string name="pincode_reenter_your_pincode">Volva a introducir o seu PIN do aplicativo</string>
@@@ -117,35 -161,72 +122,41 @@@
    <string name="media_err_unsupported">Códec multimedia non admitido</string>
    <string name="media_err_io">Non é posíbel ler o ficheiro multimedia</string>
    <string name="media_err_malformed">O ficheiro multimedia non está codificado correctamente</string>
 -  <string name="media_err_timeout">Tempo de máis tentando reproducir</string>
    <string name="media_err_invalid_progressive_playback">Non é posíbel enviar como fluxo o ficheiro multimedia</string>
    <string name="media_err_unknown">Non é posíbel reproducir o ficheiro multimedia co reprodutor «stock»</string>
    <string name="media_err_security_ex">Produciuse un erro de seguranza tentando reproducir %1$s</string>
    <string name="media_err_io_ex">Produciuse un erro de entrada tentando reproducir %1$s</string>
    <string name="media_err_unexpected">Produciuse un erro non agardado tentando reproducir %1$s</string>
 -  <string name="media_previous_description">Botón de pista anterior</string>
    <string name="media_rewind_description">Botón de retroceso</string>
    <string name="media_play_pause_description">Botón de reprodución/pausa</string>
    <string name="media_forward_description">Botón de avance rápido</string>
 -  <string name="media_next_description">Botón de pista seguinte</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minutos</item>
 -    <item>30 minutos</item>
 -    <item>60 minutos</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">Intentando acceder...</string>
    <string name="auth_no_net_conn_title">Sen conexión de rede</string>
 -  <string name="auth_no_net_conn_message">Non se detectaron conexións de rede. Comprobe a conexión a Internet e tenteo de novo.</string>
 -  <string name="auth_connect_anyway">Conectar igualmente</string>
    <string name="auth_nossl_plain_ok_title">Non hai conexión seguras dispoñíbeis.</string>
 -  <string name="auth_nossl_plain_ok_message">O aplicativo non puido facer unha conexión segura co servidor. Inda que non é segura, hai unha conexión posíbel. Pode continuar ou cancelala.</string>
    <string name="auth_connection_established">Estabeleceuse a conexión</string>
    <string name="auth_testing_connection">Comprobando a conexión...</string>
    <string name="auth_not_configured_title">Configuración errada do servidor</string>
 -  <string name="auth_not_configured_message">Semella que a súa instancia do servidor non está configurada correctamente. Contacte co seu administrador para máis detalles.</string>
 -  <string name="auth_account_not_new">Xa existe unha conta do mesmo usuario e servidor neste dispositivo</string>
 -  <string name="auth_account_not_the_same">O usuario que introduciu non coincide co usuario desta conta</string>
    <string name="auth_unknown_error_title">Produciuse un erro descoñecido!</string>
 -  <string name="auth_unknown_error_message">Produciuse un erro descoñecido. Contacte cos autores e infórmeos do fallo cos rexistros de erro do seu dispositivo.</string>
    <string name="auth_unknown_host_title">Non foi posíbel atopar a máquina</string>
 -  <string name="auth_unknown_host_message">Non foi posíbel atopar a máquina indicada. Comprobe o nome da máquina e tenteo de novo.</string>
    <string name="auth_incorrect_path_title">Non se atopou unha instancia do servidor</string>
 -  <string name="auth_incorrect_path_message">O aplicativo non atopou instancias do servidor na ruta indicada. Comprobe a ruta e tenteo de novo.</string>
    <string name="auth_timeout_title">O servidor tardou demasiado en responder</string>
    <string name="auth_incorrect_address_title">URL incorrecto</string>
    <string name="auth_ssl_general_error_title">Produciuse un fallo ao iniciar o SSL</string>
 -  <string name="auth_ssl_unverified_server_title">A identidade SSL do servidor non foi verficada</string>
    <string name="auth_bad_oc_version_title">Versión do servidor non recoñecida</string>
    <string name="auth_wrong_connection_title">Non é posíbel estabelecer a conexión</string>
    <string name="auth_secure_connection">Estabeleceuse unha conexión segura</string>
    <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>
@@@ -165,12 -246,18 +176,12 @@@
    <string name="wait_a_moment">Agarde un chisco</string>
    <string name="filedisplay_unexpected_bad_get_content">Produciuse un erro non agardado. Seleccione o ficheiro con outro aplicativo diferente</string>
    <string name="filedisplay_no_file_selected">Non se escolleu ningún ficheiro</string>
 -  <string name="oauth_host_url">URL do oAuth2</string>
 -  <string name="oauth_check_onoff">Acceder con oAuth2.</string>
    <string name="oauth_login_connection">Conectando co servidor oAuth2…</string>
 -  <string name="oauth_code_validation_message">Abra un navegador  web e vaia a:\n%1$s.\nValide alí este código:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Non está dispoñíbel a conexión con este URL</string>
 -  <string name="ssl_validator_title">Aviso</string>
    <string name="ssl_validator_header">Non foi posíbel verificar a identidade do sitio</string>
    <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor non é de confianza</string>
    <string name="ssl_validator_reason_cert_expired">- O certificado do servidor caducou</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- As datas de validez do certificado están son do futuro</string>
    <string name="ssl_validator_reason_hostname_not_verified">- O URL non coincide co nome de máquina no certificado</string>
 -  <string name="ssl_validator_certificate_not_available">Non foi posíbel obter o certificado do servidor</string>
    <string name="ssl_validator_question">Aínda así, quere fiar neste certificado igualmente?</string>
    <string name="ssl_validator_not_saved">Non foi posíbel gardar o certificado</string>
    <string name="ssl_validator_btn_details_see">Detalles</string>
@@@ -203,6 -290,8 +214,6 @@@
    <string name="conflict_dont_upload">Non enviar</string>
    <string name="preview_image_description">Vista previa da imaxe</string>
    <string name="preview_image_error_unknown_format">Esta imaxe non pode ser amosada</string>
 -  <string name="preview_image_error_out_of_memory">«Non hai memoria abondo para amosar esta imaxe</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">Non foi posíbel copiar %1$s no directorio local %2$s</string>
    <string name="actionbar_failed_instant_upload">produciuse un fallo de EnvíoInstantáneo»</string>
    <string name="failed_upload_headline_text">Envíos instantáneos fallados</string>
diff --combined res/values-it/strings.xml
index 3f3b6ed8,529efcc1..07520053
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Password:</string>
 -  <string name="main_login">Nome utente:</string>
 -  <string name="main_button_login">Accesso</string>
 -  <string name="main_welcome">Benvenuto</string>
 -  <string name="main_files">File</string>
 -  <string name="main_music">Musica</string>
 -  <string name="main_contacts">Contatti</string>
 -  <string name="main_calendar">Calendario</string>
 -  <string name="main_bookmarks">Segnalibri</string>
 -  <string name="main_settings">Impostazioni</string>
 -  <string name="main_tit_accsetup">Configurazione account</string>
 -  <string name="main_wrn_accsetup">Non ci sono account su questo dispositivo. Per utilizzare questa applicazione, devi crearne uno.</string>
    <string name="about_android">Applicazione Android di %1$s </string>
    <string name="about_version">versione %1$s</string>
    <string name="actionbar_sync">Aggiorna account</string>
@@@ -8,10 -20,20 +8,10 @@@
    <string name="actionbar_upload_files">File</string>
    <string name="actionbar_open_with">Apri con</string>
    <string name="actionbar_mkdir">Crea cartella</string>
 -  <string name="actionbar_search">Cerca</string>
    <string name="actionbar_settings">Impostazioni</string>
    <string name="actionbar_see_details">Dettagli</string>
    <string name="prefs_category_general">Generale</string>
    <string name="prefs_category_more">Altro</string>
 -  <string name="prefs_add_session">Aggiungi nuova sessione</string>
 -  <string name="prefs_create_img_thumbnails">Crea anteprime immagini</string>
 -  <string name="prefs_select_oc_account">Scegli un account</string>
 -  <string name="prefs_summary_select_oc_account">Scegli quale dei tuoi account sarà utilizzato dall\'applicazione</string>
 -  <string name="prefs_trackmydevice">Tracciamento dispostivo</string>
 -  <string name="prefs_trackmydevice_summary_off">Abilita l\'applicazione a tracciare la posizione del tuo dispositivo</string>
 -  <string name="prefs_trackmydevice_summary_on">Il tuo l\'applicazione tiene traccia di questo dispositivo</string>
 -  <string name="prefs_trackmydevice_interval">Intervallo di aggiornamento</string>
 -  <string name="prefs_trackmydevice_interval_summary">Aggiorna ogni %1$s minuti</string>
    <string name="prefs_accounts">Account</string>
    <string name="prefs_manage_accounts">Gestisci account</string>
    <string name="prefs_pincode">PIN App</string>
@@@ -24,14 -46,26 +24,18 @@@
    <string name="prefs_log_summary_history">Mostra i log registrati</string>
    <string name="prefs_log_delete_history_button">Elimina la cronologia</string>
    <string name="prefs_help">Aiuto</string>
+   <string name="prefs_recommend">Consiglia ad un amico</string>
    <string name="prefs_feedback">Segnalazioni</string>
    <string name="prefs_imprint">Imprint</string>
+   <string name="recommend_subject">Prova %1$s sul tuo smartphone!</string>
+   <string name="recommend_text">Vorrei invitarti ad usare %1$s sul tuo smartphone!⏎\nScarica qui: %2$s</string>
    <string name="auth_check_server">Verifica server</string>
+   <string name="auth_account_name">Nome account</string>
    <string name="auth_host_url">Indirizzo del server</string>
    <string name="auth_username">Nome utente</string>
    <string name="auth_password">Password</string>
    <string name="auth_register">Prima volta su %1$s?</string>
 -  <string name="new_session_uri_error">Indirizzo inserito non corretto</string>
 -  <string name="new_session_session_name_error">Nome sessione non corretta</string>
    <string name="sync_string_files">File</string>
 -  <string name="uploader_no_file_selected">Nessun file selezionato per l\'invio</string>
 -  <string name="setup_hint_username">Nome utente</string>
 -  <string name="setup_hint_password">Password</string>
 -  <string name="setup_hint_address">Indirizzo web</string>
 -  <string name="setup_hint_show_password">Mostrare la password?</string>
 -  <string name="setup_title">Connettiti al tuo %1$s</string>
    <string name="setup_btn_connect">Connetti</string>
    <string name="uploader_btn_upload_text">Carica</string>
    <string name="uploader_top_message">Scegli la cartella di caricamento:</string>
@@@ -43,6 -77,7 +47,6 @@@
    <string name="uploader_wrn_no_content_text">Non è stato ricevuto alcun contenuto. Niente da caricare.</string>
    <string name="uploader_error_forbidden_content">%1$s non è abilitato ad accedere al contenuto condiviso</string>
    <string name="uploader_info_uploading">Caricamento in corso</string>
 -  <string name="uploader_btn_create_dir_text">Crea una directory per il caricamento</string>
    <string name="file_list_empty">Non ci sono file in questa cartella.\nNuovi file possono essere aggiunti con l\'opzione di menu \"Carica\".</string>
    <string name="filedetails_select_file">Tocca un file per visualizzare informazioni aggiuntive.</string>
    <string name="filedetails_size">Dimensione:</string>
@@@ -51,6 -86,7 +55,6 @@@
    <string name="filedetails_modified">Modificato:</string>
    <string name="filedetails_download">Scarica</string>
    <string name="filedetails_sync_file">Aggiorna file</string>
 -  <string name="filedetails_redownload">Scarica nuovamente</string>
    <string name="filedetails_renamed_in_upload_msg">Il file è stato rinominato in %1$s durante il caricamento</string>
    <string name="common_yes">Sì</string>
    <string name="common_no">No</string>
@@@ -59,6 -95,7 +63,6 @@@
    <string name="common_cancel_upload">Annulla invio</string>
    <string name="common_cancel">Annulla</string>
    <string name="common_save_exit">Salva ed esci</string>
 -  <string name="common_exit">Esci da %1$s</string>
    <string name="common_error">Errore</string>
    <string name="common_loading">Caricamento in corso...</string>
    <string name="common_error_unknown">Errore sconosciuto</string>
@@@ -72,8 -109,10 +76,8 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% Caricamento di %2$s</string>
    <string name="uploader_upload_succeeded_ticker">Caricamento effettuato</string>
    <string name="uploader_upload_succeeded_content_single">%1$s è stato caricato correttamente</string>
 -  <string name="uploader_upload_succeeded_content_multiple">%1$d file sono stati caricati correttamente</string>
    <string name="uploader_upload_failed_ticker">Caricamento non riuscito</string>
    <string name="uploader_upload_failed_content_single">Il caricamento di %1$s non può essere completato</string>
 -  <string name="uploader_upload_failed_content_multiple">Caricamento non riuscito: %1$d/%2$d file sono stati caricati</string>
    <string name="downloader_download_in_progress_ticker">Scaricamento in corso...</string>
    <string name="downloader_download_in_progress_content">%1$d%% Scaricamento di %2$s</string>
    <string name="downloader_download_succeeded_ticker">Scaricamento effettuato</string>
@@@ -82,6 -121,7 +86,6 @@@
    <string name="downloader_download_failed_content">Scaricamento di %1$s non è stato completato</string>
    <string name="downloader_not_downloaded_yet">Non ancora scaricato</string>
    <string name="common_choose_account">Scegli account</string>
 -  <string name="sync_string_contacts">Contatti</string>
    <string name="sync_fail_ticker">Sincronizzazione non riuscita</string>
    <string name="sync_fail_content">La sincronizzazione di %1$s non può essere completata</string>
    <string name="sync_fail_content_unauthorized">Password non valida per %1$s</string>
@@@ -92,13 -132,17 +96,14 @@@
    <string name="sync_foreign_files_forgotten_ticker">Alcuni file locali sono stati trascurati</string>
    <string name="sync_foreign_files_forgotten_content">%1$d file della cartella %2$s non possono essere copiati</string>
    <string name="sync_foreign_files_forgotten_explanation">Dalla versione 1.3.16, i file caricati da questo dispositivo sono copiati nella cartella locale %1$s per evitare perdite di dati in caso di sincronizzazione di un singolo file con più account.\n\nA causa di questa modifica, tutti i file caricati nelle versioni precedenti di questa applicazione sono copiati nella cartella %2$s. In ogni caso, un errore ha impedito il completamento di questa operazione durante la sincronizzazione dell\'account.  Puoi mantenere i file intatti e rimuovere il collegamento a %3$s o spostare i file nella cartella %1$s e mantenere il collegamento a %4$s.\n\nQui sotto sono elencati i file locali e i file remoti in %5$s ai quali sono collegati.</string>
+   <string name="sync_current_folder_was_removed">La cartella %1$s non esiste più</string>
    <string name="foreign_files_move">Sposta tutto</string>
    <string name="foreign_files_success">Tutti i file sono stati spostati</string>
    <string name="foreign_files_fail">Alcuni file non possono essere spostati</string>
    <string name="foreign_files_local_text">Locale: %1$s</string>
    <string name="foreign_files_remote_text">Remoto %1$s</string>
    <string name="upload_query_move_foreign_files">Non c\'è spazio sufficiente per copiare i file selezionati nella cartella %1$s. Vuoi invece spostarli nella cartella?</string>
 -  <string name="use_ssl">Usa connessione sicura</string>
 -  <string name="location_no_provider">%1$s non può tracciare questo dispositivo. Controlla le impostazioni di posizionamento</string>
    <string name="pincode_enter_pin_code">Inserisci il PIN dell\'applicazione</string>
 -  <string name="pincode_enter_new_pin_code">Inserisci il nuovo PIN dell\'applicazione</string>
    <string name="pincode_configure_your_pin">Inserisci il PIN di l\'applicazione</string>
    <string name="pincode_configure_your_pin_explanation">Il PIN sarà richiesto ad ogni avvio dell\'applicazione</string>
    <string name="pincode_reenter_your_pincode">Inserisci nuovamente il PIN di l\'applicazione</string>
@@@ -117,35 -161,72 +122,41 @@@
    <string name="media_err_unsupported">Codificatore multimediale non supportato</string>
    <string name="media_err_io">Il file multimediale non può essere letto</string>
    <string name="media_err_malformed">File multimediale non codificato correttamente</string>
 -  <string name="media_err_timeout">La riproduzione ha richiesto troppo tempo</string>
    <string name="media_err_invalid_progressive_playback">Il file multimediale non può essere trasmesso</string>
    <string name="media_err_unknown">Il file multimediale non può essere riprodotto con il lettore integrato</string>
    <string name="media_err_security_ex">Errore di sicurezza durante il tentativo di riprodurre %1$s</string>
    <string name="media_err_io_ex">Errore di input durante il tentativo di riprodurre %1$s</string>
    <string name="media_err_unexpected">Errore inatteso durante il tentativo di riprodurre %1$s</string>
 -  <string name="media_previous_description">Pulsante Traccia precedente</string>
    <string name="media_rewind_description">Pulsante Riavvolgi</string>
    <string name="media_play_pause_description">Pulsante Riproduci o pausa</string>
    <string name="media_forward_description">Pulsante Avanti veloce</string>
 -  <string name="media_next_description">Pulsante Traccia successiva</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minuti</item>
 -    <item>30 minuti</item>
 -    <item>60 minuti</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">Tentativo di accesso in corso...</string>
    <string name="auth_no_net_conn_title">Nessuna connessione di rete</string>
 -  <string name="auth_no_net_conn_message">Nessuna connessione di rete rilevata, controlla la tua connessione Internet e riprova.</string>
 -  <string name="auth_connect_anyway">Connetti comunque</string>
    <string name="auth_nossl_plain_ok_title">Connessione sicura disponibile.</string>
 -  <string name="auth_nossl_plain_ok_message">L\'Applicazione non riesce a stabilire una connessione sicura con il server. È disponibile una connessione non sicura. È possibile continuare o cancellare l\'operazione.</string>
    <string name="auth_connection_established">Connessione stabilita</string>
    <string name="auth_testing_connection">Prova di connessione in corso...</string>
    <string name="auth_not_configured_title">Configurazione non corretta di il server</string>
 -  <string name="auth_not_configured_message">Sembra che l\'istanza di il server non sia configurata correttamente. Contatta il tuo amministratore per ulteriori dettagli.</string>
 -  <string name="auth_account_not_new">Esiste già un account su questo dispositivo per lo stesso utente e server</string>
 -  <string name="auth_account_not_the_same">Il nome utente inserito non corrisponde all\'utente di questo account</string>
    <string name="auth_unknown_error_title">Errore sconosciuto</string>
 -  <string name="auth_unknown_error_message">Si è verificato un errore sconosciuta. Per favore contatta il supporto e includi i file di log del tuo dispositivo.</string>
    <string name="auth_unknown_host_title">Impossibile trovare l\'host</string>
 -  <string name="auth_unknown_host_message">Impossibile trovare l\'host digitato. Controlla il nome dell\'host e la raggiungibilità del server e prova ancora.</string>
    <string name="auth_incorrect_path_title">Istanza di il server non trovata</string>
 -  <string name="auth_incorrect_path_message">L\'applicazione non può trovare un\'istanza di il server al percorso specificato. Controlla il percorso e prova ancora.</string>
    <string name="auth_timeout_title">Il server ha richiesto troppo tempo per rispondere</string>
    <string name="auth_incorrect_address_title">URL non valido</string>
    <string name="auth_ssl_general_error_title">Inizializzazione  SSL non riuscita</string>
 -  <string name="auth_ssl_unverified_server_title">Identità SSL del server non verificata</string>
    <string name="auth_bad_oc_version_title">Versione del server il server non riconosciuta</string>
    <string name="auth_wrong_connection_title">Impossibile stabilire la connessione</string>
    <string name="auth_secure_connection">Connessione sicura stabilita</string>
    <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>
@@@ -165,12 -246,18 +176,12 @@@
    <string name="wait_a_moment">Attendi</string>
    <string name="filedisplay_unexpected_bad_get_content">Problema inatteso; prova un\'altra applicazione per selezionare il file</string>
    <string name="filedisplay_no_file_selected">Non è stato selezionato alcun file</string>
 -  <string name="oauth_host_url">URL oAuth2</string>
 -  <string name="oauth_check_onoff">Accedi con oAuth2.</string>
    <string name="oauth_login_connection">Connessione al server oAuth2 in corso...</string>
 -  <string name="oauth_code_validation_message">Apri il browser e visita il collegamento:\n%1$s.\nConvalida il codice contenuto:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Connessione con questo URL non avviabile.</string>
 -  <string name="ssl_validator_title">Avviso</string>
    <string name="ssl_validator_header">L\'identità del sito non può essere verificata</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Il certificato del server non è affidabile</string>
    <string name="ssl_validator_reason_cert_expired">- Il certificato del server è scaduto</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Il certificato del server è troppo recente</string>
    <string name="ssl_validator_reason_hostname_not_verified">- L\'URL non corrisponde al nome host nel certificato</string>
 -  <string name="ssl_validator_certificate_not_available">Impossibile ottenere il certificato del server</string>
    <string name="ssl_validator_question">Vuoi fidarti comunque di questo certificato?</string>
    <string name="ssl_validator_not_saved">Il certificato non può essere salvato</string>
    <string name="ssl_validator_btn_details_see">Dettagli</string>
@@@ -203,6 -290,8 +214,6 @@@
    <string name="conflict_dont_upload">Non inviare</string>
    <string name="preview_image_description">Anteprima dell\'immagine</string>
    <string name="preview_image_error_unknown_format">Questa immagine non può essere mostrata</string>
 -  <string name="preview_image_error_out_of_memory">\"Memoria insufficiente per mostrare questa immagine</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s non può essere copiato nella cartella locale %2$s</string>
    <string name="actionbar_failed_instant_upload">Caricamento istantaneo non riuscito\"</string>
    <string name="failed_upload_headline_text">Caricamenti istantanei non riusciti</string>
diff --combined res/values-ja-rJP/strings.xml
index 277af579,4c8316f9..da9923e8
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?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="about_android">%1$s アンドロイドアプリ</string>
    <string name="about_version">バージョン %1$s</string>
    <string name="actionbar_sync">アカウントを同期</string>
@@@ -8,10 -20,17 +8,10 @@@
    <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_trackmydevice_summary_off">デバイスの位置情報をに通知</string>
 -  <string name="prefs_trackmydevice_summary_on">はこのデバイスを追跡します</string>
 -  <string name="prefs_trackmydevice_interval_summary">%1$s 分間隔で更新</string>
    <string name="prefs_accounts">アカウント</string>
    <string name="prefs_manage_accounts">アカウント管理</string>
    <string name="prefs_pincode">アプリのパスワード</string>
@@@ -24,14 -43,23 +24,17 @@@
    <string name="prefs_log_summary_history">これは記録されたログを表示します</string>
    <string name="prefs_log_delete_history_button">履歴を削除</string>
    <string name="prefs_help">ヘルプ</string>
+   <string name="prefs_recommend">友達に推薦</string>
    <string name="prefs_feedback">フィードバック</string>
    <string name="prefs_imprint">インプリント</string>
+   <string name="recommend_subject">スマートフォンで %1$s を試してください！</string>
+   <string name="recommend_text">スマートフォンで %1$s を利用してみませんか！\nここからダウンロードしてください: %2$s</string>
    <string name="auth_check_server">サーバーを確認する</string>
    <string name="auth_host_url">サーバアドレス</string>
    <string name="auth_username">ユーザー名</string>
    <string name="auth_password">パスワード</string>
    <string name="auth_register">%1$sは初めてですか？</string>
    <string name="sync_string_files">ファイル</string>
 -  <string name="uploader_no_file_selected">アップロードのためのファイルが選択されていません</string>
 -  <string name="setup_hint_username">ユーザー名</string>
 -  <string name="setup_hint_password">パスワード</string>
 -  <string name="setup_hint_address">WEBアドレス</string>
 -  <string name="setup_hint_show_password">パスワードを表示しますか？</string>
 -  <string name="setup_title">%1$sに接続</string>
    <string name="setup_btn_connect">接続</string>
    <string name="uploader_btn_upload_text">アップロード</string>
    <string name="uploader_top_message">アップロードディレクトリを選択:</string>
@@@ -51,6 -79,7 +54,6 @@@
    <string name="filedetails_modified">更新:</string>
    <string name="filedetails_download">ダウンロード</string>
    <string name="filedetails_sync_file">ファイルを同期</string>
 -  <string name="filedetails_redownload">再ダウンロード</string>
    <string name="filedetails_renamed_in_upload_msg">アップロード中にファイル名を %1$s に変更しました</string>
    <string name="common_yes">はい</string>
    <string name="common_no">いいえ</string>
@@@ -59,6 -88,7 +62,6 @@@
    <string name="common_cancel_upload">アップロードをキャンセル</string>
    <string name="common_cancel">キャンセル</string>
    <string name="common_save_exit">保存して終了</string>
 -  <string name="common_exit">%1$sを終了</string>
    <string name="common_error">エラー</string>
    <string name="common_loading">読込中...</string>
    <string name="common_error_unknown">不明なエラー</string>
@@@ -74,6 -104,7 +77,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s は正常にアップロードされました</string>
    <string name="uploader_upload_failed_ticker">アップロードに失敗</string>
    <string name="uploader_upload_failed_content_single">%1$s のアップロードが完了しませんでした</string>
 -  <string name="uploader_upload_failed_content_multiple">アップロードに失敗: %1$d/%2$d ファイルがアップロードされました</string>
    <string name="downloader_download_in_progress_ticker">ダウンロード中 ...</string>
    <string name="downloader_download_in_progress_content">%1$d%% ダウンロード中 %2$s</string>
    <string name="downloader_download_succeeded_ticker">ダウンロードに成功</string>
@@@ -82,6 -113,7 +85,6 @@@
    <string name="downloader_download_failed_content">%1$s のダウンロードは完了しませんでした</string>
    <string name="downloader_not_downloaded_yet">未ダウンロード</string>
    <string name="common_choose_account">アカウントを選択</string>
 -  <string name="sync_string_contacts">コンタクト</string>
    <string name="sync_fail_ticker">同期失敗</string>
    <string name="sync_fail_content">%1$s の同期が完了しませんでした。</string>
    <string name="sync_fail_content_unauthorized">1$sの無効なパスワード</string>
@@@ -98,7 -130,10 +101,7 @@@
    <string name="foreign_files_local_text">ローカル: %1$s</string>
    <string name="foreign_files_remote_text">リモート: %1$s</string>
    <string name="upload_query_move_foreign_files">%1$s フォルダに選択されたファイルをコピーするのに十分なスペースがありません。コピーする代わりに、それらを移動させますか？</string>
 -  <string name="use_ssl">暗号通信を利用</string>
 -  <string name="location_no_provider">%1$sがあなたのデバイスの位置情報を取得出来ません。位置情報設定を確認してください。</string>
    <string name="pincode_enter_pin_code">アプリのパスワードを入力してください</string>
 -  <string name="pincode_enter_new_pin_code">新しいアプリのパスワードを入力してください</string>
    <string name="pincode_configure_your_pin">アプリのパスワードを入力してください</string>
    <string name="pincode_configure_your_pin_explanation">アプリ開始時に毎回PINが要求されます。</string>
    <string name="pincode_reenter_your_pincode">アプリのパスワードを再入力してください</string>
@@@ -117,35 -152,67 +120,40 @@@
    <string name="media_err_unsupported">サポートされていないメディアコーデック</string>
    <string name="media_err_io">メディアファイルを読み込めませんでした</string>
    <string name="media_err_malformed">メディアファイルが正確にエンコードされていません</string>
 -  <string name="media_err_timeout">プレイを試みた回数が多すぎます</string>
    <string name="media_err_invalid_progressive_playback">メディアファイルをストリーミングできません</string>
    <string name="media_err_unknown">メディアファイルをStock Media Playerでプレイ出来ません</string>
    <string name="media_err_security_ex">プレイに際してセキュリティエラー %1$s</string>
    <string name="media_err_io_ex">プレイに際して入力エラー %1$s</string>
    <string name="media_err_unexpected">プレイに際して予期しないエラー %1$s</string>
 -  <string name="media_previous_description">前のトラックボタン</string>
    <string name="media_rewind_description">巻き戻しボタン</string>
    <string name="media_play_pause_description">プレイ/ポーズボタン</string>
    <string name="media_forward_description">早送りボタン</string>
 -  <string name="media_next_description">次のトラックボタン</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15分</item>
 -    <item>30分</item>
 -    <item>60分</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">ログイン中...</string>
    <string name="auth_no_net_conn_title">ネットワークに接続されていません</string>
 -  <string name="auth_connect_anyway">接続する</string>
    <string name="auth_nossl_plain_ok_title">暗号化通信が利用できません。</string>
    <string name="auth_connection_established">接続が確立しました</string>
    <string name="auth_testing_connection">接続をテスト中...</string>
    <string name="auth_not_configured_title">サーバーの間違った設定</string>
 -  <string name="auth_not_configured_message">サーバー設定が正しくないようです。詳しくは管理者にご相談ください。</string>
 -  <string name="auth_account_not_new">同じユーザとサーバのアカウントがデバイス上にすでに存在します</string>
 -  <string name="auth_account_not_the_same">入力されたユーザはこのアカウントのユーザと一致しません</string>
    <string name="auth_unknown_error_title">不明なエラーに発生しました</string>
    <string name="auth_unknown_host_title">ホストが見つかりませんでした</string>
 -  <string name="auth_unknown_host_message">入力されたホストが見つかりません。ホスト名とサーバが利用できるものかどうか確認して、再度試してください。</string>
    <string name="auth_incorrect_path_title">のインスタンスが見つかりませんでした</string>
 -  <string name="auth_incorrect_path_message">指定されたパスでのサーバが見つかりませんでした。パスを確認してもう一度試してみてください。</string>
    <string name="auth_timeout_title">サーバーからの反応がありません。</string>
    <string name="auth_incorrect_address_title">不明なURL形式</string>
    <string name="auth_ssl_general_error_title">SSLの初期化に失敗しました</string>
 -  <string name="auth_ssl_unverified_server_title">未認証のSSLサーバID</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_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>
@@@ -165,12 -232,18 +173,12 @@@
    <string name="wait_a_moment">しばらくお待ちください</string>
    <string name="filedisplay_unexpected_bad_get_content">予期せぬ問題；他のアプリでファイルを選択してみてください。</string>
    <string name="filedisplay_no_file_selected">ファイルは選択されていません</string>
 -  <string name="oauth_host_url">oAuth2のURL</string>
 -  <string name="oauth_check_onoff">oAuth2でログイン</string>
    <string name="oauth_login_connection">oAuth2サーバーに接続中...</string>
 -  <string name="oauth_code_validation_message">ウェブブラウザで次を開いてください:\n%1$s。\nここでこのコードを確認してください:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">このURLへの接続は利用できません。</string>
 -  <string name="ssl_validator_title">警告</string>
    <string name="ssl_validator_header">サイトの識別子を確認できませんでした</string>
    <string name="ssl_validator_reason_cert_not_trusted">- サーバ証明書は信頼されていません</string>
    <string name="ssl_validator_reason_cert_expired">- サーバ証明書は有効期限切れです</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- サーバ証明書は若すぎます</string>
    <string name="ssl_validator_reason_hostname_not_verified">- URLは証明書内のホスト名と一致しません</string>
 -  <string name="ssl_validator_certificate_not_available">サーバ証明書を取得できませんでした</string>
    <string name="ssl_validator_question">この証明書を信頼してもよろしいですか？</string>
    <string name="ssl_validator_not_saved">証明書は保存できませんでした</string>
    <string name="ssl_validator_btn_details_see">詳細</string>
@@@ -203,6 -276,8 +211,6 @@@
    <string name="conflict_dont_upload">アップロードしない</string>
    <string name="preview_image_description">イメージプレビュー</string>
    <string name="preview_image_error_unknown_format">この画像は表示できません</string>
 -  <string name="preview_image_error_out_of_memory">「この画像を表示するのに十分なメモリがありません</string>
 -  <!--we need to improve the communication of errors to the user-->
    <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>
diff --combined 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,41 -1,90 +1,50 @@@
  <?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>
    <string name="prefs_category_more">Daugiau</string>
 -  <string name="prefs_add_session">Pridėti naują sesiją</string>
 -  <string name="prefs_create_img_thumbnails">Sukurti paveikslėlių miniatiūras</string>
 -  <string name="prefs_select_oc_account">Pasirinkite paskyrą</string>
 -  <string name="prefs_trackmydevice">Įrenginio sekimas</string>
 -  <string name="prefs_trackmydevice_summary_off">Leisti šiai programai sekti Jūsų įrenginio buvimo vietą</string>
 -  <string name="prefs_trackmydevice_interval">Atnaujinimo intervalas</string>
 -  <string name="prefs_trackmydevice_interval_summary">Atnaujinti kas %1$s min.</string>
    <string name="prefs_accounts">Paskyros</string>
    <string name="prefs_manage_accounts">Tvarkyti paskyras</string>
    <string name="prefs_pincode">App programos PIN kodas</string>
    <string name="prefs_pincode_summary">Apsaugokite savo klientą</string>
    <string name="prefs_instant_upload">Įjungti momentinius įkėlimus</string>
    <string name="prefs_instant_upload_summary">Iš karto nusiųsti nufotografuotas nuotraukas</string>
 -  <string name="prefs_log_title">Įjungti žurnalo rašymą</string>
 -  <string name="prefs_log_summary">Tai naudojama problemų žurnalo vedimui</string>
 -  <string name="prefs_log_title_history">Žurnalų istorija</string>
 -  <string name="prefs_log_summary_history">Čia rodomi įrašyti žurnalai</string>
 -  <string name="prefs_log_delete_history_button">Ištrinti Istoriją</string>
    <string name="prefs_help">Pagalba</string>
 -  <string name="prefs_recommend">Rekomenduoti draugui</string>
    <string name="prefs_feedback">Atsiliepimai</string>
    <string name="prefs_imprint">Imprint</string>
 -  <string name="recommend_subject">Išbandykite %1$s savo išmaniajame telefone!</string>
 -  <string name="recommend_text">Siūlau pabandyti %1$s savo išmaniajame telefone!\nParsisiųskite štai čia: %2$s</string>
 -  <string name="auth_check_server">Patikrinti Serverį</string>
 -  <string name="auth_account_name">Paskyros pavadinimas</string>
    <string name="auth_host_url">Serverio adresas</string>
    <string name="auth_username">Prisijungimo vardas</string>
    <string name="auth_password">Slaptažodis</string>
 -  <string name="new_session_uri_error">Įvestas neteisingas adresas</string>
 -  <string name="new_session_session_name_error">Neteisingas sesijos pavadinimas</string>
    <string name="sync_string_files">Failai</string>
 -  <string name="uploader_no_file_selected">Nusiuntimui nepasirinktas joks failas</string>
 -  <string name="setup_hint_username">Prisijungimo vardas</string>
 -  <string name="setup_hint_password">Slaptažodis</string>
 -  <string name="setup_hint_address">Web adresas</string>
 -  <string name="setup_hint_show_password">Rodyti slaptažodį?</string>
 -  <string name="setup_title">Prisijunkite prie savo %1$s</string>
    <string name="setup_btn_connect">Prisijungti</string>
    <string name="uploader_btn_upload_text">Įkelti</string>
    <string name="uploader_top_message">Nustatyti įkėlimų katalogą.</string>
    <string name="uploader_wrn_no_account_title">Paskyrų nerasta</string>
+   <string name="uploader_wrn_no_account_text">Jūsų įrenginyje nėra nė vienos %1$s paskyros. Prašome pirmiausia susikurti paskyrą.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">Nustatymai</string>
    <string name="uploader_wrn_no_account_quit_btn_text">IÅ¡eiti</string>
    <string name="uploader_wrn_no_content_title">Nėra įkeltino turinio</string>
    <string name="uploader_wrn_no_content_text">nebuvo gauta turinio. Nėra įkeltino turinio</string>
+   <string name="uploader_error_forbidden_content">%1$s neleidžiama prieiti prie turinio, kuriuo dalijamasi</string>
    <string name="uploader_info_uploading">Išsiunčiama</string>
+   <string name="uploader_btn_create_dir_text">Kurti aplanką išsiuntimui</string>
+   <string name="file_list_empty">Šiame aplanke failų nėra.\nNauji failai gali būti pridėti naudojant \"Įkelti\" funkciją meniu.</string>
    <string name="filedetails_select_file">Palieskite failą, kad parodyti papildomą informaciją.</string>
    <string name="filedetails_size">Dydis:</string>
    <string name="filedetails_type">Tipas:</string>
    <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>
@@@ -43,6 -92,7 +52,6 @@@
    <string name="common_cancel_upload">Atšaukti siuntimą</string>
    <string name="common_cancel">Atšaukti</string>
    <string name="common_save_exit">IÅ¡saugoti ir IÅ¡eiti</string>
 -  <string name="common_exit">Palikti %1$s</string>
    <string name="common_error">Klaida</string>
    <string name="common_loading">Įkeliama...</string>
    <string name="common_error_unknown">Neatpažinta klaida</string>
@@@ -56,6 -106,7 +65,6 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% Siunčiama %2$s</string>
    <string name="uploader_upload_succeeded_ticker">Nusiuntimas pavyko</string>
    <string name="uploader_upload_succeeded_content_single">%1$s buvo sėkmingai nusiųstas</string>
 -  <string name="uploader_upload_succeeded_content_multiple">%1$d failai buvo sėkmingai nusiųsti</string>
    <string name="uploader_upload_failed_ticker">Nusiuntimas nepavyko</string>
    <string name="uploader_upload_failed_content_single">Nepavyko baigti %1$s nusiuntimo</string>
    <string name="downloader_download_in_progress_ticker">Atsiunčiama...</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>
@@@ -88,24 -148,64 +102,43 @@@
    <string name="media_event_done">%1$s sąrašas baigtas</string>
    <string name="media_err_nothing_to_play">Nerasta medija failų</string>
    <string name="media_err_no_account">Nenurodyta paskyra</string>
 -  <string name="media_err_unsupported">Nepalaikomas kodekas</string>
 -  <string name="media_err_io">Nenuskaitomas medijos failas</string>
 -  <string name="media_err_malformed">Netinkamai užkoduotas medijos failas</string>
 -  <string name="media_err_invalid_progressive_playback">Medijos failas negali būti transliuojamas</string>
 -  <string name="media_err_unknown">Medijos failas negali būti atkurtas naudojant gamyklinį grotuvą</string>
 -  <string name="media_err_security_ex">Saugumo klaida bandant paleisti %1$s</string>
 -  <string name="media_err_io_ex">Įvesties klaida bandant paleisti %1$s</string>
 -  <string name="media_err_unexpected">Netikėta klaida bandant paleisti %1$s</string>
 -  <string name="media_play_pause_description">Grojimo arba pauzės mygtukas</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 Minučių</item>
 -    <item>30 Minučių</item>
 -    <item>60 Minučių</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">Bandoma prisijungti...</string>
    <string name="auth_no_net_conn_title">Nėra tinklo ryšio</string>
 -  <string name="auth_connect_anyway">Vis tiek prisijungti</string>
    <string name="auth_nossl_plain_ok_title">Saugus prisijungimas negalimas.</string>
    <string name="auth_connection_established">Ryšys užmegztas</string>
    <string name="auth_testing_connection">IÅ¡bandomas prisijungimas...</string>
    <string name="auth_not_configured_title">Sugadinta serverio konfigūracija</string>
+   <string name="auth_account_not_new">To paties vartotojo ir serverio paskyra jau egzistuoja šiame įrenginyje</string>
    <string name="auth_unknown_error_title">Įvyko nežinoma klaida!</string>
    <string name="auth_unknown_host_title">Nepavyko rasti mazgo</string>
+   <string name="auth_incorrect_path_title">Å is serveris netinkamas</string>
    <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>
+   <string name="confirmation_remove_folder_alert">Ar tikrai norite pašalinti %1$s ir ten esantį turinį?</string>
    <string name="confirmation_remove_local">Tik vietiniai</string>
    <string name="confirmation_remove_folder_local">Tik vietinis turinys</string>
    <string name="confirmation_remove_remote">Pašalinti iš serverio</string>
@@@ -119,11 -219,19 +152,12 @@@
    <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>
    <string name="ssl_validator_reason_hostname_not_verified">- URL neatitinka adreso, kuris yra nurodytas sertifikate</string>
 -  <string name="ssl_validator_certificate_not_available">Negalima gauti serverio sertifikato</string>
    <string name="ssl_validator_question">Ar vis tiek norite priimti šį sertifikatą?</string>
    <string name="ssl_validator_not_saved">Sertifikatas negali būti išsaugotas</string>
    <string name="ssl_validator_btn_details_see">Informacija</string>
@@@ -141,9 -249,23 +175,22 @@@
    <string name="ssl_validator_label_validity_to">Iki:</string>
    <string name="ssl_validator_label_signature">Parašas:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritmas:</string>
+   <string name="placeholder_filetype">PNG paveikslėlis</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="instant_upload_on_wifi">Įkelti nuotraukas tik kai prisijungiama per WiFi</string>
    <string name="conflict_title">Atnaujinimo konfliktas</string>
+   <string name="conflict_message">Nutolęs failas %s nėra sinchronizuotas su vietiniu failu. Jei tęsite, failas serveryje bus pakeistas.</string>
    <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 --combined 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 --combined res/values-ms-rMY/strings.xml
index 63ef1d05,8edd82a8..81142f28
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@@ -1,23 -1,47 +1,24 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Kata laluan:</string>
 -  <string name="main_login">Nama pengguna:</string>
 -  <string name="main_button_login">Log masuk</string>
 -  <string name="main_welcome">Selamat datang</string>
 -  <string name="main_files">Fail-fail</string>
 -  <string name="main_music">Muzik</string>
 -  <string name="main_contacts">Hubungi </string>
 -  <string name="main_calendar">Kalendar</string>
 -  <string name="main_bookmarks">Tanda</string>
 -  <string name="main_settings">Tetapan</string>
 -  <string name="main_tit_accsetup">Set akaun</string>
 -  <string name="main_wrn_accsetup">Peranti anda tidak mempunyai akaun. Anda perlu membina satu akaun untuk menggunakan aplikasi ini</string>
    <string name="actionbar_upload">Muat naik</string>
    <string name="actionbar_upload_files">Fail-fail</string>
    <string name="actionbar_mkdir">Bina direktori</string>
 -  <string name="actionbar_search">Cari</string>
    <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>
    <string name="auth_password">Kata laluan</string>
    <string name="sync_string_files">Fail-fail</string>
 -  <string name="setup_hint_username">Nama pengguna</string>
 -  <string name="setup_hint_password">Kata laluan</string>
 -  <string name="setup_hint_address">Alamat sesawang</string>
 -  <string name="setup_hint_show_password">Tunjuk password?</string>
 -  <string name="setup_title">Berhubung dengan %1$s anda</string>
    <string name="setup_btn_connect">Berhubung</string>
    <string name="uploader_btn_upload_text">Muat naik</string>
    <string name="uploader_wrn_no_account_title">Tiada akaun dijumpai</string>
    <string name="uploader_wrn_no_account_text">Device anda tidak mempunyai sebarang akaun %1$s. Mohon bina akaun dahulu.</string>
    <string name="uploader_wrn_no_account_quit_btn_text">Berhenti</string>
    <string name="uploader_info_uploading">Memuatnaik</string>
 -  <string name="uploader_btn_create_dir_text">Bina direktori untuk proses upload</string>
    <string name="filedetails_size">Saiz</string>
    <string name="filedetails_type">Jenis</string>
    <string name="filedetails_created">Telah dibina:</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 --combined res/values-nl/strings.xml
index ce619254,1b6d27f7..6bd230c5
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Wachtwoord:</string>
 -  <string name="main_login">Gebruikersnaam:</string>
 -  <string name="main_button_login">Login</string>
 -  <string name="main_welcome">Welkom</string>
 -  <string name="main_files">Bestanden</string>
 -  <string name="main_music">Muziek</string>
 -  <string name="main_contacts">Contactpersonen</string>
 -  <string name="main_calendar">Kalender</string>
 -  <string name="main_bookmarks">Bladwijzers</string>
 -  <string name="main_settings">Instellingen</string>
 -  <string name="main_tit_accsetup">Account configureren.</string>
 -  <string name="main_wrn_accsetup">Er zijn nog geen accounts op dit apparaat. Als je deze app wilt gebruiken zul je een account moeten aanmaken.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">versie %1$s</string>
    <string name="actionbar_sync">Account verversen</string>
@@@ -8,10 -20,17 +8,10 @@@
    <string name="actionbar_upload_files">Bestanden</string>
    <string name="actionbar_open_with">Open met</string>
    <string name="actionbar_mkdir">Creëer map</string>
 -  <string name="actionbar_search">Zoeken</string>
    <string name="actionbar_settings">Instellingen</string>
    <string name="actionbar_see_details">Details</string>
    <string name="prefs_category_general">Algemeen</string>
    <string name="prefs_category_more">Meer</string>
 -  <string name="prefs_add_session">Voeg nieuwe sessie toe</string>
 -  <string name="prefs_create_img_thumbnails">Maak afbeeldingsminiaturen</string>
 -  <string name="prefs_select_oc_account">Selecteer een account</string>
 -  <string name="prefs_trackmydevice_summary_off">Sta toe dat app je apparaat locatie volgt</string>
 -  <string name="prefs_trackmydevice_summary_on">Houdt dit apparaat in de gaten</string>
 -  <string name="prefs_trackmydevice_interval_summary">Ververs elke %1$s minuten</string>
    <string name="prefs_accounts">Accounts</string>
    <string name="prefs_manage_accounts">Beheer accounts</string>
    <string name="prefs_pincode">App PIN</string>
@@@ -24,14 -43,23 +24,17 @@@
    <string name="prefs_log_summary_history">Dit toont de bijgehouden logs</string>
    <string name="prefs_log_delete_history_button">Verwijder Geschiedenis</string>
    <string name="prefs_help">Help</string>
+   <string name="prefs_recommend">Aanbevelen bij een vriend</string>
    <string name="prefs_feedback">Feedback</string>
    <string name="prefs_imprint">afdruk</string>
+   <string name="recommend_subject">Probeer %1$s op uw smartphone!</string>
+   <string name="recommend_text">Uitnodiging om %1$s op uw smartphone uit te proberen!\nDownload hier: %2$s</string>
    <string name="auth_check_server">Controleer server</string>
    <string name="auth_host_url">Server adres</string>
    <string name="auth_username">Gebruikersnaam</string>
    <string name="auth_password">Wachtwoord</string>
    <string name="auth_register">Nieuw bij %1$s?</string>
    <string name="sync_string_files">Bestanden</string>
 -  <string name="uploader_no_file_selected">Geen bestand geselecteerd voor upload</string>
 -  <string name="setup_hint_username">Gebruikersnaam</string>
 -  <string name="setup_hint_password">Wachtwoord</string>
 -  <string name="setup_hint_address">Webadres</string>
 -  <string name="setup_hint_show_password">Wachtwoord tonen?</string>
 -  <string name="setup_title">Verbinden met je %1$s</string>
    <string name="setup_btn_connect">Verbinden</string>
    <string name="uploader_btn_upload_text">Uploaden</string>
    <string name="uploader_top_message">Selecteer upload map:</string>
@@@ -43,6 -71,7 +46,6 @@@
    <string name="uploader_wrn_no_content_text">Er werd geen inhoud ontvangen. Niets om te uploaden.</string>
    <string name="uploader_error_forbidden_content">%1$s is niet toegestaan om toegang te hebben tot de publieke inhoud</string>
    <string name="uploader_info_uploading">Uploaden</string>
 -  <string name="uploader_btn_create_dir_text">Maak nieuwe map voor upload</string>
    <string name="file_list_empty">Er zitten geen bestanden in deze map.\nNieuwe bestanden kunnen worden toegevoegd via de \"Upload\" menukeuze.</string>
    <string name="filedetails_select_file">Druk op een bestand om extra informatie weer te geven</string>
    <string name="filedetails_size">Grootte:</string>
@@@ -51,6 -80,7 +54,6 @@@
    <string name="filedetails_modified">Aangepast:</string>
    <string name="filedetails_download">Download</string>
    <string name="filedetails_sync_file">Bestand verversen</string>
 -  <string name="filedetails_redownload">Opnieuw downloaden</string>
    <string name="filedetails_renamed_in_upload_msg">Bestand was hernoemt naar %1$s tijdens het uploaden</string>
    <string name="common_yes">Ja</string>
    <string name="common_no">Nee</string>
@@@ -59,6 -89,7 +62,6 @@@
    <string name="common_cancel_upload">Upload afbreken</string>
    <string name="common_cancel">Annuleren</string>
    <string name="common_save_exit">Opslaan &amp; Afsluiten</string>
 -  <string name="common_exit">Verlaat %1$s</string>
    <string name="common_error">Fout</string>
    <string name="common_loading">Laden...</string>
    <string name="common_error_unknown">Onbekende fout</string>
@@@ -74,6 -105,7 +77,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s is met succes ge-upload</string>
    <string name="uploader_upload_failed_ticker">Upload mislukt</string>
    <string name="uploader_upload_failed_content_single">Upload van %1$s kon niet voltooid worden</string>
 -  <string name="uploader_upload_failed_content_multiple">Uploaden mislukt: %1$d/%2$d bestanden zijn geüpload</string>
    <string name="downloader_download_in_progress_ticker">Downloaden ...</string>
    <string name="downloader_download_in_progress_content">%1$d%% Aan het downloaden %2$s</string>
    <string name="downloader_download_succeeded_ticker">Downloaden gelukt</string>
@@@ -82,6 -114,7 +85,6 @@@
    <string name="downloader_download_failed_content">Download van %1$s kon niet worden voltooid</string>
    <string name="downloader_not_downloaded_yet">Nog niet gedownload</string>
    <string name="common_choose_account">Kies account</string>
 -  <string name="sync_string_contacts">Contactpersonen</string>
    <string name="sync_fail_ticker">Synchronisatie mislukt</string>
    <string name="sync_fail_content">Synchronisatie van %1$s kon niet worden voltooid</string>
    <string name="sync_fail_content_unauthorized">Ongeldig wachtwoord voor %1$s</string>
@@@ -98,7 -131,10 +101,7 @@@
    <string name="foreign_files_local_text">Lokaal: %1$s</string>
    <string name="foreign_files_remote_text">Extern: %1$s</string>
    <string name="upload_query_move_foreign_files">Er is niet genoeg ruimte om de gekopieerde bestanden ook te plaatsen in map %1$s. Wilt u ze erheen verplaatsten? </string>
 -  <string name="use_ssl">Gebruik veilige verbinding</string>
 -  <string name="location_no_provider">%1$s kan het apparaat niet volgen. Configureer de locatie instellingen (location settings).</string>
    <string name="pincode_enter_pin_code">Voer App PIN in</string>
 -  <string name="pincode_enter_new_pin_code">Voer nieuwe App PIN in</string>
    <string name="pincode_configure_your_pin">Voer App PIN in</string>
    <string name="pincode_configure_your_pin_explanation">De PIN wordt steeds opnieuw gevraagd als de app wordt gestart</string>
    <string name="pincode_reenter_your_pincode">Voer App PIN opnieuw in</string>
@@@ -117,35 -153,67 +120,40 @@@
    <string name="media_err_unsupported">Niet ondersteunde media codec</string>
    <string name="media_err_io">Mediabestand kon niet worden gelezen</string>
    <string name="media_err_malformed">Mediabestand niet goed gecodeerd</string>
 -  <string name="media_err_timeout">Te veel tijd geprobeerd te spelen</string>
    <string name="media_err_invalid_progressive_playback">Mediabestand kan niet worden gestreamd</string>
    <string name="media_err_unknown">Mediabestand kan niet worden afgespeeld met de standaard mediaplayer</string>
    <string name="media_err_security_ex">Beveiligingsfout bij afspelen %1$s</string>
    <string name="media_err_io_ex">Invoerfout bij afspelen %1$1s</string>
    <string name="media_err_unexpected">Onverwachte fout bij afspelen %1$s</string>
 -  <string name="media_previous_description">Vorige nummer knop</string>
    <string name="media_rewind_description">terugpoel knop</string>
    <string name="media_play_pause_description">Speel of pauze knop</string>
    <string name="media_forward_description">Doorspoel knop</string>
 -  <string name="media_next_description">Volgende nummer knop</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minuten</item>
 -    <item>30 minuten</item>
 -    <item>60 mintuen</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">Proberen om in te loggen...</string>
    <string name="auth_no_net_conn_title">Geen netwerkverbinding</string>
 -  <string name="auth_connect_anyway">Toch verbinden</string>
    <string name="auth_nossl_plain_ok_title">Veilige verbinding niet beschikbaar.</string>
    <string name="auth_connection_established">Verbinding tot stand gebracht</string>
    <string name="auth_testing_connection">Probeer verbinding...</string>
    <string name="auth_not_configured_title">Foutieve server configuratie</string>
 -  <string name="auth_not_configured_message">Het lijkt erop dat je server instantie niet correct geconfigureerd is. Neem contact op met je beheerder voor meer details.</string>
 -  <string name="auth_account_not_new">Er bestaat al een account voor deze gebruiker en server op dit apparaat.</string>
 -  <string name="auth_account_not_the_same">De opgegeven gebruiker komt niet overeen met de gebruiker van dit account</string>
    <string name="auth_unknown_error_title">Onbekende fout opgetreden!</string>
    <string name="auth_unknown_host_title">Kon geen host vinden</string>
 -  <string name="auth_unknown_host_message">Kon de ingevoerde host niet vinden. Controleer de hostnaam en servertoegankelijkheid en probeer opnieuw.</string>
    <string name="auth_incorrect_path_title">Server instantie niet gevonden</string>
 -  <string name="auth_incorrect_path_message">De applicatie kon geen instantie van server vinden op de opgegeven locatie. Controleer het pad en probeer opnieuw.</string>
    <string name="auth_timeout_title">De server had te lang nodig om te reageren</string>
    <string name="auth_incorrect_address_title">Misvormde URL</string>
    <string name="auth_ssl_general_error_title">SSL initialisatie mislukt</string>
 -  <string name="auth_ssl_unverified_server_title">Niet geverifieerde SSL server identiteit</string>
    <string name="auth_bad_oc_version_title">Onherkende server versie</string>
    <string name="auth_wrong_connection_title">Kon verbinding niet tot stand brengen.</string>
    <string name="auth_secure_connection">Veilige verbinding tot stand gebracht</string>
    <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>
@@@ -165,12 -233,18 +173,12 @@@
    <string name="wait_a_moment">Even geduld</string>
    <string name="filedisplay_unexpected_bad_get_content">Onverwacht probleem; probeer een andere app om het bestand te selecteren</string>
    <string name="filedisplay_no_file_selected">Er werd geen bestand geselecteerd</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Login met oAuth2.</string>
    <string name="oauth_login_connection">Verbinden met oAuth2-server.</string>
 -  <string name="oauth_code_validation_message">Open a.u.b. een webbrpwser en ga naar:\n%1$s.\nValideer deze code daar:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Verbinding met deze URL is niet beschikbaar.</string>
 -  <string name="ssl_validator_title">Waarschuwing</string>
    <string name="ssl_validator_header">De identiteit van de site kan niet worden gecontroleerd</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Het server certificaat wordt niet vertrouwd</string>
    <string name="ssl_validator_reason_cert_expired">- Het server certificaat is verlopen</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Het server certificaat is te recent</string>
    <string name="ssl_validator_reason_hostname_not_verified">- De URL komt niet overeen met de hostname in het certificaat</string>
 -  <string name="ssl_validator_certificate_not_available">Het server certificaat kon niet opgevraagd worden</string>
    <string name="ssl_validator_question">Wil je dit certificaat alsnog vertrouwen?</string>
    <string name="ssl_validator_not_saved">Het certificaat kon niet worden opgeslagen</string>
    <string name="ssl_validator_btn_details_see">Details</string>
@@@ -203,6 -277,8 +211,6 @@@
    <string name="conflict_dont_upload">Niet uploaden</string>
    <string name="preview_image_description">Afbeelding voorbeeld</string>
    <string name="preview_image_error_unknown_format">Deze afbeelding kan niet weergegeven worden</string>
 -  <string name="preview_image_error_out_of_memory">\"Niet voldoende geheugen om deze afbeelding weer te geven</string>
 -  <!--we need to improve the communication of errors to the user-->
    <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">Mislukte Directe Upload</string>
    <string name="failed_upload_headline_text">Mislukte directe uploads</string>
diff --combined res/values-pl/strings.xml
index bf402a8a,be2c0655..92c6034c
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Hasło:</string>
 -  <string name="main_login">Nazwa użutkownika:</string>
 -  <string name="main_button_login">Login</string>
 -  <string name="main_welcome">Witaj</string>
 -  <string name="main_files">Pliki</string>
 -  <string name="main_music">Muzyka</string>
 -  <string name="main_contacts">Kontakty</string>
 -  <string name="main_calendar">Kalendarz</string>
 -  <string name="main_bookmarks">Zakładki</string>
 -  <string name="main_settings">Ustawienia</string>
 -  <string name="main_tit_accsetup">Ustawienia Konta</string>
 -  <string name="main_wrn_accsetup">Nie wykryto kont ownCloud. Aby korzystać z tej aplikacji, musisz utworzyć konto.</string>
    <string name="about_android">%1$s Aplikacja Android</string>
    <string name="about_version">wersja %1$s</string>
    <string name="actionbar_sync">Odśwież konto</string>
@@@ -8,10 -20,20 +8,10 @@@
    <string name="actionbar_upload_files">Pliki</string>
    <string name="actionbar_open_with">Otwórz za pomocą</string>
    <string name="actionbar_mkdir">Nowy katalog</string>
 -  <string name="actionbar_search">Szukaj</string>
    <string name="actionbar_settings">Ustawienia</string>
    <string name="actionbar_see_details">Szczegóły</string>
    <string name="prefs_category_general">Ogólne</string>
    <string name="prefs_category_more">Więcej</string>
 -  <string name="prefs_add_session">Dodaj sesje</string>
 -  <string name="prefs_create_img_thumbnails">Utwórz miniaturki obrazów</string>
 -  <string name="prefs_select_oc_account">Wybierz konto</string>
 -  <string name="prefs_summary_select_oc_account">Wybierz konto, z którego ma korzystać aplikacja.</string>
 -  <string name="prefs_trackmydevice">Śledzenie urządzeń</string>
 -  <string name="prefs_trackmydevice_summary_off">Włącz śledzenie lokalizacji urządzenia przez tę aplikację</string>
 -  <string name="prefs_trackmydevice_summary_on">Ta aplikacja śledzi to urządzenie</string>
 -  <string name="prefs_trackmydevice_interval">Odstęp aktualizacji</string>
 -  <string name="prefs_trackmydevice_interval_summary">Aktualizuj co %1$s minut</string>
    <string name="prefs_accounts">Konta</string>
    <string name="prefs_manage_accounts">Zarządzaj kontami</string>
    <string name="prefs_pincode">PIN aplikacji</string>
@@@ -30,11 -52,20 +30,12 @@@
    <string name="recommend_subject">Wypróbuj %1$s na swoim smartphonie!</string>
    <string name="recommend_text">Chcę was zaprosić do korzystania z %1$ s na twoim smartfonie!\nPobierz tutaj: %2$s</string>
    <string name="auth_check_server">Sprawdź serwer</string>
+   <string name="auth_account_name">Nazwa konta</string>
    <string name="auth_host_url">Adres Serwera</string>
    <string name="auth_username">Nazwa użytkownika</string>
    <string name="auth_password">Hasło</string>
    <string name="auth_register">Nowe %1$s?</string>
 -  <string name="new_session_uri_error">Niepoprawny URL</string>
 -  <string name="new_session_session_name_error">Niepoprawna nazwa sesji</string>
    <string name="sync_string_files">Pliki</string>
 -  <string name="uploader_no_file_selected">Nie wybrano plików do przesłania</string>
 -  <string name="setup_hint_username">Nazwa użytkownika</string>
 -  <string name="setup_hint_password">Hasło</string>
 -  <string name="setup_hint_address">Adres sieciowy</string>
 -  <string name="setup_hint_show_password">Pokaż hasło</string>
 -  <string name="setup_title">Połącz z %1$s</string>
    <string name="setup_btn_connect">Połącz</string>
    <string name="uploader_btn_upload_text">Wyślij</string>
    <string name="uploader_top_message">Wybierz folder do wysłania:</string>
@@@ -46,6 -77,7 +47,6 @@@
    <string name="uploader_wrn_no_content_text">Nie otrzymano danych. Nie ma nic do wysłania.</string>
    <string name="uploader_error_forbidden_content">%1$s nie ma dostępu do udostępnionych treści</string>
    <string name="uploader_info_uploading">Wysyłanie</string>
 -  <string name="uploader_btn_create_dir_text">Stwórz katalog do wysyłania</string>
    <string name="file_list_empty">Nie ma plików w tym katalogu.⏎ Nowe pliki można dodać wybierając w menu Wyślij.</string>
    <string name="filedetails_select_file">Dotknij plik aby wyświetlić dodatkowe informacje</string>
    <string name="filedetails_size">Rozmiar:</string>
@@@ -54,6 -86,7 +55,6 @@@
    <string name="filedetails_modified">Zmodyfikowano:</string>
    <string name="filedetails_download">Pobierz</string>
    <string name="filedetails_sync_file">Odśwież plik</string>
 -  <string name="filedetails_redownload">Pobierz ponownie</string>
    <string name="filedetails_renamed_in_upload_msg">Podczas wysyłania nazwa pliku została zmieniona na %1$s</string>
    <string name="common_yes">Tak</string>
    <string name="common_no">Nie</string>
@@@ -62,6 -95,7 +63,6 @@@
    <string name="common_cancel_upload">Anuluj wysyłanie</string>
    <string name="common_cancel">Anuluj</string>
    <string name="common_save_exit">Zapisz i wyjdź</string>
 -  <string name="common_exit">Opuść %1$s</string>
    <string name="common_error">Błąd</string>
    <string name="common_loading">Wczytuję ...</string>
    <string name="common_error_unknown">Nieznany błąd</string>
@@@ -75,8 -109,10 +76,8 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% Wysyłanie %2$s</string>
    <string name="uploader_upload_succeeded_ticker">Wysyłanie zakończone powodzeniem</string>
    <string name="uploader_upload_succeeded_content_single">Wysyłanie %1$s zakończone sukcesem</string>
 -  <string name="uploader_upload_succeeded_content_multiple">Wysłano %1$d plików</string>
    <string name="uploader_upload_failed_ticker">Wysyłanie nie powiodło się</string>
    <string name="uploader_upload_failed_content_single">Wysyłanie %1$s nie powiodło się</string>
 -  <string name="uploader_upload_failed_content_multiple">Wysyłanie nieudane: wysłano %1$d/%2$d plików</string>
    <string name="downloader_download_in_progress_ticker">Pobieranie …</string>
    <string name="downloader_download_in_progress_content">%1$d%% Pobieranie %2$s</string>
    <string name="downloader_download_succeeded_ticker">Pobieranie zakończone</string>
@@@ -85,6 -121,7 +86,6 @@@
    <string name="downloader_download_failed_content">Pobieranie %1$s nie powiodło się</string>
    <string name="downloader_not_downloaded_yet">Nie poprane jeszcze</string>
    <string name="common_choose_account">Wybierz konto</string>
 -  <string name="sync_string_contacts">Kontakty</string>
    <string name="sync_fail_ticker">Błąd synchronizacji</string>
    <string name="sync_fail_content">Nie można było ukończyć synchronizacji %1$s </string>
    <string name="sync_fail_content_unauthorized">Niepoprawne hasło dla %1$s</string>
@@@ -95,13 -132,17 +96,14 @@@
    <string name="sync_foreign_files_forgotten_ticker">Niektóre lokalne pliki zostały zgubione.</string>
    <string name="sync_foreign_files_forgotten_content">%1$d plików z %2$s katalogu nie może zostać skopiowana do niego</string>
    <string name="sync_foreign_files_forgotten_explanation">\"W wersji 1.3.16, pliki załadowane z tego urządzenia są skopiowane do lokalnego folderu %1$s aby zapobiec utracie danych, gdy pojedynczy plik jest synchronizowany z kilku kont.⏎ ⏎ Ze zwględu na tą zmianę, wszystkie pliki załadowane w poprzedniej wersji tej aplikacji były kopiowane do folderu %2$s. Jednakże błąd podczas synchronizacji spowodował przerwanie procesu. Możesz zostawić plik(i) i usunąć link do %3$s, lub przenieść plik(i) to katalogu %1$s i zostawić link do %4$s.⏎ ⏎ Lista poniżej zawiera lokalne i zdalne pliki, które są podlinkowane do %5$s.</string>
+   <string name="sync_current_folder_was_removed">Folder  %1$s nie istnieje.</string>
    <string name="foreign_files_move">Przenieś wszystko</string>
    <string name="foreign_files_success">Wszystkie pliki zostały przeniesione</string>
    <string name="foreign_files_fail">Niektóre pliki nie mogły być przeniesione</string>
    <string name="foreign_files_local_text">Lokalna ścieżka: %1$s</string>
    <string name="foreign_files_remote_text">Zdalna ścieżka: %1$s</string>
    <string name="upload_query_move_foreign_files">Nie ma wystarczająco miejśca, aby skopiować zaznaczone pliki do folderu %1$s. Chciałbyś je przenieść?</string>
 -  <string name="use_ssl">Użyj bezpiecznego połączenia</string>
 -  <string name="location_no_provider">%1$s nie może śledzić urządzenia. Sprawdź ustawienia lokalizacji</string>
    <string name="pincode_enter_pin_code">Podaj PIN aplikacji</string>
 -  <string name="pincode_enter_new_pin_code">Podaj nowy PIN aplikacji</string>
    <string name="pincode_configure_your_pin">Wpisz PIN aplikacji</string>
    <string name="pincode_configure_your_pin_explanation">Kod PIN będzie wymagany za każdym razem, gdy aplikacja będzie uruchamiana.</string>
    <string name="pincode_reenter_your_pincode">Ponownie wpisz PIN aplikacji</string>
@@@ -120,36 -161,57 +122,36 @@@
    <string name="media_err_unsupported">Nieobsługiwany kodek multimediów</string>
    <string name="media_err_io">Błąd odczytu pliku multimedialnego</string>
    <string name="media_err_malformed">Błąd kodowania pliku multimedialnego</string>
 -  <string name="media_err_timeout">Przekroczono czas próby odtworzenia multimediów</string>
 +  <string name="media_err_timeout">Upłynął limit czasu podczas próby odtwarzania</string>
    <string name="media_err_invalid_progressive_playback">Ni udało się przesłać pliku multimedialnego</string>
    <string name="media_err_unknown">Plik multimediów nie może być odtworzony we wbudowanym odtwarzaczu</string>
    <string name="media_err_security_ex">Błąd zabezpieczeń podczas próby odtworzenia %1$s</string>
    <string name="media_err_io_ex">Błąd wprowadzania podczas próby odtworzenia %1$s</string>
    <string name="media_err_unexpected">Nieoczekiwany błąd podczas próby odtworzenia %1$s</string>
 -  <string name="media_previous_description">Przycisk przejścia do poprzedniego utworu</string>
    <string name="media_rewind_description">Przycisk przewijania</string>
    <string name="media_play_pause_description">Przycisk odtwarzania / pauzowania</string>
    <string name="media_forward_description">Przycisk przewijania do przodu</string>
 -  <string name="media_next_description">Przycisk przejścia do kolejnego utworu</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minut</item>
 -    <item>30 minut</item>
 -    <item>60 minut</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">Próbuję się zalogować...</string>
    <string name="auth_no_net_conn_title">Brak połączenia sieciowego</string>
 -  <string name="auth_no_net_conn_message">Nie znaleziono połączenia sieciowego. Sprawdź połączenie internetowe i spróbuj ponownie.</string>
 -  <string name="auth_connect_anyway">Połącz mimo wszystko</string>
    <string name="auth_nossl_plain_ok_title">Nie można nawiązać bezpiecznego połączenia.</string>
 -  <string name="auth_nossl_plain_ok_message">Aplikacja nie można ustanowić bezpiecznego połączenia z serwerem. Niezabezpieczone połączenie jest dostępne. Możesz kontynuować lub anulować.</string>
    <string name="auth_connection_established">Połączenie nawiązane</string>
    <string name="auth_testing_connection">Testowanie połączenia…</string>
    <string name="auth_not_configured_title">Uszkodzona konfiguracja serwera</string>
 -  <string name="auth_not_configured_message">Wygląda na to, że twoja instancja serwer nie jest poprawnie skonfigurowana. Aby uzyskać więcej informacji, skontaktuj się z administratorem.</string>
    <string name="auth_account_not_new">Konto tego samego użytkownika i serwera już istnieje na tym urządzeniu</string>
    <string name="auth_account_not_the_same">Podany login nie pasuje do użytkowników </string>
    <string name="auth_unknown_error_title">Wystąpił nieznany błąd!</string>
 -  <string name="auth_unknown_error_message">Wystąpił nieznany błąd. Proszę skontaktować się z autorami i dodać dzienniki z urządzenia.</string>
    <string name="auth_unknown_host_title">Nie mogę znaleźć hosta</string>
 -  <string name="auth_unknown_host_message">Nie można znaleźć podanego hosta. Sprawdź nazwę hosta oraz dostępność serwera i spróbuj ponownie.</string>
    <string name="auth_incorrect_path_title">Nie znaleziono instancji serwer</string>
 -  <string name="auth_incorrect_path_message">Aplikacja nie odnalazła instancji serwera pod podaną ścieżką. Sprawdź ścieżkę i spróbuj ponownie.</string>
    <string name="auth_timeout_title">Serwer zbyt długo nie odpowiadał</string>
    <string name="auth_incorrect_address_title">Zły format adresu URL</string>
    <string name="auth_ssl_general_error_title">Inicjowanie SSL nie powiodło się</string>
 -  <string name="auth_ssl_unverified_server_title">Tożsamość SSL serwera niezweryfikowana</string>
 +  <string name="auth_ssl_unverified_server_title">Nie można zweryfikować tożsamości SSl serwera</string>
    <string name="auth_bad_oc_version_title">Nie rozpoznano wersji serwera</string>
    <string name="auth_wrong_connection_title">Nie można ustanowić połączenia</string>
    <string name="auth_secure_connection">Nawiązano bezpieczne połączenie</string>
    <string name="auth_unauthorized">Zła nazwa użytkownika lub hasło</string>
    <string name="auth_oauth_error">Nieudana autoryzacja</string>
    <string name="auth_oauth_error_access_denied">Dostęp zabroniony przez serwer autoryzacji</string>
 -  <string name="auth_not_found">Wprowadzono nieprawidłową ścieżkę</string>
 -  <string name="auth_internal">Wewnętrzny błąd serwera, kod %1$d</string>
    <string name="auth_wtf_reenter_URL">Nieoczekiwany stan; Proszę wpisz adres URL serwera ponownie</string>
    <string name="auth_expired_oauth_token_toast">Twoja sesja wygasła. Proszę zaloguj się ponownie</string>
    <string name="auth_expired_basic_auth_toast">Proszę podać obecne hasło</string>
@@@ -157,7 -219,13 +159,7 @@@
    <string name="auth_connecting_auth_server">Łączenie z serwerem autoryzacji...</string>
    <string name="auth_unsupported_auth_method">Serwer nie obsługuje tej metody autoryzacji</string>
    <string name="auth_unsupported_multiaccount">%1$s nie wspiera multikont</string>
 -  <string name="crashlog_message">Aplikacja została nieoczekiwanie zakończona. Czy chcesz przesłać raport awarii?</string>
 -  <string name="crashlog_send_report">Wyślij raport</string>
 -  <string name="crashlog_dont_send_report">Nie wysyłaj raportu</string>
 -  <string name="extensions_avail_title">Rozszerzenie dostępne!</string>
 -  <string name="extensions_avail_message">Twoja instancja serwera wspiera zaawansowane rozszerzenia. Czy chcesz zobaczyć rozszerzenia dostępne dla systemu Android?</string>
    <string name="fd_keep_in_sync">Automatyczne aktualizuj plik</string>
 -  <string name="common_share">Udostępnij</string>
    <string name="common_rename">Zmień nazwę</string>
    <string name="common_remove">Usuń</string>
    <string name="confirmation_remove_alert">Czy na pewno chcesz usunąć %1$s ?</string>
@@@ -177,13 -245,18 +179,13 @@@
    <string name="wait_a_moment">Poczekaj chwilę</string>
    <string name="filedisplay_unexpected_bad_get_content">Nieoczekiwany problem; spróbuj wybrać plik z innej aplikacji</string>
    <string name="filedisplay_no_file_selected">Nie wybrano żadnych plików</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
    <string name="oauth_check_onoff">Loguj przez oAuth2</string>
    <string name="oauth_login_connection">Łączenie z serwerem oAuth2...</string>
 -  <string name="oauth_code_validation_message">Proszę Otwórz przeglądarkę internetową i przejdź do:\n%1$s.\nSprawdź ten kod tam:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Połączenie do tego adresu URL jest niedostępne.</string>
 -  <string name="ssl_validator_title">Ostrzeżenie</string>
    <string name="ssl_validator_header">Nie można zweryfikować tożsamości strony</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Certyfikat serwera jest niezaufany</string>
    <string name="ssl_validator_reason_cert_expired">- Certyfikat serwera wygasł</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Certyfikat serwera jest wystawiony w przyszłości</string>
    <string name="ssl_validator_reason_hostname_not_verified">- URL nie pasuje do nazwy hosta w certyfikacie</string>
 -  <string name="ssl_validator_certificate_not_available">Nie można uzyskać certyfikatu serwera</string>
    <string name="ssl_validator_question">Zaakceptować certyfikat mimo wszystko?</string>
    <string name="ssl_validator_not_saved">Nie można zapisać certyfikatu</string>
    <string name="ssl_validator_btn_details_see">Szczegóły</string>
@@@ -216,6 -289,8 +218,6 @@@
    <string name="conflict_dont_upload">Nie wysyłaj</string>
    <string name="preview_image_description">Podgląd</string>
    <string name="preview_image_error_unknown_format">Obraz nie może zostać wyświetlony</string>
 -  <string name="preview_image_error_out_of_memory">\"Brak wystarczającej ilości pamięci do wyświetlenia obrazu</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s nie może zostać skopiowany do lokalnego %2$s katalogu</string>
    <string name="actionbar_failed_instant_upload">Autoprzesyłanie nieudane\"</string>
    <string name="failed_upload_headline_text">Błąd automatycznego przesyłania</string>
diff --combined res/values-pt-rBR/strings.xml
index 1e0c8e49,5d75bc41..5a71ff1c
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Senha:</string>
 -  <string name="main_login">Nome de usuário:</string>
 -  <string name="main_button_login">Login</string>
 -  <string name="main_welcome">Bem-vindo</string>
 -  <string name="main_files">Arquivos</string>
 -  <string name="main_music">Música</string>
 -  <string name="main_contacts">Contatos</string>
 -  <string name="main_calendar">Calendário</string>
 -  <string name="main_bookmarks">Marcadores</string>
 -  <string name="main_settings">Configurações</string>
 -  <string name="main_tit_accsetup">Configuração de conta</string>
 -  <string name="main_wrn_accsetup">Não existem contas no seu dispositivo. Para usar este aplicativo, você precisa criar uma.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">versão %1$s</string>
    <string name="actionbar_sync">Atualização de conta</string>
@@@ -8,10 -20,17 +8,10 @@@
    <string name="actionbar_upload_files">Arquivos</string>
    <string name="actionbar_open_with">Abrir com</string>
    <string name="actionbar_mkdir">Criar pasta</string>
 -  <string name="actionbar_search">Perquisar</string>
    <string name="actionbar_settings">Ajustes</string>
    <string name="actionbar_see_details">Detalhes</string>
    <string name="prefs_category_general">Geral</string>
    <string name="prefs_category_more">Mais</string>
 -  <string name="prefs_add_session">Adicionar nova sessão</string>
 -  <string name="prefs_create_img_thumbnails">Criar miniaturas de imagens</string>
 -  <string name="prefs_select_oc_account">Selecione uma conta</string>
 -  <string name="prefs_trackmydevice_summary_off">Habilite aplicação para rastrear a localização do seu dispositivo</string>
 -  <string name="prefs_trackmydevice_summary_on">Seu aplicação mantém registro da localização desse dispositivo</string>
 -  <string name="prefs_trackmydevice_interval_summary">Atualizar a cada %1$s minutos</string>
    <string name="prefs_accounts">Contas</string>
    <string name="prefs_manage_accounts">Gerenciar contas</string>
    <string name="prefs_pincode">PIN App</string>
@@@ -24,14 -43,23 +24,17 @@@
    <string name="prefs_log_summary_history">Isso mostra os registros gravados</string>
    <string name="prefs_log_delete_history_button">Excluir Histórico</string>
    <string name="prefs_help">Ajuda</string>
+   <string name="prefs_recommend">Recomendar a um amigo</string>
    <string name="prefs_feedback">Feedback</string>
    <string name="prefs_imprint">Imprint</string>
+   <string name="recommend_subject">Tentar %1$s em seu smartfone!</string>
+   <string name="recommend_text">Gostaria de lhe convidar para usar %1$s em seu smartfone!\nBaixe aqui: %2$s</string>
    <string name="auth_check_server">Verificar Servidor</string>
    <string name="auth_host_url">Endereço do servidor</string>
    <string name="auth_username">Nome de usuário</string>
    <string name="auth_password">Senha</string>
    <string name="auth_register">Novo para %1$s?</string>
    <string name="sync_string_files">Arquivos</string>
 -  <string name="uploader_no_file_selected">Nenhum arquivo selecionado para upload</string>
 -  <string name="setup_hint_username">Nome de Usuário</string>
 -  <string name="setup_hint_password">Senha</string>
 -  <string name="setup_hint_address">Endereço Web</string>
 -  <string name="setup_hint_show_password">Mostrar senha?</string>
 -  <string name="setup_title">Conecte ao seu %1$s</string>
    <string name="setup_btn_connect">Conectar</string>
    <string name="uploader_btn_upload_text">Upload</string>
    <string name="uploader_top_message">Escolher pasta para enviar:</string>
@@@ -43,6 -71,7 +46,6 @@@
    <string name="uploader_wrn_no_content_text">Nenhum foi recebido. Nada para enviar.</string>
    <string name="uploader_error_forbidden_content">%1$s não é permitido a acessar o conteúdo compartilhado</string>
    <string name="uploader_info_uploading">Enviando</string>
 -  <string name="uploader_btn_create_dir_text">Criar um diretório para upload</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="filedetails_select_file">Toque em um arquivo para mostrar informações adicionais.</string>
    <string name="filedetails_size">Tamanho:</string>
@@@ -51,6 -80,7 +54,6 @@@
    <string name="filedetails_modified">Modificado:</string>
    <string name="filedetails_download">Download</string>
    <string name="filedetails_sync_file">Atualizar arquivo</string>
 -  <string name="filedetails_redownload">Baixar novamente</string>
    <string name="filedetails_renamed_in_upload_msg">Arquivo foi renomeado para %1$s durante o upload</string>
    <string name="common_yes">Sim</string>
    <string name="common_no">Não</string>
@@@ -59,6 -89,7 +62,6 @@@
    <string name="common_cancel_upload">Cancelar upload</string>
    <string name="common_cancel">Cancelar</string>
    <string name="common_save_exit">Salvar &amp; Sair</string>
 -  <string name="common_exit">Sair do %1$s</string>
    <string name="common_error">Erro</string>
    <string name="common_loading">Carregando ...</string>
    <string name="common_error_unknown">Erro desconhecido</string>
@@@ -74,6 -105,7 +77,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s foi enviado com sucesso</string>
    <string name="uploader_upload_failed_ticker">Falha no envio</string>
    <string name="uploader_upload_failed_content_single">Envio de %1$s não pôde ser completado</string>
 -  <string name="uploader_upload_failed_content_multiple">Envio falhou: %1$d/%2$d arquivos foram enviados</string>
    <string name="downloader_download_in_progress_ticker">Baixando …</string>
    <string name="downloader_download_in_progress_content">%1$d%% Baixando %2$s</string>
    <string name="downloader_download_succeeded_ticker">Download bem sucedido</string>
@@@ -82,6 -114,7 +85,6 @@@
    <string name="downloader_download_failed_content">Download de %1$s não pôde ser concluído</string>
    <string name="downloader_not_downloaded_yet">Não baixado ainda</string>
    <string name="common_choose_account">Escolha a conta</string>
 -  <string name="sync_string_contacts">Contatos</string>
    <string name="sync_fail_ticker">Sincronização falhou</string>
    <string name="sync_fail_content">Sincronização de %1$s não pôde ser completada</string>
    <string name="sync_fail_content_unauthorized">Senha inválida para %1$s</string>
@@@ -98,7 -131,10 +101,7 @@@
    <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 há espaço suficiente para copiar os arquivos selecionados para a pasta %1$s. Ao invés disso, gostaria de movê-los?</string>
 -  <string name="use_ssl">Usar Conexão Segura</string>
 -  <string name="location_no_provider">%1$s não pode rastrear seu dispositivo. Por favor verifique suas configurações de localização</string>
    <string name="pincode_enter_pin_code">Por favor, insira o seu PIN de Aplicativo</string>
 -  <string name="pincode_enter_new_pin_code">Por favor, insira seu novo PIN de Aplicativo</string>
    <string name="pincode_configure_your_pin">Insira seu PIN de Aplicativo</string>
    <string name="pincode_configure_your_pin_explanation">O PIN (senha) será solicitado toda vez que o aplicativo for iniciado</string>
    <string name="pincode_reenter_your_pincode">Por favor, reinsira seu PIN de Aplicativo</string>
@@@ -117,35 -153,70 +120,40 @@@
    <string name="media_err_unsupported">Codec de mídia não suportado</string>
    <string name="media_err_io">Arquivo de mídia não pode ser lido</string>
    <string name="media_err_malformed">Arquivo de mídia não corretamente codificado</string>
 -  <string name="media_err_timeout">Muito tempo tentando reproduzir</string>
    <string name="media_err_invalid_progressive_playback">Arquivo de mídia não pode ser transmitido</string>
    <string name="media_err_unknown">Arquivo de mídia não pode ser reproduzido com o estoque media player</string>
    <string name="media_err_security_ex">Erro de segurança tentando reproduzir %1$s</string>
    <string name="media_err_io_ex">Erro de entrada tentando reproduzir %1$s</string>
    <string name="media_err_unexpected">Erro inesperado tentando reproduzir %1$s</string>
 -  <string name="media_previous_description">Botão para trilha anterior</string>
    <string name="media_rewind_description">Botão rebobinar</string>
    <string name="media_play_pause_description">Botão reproduzir parar</string>
    <string name="media_forward_description">Botão de adiantamento rápido</string>
 -  <string name="media_next_description">Botão próxima trilha</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minutos</item>
 -    <item>30 minutos</item>
 -    <item>60 minutos</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">Tentando fazer login...</string>
    <string name="auth_no_net_conn_title">Sem conexão de rede</string>
 -  <string name="auth_connect_anyway">Conectar mesmo assim</string>
    <string name="auth_nossl_plain_ok_title">Conexão segura indisponível.</string>
 -  <string name="auth_nossl_plain_ok_message">O aplicativo não pôde estabelecer uma conexão segura. Uma conexão não-segura está disponível. Você pode continuar ou cancelar.</string>
    <string name="auth_connection_established">Conexão estabelecida</string>
    <string name="auth_testing_connection">Testando conexão...</string>
    <string name="auth_not_configured_title">Configuração do servidor mal formada</string>
 -  <string name="auth_not_configured_message">Parece que a instância do seu servidor não está corretamente configurada. Contate seu administrador para mais detalhes.</string>
 -  <string name="auth_account_not_new">Uma conta para o mesmo usuário e servidor já existe no dispositivo</string>
 -  <string name="auth_account_not_the_same">As informações que o usuário digitou não corresponde ao usuário da conta</string>
    <string name="auth_unknown_error_title">Ocorreu um erro desconhecido!</string>
 -  <string name="auth_unknown_error_message">Ocorreu um erro desconhecido. Por favor contate o suporte e inclua registros do seu dispositivo.</string>
    <string name="auth_unknown_host_title">Não pôde encontrar host</string>
 -  <string name="auth_unknown_host_message">Couldn\'t find the entered host. Por favor verifique o nome de host, disponibilidade do servidor e tente novamente.</string>
    <string name="auth_incorrect_path_title">Instância de servidor não encontrada</string>
 -  <string name="auth_incorrect_path_message">O aplicativo não pôde encontrar uma instância de servidor no caminho indicado. Por favor, verifique-o e tente novamente.</string>
    <string name="auth_timeout_title">O servidor demorou demais a responder</string>
    <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">Identidade SSL do servidor não verificada</string>
    <string name="auth_bad_oc_version_title">Versão do servidor é irreconhecível</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>
    <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>
@@@ -165,12 -236,18 +173,12 @@@
    <string name="wait_a_moment">Aguarde um momento</string>
    <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, tente selecionar o arquivo com outro app</string>
    <string name="filedisplay_no_file_selected">Nenhum arquivo foi selecionado</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Entrar com oAuth2.</string>
    <string name="oauth_login_connection">Conectando-se a oAuth2 servidor ...</string>
 -  <string name="oauth_code_validation_message">Por favor, abra um navegador e vá para: ⏎\n%1$s. ⏎\nValidar este código lá: ⏎\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">O acesso a este URL não está disponível.</string>
 -  <string name="ssl_validator_title">Aviso</string>
    <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_hostname_not_verified">- O URL do host não confere com o host do certificado</string>
 -  <string name="ssl_validator_certificate_not_available">O certificado do servidor não pode ser obtido</string>
    <string name="ssl_validator_question">Você confia nesse certificado mesmo assim?</string>
    <string name="ssl_validator_not_saved">O certificado não pode ser salvo</string>
    <string name="ssl_validator_btn_details_see">Detalhes</string>
@@@ -203,6 -280,8 +211,6 @@@
    <string name="conflict_dont_upload">Não fazer upload</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="preview_image_error_out_of_memory">\"Não há memoria suficiente para mostrar esta imagem</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s não pode ser copiado a pasta local %2$s</string>
    <string name="actionbar_failed_instant_upload">Falha no envio imediato</string>
    <string name="failed_upload_headline_text">Falhas nos envios imediatos</string>
diff --combined res/values-pt-rPT/strings.xml
index 514e60c9,a29e8e09..56267b02
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Palavra-passe:</string>
 -  <string name="main_login">Nome de Utilizador:</string>
 -  <string name="main_button_login">Login</string>
 -  <string name="main_welcome">Bem-vindo</string>
 -  <string name="main_files">Ficheiros</string>
 -  <string name="main_music">Musica</string>
 -  <string name="main_contacts">Contactos</string>
 -  <string name="main_calendar">Calendário</string>
 -  <string name="main_bookmarks">Marcadores</string>
 -  <string name="main_settings">Configurações</string>
 -  <string name="main_tit_accsetup">Configurar conta</string>
 -  <string name="main_wrn_accsetup">Não há contas no seu aparelho. Para usar esta Aplicação, precisa de criar uma.</string>
    <string name="about_android">%1$s Aplicação(ões) Android</string>
    <string name="about_version">versão %1$s</string>
    <string name="actionbar_sync">Recarregar a conta</string>
@@@ -8,10 -20,17 +8,10 @@@
    <string name="actionbar_upload_files">Ficheiros</string>
    <string name="actionbar_open_with">Abrir com</string>
    <string name="actionbar_mkdir">Criar pasta</string>
 -  <string name="actionbar_search">Procurar</string>
    <string name="actionbar_settings">Definições</string>
    <string name="actionbar_see_details">Detalhes</string>
    <string name="prefs_category_general">Geral</string>
    <string name="prefs_category_more">Mais</string>
 -  <string name="prefs_add_session">Acrescentar nova sessão</string>
 -  <string name="prefs_create_img_thumbnails">Criar miniaturas de imagens</string>
 -  <string name="prefs_select_oc_account">Escolha uma conta</string>
 -  <string name="prefs_trackmydevice_summary_off">Permitir que aplicação siga a localização do seu aparelho.</string>
 -  <string name="prefs_trackmydevice_summary_on">A sua aplicação segue a localização deste aparelho.</string>
 -  <string name="prefs_trackmydevice_interval_summary">Actualizar a cada %1$s minutos</string>
    <string name="prefs_accounts">Contas</string>
    <string name="prefs_manage_accounts">Gerir contas</string>
    <string name="prefs_pincode">App PIN</string>
@@@ -32,6 -51,12 +32,6 @@@
    <string name="auth_password">Palavra-passe</string>
    <string name="auth_register">Novo em %1$s?</string>
    <string name="sync_string_files">Ficheiros</string>
 -  <string name="uploader_no_file_selected">Nenhum ficheiro seleccionado para envio</string>
 -  <string name="setup_hint_username">Nome de utilizador</string>
 -  <string name="setup_hint_password">Password</string>
 -  <string name="setup_hint_address">Endereço web</string>
 -  <string name="setup_hint_show_password">Mostrar palavra-passe?</string>
 -  <string name="setup_title">Ligar à sua  %1$s</string>
    <string name="setup_btn_connect">Ligar</string>
    <string name="uploader_btn_upload_text">Enviar</string>
    <string name="uploader_top_message">Escolha a directoria do upload:</string>
@@@ -43,6 -68,7 +43,6 @@@
    <string name="uploader_wrn_no_content_text">Não foi recebido nenhum conteúdo. Nada para enviar.</string>
    <string name="uploader_error_forbidden_content">O  %1$s não está autorizado a aceder aos ficheiro partilhados.</string>
    <string name="uploader_info_uploading">A enviar</string>
 -  <string name="uploader_btn_create_dir_text">Criar directoria para envio</string>
    <string name="file_list_empty">Não existem ficheiros nesta pasta.\nPode adicionar ficheiros com a opção \"Enviar\" no menu.</string>
    <string name="filedetails_select_file">Clique no ficheiro para visualizar informação adicional.</string>
    <string name="filedetails_size">Tamanho:</string>
@@@ -59,6 -85,7 +59,6 @@@
    <string name="common_cancel_upload">Cancelar envio</string>
    <string name="common_cancel">Cancelar</string>
    <string name="common_save_exit">Guardar &amp; Sair</string>
 -  <string name="common_exit">Sair de  %1$s</string>
    <string name="common_error">Erro</string>
    <string name="common_loading">A carregar...</string>
    <string name="common_error_unknown">Erro Desconhecido</string>
@@@ -74,6 -101,7 +74,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s foi carregado com sucesso</string>
    <string name="uploader_upload_failed_ticker">Carregamento falhou</string>
    <string name="uploader_upload_failed_content_single">O envio do ficheiro %1$s não foi concluído.</string>
 -  <string name="uploader_upload_failed_content_multiple">O envio falhou. %1$d/%2$d ficheiro foram enviados com sucesso.</string>
    <string name="downloader_download_in_progress_ticker">A descarregar...</string>
    <string name="downloader_download_in_progress_content">%1$d%% A decarregar %2$s</string>
    <string name="downloader_download_succeeded_ticker">Descarga com sucesso</string>
@@@ -82,6 -110,7 +82,6 @@@
    <string name="downloader_download_failed_content">O descarregamento %1$s não foi possível descarregar</string>
    <string name="downloader_not_downloaded_yet">Não transferido</string>
    <string name="common_choose_account">Escolha a conta</string>
 -  <string name="sync_string_contacts">Contactos</string>
    <string name="sync_fail_ticker">Falhou a sincronização</string>
    <string name="sync_fail_content">Não foi possível sincronizar %1$s</string>
    <string name="sync_fail_content_unauthorized">Password inválida para %1$s</string>
@@@ -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>
@@@ -117,35 -148,60 +118,35 @@@
    <string name="media_err_unsupported">Codec de média não suportado</string>
    <string name="media_err_io">Não foi possível reproduzir o ficheiro</string>
    <string name="media_err_malformed">Ficheiro erradamente codificado (codec)</string>
 -  <string name="media_err_timeout">Demasiado tempo a tentar reproduzir</string>
    <string name="media_err_invalid_progressive_playback">O ficheiro não pode ser reproduzido (streaming)</string>
    <string name="media_err_unknown">O ficheiro não pode ser reproduzido com o leitor de média de origem</string>
    <string name="media_err_security_ex">Erro de segurança a tentar reproduzir o ficheiro %1$s</string>
    <string name="media_err_io_ex">Erro de input a tentar reproduzir %1$s</string>
    <string name="media_err_unexpected">Erro inesperado a tentar reproduzir %1$s</string>
 -  <string name="media_previous_description">Faixa anterior</string>
    <string name="media_rewind_description">Botão de rebobinar</string>
    <string name="media_play_pause_description">Botão Tocar/Pausa</string>
    <string name="media_forward_description">Botão de avanço rápido</string>
 -  <string name="media_next_description">Botão Próxima Faixa</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 Minutos</item>
 -    <item>30 Minutos</item>
 -    <item>60 Minutos</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">A tentar entrar...</string>
    <string name="auth_no_net_conn_title">Sem ligação à rede</string>
 -  <string name="auth_connect_anyway">Ligar de qualquer maneira</string>
    <string name="auth_nossl_plain_ok_title">Ligação segura indisponível</string>
    <string name="auth_connection_established">Ligação estabelecida</string>
    <string name="auth_testing_connection">A testar a ligação...</string>
    <string name="auth_not_configured_title">Configuração do servidor incorrecta.</string>
 -  <string name="auth_not_configured_message">Parece haver um ou mais erros na configuração do servidor, por favor contacte o administrador para mais detalhes.</string>
    <string name="auth_unknown_error_title">Ocorreu um erro desconhecido!</string>
    <string name="auth_unknown_host_title">Não é possível encontrar o servidor</string>
 -  <string name="auth_unknown_host_message">Não foi possível encontrar o host. Por favor verifique se o nome está correcto, e se o servidor está disponível e tente novamente.</string>
    <string name="auth_incorrect_path_title">Instância servidor não encontrada</string>
 -  <string name="auth_incorrect_path_message">Não foi possível encontrar o servidor no caminho dado. Por favor verifique novamente.</string>
    <string name="auth_timeout_title">O servidor levou demasiado tempo a responder</string>
    <string name="auth_incorrect_address_title">URL errado</string>
    <string name="auth_ssl_general_error_title">Inicialização de SSL falhou</string>
 -  <string name="auth_ssl_unverified_server_title">Identidade SSL do servidor não verificada.</string>
    <string name="auth_bad_oc_version_title">Versão do servidor não reconhecida</string>
    <string name="auth_wrong_connection_title">Não consegue estabelecer ligação</string>
    <string name="auth_secure_connection">Ligação segura estabelecida</string>
    <string name="auth_unauthorized">Nome de utilizador/password inválida</string>
    <string name="auth_oauth_error">autorização mal sucedida</string>
    <string name="auth_oauth_error_access_denied">Acesso negado pelo servidor</string>
 -  <string name="auth_not_found">Foi dado um caminho inválido</string>
 -  <string name="auth_internal">Erro interno de 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_basic_auth_toast">Por favor, introduza a password actual</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 a sua instalação do servidor suporta extensões avançadas. Deseja ver as extensões disponíveis para Android?</string>
    <string name="fd_keep_in_sync">manter ficheiro actualizado</string>
 -  <string name="common_share">Partilhar</string>
    <string name="common_rename">Renomear</string>
    <string name="common_remove">Remover</string>
    <string name="confirmation_remove_alert">Tem a certeza que deseja remover %1$s ?</string>
@@@ -165,12 -221,18 +166,12 @@@
    <string name="wait_a_moment">Aguarde um momento</string>
    <string name="filedisplay_unexpected_bad_get_content">Erro inesperado. Por favor tente outra aplicação para seleccionar o ficheiro.</string>
    <string name="filedisplay_no_file_selected">Não selecionou nenhum ficheiro</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Entrar usando oAuth2</string>
    <string name="oauth_login_connection">A ligar ao servidor oAuth2</string>
 -  <string name="oauth_code_validation_message">Por favor, abra o navegador de internet e vá a:\n%1$s.\nValide este codigo aqui:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">O acesso a este URL não está disponível.</string>
 -  <string name="ssl_validator_title">Aviso</string>
    <string name="ssl_validator_header">Não foi possível verificar a identidade do site.</string>
    <string name="ssl_validator_reason_cert_not_trusted">- O certificado do servidor não é de confiança</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_hostname_not_verified">O URL não condiz com o nome no certificado.</string>
 -  <string name="ssl_validator_certificate_not_available">- Não foi possível obter o certificado do servidor</string>
    <string name="ssl_validator_question">Quer confiar neste certificado de qualquer maneira?</string>
    <string name="ssl_validator_not_saved">O certificado não pôde ser guardado</string>
    <string name="ssl_validator_btn_details_see">Detalhes</string>
@@@ -203,6 -265,8 +204,6 @@@
    <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="preview_image_error_out_of_memory">\"Falta de memória para mostrar esta imagem</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">Não foi possível copiar %1$s para a pasta local %2$s</string>
    <string name="actionbar_failed_instant_upload">Falhou o Upload-Instantâneo\"</string>
    <string name="failed_upload_headline_text">Falharam os Uploads-Instantâneos</string>
diff --combined res/values-ru-rRU/strings.xml
index b7d3c62a,67d967e7..c58b429b
--- a/res/values-ru-rRU/strings.xml
+++ b/res/values-ru-rRU/strings.xml
@@@ -1,14 -1,36 +1,14 @@@
  <?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_sync">Обновить</string>
    <string name="actionbar_upload">Загрузка</string>
    <string name="actionbar_upload_from_apps">Содержимое из других приложений</string>
    <string name="actionbar_upload_files">Файлы</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_manage_accounts">Управление учетными записями</string>
    <string name="prefs_pincode">App PIN</string>
@@@ -20,7 -42,15 +20,7 @@@
    <string name="auth_username">Имя пользователя</string>
    <string name="auth_password">Пароль</string>
    <string name="auth_register">Я новичок в %1$s</string>
 -  <string name="new_session_uri_error">Дан неверный URL</string>
 -  <string name="new_session_session_name_error">Неверное имя сессии</string>
    <string name="sync_string_files">Файлы</string>
 -  <string name="uploader_no_file_selected">Не выбран файл для загрузки</string>
 -  <string name="setup_hint_username">Имя пользователя</string>
 -  <string name="setup_hint_password">Пароль</string>
 -  <string name="setup_hint_address">Веб-адрес</string>
 -  <string name="setup_hint_show_password">Показать пароль?</string>
 -  <string name="setup_title">Подключение к Вашему %1$s</string>
    <string name="setup_btn_connect">Подключить</string>
    <string name="uploader_btn_upload_text">Загрузка</string>
    <string name="uploader_wrn_no_account_title">Не найден аккаунт</string>
@@@ -31,6 -61,7 +31,6 @@@
    <string name="uploader_wrn_no_content_text">Содержимое не было получено. Нечего загружать.</string>
    <string name="uploader_error_forbidden_content">%1$s не разрешен доступ к общему содержимому</string>
    <string name="uploader_info_uploading">Загрузка</string>
 -  <string name="uploader_btn_create_dir_text">Создайте каталог для загрузки</string>
    <string name="file_list_empty">В этой папке нет файлов.\nНовые файлы могут быть добавлены с помощью опции \"Загрузка\" в меню.</string>
    <string name="filedetails_select_file">Нажмите на файл, чтобы увидеть дополнительную информацию.</string>
    <string name="filedetails_size">Размер:</string>
@@@ -39,6 -70,7 +39,6 @@@
    <string name="filedetails_modified">Модифицировано:</string>
    <string name="filedetails_download">Загрузка</string>
    <string name="filedetails_sync_file">Обновить</string>
 -  <string name="filedetails_redownload">Загрузить еще раз</string>
    <string name="filedetails_renamed_in_upload_msg">Файл был переименован в %1$s во время загрузки</string>
    <string name="common_yes">Да</string>
    <string name="common_no">Нет</string>
@@@ -47,6 -79,7 +47,6 @@@
    <string name="common_cancel_upload">Отмена загрузки</string>
    <string name="common_cancel">Отмена</string>
    <string name="common_save_exit">Сохранить &amp; Выход</string>
 -  <string name="common_exit">Покинуть %1$s</string>
    <string name="common_error">Ошибка</string>
    <string name="about_title">О программе</string>
    <string name="delete_account">Удалить аккаунт</string>
@@@ -57,8 -90,10 +57,8 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% Загрузка %2$s</string>
    <string name="uploader_upload_succeeded_ticker">Загрузка выполнена успешно</string>
    <string name="uploader_upload_succeeded_content_single">%1$s был успешно загружен</string>
 -  <string name="uploader_upload_succeeded_content_multiple">%1$d файлы были успешно загружены</string>
    <string name="uploader_upload_failed_ticker">Загрузка не удалась</string>
    <string name="uploader_upload_failed_content_single">Загрузка %1$s не может быть завершена</string>
 -  <string name="uploader_upload_failed_content_multiple">Загрузка не удалась: %1$d/%2$d файлы были загружены</string>
    <string name="downloader_download_in_progress_ticker">Загрузка …</string>
    <string name="downloader_download_in_progress_content">%1$d%% Загрузка %2$s</string>
    <string name="downloader_download_succeeded_ticker">Загрузка выполнена успешно</string>
@@@ -66,13 -101,17 +66,13 @@@
    <string name="downloader_download_failed_ticker">Загрузка не удалась</string>
    <string name="downloader_download_failed_content">Загрузка %1$s не может быть завершена</string>
    <string name="common_choose_account">Выбрать аккаунт</string>
 -  <string name="sync_string_contacts">Контакты</string>
    <string name="sync_fail_ticker">Ошибка синхронизации</string>
    <string name="sync_fail_content">Синхронизация %1$s не может быть завершена</string>
    <string name="sync_conflicts_in_favourites_ticker">Найдены конфликты</string>
    <string name="sync_conflicts_in_favourites_content">%1$d файлы, подлежащие синхронизации, не могут быть синхронизированы</string>
    <string name="sync_fail_in_favourites_ticker">Синхронизация файлов не удалась</string>
    <string name="sync_fail_in_favourites_content">Содержимое %1$d файлов не может быть синхронизировано (%2$d конфликты)</string>
 -  <string name="use_ssl">Использовать защищенное соединение</string>
 -  <string name="location_no_provider">%1$s не может отследить Ваше устройство. Пожалуйста, проверьте настройки местоположения</string>
    <string name="pincode_enter_pin_code">Пожалуйста, введите Ваш PIN-код приложения</string>
 -  <string name="pincode_enter_new_pin_code">Пожалуйста, введите Ваш новый PIN-код приложения</string>
    <string name="pincode_configure_your_pin">Введите PIN-код приложения</string>
    <string name="pincode_configure_your_pin_explanation">PIN будет запрашиваться каждый раз при запуске приложения</string>
    <string name="pincode_reenter_your_pincode">Повторно введите PIN-код приложения, пожалуйста</string>
@@@ -81,23 -120,49 +81,23 @@@
    <string name="pincode_wrong">Неверный PIN-код приложения</string>
    <string name="pincode_removed">PIN-код приложения удален</string>
    <string name="pincode_stored">PIN-код приложения сохранен</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 минут</item>
 -    <item>30 минут</item>
 -    <item>60 минут</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">Попытка входа ...</string>
    <string name="auth_no_net_conn_title">Нет подключения к сети</string>
 -  <string name="auth_no_net_conn_message">Подключения к сети не были обнаружены, проверьте подключение к Интернету и повторите попытку.</string>
 -  <string name="auth_connect_anyway">Подключить все равно</string>
    <string name="auth_nossl_plain_ok_title">Защищенное соединение недоступно.</string>
 -  <string name="auth_nossl_plain_ok_message">Приложению не удалось установить безопасное подключение к серверу. Но небезопасное соединение доступно. Вы можете продолжить или отменить.</string>
    <string name="auth_connection_established">Соединение установлено</string>
    <string name="auth_testing_connection">Тестирование соединения…</string>
    <string name="auth_not_configured_title">Некорректная сервер-конфигурация</string>
 -  <string name="auth_not_configured_message">Похоже, что Ваш сервер неправильно настроен. Обратитесь к администратору для получения дополнительной информации.</string>
    <string name="auth_unknown_error_title">Произошла неизвестная ошибка!</string>
 -  <string name="auth_unknown_error_message">Произошла неизвестная ошибка. Пожалуйста, свяжитесь с разработчиками и отправьте журнал с устройства.</string>
    <string name="auth_unknown_host_title">Не удалось найти хост</string>
 -  <string name="auth_unknown_host_message">Не удалось найти введенный хост. Пожалуйста, проверьте имя хоста и доступность сервера и попробуйте снова</string>
    <string name="auth_incorrect_path_title">сервер не найден</string>
 -  <string name="auth_incorrect_path_message">Приложение не может найти экземпляр ownClound по предложенному пути. Пожалуйста, проверьте ​​путь и попробуйте еще раз.</string>
    <string name="auth_timeout_title">Ответ сервера занимает слишком много времени</string>
    <string name="auth_incorrect_address_title">Адрес URL неверен</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_not_found">Указан неверный путь</string>
 -  <string name="auth_internal">Внутренняя ошибка сервера с кодом %1$d</string>
 -  <string name="crashlog_message">Приложение неожиданно завершило работу. Хотели бы вы отправить отчет о неполадках?</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>
@@@ -117,11 -182,13 +117,11 @@@
    <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_header">Идентификация сайта не может быть проверена</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Сертификат сервера недостоверен</string>
    <string name="ssl_validator_reason_cert_expired">- Сертификат сервера истек</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Сертификат сервера еще не действителен</string>
    <string name="ssl_validator_reason_hostname_not_verified">- URL не соответствует имени хоста в сертификате</string>
 -  <string name="ssl_validator_certificate_not_available">Сертификат сервера не может быть получен</string>
    <string name="ssl_validator_question">Хотите объявить этот сертификат надежным в любом случае?</string>
    <string name="ssl_validator_not_saved">Этот сертификат не может быть сохранен</string>
    <string name="ssl_validator_btn_details_see">Сведения</string>
@@@ -146,4 -213,5 +146,5 @@@
    <string name="conflict_keep_both">Сохранить оба</string>
    <string name="conflict_overwrite">Перезаписать</string>
    <string name="conflict_dont_upload">Не загружать</string>
+   <!--we need to improve the communication of errors to the user-->
  </resources>
diff --combined res/values-ru/strings.xml
index 4114f464,fc93e945..069953b0
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?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="about_android">%1$s Приложение Андроид</string>
    <string name="about_version">Версия %1$s</string>
    <string name="actionbar_sync">Обновить учетную запись</string>
@@@ -8,10 -20,17 +8,10 @@@
    <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_trackmydevice_summary_off">Разрешить применение отслеживать местонахождение вашего устройства</string>
 -  <string name="prefs_trackmydevice_summary_on">Ваш применение продолжает отслеживать это устройство</string>
 -  <string name="prefs_trackmydevice_interval_summary">Обновлять каждые %1$s минут</string>
    <string name="prefs_accounts">Аккаунты</string>
    <string name="prefs_manage_accounts">Управление аккаунтами</string>
    <string name="prefs_pincode">App PIN</string>
@@@ -24,14 -43,23 +24,17 @@@
    <string name="prefs_log_summary_history">Здесь показаны журналы</string>
    <string name="prefs_log_delete_history_button">Удалить историю</string>
    <string name="prefs_help">Помощь</string>
+   <string name="prefs_recommend">Рекомендовать другу</string>
    <string name="prefs_feedback">Обратная связь</string>
    <string name="prefs_imprint">Штамп</string>
+   <string name="recommend_subject">Попробуйте %1$s на вашем смартфоне!</string>
+   <string name="recommend_text">Хочу предложить вам пользоваться %1$s на вашем смартфоне!\nДля загрузки: %2$s</string>
    <string name="auth_check_server">Проверить сервер</string>
    <string name="auth_host_url">Адрес сервера</string>
    <string name="auth_username">Пользователь</string>
    <string name="auth_password">Пароль</string>
    <string name="auth_register">Впервые с %1$s?</string>
    <string name="sync_string_files">Файлы</string>
 -  <string name="uploader_no_file_selected">Файлы для загрузки не выбраны</string>
 -  <string name="setup_hint_username">Имя пользователя</string>
 -  <string name="setup_hint_password">Пароль</string>
 -  <string name="setup_hint_address">Веб адрес</string>
 -  <string name="setup_hint_show_password">Показать пароль?</string>
 -  <string name="setup_title">Соединение с вашим %1$s</string>
    <string name="setup_btn_connect">Соединить</string>
    <string name="uploader_btn_upload_text">Загрузка</string>
    <string name="uploader_top_message">Выбрать место для загрузки:</string>
@@@ -43,6 -71,7 +46,6 @@@
    <string name="uploader_wrn_no_content_text">Контент не получен. Нечего загружать.</string>
    <string name="uploader_error_forbidden_content">%1$s не имеет доступа к опубликованным данным</string>
    <string name="uploader_info_uploading">Загрузка</string>
 -  <string name="uploader_btn_create_dir_text">Создайте директорию для загрузки</string>
    <string name="file_list_empty">В этой папке нет файлов.\nНовые файлы могут быть добавлены с помощью пункта меню \"Загрузить\".</string>
    <string name="filedetails_select_file">Нажмите на файл для отображения дополнительной информации.</string>
    <string name="filedetails_size">Размер:</string>
@@@ -51,6 -80,7 +54,6 @@@
    <string name="filedetails_modified">Изменён:</string>
    <string name="filedetails_download">Скачать</string>
    <string name="filedetails_sync_file">Обновить файл</string>
 -  <string name="filedetails_redownload">Скачать заново</string>
    <string name="filedetails_renamed_in_upload_msg">Файл был переименован в %1$s во время загрузки</string>
    <string name="common_yes">Да</string>
    <string name="common_no">Нет</string>
@@@ -59,6 -89,7 +62,6 @@@
    <string name="common_cancel_upload">Отмена загрузки</string>
    <string name="common_cancel">Отмена</string>
    <string name="common_save_exit">Сохранить &amp; Выйти</string>
 -  <string name="common_exit">Выйти из %1$s</string>
    <string name="common_error">Ошибка</string>
    <string name="common_loading">Загружается...</string>
    <string name="common_error_unknown">Неизвестная ошибка</string>
@@@ -74,6 -105,7 +77,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s был успешно загружен</string>
    <string name="uploader_upload_failed_ticker">Ошибка загрузки</string>
    <string name="uploader_upload_failed_content_single">Загрузка %1$s не может быть завершена</string>
 -  <string name="uploader_upload_failed_content_multiple">Загрузка неудалась: %1$d/%2$d файла было загружено</string>
    <string name="downloader_download_in_progress_ticker">Скачивание...</string>
    <string name="downloader_download_in_progress_content">%1$d%% скачивания %2$s</string>
    <string name="downloader_download_succeeded_ticker">Скачивание прошло успешно</string>
@@@ -82,6 -114,7 +85,6 @@@
    <string name="downloader_download_failed_content">Скачивание %1$s не может быть завершено</string>
    <string name="downloader_not_downloaded_yet">Ещё не загружено</string>
    <string name="common_choose_account">Выберите аккаунт</string>
 -  <string name="sync_string_contacts">Контакты</string>
    <string name="sync_fail_ticker">Синхронизация прошла неудачно</string>
    <string name="sync_fail_content">Синхронизация %1$s не может быть завершена</string>
    <string name="sync_fail_content_unauthorized">Неверный пароль для %1$s</string>
@@@ -98,7 -131,10 +101,7 @@@
    <string name="foreign_files_local_text">Локально: %1$s</string>
    <string name="foreign_files_remote_text">Удаленно: %1$s</string>
    <string name="upload_query_move_foreign_files">Отсутствует достаточное количество места для копирования выделенных файлов в папку %1$s. Хотите ли Вы переместить их в другое место?</string>
 -  <string name="use_ssl">Использовать защищённое соединение</string>
 -  <string name="location_no_provider">%1$s не может отслеживать ваше устройство. Проверьте настройки вашего местоположения</string>
    <string name="pincode_enter_pin_code">Вставьте PIN вашего приложения</string>
 -  <string name="pincode_enter_new_pin_code">Введите новый  App PIN</string>
    <string name="pincode_configure_your_pin">Введите  App PIN</string>
    <string name="pincode_configure_your_pin_explanation">ПИН-код будет запрашиваться каждый раз, когда вы запускаете приложение.</string>
    <string name="pincode_reenter_your_pincode">Повторите App PIN</string>
@@@ -117,35 -153,66 +120,40 @@@
    <string name="media_err_unsupported">Неподдерживаемый кодек</string>
    <string name="media_err_io">Файл не может быть прочитан</string>
    <string name="media_err_malformed">Файл </string>
 -  <string name="media_err_timeout">Воспроизведение ожидается слишком долго</string>
    <string name="media_err_invalid_progressive_playback">Невозможно воспроизвести файл как поток</string>
    <string name="media_err_unknown">Файл не может быть проигран  стандартным плеером</string>
    <string name="media_err_security_ex">Ошибка безопасности при воспроизведении %1$s</string>
    <string name="media_err_io_ex">Ошибка ввода при воспроизведении %1$s</string>
    <string name="media_err_unexpected">Неожиданная ошибка при воспроизведении %1$s</string>
 -  <string name="media_previous_description">Предыдущая</string>
    <string name="media_rewind_description">Перемотка назад</string>
    <string name="media_play_pause_description">Воспроизведение или пауза</string>
    <string name="media_forward_description">Перемотка вперед</string>
 -  <string name="media_next_description">Следующая композиция</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 Минут</item>
 -    <item>30 Минут</item>
 -    <item>60 Минут</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">Попытка входа...</string>
    <string name="auth_no_net_conn_title">Нет сетевого соединения</string>
 -  <string name="auth_connect_anyway">Соединить всё равно</string>
    <string name="auth_nossl_plain_ok_title">Защищённое соединение недоступно.</string>
    <string name="auth_connection_established">Соединение установлено</string>
    <string name="auth_testing_connection">Тестирование соединения...</string>
    <string name="auth_not_configured_title">Неверная конфигурация сервер</string>
 -  <string name="auth_not_configured_message">Похоже что ваш экземпляр сервер не был корректно сконфигурирован. Обратитесь за деталями к вашему администратору.</string>
 -  <string name="auth_account_not_new">Учётная запись для такого пользователя и сервера уже существует на устройстве</string>
 -  <string name="auth_account_not_the_same">Введённый пользователь не соответсвует пользователю учётной записи</string>
    <string name="auth_unknown_error_title">Произошла неизвестная ошибка!</string>
    <string name="auth_unknown_host_title">Невозможно найти сервер</string>
 -  <string name="auth_unknown_host_message">Невозможно найти введённый сервер. Проверьте имя сервера и его доступность, затем попробуйте ещё раз.</string>
    <string name="auth_incorrect_path_title">Экземпляр сервер не найден</string>
    <string name="auth_timeout_title">Сервер слишком долго не отвечает</string>
    <string name="auth_incorrect_address_title">Неверный URL</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_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>
@@@ -165,12 -232,18 +173,12 @@@
    <string name="wait_a_moment">Подождите немного</string>
    <string name="filedisplay_unexpected_bad_get_content">Неизвестная ошибка; попробуйте другое приложение для выбора файла</string>
    <string name="filedisplay_no_file_selected">Файлы не выбраны</string>
 -  <string name="oauth_host_url">адрес oAuth2</string>
 -  <string name="oauth_check_onoff">Войти через oAuth2</string>
    <string name="oauth_login_connection">Подключение к серверу oAuth2...</string>
 -  <string name="oauth_code_validation_message">Пожалуйста, откройте ссылку\n%1$s\nв браузере и подтвердите этот: %2$s</string>
 -  <string name="oauth_connection_url_unavailable">Подключение к этому серверу недоступно</string>
 -  <string name="ssl_validator_title">Предупреждение</string>
    <string name="ssl_validator_header">Подлинность сайта не может быть проверена</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Сертификат сервера не является доверенным</string>
    <string name="ssl_validator_reason_cert_expired">- Срок действия сертификата сервера истёк</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Сертификат сервера слишком новый</string>
    <string name="ssl_validator_reason_hostname_not_verified">- Адрес не совпадает с именем в сертификате</string>
 -  <string name="ssl_validator_certificate_not_available">Сертификат сервера не доступен</string>
    <string name="ssl_validator_question">Все-равно доверять данному сертификату?</string>
    <string name="ssl_validator_not_saved">Сертификат не может быть сохранён</string>
    <string name="ssl_validator_btn_details_see">Детали</string>
@@@ -203,6 -276,8 +211,6 @@@
    <string name="conflict_dont_upload">Не загружать</string>
    <string name="preview_image_description">Предпросмотр</string>
    <string name="preview_image_error_unknown_format">Это изображение не может быть отображено</string>
 -  <string name="preview_image_error_out_of_memory">Недостаточно памяти для показа изображения</string>
 -  <!--we need to improve the communication of errors to the user-->
    <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>
diff --combined res/values-si-rLK/strings.xml
index 59a85318,c9d8d88f..6dad11a1
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@@ -1,11 -1,30 +1,11 @@@
  <?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_mkdir">ඩිරෙක්ටරිය සාදන්න</string>
 -  <string name="actionbar_search">සොයන්න</string>
    <string name="actionbar_settings">සිටුවම්</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_trackmydevice_summary_off">ඔබගේ යන්ත්‍රය ඇති ස්ථානය සොයාගැනීමට අවසර ට ලබාදෙන්න</string>
 -  <string name="prefs_trackmydevice_summary_on">ඔබගේ  ඔබගේ යන්ත්‍රය ඇති ස්ථානය හඹායයි</string>
 -  <string name="prefs_trackmydevice_interval_summary">සෑම මිනිත්තු %1$s වරක් යාවත්කාලීන කරන්න</string>
    <string name="prefs_accounts">ගිණුම්</string>
    <string name="prefs_manage_accounts">ගිණුම් කළමනාකරනය</string>
    <string name="prefs_pincode_summary">ඔබේ සේවාලාභියා සුරකින්න</string>
@@@ -16,6 -35,12 +16,6 @@@
    <string name="auth_username">පරිශීලක නම</string>
    <string name="auth_password">මුර පදය</string>
    <string name="sync_string_files">ගොනු</string>
 -  <string name="uploader_no_file_selected">උඩුගත කිරීමට ගොනුවක් තෝරා නැත</string>
 -  <string name="setup_hint_username">පරිශීලක නම</string>
 -  <string name="setup_hint_password">මුර පදය</string>
 -  <string name="setup_hint_address">අන්තර්ජාල ලිපිනය</string>
 -  <string name="setup_hint_show_password">මුරපදය පෙන්වන්නද?</string>
 -  <string name="setup_title">ඔබගේ %1$s හා සම්බන්ධ වන්න</string>
    <string name="setup_btn_connect">සම්බන්ධ වන්න</string>
    <string name="uploader_btn_upload_text">උඩුගත කිරීම</string>
    <string name="uploader_wrn_no_account_title">ගිණුමක් හමු නොවුණි</string>
@@@ -23,6 -48,7 +23,6 @@@
    <string name="uploader_wrn_no_account_setup_btn_text">ස්ථාපනය</string>
    <string name="uploader_wrn_no_account_quit_btn_text">නික්මෙන්න</string>
    <string name="uploader_info_uploading">උඩුගතවේ</string>
 -  <string name="uploader_btn_create_dir_text">උඩුගත කිරීම් සඳහා ඩිරෙක්ටරිය තනන්න</string>
    <string name="filedetails_select_file">වැඩි විස්තර සඳහා ගොනුවක් ස්පර්ෂ කරන්න</string>
    <string name="filedetails_size">විශාලත්වය:</string>
    <string name="filedetails_type">ගණය:</string>
@@@ -35,6 -61,7 +35,6 @@@
    <string name="common_cancel_upload">උඩුගත කිරීම අත් හරින්න</string>
    <string name="common_cancel">එපා</string>
    <string name="common_save_exit">සුරැක &amp; පිටවන්න</string>
 -  <string name="common_exit">%1$s අත්හැර යන්න</string>
    <string name="common_error">දෝශය</string>
    <string name="about_title">පිළිබඳව</string>
    <string name="change_password">මුරපදය වෙනස් කිරීම</string>
@@@ -43,12 -70,26 +43,12 @@@
    <string name="uploader_info_dirname">ඩිරෙක්ටරි නම</string>
    <string name="uploader_upload_succeeded_ticker">උඩුගත කිරීම සාර්ථකයි</string>
    <string name="uploader_upload_failed_ticker">උඩුගත කිරීම අසාර්ථකයි</string>
 -  <string name="uploader_upload_failed_content_multiple">උඩුගත කිරීම අසාර්ථකයි: %1$d/%2$d ගොනු උඩගත විය</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="use_ssl">ආරක්ෂිත සම්බන්ධතාවක් භාවිතා කරන්න</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>විනාඩි 15</item>
 -    <item>විනාඩි 30</item>
 -    <item>විනාඩි 60</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">පිවිසීමට උත්සහ කරනවා...</string>
    <string name="auth_no_net_conn_title">ජාල සම්බන්ධතාවක් නොමැත</string>
 -  <string name="auth_connect_anyway">කොහොමත් සම්බන්ධවන්න</string>
    <string name="auth_nossl_plain_ok_title">ආරක්ෂිත සම්බන්ධතාවක් නොලැබුණි</string>
    <string name="auth_connection_established">සම්බන්ධතාවක් සාදන ලදී</string>
    <string name="auth_testing_connection">සම්බන්ධතාව පරීක්ෂා කෙරේ</string>
@@@ -61,7 -102,10 +61,7 @@@
    <string name="auth_bad_oc_version_title">හඳුනාගත නොහැකි  අනුවාදයක්</string>
    <string name="auth_wrong_connection_title">සම්බන්ධයක් ඇතිකර ගැනීමට නොහැකි විය</string>
    <string name="auth_secure_connection">රක්‍ෂිත සම්බන්ධතාවක් සාදන ලදී</string>
 -  <string name="crashlog_send_report">වාර්තාව යවන්න</string>
 -  <string name="crashlog_dont_send_report">වාර්තාව යවන්න එපා</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>
@@@ -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 --combined res/values-sk-rSK/strings.xml
index b3434aaa,cc6ba21b..7714e73c
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Heslo:</string>
 -  <string name="main_login">Meno:</string>
 -  <string name="main_button_login">Prihlásenie</string>
 -  <string name="main_welcome">Vitajte</string>
 -  <string name="main_files">Súbory</string>
 -  <string name="main_music">Hudba</string>
 -  <string name="main_contacts">Kontakty</string>
 -  <string name="main_calendar">Kalendár</string>
 -  <string name="main_bookmarks">Záložky</string>
 -  <string name="main_settings">Nastavenia</string>
 -  <string name="main_tit_accsetup">Nastavenie účtu</string>
 -  <string name="main_wrn_accsetup">Vo vašom zariadení nie sú žiadne účty. Vytvorte si účet ak chcete používať túto aplikáciu.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">verzia %1$s</string>
    <string name="actionbar_sync">Obnoviť účet</string>
@@@ -8,10 -20,16 +8,10 @@@
    <string name="actionbar_upload_files">Súbory</string>
    <string name="actionbar_open_with">Otvoriť v</string>
    <string name="actionbar_mkdir">Vytvor priečinok</string>
 -  <string name="actionbar_search">Hľadaj</string>
    <string name="actionbar_settings">Nastavenia</string>
    <string name="actionbar_see_details">Podrobnosti</string>
    <string name="prefs_category_general">Všeobecné</string>
    <string name="prefs_category_more">Viac</string>
 -  <string name="prefs_add_session">Vytvoriť nové sedenie</string>
 -  <string name="prefs_create_img_thumbnails">Vytvor náhľad obrázku</string>
 -  <string name="prefs_select_oc_account">Vyber účet</string>
 -  <string name="prefs_trackmydevice_summary_on">Váš aplikácie sleduje vašu polohu na tomto zariadení</string>
 -  <string name="prefs_trackmydevice_interval_summary">Aktualizácia každých %1$s minút</string>
    <string name="prefs_accounts">Účty</string>
    <string name="prefs_manage_accounts">Správa účtov</string>
    <string name="prefs_pincode">PIN aplikácie</string>
@@@ -24,14 -42,23 +24,16 @@@
    <string name="prefs_log_summary_history">Toto zobrazuje zaznamenané logy</string>
    <string name="prefs_log_delete_history_button">Zmazať históriu</string>
    <string name="prefs_help">Pomoc</string>
+   <string name="prefs_recommend">Doporučiť známemu</string>
    <string name="prefs_feedback">Spätná väzba</string>
    <string name="prefs_imprint">Podmienky používania</string>
+   <string name="recommend_subject">Skúste %1$s na vašom telefóne!</string>
    <string name="auth_check_server">Skontrolovať Server</string>
    <string name="auth_host_url">Adresa servera</string>
    <string name="auth_username">Používateľské meno</string>
    <string name="auth_password">Heslo</string>
    <string name="auth_register">Ste nový v %1$s?</string>
 -  <string name="new_session_uri_error">Zadaná nesprávna URL</string>
    <string name="sync_string_files">Súbory</string>
 -  <string name="uploader_no_file_selected">Nebol označený žiadny súbor pre odoslanie</string>
 -  <string name="setup_hint_username">Používateľské meno</string>
 -  <string name="setup_hint_password">Heslo</string>
 -  <string name="setup_hint_address">Web adresa</string>
 -  <string name="setup_hint_show_password">Zobraziť heslo?</string>
 -  <string name="setup_title">Pripojiť k %1$s</string>
    <string name="setup_btn_connect">Pripoj</string>
    <string name="uploader_btn_upload_text">Nahrať</string>
    <string name="uploader_top_message">Vyberte priečinok pre nahrané súbory:</string>
@@@ -43,6 -70,7 +45,6 @@@
    <string name="uploader_wrn_no_content_text">Nedodaný žiaden obsah. Nič na odoslanie.</string>
    <string name="uploader_error_forbidden_content">%1$s nemá práva pre prístup k zdieľanému obsahu</string>
    <string name="uploader_info_uploading">Nahrávanie</string>
 -  <string name="uploader_btn_create_dir_text">Vytvoriť priečinok pre nahrávanie</string>
    <string name="file_list_empty">Priečinok neobsahuje súbory.\nNové súbory môžete pridať cez \"Upload\".</string>
    <string name="filedetails_select_file">Viac informácií získate kliknutím na súbor.</string>
    <string name="filedetails_size">Veľkosť:</string>
@@@ -59,6 -87,7 +61,6 @@@
    <string name="common_cancel_upload">Zrušiť odosielanie</string>
    <string name="common_cancel">Zrušiť</string>
    <string name="common_save_exit">Uložiť a ukončiť</string>
 -  <string name="common_exit">Opustiť %1$s</string>
    <string name="common_error">Chyba</string>
    <string name="common_loading">Načítavam...</string>
    <string name="common_error_unknown">Neznáma chyba</string>
@@@ -74,6 -103,7 +76,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s úspešne odoslaný</string>
    <string name="uploader_upload_failed_ticker">Odoslanie bolo neúspešné</string>
    <string name="uploader_upload_failed_content_single">Odoslanie %1$s nemohlo byť dokončené</string>
 -  <string name="uploader_upload_failed_content_multiple">Nahrávanie zlyhalo: %1$d/%2$d súborov bolo odoslaných</string>
    <string name="downloader_download_in_progress_ticker">SÅ¥ahujem ...</string>
    <string name="downloader_download_in_progress_content">%1$d%% SÅ¥ahovanie %2$s</string>
    <string name="downloader_download_succeeded_ticker">Sťahovanie bolo úspešné</string>
@@@ -82,6 -112,7 +84,6 @@@
    <string name="downloader_download_failed_content">Sťahovanie %1$s nebolo dokončené</string>
    <string name="downloader_not_downloaded_yet">Ešte nie je stiahnuté</string>
    <string name="common_choose_account">Zvoliť účet</string>
 -  <string name="sync_string_contacts">Kontakty</string>
    <string name="sync_fail_ticker">Synchronizácia zlyhala</string>
    <string name="sync_fail_content">Synchronizáciu %1$s nemožno dokončiť</string>
    <string name="sync_fail_content_unauthorized">Nesprávne heslo pre %1$s</string>
@@@ -98,7 -129,10 +100,7 @@@
    <string name="foreign_files_local_text">Lokálne: %1$s</string>
    <string name="foreign_files_remote_text">Vzdialené: %1$s</string>
    <string name="upload_query_move_foreign_files">Nie je dostatok miesta na kopírovanie vybraných súborov do priečinka %1$s. Želáte si miesto kopírovania zmeniť?</string>
 -  <string name="use_ssl">Použiť zabezpečené pripojenie</string>
 -  <string name="location_no_provider">%1$s nemôže sledovať polohu vášho zariadenia. Skontrolujte nastavenia umiestnenia.</string>
    <string name="pincode_enter_pin_code">Zadajte PIN aplikácie</string>
 -  <string name="pincode_enter_new_pin_code">Zadajte nový PIN aplikácie</string>
    <string name="pincode_configure_your_pin">Zadajte PIN aplikácie</string>
    <string name="pincode_configure_your_pin_explanation">Pri každom spustení aplikácie bude vyžadovaný PIN</string>
    <string name="pincode_reenter_your_pincode">Zadajte znovu PIN aplikácie</string>
@@@ -117,35 -151,70 +119,40 @@@
    <string name="media_err_unsupported">Nepodporovaný kodek</string>
    <string name="media_err_io">Mediálny súbor nemožno čítať</string>
    <string name="media_err_malformed">Mediálny súbor nemá správne kódovanie</string>
 -  <string name="media_err_timeout">Pokus o prehrávanie opakovaný príliš mnohokrát</string>
    <string name="media_err_invalid_progressive_playback">Mediálny súbor nemožno streamovať</string>
    <string name="media_err_unknown">Mediálny súbor nemožno prehrať s východzím prehrávačom</string>
    <string name="media_err_security_ex">Chyba zabezpečenia pri pokuse o prehranie %1$s</string>
    <string name="media_err_io_ex">Chyba vstupu pri prehrávaní %1$s</string>
    <string name="media_err_unexpected">Nečakaná chyba pri prehrávaní %1$s</string>
 -  <string name="media_previous_description">Tlačidlo predchádzajúcej skladby</string>
    <string name="media_rewind_description">Tlačidlo pretáčania</string>
    <string name="media_play_pause_description">Tlačidlo prehrávania / pauzy</string>
    <string name="media_forward_description">Tlačidlo \"rýchlo vpred\"</string>
 -  <string name="media_next_description">Tlačidlo nasledujúcej skladby</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 minút</item>
 -    <item>30 minút</item>
 -    <item>60 minút</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">Pokus o pripojenie...</string>
    <string name="auth_no_net_conn_title">Bez sieťového pripojenia</string>
 -  <string name="auth_connect_anyway">Aj tak pripojiť</string>
    <string name="auth_nossl_plain_ok_title">Nie je k dispozícii bezpečné pripojenie</string>
 -  <string name="auth_nossl_plain_ok_message">Aplikácia nemôže nadviazať zabezpečené spojenie so serverom. Nezabezpečené pripojenie je k dispozícii. Môžete pokračovať alebo prerušiť spojenie.</string>
    <string name="auth_connection_established">Pripojenie vytvorené</string>
    <string name="auth_testing_connection">Testovane pripojenia...</string>
    <string name="auth_not_configured_title">Nesprávna konfigurácia servera</string>
 -  <string name="auth_not_configured_message">Nastavenie servera nie je správne. Kontaktujte administrátora pre získanie viac informácií.</string>
 -  <string name="auth_account_not_new">Účet pre tohoto používateľa a tento server už v tomto zariadení existuje</string>
 -  <string name="auth_account_not_the_same">Zadané prihlasovacie údaje používateľa sú nesprávne</string>
    <string name="auth_unknown_error_title">Nastala neznáma chyba!</string>
 -  <string name="auth_unknown_error_message">Nastala neznáma chyba. Kontaktujte podporu a pripojte záznam z Vášho zariadenia.</string>
    <string name="auth_unknown_host_title">Nemožno nájsť hosta</string>
 -  <string name="auth_unknown_host_message">Nemôžm sa pripojiť k serveru. Skontrolujte nastavenia servera, či beží a skúste to znovu.</string>
    <string name="auth_incorrect_path_title">Servera inštancia nebola nájdená</string>
 -  <string name="auth_incorrect_path_message">Aplikácia na zadanej adrese nenašla inštanciu servera. Skontrolujte cestu a skúste to znovu.</string>
    <string name="auth_timeout_title">Serveru trvá odpoveď príliš dlho</string>
    <string name="auth_incorrect_address_title">Poškodená URL</string>
    <string name="auth_ssl_general_error_title">Inicializácia SSL zlyhala</string>
 -  <string name="auth_ssl_unverified_server_title">Neoverená SSL identita servera</string>
    <string name="auth_bad_oc_version_title">Nerozpoznaná verzia servera</string>
    <string name="auth_wrong_connection_title">Nie je možne vytvoriť spojenie</string>
    <string name="auth_secure_connection">Vytvorené zabezpečené spojenie</string>
    <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,12 -234,18 +172,13 @@@
    <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>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Certifikát servera je príliš mladý</string>
    <string name="ssl_validator_reason_hostname_not_verified">- URL nezodpovedá hodnote hostname certifikátu</string>
 -  <string name="ssl_validator_certificate_not_available">Nie je možné získať certifikát servera</string>
    <string name="ssl_validator_question">Chcete veriť tomuto certifikátu v každom prípade ?</string>
    <string name="ssl_validator_not_saved">Certifikát nemôže byť uložený</string>
    <string name="ssl_validator_btn_details_see">Podrobnosti</string>
@@@ -203,6 -278,8 +211,6 @@@
    <string name="conflict_dont_upload">Nenahrávajte</string>
    <string name="preview_image_description">Ukážka obrazu</string>
    <string name="preview_image_error_unknown_format">Obraz nemôže byť zobrazený</string>
 -  <string name="preview_image_error_out_of_memory">\"Nedostatok pamäte pre zobrazenie obrazu</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s nemožno skopírovať do lokálneho priečinka %2$s</string>
    <string name="actionbar_failed_instant_upload">Zlyhaný InstantnýUpload\"</string>
    <string name="failed_upload_headline_text">Zlyhané instantné nahratia</string>
diff --combined res/values-sv/strings.xml
index 9d77e0ab,c743a4e3..ab850905
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Lösenord:</string>
 -  <string name="main_login">Användarnamn:</string>
 -  <string name="main_button_login">Logga in</string>
 -  <string name="main_welcome">Välkommen</string>
 -  <string name="main_files">Filer</string>
 -  <string name="main_music">Musik</string>
 -  <string name="main_contacts">Kontakter</string>
 -  <string name="main_calendar">Kalender</string>
 -  <string name="main_bookmarks">Bokmärken</string>
 -  <string name="main_settings">Inställningar</string>
 -  <string name="main_tit_accsetup">Skapa konto</string>
 -  <string name="main_wrn_accsetup">Det finns inget konto för applikation på denna enhet. För att kunna använda applikation så måste du skapa ett konto.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">version %1$s</string>
    <string name="actionbar_sync">Uppdatera konto</string>
@@@ -8,10 -20,17 +8,10 @@@
    <string name="actionbar_upload_files">Filer</string>
    <string name="actionbar_open_with">Öppna med</string>
    <string name="actionbar_mkdir">Skapa mapp</string>
 -  <string name="actionbar_search">Sök</string>
    <string name="actionbar_settings">Inställningar</string>
    <string name="actionbar_see_details">Detaljer</string>
    <string name="prefs_category_general">Allmänt</string>
    <string name="prefs_category_more">Mer</string>
 -  <string name="prefs_add_session">Lägg till ny session</string>
 -  <string name="prefs_create_img_thumbnails">Skapa miniatyrbilder</string>
 -  <string name="prefs_select_oc_account">Välj ett konto</string>
 -  <string name="prefs_trackmydevice_summary_off">Aktivera applikation att spåra din enhets plats</string>
 -  <string name="prefs_trackmydevice_summary_on">applikation spårar denna enhet</string>
 -  <string name="prefs_trackmydevice_interval_summary">Uppdatera var %1$s minut</string>
    <string name="prefs_accounts">Konton</string>
    <string name="prefs_manage_accounts">Hantera konton</string>
    <string name="prefs_pincode">applikation PIN</string>
@@@ -24,14 -43,23 +24,17 @@@
    <string name="prefs_log_summary_history">Visar sparade loggar</string>
    <string name="prefs_log_delete_history_button">Radera historik</string>
    <string name="prefs_help">Hjälp</string>
+   <string name="prefs_recommend">Rekommendera till en vän</string>
    <string name="prefs_feedback">Återkoppling</string>
    <string name="prefs_imprint">Imprint</string>
+   <string name="recommend_subject">Försök %1$s på din smarttelefon!</string>
+   <string name="recommend_text">Jag vill bjuda in dig till att anända %1$s på din smarttelefon!\nLadda ner här: %2$s</string>
    <string name="auth_check_server">Kontrollera Server</string>
    <string name="auth_host_url">Serveradress</string>
    <string name="auth_username">Användarnamn</string>
    <string name="auth_password">Lösenord</string>
    <string name="auth_register">Ny på %1$s?</string>
    <string name="sync_string_files">Filer</string>
 -  <string name="uploader_no_file_selected">Ingen fil vald för uppladdning</string>
 -  <string name="setup_hint_username">Användarnamn</string>
 -  <string name="setup_hint_password">Lösenord</string>
 -  <string name="setup_hint_address">Webbadress</string>
 -  <string name="setup_hint_show_password">Visa lösenord?</string>
 -  <string name="setup_title">Anslut till %1$s</string>
    <string name="setup_btn_connect">Anslut</string>
    <string name="uploader_btn_upload_text">Ladda upp</string>
    <string name="uploader_top_message">Välj mapp för uppladdning:</string>
@@@ -43,6 -71,7 +46,6 @@@
    <string name="uploader_wrn_no_content_text">Inget innehåll mottaget. Inget att ladda upp.</string>
    <string name="uploader_error_forbidden_content">%1$s har inte rättighet till det delade innehållet</string>
    <string name="uploader_info_uploading">Laddar upp</string>
 -  <string name="uploader_btn_create_dir_text">Skapa mapp för att ladda upp</string>
    <string name="file_list_empty">Det finns inga filer i denna mapp.\nNya filer kan läggas till med \"Ladda upp\" i menyn.</string>
    <string name="filedetails_select_file">Peka på en fil för att visa mer information.</string>
    <string name="filedetails_size">Storlek:</string>
@@@ -51,6 -80,7 +54,6 @@@
    <string name="filedetails_modified">Ändrad:</string>
    <string name="filedetails_download">Ladda ner</string>
    <string name="filedetails_sync_file">Ladda om fil</string>
 -  <string name="filedetails_redownload">Ladda ner igen</string>
    <string name="filedetails_renamed_in_upload_msg">Filen bytte namn till %1$s under uppladdningen</string>
    <string name="common_yes">Ja</string>
    <string name="common_no">Nej</string>
@@@ -59,6 -89,7 +62,6 @@@
    <string name="common_cancel_upload">Avbryt uppladdning</string>
    <string name="common_cancel">Avbryt</string>
    <string name="common_save_exit">Spara &amp; Avsluta</string>
 -  <string name="common_exit">Lämna %1$s</string>
    <string name="common_error">Fel</string>
    <string name="common_loading">Laddar...</string>
    <string name="common_error_unknown">Okänt fel</string>
@@@ -74,6 -105,7 +77,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s laddades upp</string>
    <string name="uploader_upload_failed_ticker">Misslyckad uppladdning</string>
    <string name="uploader_upload_failed_content_single">Uppladdning av %1$s kunde inte slutföras</string>
 -  <string name="uploader_upload_failed_content_multiple">Misslyckad uppladdning: %1$d/%2$d filer laddades upp</string>
    <string name="downloader_download_in_progress_ticker">Laddar ner ...</string>
    <string name="downloader_download_in_progress_content">%1$d%% Laddar ner %2$s</string>
    <string name="downloader_download_succeeded_ticker">Nedladdning klar</string>
@@@ -82,6 -114,7 +85,6 @@@
    <string name="downloader_download_failed_content">Nedladdning av %1$s kunde inte slutföras</string>
    <string name="downloader_not_downloaded_yet">Ännu inte nedladdade</string>
    <string name="common_choose_account">Välj konto</string>
 -  <string name="sync_string_contacts">Kontakter</string>
    <string name="sync_fail_ticker">Synkroniseringen misslyckades</string>
    <string name="sync_fail_content">Synkronisering av %1$s kunde inte slutföras</string>
    <string name="sync_fail_content_unauthorized">Felaktigt lösenord för %1$s</string>
@@@ -98,7 -131,10 +101,7 @@@
    <string name="foreign_files_local_text">Lokal: %1$s</string>
    <string name="foreign_files_remote_text">Fjärr: %1$s</string>
    <string name="upload_query_move_foreign_files">Det finns inte tillräckligt med utrymme för att kopiera valda filer till mappen %1$s. Vill du flytta filerna istället? </string>
 -  <string name="use_ssl">Använd säker anslutning</string>
 -  <string name="location_no_provider">%1$s  kan inte spåra denna enhet. Kontrollera dina platsinställningar</string>
    <string name="pincode_enter_pin_code">Ange din PIN</string>
 -  <string name="pincode_enter_new_pin_code">Ange din nya PIN</string>
    <string name="pincode_configure_your_pin">Ange applikation PIN</string>
    <string name="pincode_configure_your_pin_explanation">Din PIN måste anges varje gång du startar programmet.</string>
    <string name="pincode_reenter_your_pincode">Ange applikation PIN igen</string>
@@@ -117,35 -153,61 +120,35 @@@
    <string name="media_err_unsupported">Saknar stöd för denna mediatyp</string>
    <string name="media_err_io">Mediafil kunde inte skapas</string>
    <string name="media_err_malformed">Mediafilen är felaktigt kodad</string>
 -  <string name="media_err_timeout">Försökt att spela för länge</string>
    <string name="media_err_invalid_progressive_playback">Meidiafilen kan inte strömmas</string>
    <string name="media_err_unknown">Mediefilen kan inte spelas med standardspelaren</string>
    <string name="media_err_security_ex">Säkerhetsproplem när vi försöker spela %1$s</string>
    <string name="media_err_io_ex">Inmatningsfel när vi försöker spela %1$s</string>
    <string name="media_err_unexpected">Oväntat fel när vi försöker spela %1$s</string>
 -  <string name="media_previous_description">Tillbaka till föregående spår</string>
    <string name="media_rewind_description">Bakåtspolningsknapp</string>
    <string name="media_play_pause_description">Spela- / Pausknapp</string>
    <string name="media_forward_description">Snappspolningsknapp</string>
 -  <string name="media_next_description">Nästa spår</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 Minuter</item>
 -    <item>30 Minuter</item>
 -    <item>60 Minuter</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">Försöker logga in...</string>
    <string name="auth_no_net_conn_title">Ingen nätverksanslutning</string>
 -  <string name="auth_connect_anyway">Anslut ändå</string>
    <string name="auth_nossl_plain_ok_title">Säker anslutning inte tillgänglig.</string>
    <string name="auth_connection_established">Anslutning etablerad</string>
    <string name="auth_testing_connection">Testar anslutning...</string>
    <string name="auth_not_configured_title">Felaktig konfiguration</string>
 -  <string name="auth_not_configured_message">Det verkar som om din version av server inte är korrekt konfigurerad. Kontakta din administratör för mer information.</string>
 -  <string name="auth_account_not_new">En användare med samma namn och server finns redan i denna aparat</string>
    <string name="auth_unknown_error_title">Okänt fel inträffade!</string>
    <string name="auth_unknown_host_title">Kunde inte hitta server</string>
 -  <string name="auth_unknown_host_message">Kunde inte hitta angiven server. Kontrollera serverns tillgänglighet och försök igen.</string>
    <string name="auth_incorrect_path_title">Ingen version av server kan hittas</string>
 -  <string name="auth_incorrect_path_message">Applikationen kunde inte hitta någon version av server i angiven sökväg. Kontrollera sökvägen och försök igen.</string>
    <string name="auth_timeout_title">Servern svarar inte</string>
    <string name="auth_incorrect_address_title">Felaktig URL</string>
    <string name="auth_ssl_general_error_title">Misslyckad initiering av SSL</string>
 -  <string name="auth_ssl_unverified_server_title">Obekräftad SSL-identitet</string>
    <string name="auth_bad_oc_version_title">Okänd server serverversion</string>
    <string name="auth_wrong_connection_title">Kunde inte etablera anslutning</string>
    <string name="auth_secure_connection">Säker anslutning etablerad</string>
    <string name="auth_unauthorized">Felaktigt användarnamn eller lösenord</string>
    <string name="auth_oauth_error">Behörighet saknas</string>
    <string name="auth_oauth_error_access_denied">Nekad åtkomst av server</string>
 -  <string name="auth_not_found">Felaktig  sökväg angiven</string>
 -  <string name="auth_internal">Internt serverfel, kod %1$d</string>
    <string name="auth_wtf_reenter_URL">Oväntat tillstånd; Ange serverns URL igen</string>
    <string name="auth_expired_basic_auth_toast">Vänligen ange det aktuella lösenordet</string>
 -  <string name="crashlog_send_report">Skicka rapport</string>
 -  <string name="crashlog_dont_send_report">Skicka inte rapport</string>
 -  <string name="extensions_avail_title">Tillägg finns tillgängliga!</string>
 -  <string name="extensions_avail_message">Det verkar som att din version av server stödjer avancerade tillägg. Vill du se tilläggen tillgängliga för Android?</string>
    <string name="fd_keep_in_sync">HÃ¥ll filen uppdaterad</string>
 -  <string name="common_share">Dela</string>
    <string name="common_rename">Byt namn</string>
    <string name="common_remove">Radera</string>
    <string name="confirmation_remove_alert">Vill du verkligen radera: %1$s ?</string>
@@@ -165,12 -227,18 +168,12 @@@
    <string name="wait_a_moment">Var god vänta</string>
    <string name="filedisplay_unexpected_bad_get_content">Oväntat problem; prova annat program för aktuell fil</string>
    <string name="filedisplay_no_file_selected">Ingen fil vald</string>
 -  <string name="oauth_host_url">oAuth2 URL</string>
 -  <string name="oauth_check_onoff">Logga in med oAuth2.</string>
    <string name="oauth_login_connection">Ansluter till oAuth2 servern…</string>
 -  <string name="oauth_code_validation_message">Öppna en webbläsare och gå till:\n%1$s.\nAnge denna kod för validering:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Anslutning till denna URL är inte tillgänglig.</string>
 -  <string name="ssl_validator_title">Varning</string>
    <string name="ssl_validator_header">Webbplatsens identitet kunde inte verifieras</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Servercertifikatet är inte tillförlitligt</string>
    <string name="ssl_validator_reason_cert_expired">- Servercertifikatet har gått ut</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Servercertifikatet är för nytt</string>
    <string name="ssl_validator_reason_hostname_not_verified">- Webbadressen matchar inte värdnamnet i certifikatet</string>
 -  <string name="ssl_validator_certificate_not_available">Servercertifikatet kunde inte hämtas</string>
    <string name="ssl_validator_question">Vill du lita på detta certifikat ändå?</string>
    <string name="ssl_validator_not_saved">Certifikatet kunde inte sparas</string>
    <string name="ssl_validator_btn_details_see">Detaljer</string>
@@@ -203,6 -271,8 +206,6 @@@
    <string name="conflict_dont_upload">Ladda inte upp</string>
    <string name="preview_image_description">Förhandsvisa bild</string>
    <string name="preview_image_error_unknown_format">Denna bild kan inte visas</string>
 -  <string name="preview_image_error_out_of_memory">\"Inte tillräckligt med minne för att visa bilden</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s kunde inte kopieras till %2$s lokal mapp</string>
    <string name="actionbar_failed_instant_upload">Fel vid direktuppladdning\"</string>
    <string name="failed_upload_headline_text">Misslyckades vid direktuppladdning</string>
diff --combined res/values-tr/strings.xml
index 620422a2,43126492..d16b8fe5
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@@ -1,5 -1,17 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="main_password">Parola:</string>
 -  <string name="main_login">Kullanıcı Adı:</string>
 -  <string name="main_button_login">Oturum Aç</string>
 -  <string name="main_welcome">karşılama</string>
 -  <string name="main_files">Dosyalar</string>
 -  <string name="main_music">Müzik</string>
 -  <string name="main_contacts">Kontaklar</string>
 -  <string name="main_calendar">Takvim</string>
 -  <string name="main_bookmarks">Yer Ä°mleri</string>
 -  <string name="main_settings">Ayarlar</string>
 -  <string name="main_tit_accsetup">Kurulum Hesabi</string>
 -  <string name="main_wrn_accsetup">Cihazınızda App hesabı bulunmamaktadır. Bu uygulamayı kullanabilmeniz için App hesabı oluşturmalısınız.</string>
    <string name="about_android">%1$s Android Uygulaması</string>
    <string name="about_version">sürüm %1$s</string>
    <string name="actionbar_sync">Hesabı yenile</string>
@@@ -7,11 -19,21 +7,11 @@@
    <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>
    <string name="prefs_category_more">Daha fazla</string>
 -  <string name="prefs_add_session">Yeni oturum ekle</string>
 -  <string name="prefs_create_img_thumbnails">Küçük resim oluştur</string>
 -  <string name="prefs_select_oc_account">Oturum seç</string>
 -  <string name="prefs_summary_select_oc_account">Uygulamanın hangi hesaplarınızı kullanması gerektiğini seçiniz.</string>
 -  <string name="prefs_trackmydevice">Cihaz Takibi</string>
 -  <string name="prefs_trackmydevice_summary_off">Cihazınınızın konumunu takip etmesi için App\'u aktif edin</string>
 -  <string name="prefs_trackmydevice_summary_on">App\'unuz bu cihazı takip etmektedir</string>
 -  <string name="prefs_trackmydevice_interval">Güncelleme Aralığı</string>
 -  <string name="prefs_trackmydevice_interval_summary">Her %1$s dakikada güncelle</string>
    <string name="prefs_accounts">Hesaplar</string>
    <string name="prefs_manage_accounts">Hesapları yönet</string>
    <string name="prefs_pincode">App PIN</string>
@@@ -24,13 -46,26 +24,18 @@@
    <string name="prefs_log_summary_history">Bu, kayıtlı günlük dosyalarını görüntüler</string>
    <string name="prefs_log_delete_history_button">Geçmişi Sil</string>
    <string name="prefs_help">Yardım</string>
+   <string name="prefs_recommend">Bir arkadaşa öner</string>
+   <string name="prefs_feedback">Geribildirim</string>
    <string name="prefs_imprint">Ä°zlenim</string>
+   <string name="recommend_subject">%1$s uygulamasını akıllı telefonunda dene!</string>
+   <string name="recommend_text">Sana, akıllı telefonunda kullanmak üzere %1$s daveti yapıyorum!\nBuradan indirebilirsin: %2$s</string>
    <string name="auth_check_server">Sunucuyu kontrol et</string>
+   <string name="auth_account_name">Hesap adı</string>
    <string name="auth_host_url">Sunucu Adresi</string>
    <string name="auth_username">Kullanıcı Adi:</string>
    <string name="auth_password">Şifre:</string>
    <string name="auth_register">%1$s senin için yeni mi?</string>
 -  <string name="new_session_uri_error">Geçersiz adres girildi</string>
 -  <string name="new_session_session_name_error">Geçersiz oturum adı</string>
    <string name="sync_string_files">Dosyalar</string>
 -  <string name="uploader_no_file_selected">Yüklemek için dosya seçilmedi</string>
 -  <string name="setup_hint_username">Kullanıcı Adı</string>
 -  <string name="setup_hint_password">Parola</string>
 -  <string name="setup_hint_address">Web adres</string>
 -  <string name="setup_hint_show_password">Şifre göster?</string>
 -  <string name="setup_title">%1$s\'nıza bağlanin</string>
    <string name="setup_btn_connect">Bağlan</string>
    <string name="uploader_btn_upload_text">Yükle</string>
    <string name="uploader_top_message">Yükleme dizinini seçiniz:</string>
@@@ -42,14 -77,16 +47,14 @@@
    <string name="uploader_wrn_no_content_text">Yüklenecek içerik yok. Yüklenecek dosya yok.</string>
    <string name="uploader_error_forbidden_content">%1$s, paylaşılan içeriğe erişim izni vermiyor</string>
    <string name="uploader_info_uploading">Yükleniyor</string>
 -  <string name="uploader_btn_create_dir_text">Yükleme için dizin oluştur</string>
    <string name="file_list_empty">Klasörde dosya yok. Yeni dosyalar yükle\'ye tıklayarak eklenebilir.</string>
    <string name="filedetails_select_file">Ek bilgileri görmek için dosyaya tıklayınız.</string>
    <string name="filedetails_size">Boyut:</string>
    <string name="filedetails_type">Tür:</string>
-   <string name="filedetails_created">Yaratma:</string>
+   <string name="filedetails_created">Oluşturulma:</string>
    <string name="filedetails_modified">Değiştirme:</string>
    <string name="filedetails_download">Ä°ndir</string>
    <string name="filedetails_sync_file">Dosyayı yenile</string>
 -  <string name="filedetails_redownload">Tekrar indir</string>
    <string name="filedetails_renamed_in_upload_msg">Dosya adı, yükleme sırasında %1$s olarak değiştirildi</string>
    <string name="common_yes">Evet</string>
    <string name="common_no">Hayır</string>
@@@ -58,6 -95,7 +63,6 @@@
    <string name="common_cancel_upload">Yüklemeyi iptal et</string>
    <string name="common_cancel">Ä°ptal</string>
    <string name="common_save_exit">Kaydet %amp; Kapat</string>
 -  <string name="common_exit">%1$s Çıkışı Yap</string>
    <string name="common_error">Hata</string>
    <string name="common_loading">Yükleniyor...</string>
    <string name="common_error_unknown">Bilinmeyen hata</string>
@@@ -71,8 -109,10 +76,8 @@@
    <string name="uploader_upload_in_progress_content">%1$d%% Yükleniyor %2$s</string>
    <string name="uploader_upload_succeeded_ticker">Yükleme başarılı</string>
    <string name="uploader_upload_succeeded_content_single">%1$s kadarı başarıyla yüklendi.</string>
 -  <string name="uploader_upload_succeeded_content_multiple">%1$d dosya başarılı bir şekilde yüklendi</string>
    <string name="uploader_upload_failed_ticker">Yükleme başarısız</string>
    <string name="uploader_upload_failed_content_single">%1$s yüklenmedi tamamlanamadı</string>
 -  <string name="uploader_upload_failed_content_multiple">Yükleme başarısız : %1$d/%2$d dosya yüklendi</string>
    <string name="downloader_download_in_progress_ticker">Ä°ndiriyor ...</string>
    <string name="downloader_download_in_progress_content">%1$d%% Ä°ndiriliyor %2$s</string>
    <string name="downloader_download_succeeded_ticker">İndirme başarılı</string>
@@@ -81,6 -121,7 +86,6 @@@
    <string name="downloader_download_failed_content">%1$s indirilmesi tamamlanamadı</string>
    <string name="downloader_not_downloaded_yet">Henüz indirilemedi</string>
    <string name="common_choose_account">Hesap seçiniz</string>
 -  <string name="sync_string_contacts">Kontaklar</string>
    <string name="sync_fail_ticker">Eşitleme başarısız</string>
    <string name="sync_fail_content">%1$s Senkronizasyonu tamamlanamadı</string>
    <string name="sync_fail_content_unauthorized">%1$s için geçersiz parola</string>
@@@ -91,13 -132,17 +96,14 @@@
    <string name="sync_foreign_files_forgotten_ticker">Bazı yerel dosyalar unutuldu</string>
    <string name="sync_foreign_files_forgotten_content">%1$d dosyalar  %2$s dizinine kopyalanamadı</string>
    <string name="sync_foreign_files_forgotten_explanation">1.3.16 sürümünden sonra, bu aygıttan yüklenen dosyalar bir dosya birden fazla hesapla eşitlendiğinde veri kaybının önlenebilmesi için %1$s yerel klasörüne kopyalanır.\n\nBu değişiklikten dolayı, bu uygulamanın yüklenmiş tüm önceki sürümündeki dosyalar %2$s klasörüne kopyalandı. Ancak hesap eşitlenmesi sırasında bu işlemin tamamlanmasını engelleyen bir hata oluştu. Dosyayı/dosyaları olduğu gibi bırakabilir ve %3$s bağlantısını kaldırabilirsiniz veya dosyayı/dosyaları %1$s dizinine taşıyıp %4$s bağlantılarını koruyabilirsiniz.\n\nAşağıda listelenenler yerel dosyalar ve bağlı oldukları %5$s içerisindeki uzak dosyalardır.</string>
+   <string name="sync_current_folder_was_removed">%1$s klasörü artık mevcut değil.</string>
    <string name="foreign_files_move">Tümünü taşı</string>
    <string name="foreign_files_success">Tüm dosyalar taşındı</string>
    <string name="foreign_files_fail">Bazı dosyalar taşınamadı</string>
    <string name="foreign_files_local_text">Yerel: %1$s</string>
    <string name="foreign_files_remote_text">Uzak: %1$s</string>
    <string name="upload_query_move_foreign_files">Seçilen dosyaları %1$s dizinine kopyalamak için yeterli alan yok. Bunun yerine dosyayı taşımak ister misiniz?</string>
 -  <string name="use_ssl">Güvenli bağlanti kullan</string>
 -  <string name="location_no_provider">%1$s cihazınızı takip edemiyor. Lütfen konum ayarlarınızı kontrol ediniz</string>
    <string name="pincode_enter_pin_code">Lütfen uygulama PIN\'ınızı giriniz</string>
 -  <string name="pincode_enter_new_pin_code">Lütfen yeni uygulama PIN\'ınızı giriniz</string>
    <string name="pincode_configure_your_pin">App PIN giriniz</string>
    <string name="pincode_configure_your_pin_explanation">PIN uygulama yeniden başladığında tekrar sorulacak</string>
    <string name="pincode_reenter_your_pincode">Lütfen, App PIN ni tekrar giriniz</string>
@@@ -116,35 -161,72 +122,41 @@@
    <string name="media_err_unsupported">Codec desteklenmiyor</string>
    <string name="media_err_io">Medya öğesi okunamadı</string>
    <string name="media_err_malformed">Medya öğesi doğru bir şekilde kodlanmadı</string>
 -  <string name="media_err_timeout">Oynatmak için fazla deneme yapıldı</string>
    <string name="media_err_invalid_progressive_playback">Medya öğesi aktarılamadı</string>
    <string name="media_err_unknown">Ortam dosyası mevcut ortam oynatıcı ile çalınamaz</string>
    <string name="media_err_security_ex">%1$s oynatılmaya çalışılırken güvenlik hatası oluştu</string>
    <string name="media_err_io_ex">%1$s oynatılmaya çalışılırken girdi hatası oluştu</string>
    <string name="media_err_unexpected">%1$s oynatılmaya çalışılırken beklenmeyen bir hata oluştu</string>
 -  <string name="media_previous_description">Önceki iz butonu</string>
    <string name="media_rewind_description">Başa sar butonu</string>
    <string name="media_play_pause_description">Oynat veya duraklat butonu</string>
    <string name="media_forward_description">Hızlı ileri butonu</string>
 -  <string name="media_next_description">Sonraki parça butonu</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 Dakika</item>
 -    <item>30 Dakika</item>
 -    <item>60 Dakika</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">Giriş için deneniyor</string>
    <string name="auth_no_net_conn_title">Ağ bağlantısı yok</string>
 -  <string name="auth_no_net_conn_message">Ağ bağlantısı bulunamadı. İnternet bağlantınızı kontrol edin ve tekrar deneyin.</string>
 -  <string name="auth_connect_anyway">Her halükarda bağlan</string>
    <string name="auth_nossl_plain_ok_title">Günvenli bağlantı mevcut değil.</string>
 -  <string name="auth_nossl_plain_ok_message">Uygulama sunucu ile güvenli bağlantı kuramadı. Buna rağmen güvensiz bağlantı mevcut. Devam edebilirsiniz veya iptal edebilirsiniz.</string>
    <string name="auth_connection_established">Bağlantı kuruldu</string>
    <string name="auth_testing_connection">Bağlantı kontrol ediliyor ...</string>
    <string name="auth_not_configured_title">Hatalı sunucu ayarı.</string>
 -  <string name="auth_not_configured_message">Görünüşe bakılırsa sunucu servisiniz doğru ayarlanmamış. Detaylı bilgi için sistem yöneticinize başvurunuz.</string>
 -  <string name="auth_account_not_new">Cihazda aynı kullanıcı adı ve sunucu için bir hesap zaten mevcut</string>
 -  <string name="auth_account_not_the_same">Girilen kullanıcı bu hesabın kullanıcısı ile eşleşmiyor</string>
    <string name="auth_unknown_error_title">Bilinmeyen hata oluştu.</string>
 -  <string name="auth_unknown_error_message">Bilinmeyen bir hata oluştu. Lütfen cihazınızdaki hata kayıtlarını ekleyerek destekle iletişime geçin.</string>
    <string name="auth_unknown_host_title">Anabilgisayar bulunamadı</string>
 -  <string name="auth_unknown_host_message">Girilen anabilgisayar bulunamadı. Anabilgisayaradı ve sunucu kullanılabilirliğini kontrol edin ve yeniden deneyin.</string>
    <string name="auth_incorrect_path_title">sunucu servisi bulunamadı.</string>
 -  <string name="auth_incorrect_path_message">Uygulama verilen dizin yolunda sunucu bulamadı. Lütfen dizin yolunu kontrol edin ve tekrar deneyin.</string>
    <string name="auth_timeout_title">Sunucu çok geç cevap veriyor</string>
    <string name="auth_incorrect_address_title">Hatalı biçimlendirilmiş URL</string>
    <string name="auth_ssl_general_error_title">SSL başlatılmasında hata</string>
 -  <string name="auth_ssl_unverified_server_title">Doğrulanmamış SSL sunucu kimliğini</string>
    <string name="auth_bad_oc_version_title">Bilinmeyen sunucu sürümü</string>
    <string name="auth_wrong_connection_title">Bağlantı kurulamadı</string>
    <string name="auth_secure_connection">Güvenli bağlantı sağlandı.</string>
    <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>
@@@ -164,12 -246,18 +176,12 @@@
    <string name="wait_a_moment">Bir süre bekleyin</string>
    <string name="filedisplay_unexpected_bad_get_content">Beklenmeyen problem ; lütfen, dosya seçmek için diğer uygulamayı deneyin</string>
    <string name="filedisplay_no_file_selected">Hiçbir dosya seçilmedi</string>
 -  <string name="oauth_host_url">oAuth2 URL\'si</string>
 -  <string name="oauth_check_onoff">oAuth2 ile oturum aç.</string>
    <string name="oauth_login_connection">oAuth2 sunucusuna bağlanılıyor…</string>
 -  <string name="oauth_code_validation_message">Lütfen bir web tarayıcısı açın ve şu adrese gidin:\n%1$s.\nŞu kodu açılan sayfada doğrulayın:\n%2$s</string>
 -  <string name="oauth_connection_url_unavailable">Bu URL\'ye bağlantı yok.</string>
 -  <string name="ssl_validator_title">Uyarı</string>
    <string name="ssl_validator_header">Bu sitenin sertifikası doğrulanamadı</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Sunucu sertifikası güvenilmez</string>
    <string name="ssl_validator_reason_cert_expired">- Sunucu sertifikasının süresi geçmiş</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">Sunucu sertifikasının geçerli olacağı tarih</string>
    <string name="ssl_validator_reason_hostname_not_verified">- URL adresi sunucu isminin sertifikası ile uyuşmuyor</string>
 -  <string name="ssl_validator_certificate_not_available">Sunucu sertifikası elde edilemedi</string>
    <string name="ssl_validator_question">Sertifikaya yine de güvenmek istiyor musunuz?</string>
    <string name="ssl_validator_not_saved">Sertifika kaydedilemedi</string>
    <string name="ssl_validator_btn_details_see">Ayrıntılar</string>
@@@ -202,6 -290,8 +214,6 @@@
    <string name="conflict_dont_upload">Yükleme</string>
    <string name="preview_image_description">Görüntü önizleme</string>
    <string name="preview_image_error_unknown_format">Bu resim gösterilemez</string>
 -  <string name="preview_image_error_out_of_memory">\"Bu resmi göstermek için yeterli hafıza yok</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s, %2$s yerel dizine kopyalanamadı</string>
    <string name="actionbar_failed_instant_upload">AnındaYükleme\" başarısız</string>
    <string name="failed_upload_headline_text">Anında yüklemeler başarısız</string>
diff --combined res/values-uk/strings.xml
index 749321ea,c7df14a7..c50ed04d
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@@ -1,13 -1,32 +1,13 @@@
  <?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">На Вашому пристрої відсутні облікові запси App. Для того, щоб користуватися цим ПО, Вам потрібно створити обліковий запис.</string>
    <string name="actionbar_upload">Відвантажити</string>
    <string name="actionbar_upload_from_apps">Вміст із інших програм</string>
    <string name="actionbar_upload_files">Файли</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_trackmydevice_summary_off">Дозволити App стежити за місцезнаходженням Вашого пристрою</string>
 -  <string name="prefs_trackmydevice_summary_on">Ваш App стежить за цим пристроєм</string>
 -  <string name="prefs_trackmydevice_interval_summary">Оновлювати кожні %1$s хвилин</string>
    <string name="prefs_accounts">Облікові записи</string>
    <string name="prefs_manage_accounts">Управління обліковими записами</string>
    <string name="prefs_pincode">App програмний PIN</string>
@@@ -21,6 -40,12 +21,6 @@@
    <string name="auth_username">Ім\'я користувача</string>
    <string name="auth_password">Пароль</string>
    <string name="sync_string_files">Файли</string>
 -  <string name="uploader_no_file_selected">Не обрано файл для завантаження</string>
 -  <string name="setup_hint_username">Ім\'я користувача</string>
 -  <string name="setup_hint_password">Пароль</string>
 -  <string name="setup_hint_address">Веб адреса</string>
 -  <string name="setup_hint_show_password">Показувати пароль?</string>
 -  <string name="setup_title">Підключитись до Вашого %1$s</string>
    <string name="setup_btn_connect">З\'єднати</string>
    <string name="uploader_btn_upload_text">Відвантажити</string>
    <string name="uploader_wrn_no_account_title">Не знайдено облікового запису</string>
@@@ -31,6 -56,7 +31,6 @@@
    <string name="uploader_wrn_no_content_text">Не отримано даних. Нічого завантажувати.</string>
    <string name="uploader_error_forbidden_content">%1$s не може отримати доступ до спільного контенту</string>
    <string name="uploader_info_uploading">Завантаження</string>
 -  <string name="uploader_btn_create_dir_text">Створити теку для завантаження</string>
    <string name="file_list_empty">В цьому каталозі відсутні файли.\nНові файли можна додати через опцію меню \"Завантаження\".</string>
    <string name="filedetails_select_file">Натисніть на файлі для відображення додаткової інформації</string>
    <string name="filedetails_size">Розмір:</string>
@@@ -38,6 -64,7 +38,6 @@@
    <string name="filedetails_created">Створено:</string>
    <string name="filedetails_modified">Змінено:</string>
    <string name="filedetails_download">Завантажити</string>
 -  <string name="filedetails_redownload">Оновити</string>
    <string name="filedetails_renamed_in_upload_msg">Файл був переіменований в %1$s протягом вивантаження</string>
    <string name="common_yes">Так</string>
    <string name="common_no">Ні</string>
@@@ -46,6 -73,7 +46,6 @@@
    <string name="common_cancel_upload">Перервати завантаження</string>
    <string name="common_cancel">Відмінити</string>
    <string name="common_save_exit">Зберегти &amp; Вихід</string>
 -  <string name="common_exit">Вийти з %1$s</string>
    <string name="common_error">Помилка</string>
    <string name="common_error_unknown">Невідома помилка</string>
    <string name="about_title">Про</string>
@@@ -60,6 -88,7 +60,6 @@@
    <string name="uploader_upload_succeeded_content_single">%1$s було успішно завантажено</string>
    <string name="uploader_upload_failed_ticker">Помилка завантаження</string>
    <string name="uploader_upload_failed_content_single">Завантаження %1$s не може завершитись</string>
 -  <string name="uploader_upload_failed_content_multiple">Помилка завантаження: %1$d/%2$d файли завантажено</string>
    <string name="downloader_download_in_progress_ticker">Зкачування …</string>
    <string name="downloader_download_in_progress_content">%1$d%% Зкачування %2$s</string>
    <string name="downloader_download_succeeded_ticker">Успішно зкачано</string>
@@@ -67,6 -96,7 +67,6 @@@
    <string name="downloader_download_failed_ticker">Завантаження не вдалося</string>
    <string name="downloader_download_failed_content">Завантаження %1$s не вдається завершити</string>
    <string name="common_choose_account">Оберіть обліковий запис</string>
 -  <string name="sync_string_contacts">Контакти</string>
    <string name="sync_fail_ticker">Помилка синхронізації</string>
    <string name="sync_fail_content">Синхронізація %1$s не вдалась</string>
    <string name="sync_conflicts_in_favourites_ticker">Конфліктів знайдено</string>
@@@ -81,7 -111,10 +81,7 @@@
    <string name="foreign_files_local_text">Локально: %1$s</string>
    <string name="foreign_files_remote_text">Віддалено: %1$s</string>
    <string name="upload_query_move_foreign_files">Недостатньо місця для копіювання обраних файлів у теку %1$s. Чи бажаєте ви перемістити їх замість копіювання?</string>
 -  <string name="use_ssl">Використовувати безпечне з\'єднання</string>
 -  <string name="location_no_provider">%1$s не може стежити за Вашим пристроєм. Будь ласка, перевірте свої налаштування місцезнаходження</string>
    <string name="pincode_enter_pin_code">Будь ласка, введіть свій програмний PIN</string>
 -  <string name="pincode_enter_new_pin_code">Будь ласка, введіть новий програмний PIN</string>
    <string name="pincode_configure_your_pin">Введіть програмний PIN</string>
    <string name="pincode_configure_your_pin_explanation">PIN необхідно буде вводити щоразу при запуску цієї програми</string>
    <string name="pincode_reenter_your_pincode">Повторно введіть App програмний PIN, будь ласка</string>
@@@ -90,22 -123,43 +90,24 @@@
    <string name="pincode_wrong">Не вірний App програмний PIN</string>
    <string name="pincode_removed">App програмний PIN видалено</string>
    <string name="pincode_stored">App програмний PIN збережено</string>
 -  <string-array name="prefs_trackmydevice_intervall_keys">
 -    <item>15 хвилин</item>
 -    <item>30 хвилин</item>
 -    <item>60 хвилин</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">Спроба входу…</string>
    <string name="auth_no_net_conn_title">Відсутнє підключення до мережі</string>
 -  <string name="auth_connect_anyway">Все одно з\'єднатися</string>
    <string name="auth_nossl_plain_ok_title">Безпечне з\'єднання не доступне.</string>
    <string name="auth_connection_established">З\'єднання встановлено</string>
    <string name="auth_testing_connection">Перевірка з\'єднання…</string>
    <string name="auth_not_configured_title">Не вірні налаштування сервер </string>
 -  <string name="auth_not_configured_message">Здається, Ваш сервер примірник не правильно налаштовано. Зверніться до адміністратора для більш докладної інформації.</string>
    <string name="auth_unknown_error_title">Виникла невідома помилка!</string>
    <string name="auth_unknown_host_title">Не вдалося знайти хост</string>
 -  <string name="auth_unknown_host_message">Не вдалося знайти визначений хост. Будь ласка, перевірте ім\'я хосту і доступність серверу та спробуйте ще.</string>
    <string name="auth_incorrect_path_title">Не знайдено примірник сервер</string>
    <string name="auth_timeout_title">Сервер занадто довго не відповідає</string>
    <string name="auth_incorrect_address_title">Пошкоджений URL</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_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>
@@@ -125,11 -179,13 +127,11 @@@
    <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_header">Не вдалося перевірити ідентифікацію сайта</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Не довірений сертифікат серверу</string>
    <string name="ssl_validator_reason_cert_expired">- Сертифікат серверу втратив чинність</string>
    <string name="ssl_validator_reason_cert_not_yet_valid">- Сертифікат серверу занадто новий</string>
    <string name="ssl_validator_reason_hostname_not_verified">- URL не відповідає імені хоста у сертифікаті</string>
 -  <string name="ssl_validator_certificate_not_available">Не вдалося отримати сертифікат серверу</string>
    <string name="ssl_validator_question">Ви все одно бажаєте довіряти цьому сертифікату?</string>
    <string name="ssl_validator_not_saved">Не вдалося зберегти сертифікат</string>
    <string name="ssl_validator_btn_details_see">Деталі</string>
@@@ -155,5 -211,6 +157,5 @@@
    <string name="conflict_keep_both">Залишити обидва</string>
    <string name="conflict_overwrite">Замінити</string>
    <string name="conflict_dont_upload">Не завантажувати</string>
 -  <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s неможливо скопіювати в локальний каталог %2$s</string>
  </resources>