Merge branch 'multiSelect' of https://github.com/owncloud/android into multiSelectNew

Conflicts:
	build.gradle
	oc_jb_workaround/build.gradle
	owncloud-android-library
	res/layout/uploader_layout.xml
	res/layout/uploader_list_item_layout.xml
	res/menu/file_actions_menu.xml
	res/values/setup.xml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
	src/com/owncloud/android/db/PreferenceManager.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java

res/menu/file_actions_menu.xml

@@ -28,7 +28,7 @@
     <item
         android:id="@+id/action_open_file_with"
         android:title="@string/actionbar_open_with"
-        android:icon="@drawable/ic_export"
+        android:icon="@drawable/ic_open_in_app"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_download_file"

res/values-ar/strings.xml

@@ -55,7 +55,6 @@
   <string name="sync_string_files">الملفات</string>
   <string name="setup_btn_connect">اتصال</string>
   <string name="uploader_btn_upload_text">رفع</string>
-  <string name="uploader_top_message">اختر مجلد الرفع</string>
   <string name="uploader_wrn_no_account_title">لم يتم العثور على أي حساب</string>
   <string name="uploader_wrn_no_account_text">لا توجد حسابات %1$s على جهازك.  أنت بحاجة لإعداد حساب في البداية.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">تهيئة</string>
@@ -198,7 +197,7 @@
 	</string>
   <string name="common_rename">إعادة التسمية</string>
   <string name="common_remove">حذف</string>
-  <string name="confirmation_remove_alert">هل تريد حقاً حذف %1$s ؟</string>
+  <string name="confirmation_remove_file_alert">هل تريد حقاً حذف %1$s ؟</string>
   <string name="confirmation_remove_folder_alert">هل ترغب في حذف %1$s و جهات الإتصال التابعة له؟ </string>
   <string name="confirmation_remove_local">محليا فقط</string>
   <string name="remove_success_msg">تم الحذف بنجاح</string>
@@ -269,7 +268,10 @@
   <string name="prefs_category_accounts">حسابات</string>
   <string name="actionbar_logger">سجل</string>
   <string name="saml_authentication_wrong_pass">كلمة مرور خاطئة</string>
+  <string name="actionbar_move">أنقل</string>
   <string name="folder_picker_choose_button_text">اختيار</string>
+  <string name="move_file_invalid_overwrite">الملف موجود بالفعل في المجلد الوجهة</string>
+  <string name="copy_file_invalid_overwrite">الملف موجود بالفعل في المجلد الوجهة</string>
   <string name="prefs_category_details">تفاصيل</string>
   <string name="auth_host_address">عنوان الخادم</string>
   <string name="share_dialog_title">مشاركة</string>

res/values-az/strings.xml

@@ -47,7 +47,6 @@
   <string name="sync_string_files">Fayllar</string>
   <string name="setup_btn_connect">Qoşul</string>
   <string name="uploader_btn_upload_text">Serverə yüklə</string>
-  <string name="uploader_top_message">Yüklənmə qovluöunu seçin:</string>
   <string name="uploader_wrn_no_account_title">Hesab tapılmadı</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Qurulum</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Çıx</string>
@@ -157,7 +156,7 @@ Aşağıda göstərilən %5$s-də olan daxili və xarici fayl(lar) link edilmiş
   <string name="auth_account_does_not_exist">Hesab göstərilən avadanlıqda mövcud deyil</string>
   <string name="common_rename">Adı dəyiş</string>
   <string name="common_remove">Sil</string>
-  <string name="confirmation_remove_alert">Siz həqiqətən %1$s silmək istəyirsiniz?</string>
+  <string name="confirmation_remove_file_alert">Siz həqiqətən %1$s silmək istəyirsiniz?</string>
   <string name="confirmation_remove_folder_alert">Siz həqiqətəndə %1$s və onun kontentini silmək istəyirsiniz?</string>
   <string name="confirmation_remove_local">Yalnız daxili</string>
   <string name="remove_success_msg">Silmə uğurlu oldu</string>

res/values-bg-rBG/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Файлове</string>
   <string name="setup_btn_connect">Свързване</string>
   <string name="uploader_btn_upload_text">Качване</string>
-  <string name="uploader_top_message">Избери папка за качване:</string>
   <string name="uploader_wrn_no_account_title">Няма открит профил</string>
   <string name="uploader_wrn_no_account_text">Все още няма %1$s създаден профила на устройството. Моля да се създаде такъв.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Настройка</string>
@@ -223,7 +222,7 @@
   <string name="auth_account_does_not_exist">Профила не съществува на устройството все още</string>
   <string name="common_rename">Преименуване</string>
   <string name="common_remove">Премахване</string>
-  <string name="confirmation_remove_alert">Наистина ли искате да изтриете %1$s ?</string>
+  <string name="confirmation_remove_file_alert">Наистина ли искате да изтриете %1$s ?</string>
   <string name="confirmation_remove_folder_alert">Наистина ли искате да премахнете %1$s и съдържанието му?</string>
   <string name="confirmation_remove_local">Само локално</string>
   <string name="remove_success_msg">Премахването успешно.</string>

res/values-bn-rBD/strings.xml

@@ -38,7 +38,6 @@
   <string name="sync_string_files">ফাইল</string>
   <string name="setup_btn_connect">সংযুক্ত হও</string>
   <string name="uploader_btn_upload_text">আপলোড</string>
-  <string name="uploader_top_message">আপলোডের ফোলডার পছনদ করেন</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>
@@ -140,7 +139,7 @@
 ⇥</string>
   <string name="common_rename">পূনঃনামকরণ</string>
   <string name="common_remove">অপসারণ</string>
-  <string name="confirmation_remove_alert">আপনি কি সত্যিই %1$s অপসারণ করতে চান?</string>
+  <string name="confirmation_remove_file_alert">আপনি কি সত্যিই %1$s অপসারণ করতে চান?</string>
   <string name="confirmation_remove_folder_alert">আপনি কি সত্যিই %1$s এবং এর কনটেন্ট অপসারণ করতে চান?</string>
   <string name="confirmation_remove_local">শুধুমাত্র লোকাল</string>
   <string name="remove_success_msg">অপসারণ সফল</string>

res/values-ca/strings.xml

@@ -49,6 +49,7 @@
   <string name="prefs_remember_last_share_location">Recorda la ubicació de la unitat compartida</string>
   <string name="prefs_remember_last_upload_location_summary">Recorda la ubicació de l\'última càrrega</string>
   <string name="recommend_subject">Proveu %1$s a un telèfon avançat!</string>
+  <string name="recommend_text">Vull invitar-te a utilitzar %1$s al teu smartphone!\nDescarrega-ho aqui: %2$s</string>
   <string name="auth_check_server">Comprova el funcionament del servidor</string>
   <string name="auth_host_url">Adreça del servidor https://…</string>
   <string name="auth_username">Nom d\'usuari</string>
@@ -57,7 +58,6 @@
   <string name="sync_string_files">Fitxers</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>
   <string name="uploader_wrn_no_account_title">No s\'ha trobat el compte</string>
   <string name="uploader_wrn_no_account_text">No hi ha comptes %1$s al dispositiu. Primer configureu un compte.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configura</string>
@@ -68,6 +68,7 @@
   <string name="uploader_error_title_file_cannot_be_uploaded">No es pot carregar el fitxer</string>
   <string name="uploader_error_message_read_permission_not_granted">%1$s no té permissos per llegir un dels fitxers rebuts</string>
   <string name="uploader_error_message_source_file_not_found">L\' arxiu a carregar no va ser trobat en la seva ubicació. Si us plau verifica si l\'arxiu existeix.</string>
+  <string name="uploader_error_message_source_file_not_copied">S\'ha produït un error mentre es copiava el fitxer a una carpeta temporal. Sisplau intenta enviar-ho una altra vegada.</string>
   <string name="file_list_seconds_ago">segons enrere</string>
   <string name="file_list_empty">Res per aquí. Pugeu alguna cosa!</string>
   <string name="file_list_loading">Carregant...</string>
@@ -86,6 +87,7 @@
   <string name="filedetails_download">Baixa</string>
   <string name="filedetails_sync_file">Sincronitza</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="list_layout">Veure en llista</string>
   <string name="action_share">Comparteix</string>
   <string name="common_yes">Sí</string>
   <string name="common_no">No</string>
@@ -115,23 +117,35 @@
   <string name="uploader_upload_failed_credentials_error">La pujada ha fallat, us heu de tornar a acreditar</string>
   <string name="uploads_view_title">Fitxers carregats</string>
   <string name="uploads_view_group_current_uploads">Actual</string>
+  <string name="uploads_view_group_failed_uploads">Error (toca per tornar a intentar)</string>
   <string name="uploads_view_group_finished_uploads">Carregat</string>
   <string name="uploads_view_upload_status_succeeded">Completat</string>
   <string name="uploads_view_upload_status_cancelled">S\'ha cancel·lat</string>
+  <string name="uploads_view_upload_status_paused">Pausat</string>
   <string name="uploads_view_upload_status_failed_connection_error">Hi ha un error de connexió</string>
+  <string name="uploads_view_upload_status_failed_retry">La pujada tornarà a reintentar-se en poc temps</string>
   <string name="uploads_view_upload_status_failed_credentials_error">Hi ha un error de credencials</string>
   <string name="uploads_view_upload_status_failed_folder_error">Hi ha un error de carpetes</string>
   <string name="uploads_view_upload_status_failed_file_error">Hi ha un error en el fitxer</string>
   <string name="uploads_view_upload_status_failed_localfile_error">No s\'ha trobat el fitxer local</string>
   <string name="uploads_view_upload_status_failed_permission_error">Error de permisos</string>
+  <string name="uploads_view_upload_status_conflict">Conflicte</string>
+  <string name="uploads_view_upload_status_service_interrupted">L\'aplicació s\'ha finalitzat</string>
   <string name="uploads_view_upload_status_unknown_fail">Error desconegut</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">Esperant connectivitat wifi</string>
+  <string name="uploads_view_later_waiting_to_upload">S\'està esperant per pujar-ho</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>
+  <string name="downloader_download_succeeded_content">%1$s descarregat</string>
   <string name="downloader_download_failed_ticker">La baixada ha fallat</string>
   <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="downloader_download_failed_credentials_error">La Descarrega ha fallat, t\'has de tornar a acreditar</string>
   <string name="common_choose_account">Escolliu el compte</string>
+  <string name="sync_fail_ticker">La sincronització ha fallat</string>
+  <string name="sync_fail_ticker_unauthorized">La Sincronització ha fallat, t\'has de tornar a acreditar</string>
+  <string name="sync_fail_content">La Sincronització de %1$s no s\'ha pogut completar</string>
   <string name="sync_fail_content_unauthorized">Contrasenya no vàlida per %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">S\'han trobat conflictes</string>
   <string name="sync_conflicts_in_favourites_content">%1$d mantinguts els arxius que no podien ser sincronitzats</string>
@@ -145,6 +159,16 @@
   <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 espai suficient per copiar els fitxers sel·leccionats dins la carpeta %1$s. Voldries moure-les en comptes d\'això?</string>
+  <string name="pass_code_enter_pass_code">Sisplau introdueix el teu codi d\'accés</string>
+  <string name="pass_code_configure_your_pass_code">Escriviu codi d\'accés</string>
+  <string name="pass_code_configure_your_pass_code_explanation">Es requerirà el codi d\'accés cada vegada que s\'iniciï l\'aplicació</string>
+  <string name="pass_code_reenter_your_pass_code">Torneu a escriure el codi d\'accés</string>
+  <string name="pass_code_remove_your_pass_code">Elimina el codi d\'accés</string>
+  <string name="pass_code_mismatch">Els codis d\'accés no coincideixen</string>
+  <string name="pass_code_wrong">Codi d\'accés incorrecte</string>
+  <string name="pass_code_removed">Codi d\'accés eliminat</string>
+  <string name="pass_code_stored">Codi d\'accés guardat</string>
   <string name="media_notif_ticker">reproductor de música %1$s</string>
   <string name="media_state_playing">%1$s (sonant)</string>
   <string name="media_state_loading">%1$s (carregant)</string>
@@ -164,9 +188,12 @@
   <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="auth_getting_authorization">Recuperant autorització ...</string>
+  <string name="auth_trying_to_login">Intentat accedir ...</string>
   <string name="auth_no_net_conn_title">Sense connexió de xarxa</string>
   <string name="auth_nossl_plain_ok_title">La connexió segura no està disponible.</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_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>
@@ -174,6 +201,7 @@
   <string name="auth_unknown_host_title">No s\'ha trobat el servidor</string>
   <string name="auth_incorrect_path_title">No s\'ha trobat la instància del servidor</string>
   <string name="auth_timeout_title">El servidor ha trigat massa en respondre</string>
+  <string name="auth_incorrect_address_title">Format de l\'adreça del servidor incorrecte</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>
@@ -183,13 +211,17 @@
   <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_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">Connectant amb el servidor d\'autentificació...</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="auth_fail_get_user_name">El servidor no retorna una id d\'usuari correcta, contacteu amb l\'administrador.</string>
+  <string name="auth_can_not_auth_against_server">No es pot autenticar en aquest servidor</string>
+  <string name="auth_account_does_not_exist">El compte no existeix en aquest dispositiu encara</string>
   <string name="common_rename">Reanomena</string>
   <string name="common_remove">Elimina</string>
-  <string name="confirmation_remove_alert">Esteu segur que voleu eliminar %1$s?</string>
+  <string name="confirmation_remove_file_alert">Esteu segur que voleu eliminar %1$s?</string>
   <string name="confirmation_remove_folder_alert">Estàs segur que vols esborrar %1$s i els seus continguts?</string>
   <string name="confirmation_remove_local">Només local</string>
   <string name="remove_success_msg">L\'eliminació ha tingut èxit</string>
@@ -201,11 +233,14 @@
   <string name="sync_file_nothing_to_do_msg">Contingut de l\'arxiu ja sincronitzat</string>
   <string name="create_dir_fail_msg">La carpeta no s\'ha pogut crear</string>
   <string name="filename_forbidden_characters">Caràcters no permesos: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_forbidden_charaters_from_server">El nom del fitxer conté al menys un caràcter invàlid</string>
   <string name="filename_empty">El Nom de l\'arxiu no pot estar buit</string>
   <string name="wait_a_moment">Espereu</string>
+  <string name="wait_checking_credentials">Comprovant les credencials emmagatzemades</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="activity_chooser_title">Envia l\'enllaç a...</string>
+  <string name="wait_for_tmp_copy_from_private_storage">Copiant fitxer des de emmagatzemament privat</string>
   <string name="oauth_check_onoff">Accés amb oAuth2</string>
   <string name="oauth_login_connection">Connectant amb el servidor oAuth2...</string>
   <string name="ssl_validator_header">No s\'ha pogut verificar la identitat del lloc web</string>
@@ -230,6 +265,8 @@
   <string name="ssl_validator_label_validity_to">A:</string>
   <string name="ssl_validator_label_signature">Signatura:</string>
   <string name="ssl_validator_label_signature_algorithm">Algoritme:</string>
+  <string name="ssl_validator_label_certificate_fingerprint">Empremta:</string>
+  <string name="certificate_load_problem">Hi ha un problema carregant el certificat.</string>
   <string name="ssl_validator_null_cert">No s\'ha pogut mostrar el certificat.</string>
   <string name="ssl_validator_no_info_about_error">- No hi ha informació de l\'error</string>
   <string name="placeholder_sentence">Això és un text variable</string>
@@ -238,17 +275,32 @@
   <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">Pujar les fotos només via WiFi</string>
+  <string name="instant_video_upload_on_wifi">Pujar videos només via WiFi</string>
   <string name="instant_upload_path">/CarregaInstantània</string>
+  <string name="conflict_title">Conflicte de fitxers</string>
+  <string name="conflict_message">Quins fitxers vols mantenir? Si seleccioneu les dues versions, el fitxer local tindrà un número afegit al seu nom.</string>
   <string name="conflict_keep_both">Mantén-los ambdós</string>
+  <string name="conflict_use_local_version">Versió local</string>
+  <string name="conflict_use_server_version">versió del servidor</string>
   <string name="preview_image_description">Visualització prèvia d\'imatge</string>
   <string name="preview_image_error_unknown_format">Aquesta imatge no es pot mostrar</string>
   <string name="error__upload__local_file_not_copied">%1$s no s\'ha pogut copiar a la carpeta local %2$s</string>
   <string name="share_link_no_support_share_api">La compartició no es troba disponible al vostre servidor. Contacteu amb l\'administrador.</string>
+  <string name="share_link_file_no_exist">No es pot compartir. Assegureu-vos que el fitxer existeix</string>
   <string name="share_link_file_error">S\'ha produït un error en intentar compartir aquest fitxer o carpeta</string>
+  <string name="unshare_link_file_no_exist">No es pot des-compartir. Assegureu-vos que el fitxer existeix</string>
   <string name="unshare_link_file_error">S\'ha produït un error en intentar deixar de compartir aquest fitxer o carpeta</string>
+  <string name="update_link_file_no_exist">No es pot actualitzar. Assegureu-vos que el fitxer existeix</string>
+  <string name="update_link_file_error">S\'ha produït un error en tractar d\'actualitzar la compartició</string>
+  <string name="share_link_password_title">Escriviu una contrasenya</string>
+  <string name="share_link_empty_password">Heu d\'escriure una contrasenya</string>
   <string name="activity_chooser_send_file_title">Envia</string>
   <string name="copy_link">Copia l\'enllaç</string>
   <string name="clipboard_text_copied">S\'ha copiat al porta-retalls</string>
+  <string name="clipboard_no_text_to_copy">No s\'ha rebut cap text per copiar-lo al porta-retalls</string>
+  <string name="clipboard_uxexpected_error">Error inesperat quan es copiava al porta-retalls</string>
+  <string name="clipboard_label">Text copiat des de %1$s</string>
   <string name="error_cant_bind_to_operations_service">Error crític: no es poden realitzar operacions</string>
   <string name="network_error_socket_exception">Hi ha hagut un error mentre es connectava al servidor.</string>
   <string name="network_error_socket_timeout_exception">Hi ha hagut un error esperant al servidor, l\'operació no s\'ha pogut realitzar</string>
@@ -260,6 +312,7 @@
   <string name="forbidden_permissions_delete">per eliminar aquest fitxer</string>
   <string name="share_link_forbidden_permissions">per compartir aquest fitxer</string>
   <string name="unshare_link_forbidden_permissions">per deixar de compartir aquest fitxer</string>
+  <string name="update_link_forbidden_permissions">per actualitzar aquesta compartició</string>
   <string name="forbidden_permissions_create">per crear el fitxer</string>
   <string name="uploader_upload_forbidden_permissions">per pujar fitxers en aquesta carpeta</string>
   <string name="downloader_download_file_not_found">El fitxer ja no està disponible en el servidor</string>
@@ -267,22 +320,52 @@
   <string name="prefs_add_account">Afegeix compte</string>
   <string name="auth_redirect_non_secure_connection_title">La connexió segura està essent redirigida a través d\'una ruta insegura</string>
   <string name="actionbar_logger">Registre</string>
+  <string name="log_send_history_button">Enviar història</string>
+  <string name="log_progress_dialog_text">Carregant dades...</string>
   <string name="saml_authentication_required_text">Es requereix autenticació</string>
   <string name="saml_authentication_wrong_pass">Contrasenya incorrecta</string>
   <string name="actionbar_move">Moure</string>
+  <string name="file_list_empty_moving">Res per aquí. Pots afegir una carpeta!</string>
   <string name="folder_picker_choose_button_text">Escull</string>
+  <string name="move_file_not_found">No es pot moure. Assegureu-vos que el fitxer existeix</string>
+  <string name="move_file_invalid_overwrite">El fitxer ja existeix a la carpeta de destinació</string>
+  <string name="forbidden_permissions_move">per moure aquest fitxer</string>
+  <string name="copy_file_not_found">No es pot copiar. Assegureu-vos que el fitxer existeix</string>
+  <string name="copy_file_invalid_overwrite">El fitxer ja existeix a la carpeta de destinació</string>
+  <string name="forbidden_permissions_copy">per copiar aquest fitxer</string>
+  <string name="prefs_category_instant_uploading">Pujades instantanies</string>
   <string name="prefs_category_details">Detalls</string>
+  <string name="shared_subject_header">compartit</string>
+  <string name="with_you_subject_header">amb tú</string>
   <string name="auth_host_address">Adreça del servidor</string>
+  <string name="username">Nom d\'usuari</string>
+  <string name="file_list__footer__folder">1 carpeta</string>
+  <string name="file_list__footer__file">1 fitxer</string>
+  <string name="file_list__footer__file_and_folder">1 fitxer, 1 carpeta</string>
+  <string name="upload_copy_files">Copiar fitxer</string>
+  <string name="upload_move_files">Moure fitxer</string>
   <string name="share_dialog_title">Compartir</string>
+  <string name="share_with_user_section_title">Comparteix amb usuaris i grups</string>
+  <string name="share_no_users">No s\'han compartit dades amb usuaris encara</string>
+  <string name="share_add_user_or_group">Afegeix usuari o group</string>
   <string name="share_via_link_section_title">Comparteix l\'enllaç</string>
   <string name="share_via_link_expiration_date_label">Estableix la data de venciment</string>
   <string name="share_via_link_password_label">Protegir amb contrasenya</string>
+  <string name="share_via_link_password_title">Assegurat</string>
   <string name="share_via_link_edit_permission_label">Permetre edició</string>
+  <string name="share_with_title">Comparteix amb ...</string>
   <string name="share_search">Cerca</string>
+  <string name="search_users_and_groups_hint">Cerca usuaris i grups</string>
   <string name="share_privilege_can_share">pot compartir</string>
   <string name="share_privilege_can_edit">pot editar</string>
   <string name="share_privilege_can_edit_create">crea</string>
   <string name="share_privilege_can_edit_change">canvi</string>
   <string name="share_privilege_can_edit_delete">elimina</string>
   <string name="edit_share_unshare">Deixar de compartir</string>
+  <string name="edit_share_done">Fet</string>
+  <string name="action_switch_grid_view">Vista de graella</string>
+  <string name="action_switch_list_view">Vista de Llista</string>
+  <string name="manage_space_title">Gestió d\'espai</string>
+  <string name="manage_space_clear_data">Neteja dades</string>
+  <string name="manage_space_error">Alguns fitxers no s\'han pogut esborrar</string>
 </resources>

res/values-cs-rCZ/strings.xml

@@ -58,7 +58,7 @@
   <string name="sync_string_files">Soubory</string>
   <string name="setup_btn_connect">Připojit</string>
   <string name="uploader_btn_upload_text">Nahrát</string>
-  <string name="uploader_top_message">Vyberte adresář pro nahrání:</string>
+  <string name="uploader_top_message">Vybrat adresář k nahrávání</string>
   <string name="uploader_wrn_no_account_title">Nenalezen žádný účet</string>
   <string name="uploader_wrn_no_account_text">Na tomto přístroji nejsou žádné %1$s účty. Nejdříve prosím zadejte účet.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavení</string>
@@ -226,7 +226,7 @@
   <string name="unfavorite">Zrušit nastavení dostupnosti offline</string>
   <string name="common_rename">Přejmenovat</string>
   <string name="common_remove">Odstranit</string>
-  <string name="confirmation_remove_alert">Opravdu chcete odstranit %1$s ?</string>
+  <string name="confirmation_remove_file_alert">Opravdu chcete odstranit %1$s ?</string>
   <string name="confirmation_remove_folder_alert">Opravdu chcete odstranit %1$s a jeho obsah?</string>
   <string name="confirmation_remove_local">Pouze místní</string>
   <string name="remove_success_msg">Úspěšně odstraněno</string>

res/values-da/strings.xml

@@ -56,7 +56,6 @@
   <string name="sync_string_files">Filer</string>
   <string name="setup_btn_connect">Tilslut</string>
   <string name="uploader_btn_upload_text">Upload</string>
-  <string name="uploader_top_message">Vælg upload-mappe:</string>
   <string name="uploader_wrn_no_account_title">Ingen konto fundet</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Opsætning</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Afslut</string>
@@ -179,7 +178,7 @@
   <string name="auth_account_does_not_exist">Kontoen findes endnu ikke på enheden</string>
   <string name="common_rename">Omdøb</string>
   <string name="common_remove">Fjern</string>
-  <string name="confirmation_remove_alert">Er du sikker på at du vil fjerne %1$s ?</string>
+  <string name="confirmation_remove_file_alert">Er du sikker på at du vil fjerne %1$s ?</string>
   <string name="confirmation_remove_folder_alert">Ønsker du virkelig at slette %1$s og dets indhold?</string>
   <string name="confirmation_remove_local">Kun lokal</string>
   <string name="remove_success_msg">Vellykket fjernelse</string>

res/values-de-rCH/strings.xml

@@ -146,7 +146,7 @@
   <string name="common_remove">Löschen</string>
   <string name="confirmation_remove_local">Nur lokal</string>
   <string name="confirmation_remove_folder_local">Nur lokale Inhalte</string>
-  <string name="confirmation_remove_remote">Vom Server entfernen</string>
+  <string name="confirmation_remove_file_remote">Vom Server entfernen</string>
   <string name="confirmation_remove_remote_and_local">Lokal und auf dem Server</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>
   <string name="remove_fail_msg">Der Löschvorgang konnte nicht beendet werden</string>

res/values-de-rDE/strings.xml

@@ -58,7 +58,7 @@
   <string name="sync_string_files">Dateien</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Hochladen</string>
-  <string name="uploader_top_message">Uploadordner auswählen:</string>
+  <string name="uploader_top_message">Hochladeordner auswählen</string>
   <string name="uploader_wrn_no_account_title">Kein Konto gefunden</string>
   <string name="uploader_wrn_no_account_text">Es sind keine %1$s-Konten auf Ihrem Gerät eingerichtet. Bitte richten Sie zuerst ein Konto ein.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Einrichten</string>
@@ -227,7 +227,7 @@
   <string name="unfavorite">Offline verfügbar Markierung entfernen</string>
   <string name="common_rename">Umbenennen</string>
   <string name="common_remove">Löschen</string>
-  <string name="confirmation_remove_alert">Möchten Sie %1$s wirklich löschen?</string>
+  <string name="confirmation_remove_file_alert">Möchten Sie %1$s wirklich löschen?</string>
   <string name="confirmation_remove_folder_alert">Möchten Sie wirklich %1$s und dessen Inhalte entfernen?</string>
   <string name="confirmation_remove_local">Nur lokal</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>

res/values-de/strings.xml

@@ -58,7 +58,7 @@
   <string name="sync_string_files">Dateien</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>
+  <string name="uploader_top_message">Hochladeordner auswählen</string>
   <string name="uploader_wrn_no_account_title">Kein Account gefunden</string>
   <string name="uploader_wrn_no_account_text">Es sind keine %1$s Konten auf deinem Gerät eingerichtet. Bitte erstelle zuerst ein Konto.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Einrichten</string>
@@ -227,7 +227,7 @@
   <string name="unfavorite">Offline verfügbar Markierung entfernen</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>
+  <string name="confirmation_remove_file_alert">Möchtest Du %1$s wirklich löschen?</string>
   <string name="confirmation_remove_folder_alert">Möchtest Du wirklich %1$s und dessen Inhalte entfernen?</string>
   <string name="confirmation_remove_local">Nur lokal</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>

res/values-el/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Αρχεία</string>
   <string name="setup_btn_connect">Σύνδεση</string>
   <string name="uploader_btn_upload_text">Μεταφόρτωση</string>
-  <string name="uploader_top_message">Επιλέξτε φάκελο μεταφορτώσεων:</string>
   <string name="uploader_wrn_no_account_title">Δεν βρέθηκε λογαριασμός</string>
   <string name="uploader_wrn_no_account_text">Δεν υπάρχουν λογαριασμοί %1$s στη συσκευή σας. Παρακαλώ ρυθμίστε πρώτα ένα λογαριασμό.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Ρύθμιση</string>
@@ -206,7 +205,7 @@
   <string name="auth_account_does_not_exist">Ο λογαριασμός δεν υπάρχει στη συσκευή ακόμα.</string>
   <string name="common_rename">Μετονομασία</string>
   <string name="common_remove">Αφαίρεση</string>
-  <string name="confirmation_remove_alert">Θέλετε στ\' αλήθεια να αφαιρέσετε το  %1$s;</string>
+  <string name="confirmation_remove_file_alert">Θέλετε στ\' αλήθεια να αφαιρέσετε το  %1$s;</string>
   <string name="confirmation_remove_folder_alert">Θέλετε στ\' αλήθεια να διαγράψετε το %1$s και τα περιεχόμενά του;</string>
   <string name="confirmation_remove_local">Μόνο τοπικά</string>
   <string name="remove_success_msg">Αφαίρεση επιτυχής</string>

res/values-en-rGB/strings.xml

@@ -58,7 +58,7 @@
   <string name="sync_string_files">Files</string>
   <string name="setup_btn_connect">Connect</string>
   <string name="uploader_btn_upload_text">Upload</string>
-  <string name="uploader_top_message">Choose upload folder:</string>
+  <string name="uploader_top_message">Choose upload folder</string>
   <string name="uploader_wrn_no_account_title">No account found</string>
   <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please set up an account first.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
@@ -227,7 +227,7 @@
   <string name="unfavorite">Unset as available offline</string>
   <string name="common_rename">Rename</string>
   <string name="common_remove">Remove</string>
-  <string name="confirmation_remove_alert">Do you really want to remove %1$s?</string>
+  <string name="confirmation_remove_file_alert">Do you really want to remove %1$s?</string>
   <string name="confirmation_remove_folder_alert">Do you really want to remove %1$s and its contents?</string>
   <string name="confirmation_remove_local">Local only</string>
   <string name="remove_success_msg">Removal succeeded</string>

res/values-eo/strings.xml

@@ -44,7 +44,6 @@
   <string name="sync_string_files">Dosieroj</string>
   <string name="setup_btn_connect">Konekti</string>
   <string name="uploader_btn_upload_text">Alŝuti</string>
-  <string name="uploader_top_message">Elektu alŝutan dosierujon:</string>
   <string name="uploader_wrn_no_account_title">Neniu konto troviĝis</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Agordi</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Forlasi</string>
@@ -148,7 +147,7 @@
   <string name="auth_account_does_not_exist">Konto ankoraŭ ne ekzistas en la aparato</string>
   <string name="common_rename">Alinomigi</string>
   <string name="common_remove">Forigi</string>
-  <string name="confirmation_remove_alert">Ĉu vi vere volas forigi %1$s?</string>
+  <string name="confirmation_remove_file_alert">Ĉu vi vere volas forigi %1$s?</string>
   <string name="confirmation_remove_folder_alert">Ĉu vi vere volas forigi %1$s kaj ĝia enhavo?</string>
   <string name="confirmation_remove_local">Nur loka</string>
   <string name="remove_success_msg">Forigo sukcesis</string>

res/values-es-rAR/strings.xml

@@ -49,7 +49,6 @@
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
-  <string name="uploader_top_message">Elija la carpeta de subida:</string>
   <string name="uploader_wrn_no_account_title">No se encontraron cuentas</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>
@@ -153,7 +152,7 @@
   <string name="auth_fail_get_user_name">Tú servidor no esta regresando una identificación de usuario correcta, por favor contacta a un administrador</string>
   <string name="common_rename">Renombrar</string>
   <string name="common_remove">Borrar</string>
-  <string name="confirmation_remove_alert">¿Realmente quieres eliminar %1$s?</string>
+  <string name="confirmation_remove_file_alert">¿Realmente quieres eliminar %1$s?</string>
   <string name="confirmation_remove_folder_alert">¿Realmente deseas eliminar %1$s y todo su contenido?</string>
   <string name="confirmation_remove_local">Sólo local</string>
   <string name="remove_success_msg">Borrado correctamente</string>

res/values-es-rCL/strings.xml

@@ -25,7 +25,6 @@
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
-  <string name="uploader_top_message">Elija el directorio donde subir los archivos:</string>
   <string name="uploader_wrn_no_account_title">No se encuentra la cuenta</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuración</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Salir</string>
@@ -97,7 +96,7 @@
   <string name="auth_unauthorized">usuario o clave incorrecta</string>
   <string name="common_rename">Renombrar</string>
   <string name="common_remove">Remover</string>
-  <string name="confirmation_remove_alert">¿Realmente desea eliminar %1$s?</string>
+  <string name="confirmation_remove_file_alert">¿Realmente desea eliminar %1$s?</string>
   <string name="confirmation_remove_folder_alert">¿Realmente desea eliminar el archivo %1$s y su contenido?</string>
   <string name="confirmation_remove_local">Solo local</string>
   <string name="remove_success_msg">Removido correctamente</string>

res/values-es/strings.xml

@@ -58,7 +58,7 @@
   <string name="sync_string_files">Archivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
-  <string name="uploader_top_message">Escoger carpeta de carga:</string>
+  <string name="uploader_top_message">Elige carpeta de subida</string>
   <string name="uploader_wrn_no_account_title">No se encontró la cuenta</string>
   <string name="uploader_wrn_no_account_text">No hay %1$s cuentas en tu dispositivo. Por favor añade una cuenta primero.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuración</string>
@@ -227,7 +227,7 @@
   <string name="unfavorite">Desmarcar como disponible offline</string>
   <string name="common_rename">Renombrar</string>
   <string name="common_remove">Borrar</string>
-  <string name="confirmation_remove_alert">¿Realmente desea eliminar %1$s?</string>
+  <string name="confirmation_remove_file_alert">¿Realmente desea eliminar %1$s?</string>
   <string name="confirmation_remove_folder_alert">¿Realmente desea eliminar %1$s y todo su contenido?</string>
   <string name="confirmation_remove_local">Sólo local</string>
   <string name="remove_success_msg">Borrado correctamente</string>

res/values-et-rEE/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Failid</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>
   <string name="uploader_wrn_no_account_title">Kontot ei leitud</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Seadista</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Lõpeta</string>
@@ -198,7 +197,7 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
   <string name="auth_account_does_not_exist">Kontot pole veel seadmes</string>
   <string name="common_rename">Nimeta ümber</string>
   <string name="common_remove">Eemalda</string>
-  <string name="confirmation_remove_alert">Oled sa kindel, et soovid %1$s eemaldada?</string>
+  <string name="confirmation_remove_file_alert">Oled sa kindel, et soovid %1$s eemaldada?</string>
   <string name="confirmation_remove_folder_alert">Kas sa tõesti soovid eemaldada %1$s ja selle sisu?</string>
   <string name="confirmation_remove_local">Ainult kohalik</string>
   <string name="remove_success_msg">Eemaldamine oli edukas</string>

res/values-eu/strings.xml

@@ -53,7 +53,6 @@
   <string name="sync_string_files">Fitxategiak</string>
   <string name="setup_btn_connect">Konektatu</string>
   <string name="uploader_btn_upload_text">Igo</string>
-  <string name="uploader_top_message">Hautatu igoera karpeta:</string>
   <string name="uploader_wrn_no_account_title">Ez da konturik aurkitu</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Konfiguratu</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Irten</string>
@@ -164,7 +163,7 @@ Mesedez, baimendu berriz</string>
   <string name="auth_fail_get_user_name">Zure zerbitzariak ez du bueltatzen erabiltzailearen id egokia, mesedez jarri harremanetan administratzailearekin.</string>
   <string name="common_rename">Berrizendatu</string>
   <string name="common_remove">Ezabatu</string>
-  <string name="confirmation_remove_alert">Ziur zaude %1$s ezabatu nahi duzula?</string>
+  <string name="confirmation_remove_file_alert">Ziur zaude %1$s ezabatu nahi duzula?</string>
   <string name="confirmation_remove_folder_alert">Ziru zaude %1$s eta bere edukiak ezabatu nahi dituzula?</string>
   <string name="confirmation_remove_local">Bertakoa bakarrik</string>
   <string name="remove_success_msg">Ongi ezabatu da</string>

res/values-fa/strings.xml

@@ -44,7 +44,6 @@
   <string name="sync_string_files">پرونده‌ها</string>
   <string name="setup_btn_connect">اتصال</string>
   <string name="uploader_btn_upload_text">بارگزاری</string>
-  <string name="uploader_top_message">انتخاب پوشه آپلود:</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>

res/values-fi-rFI/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Tiedostot</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>
   <string name="uploader_wrn_no_account_title">Tiliä ei löytynyt</string>
   <string name="uploader_wrn_no_account_text">Laitteellasi ei ole %1$s-tilejä. Määritä tilin asetukset ensin.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Asetukset</string>
@@ -204,7 +203,7 @@
   <string name="auth_account_does_not_exist">Tiliä ei ole olemassa vielä laitteella</string>
   <string name="common_rename">Nimeä uudelleen</string>
   <string name="common_remove">Poista</string>
-  <string name="confirmation_remove_alert">Haluatko varmasti poistaa kohteen %1$s?</string>
+  <string name="confirmation_remove_file_alert">Haluatko varmasti poistaa kohteen %1$s?</string>
   <string name="confirmation_remove_folder_alert">Haluatko varmasti poistaa kohteen %1$s ja sen sisällön?</string>
   <string name="confirmation_remove_local">Vain paikallinen</string>
   <string name="remove_success_msg">Poistettu onnistuneesti</string>

res/values-fr/strings.xml

@@ -59,7 +59,6 @@ Téléchargez-le ici : %2$s</string>
   <string name="sync_string_files">Fichiers</string>
   <string name="setup_btn_connect">Connecter</string>
   <string name="uploader_btn_upload_text">Téléverser</string>
-  <string name="uploader_top_message">Sélectionner le dossier d\'envoi :</string>
   <string name="uploader_wrn_no_account_title">Aucun compte n\'a été trouvé</string>
   <string name="uploader_wrn_no_account_text">Aucun compte %1$s sur l\'appareil. Veuillez configurer un compte au préalable.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuration</string>
@@ -230,7 +229,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="auth_account_does_not_exist">Le compte n\'existe pas encore sur ce périphérique</string>
   <string name="common_rename">Renommer</string>
   <string name="common_remove">Supprimer</string>
-  <string name="confirmation_remove_alert">Voulez-vous vraiment supprimer %1$s ?</string>
+  <string name="confirmation_remove_file_alert">Voulez-vous vraiment supprimer %1$s ?</string>
   <string name="confirmation_remove_folder_alert">Voulez-vous vraiment supprimer %1$s et son contenu ?</string>
   <string name="confirmation_remove_local">Local seulement</string>
   <string name="remove_success_msg">Suppression effectuée avec succès</string>

res/values-gl/strings.xml

@@ -54,7 +54,6 @@ Descárgueo de aquí: %2$s</string>
   <string name="sync_string_files">Ficheiros</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Enviar</string>
-  <string name="uploader_top_message">Escolla o cartafol de envío:</string>
   <string name="uploader_wrn_no_account_title">Non se atoparon contas</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalación</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Saír</string>
@@ -179,7 +178,7 @@ Descárgueo de aquí: %2$s</string>
   <string name="auth_account_does_not_exist">Aínda non existe a conta no dispositivo</string>
   <string name="common_rename">Renomear</string>
   <string name="common_remove">Retirar</string>
-  <string name="confirmation_remove_alert">Confirma que quere retirar %1$s?</string>
+  <string name="confirmation_remove_file_alert">Confirma que quere retirar %1$s?</string>
   <string name="confirmation_remove_folder_alert">Confirma que quere retirar %1$s e o seu contido?</string>
   <string name="confirmation_remove_local">Só local</string>
   <string name="remove_success_msg">Retirado correctamente</string>

res/values-he/strings.xml

@@ -58,16 +58,24 @@
   <string name="sync_string_files">קבצים</string>
   <string name="setup_btn_connect">התחברות</string>
   <string name="uploader_btn_upload_text">העלאה</string>
-  <string name="uploader_top_message">בחירת תיקיית העלאה:</string>
+  <string name="uploader_top_message">יש לבחור בתיקיית העלאה</string>
   <string name="uploader_wrn_no_account_title">לא נמצא חשבון</string>
   <string name="uploader_wrn_no_account_text">לא מוגדרים חשבונות %1$s במכשיר שלך. יש להגדיר חשבות תחילה.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">הגדרות</string>
   <string name="uploader_wrn_no_account_quit_btn_text">יציאה</string>
+  <string name="uploader_error_title_no_file_to_upload">אין קובץ להעלאה</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s לא ניתן להעלות מחרוזת טקסט כקובץ.</string>
+  <string name="uploader_error_message_no_file_to_upload">מידע שהתקבל אינו מכיל כל קובץ חוקי.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">קובץ לא ניתן להעלאה</string>
+  <string name="uploader_error_message_read_permission_not_granted">ל- %1$s אסור לקרוא קובץ מתקבל</string>
+  <string name="uploader_error_message_source_file_not_found">הקובץ להעלאה לא נמצא במיקום שלו. יש לבדוק אם הקובץ קיים.</string>
+  <string name="uploader_error_message_source_file_not_copied">שגיאה אירעה בזמן העתקת הקובץ לתיקייה הזמנית. יש לנסות לשלוח שוב.</string>
   <string name="file_list_seconds_ago">שניות</string>
   <string name="file_list_empty">אין כאן שום דבר. אולי ברצונך להעלות משהו?</string>
   <string name="file_list_loading">בטעינה …</string>
   <string name="file_list_no_app_for_file_type">לא נמצא יישום עבור סוג זה!</string>
   <string name="local_file_list_empty">אין קבצים בתיקייה זו:</string>
+  <string name="upload_list_empty">אין העלאות זמינות.</string>
   <string name="file_list_folder">תקיה</string>
   <string name="file_list_folders">תקיות</string>
   <string name="file_list_file">קובץ</string>
@@ -85,12 +93,15 @@
   <string name="common_yes">כן</string>
   <string name="common_no">לא</string>
   <string name="common_ok">אישור</string>
+  <string name="common_remove_upload">הסרת העלאה</string>
+  <string name="common_retry_upload">נסיון נוסף להעלאה</string>
   <string name="common_cancel_sync">ביטול סנכרון</string>
   <string name="common_cancel">ביטול</string>
   <string name="common_back">אחורה</string>
   <string name="common_save_exit">שמירה ויציאה</string>
   <string name="common_error">שגיאה</string>
   <string name="common_loading">בטעינה …</string>
+  <string name="common_unknown">לא ידוע</string>
   <string name="common_error_unknown">שגיאה בלתי ידועה</string>
   <string name="about_title">על אודות</string>
   <string name="change_password">שינוי ססמה</string>
@@ -107,13 +118,22 @@
   <string name="uploader_upload_failed_credentials_error">העלאה נכשלה, יש להתחבר מחדש</string>
   <string name="uploads_view_title">העלאות</string>
   <string name="uploads_view_group_current_uploads">נוכחי</string>
+  <string name="uploads_view_group_failed_uploads">נכשל (יש להקיש לניסיון נוסף)</string>
   <string name="uploads_view_group_finished_uploads">הועלה</string>
   <string name="uploads_view_upload_status_succeeded">הושלם</string>
+  <string name="uploads_view_upload_status_cancelled">בוטל</string>
+  <string name="uploads_view_upload_status_paused">מושהה</string>
+  <string name="uploads_view_upload_status_failed_connection_error">שגיאת חיבור</string>
+  <string name="uploads_view_upload_status_failed_retry">העלאה תבוצע שוב בהקדם</string>
   <string name="uploads_view_upload_status_failed_credentials_error">שגיאת אישורי גישה</string>
   <string name="uploads_view_upload_status_failed_folder_error">שגיאת תיקייה</string>
   <string name="uploads_view_upload_status_failed_file_error">שגיאת קובץ</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">קובץ מקומי לא נמצא</string>
   <string name="uploads_view_upload_status_failed_permission_error">שגיאת הרשאה</string>
+  <string name="uploads_view_upload_status_conflict">התנגשות</string>
+  <string name="uploads_view_upload_status_service_interrupted">יישום הופסק</string>
   <string name="uploads_view_upload_status_unknown_fail">שגיאה בלתי ידועה</string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">מחכה לחיבור WiFi</string>
   <string name="uploads_view_later_waiting_to_upload">ממתין להעלאה</string>
   <string name="downloader_download_in_progress_ticker">בהורדה …</string>
   <string name="downloader_download_in_progress_content">%1$d%% בהורדה %2$s</string>
@@ -203,9 +223,11 @@
 ⇥</string>
   <string name="auth_can_not_auth_against_server">לא ניתן לאמת עבור שרת זה</string>
   <string name="auth_account_does_not_exist">עדיין לא קיים חשבון במכשיר</string>
+  <string name="favorite">הגדר כזמין באופן לא מקוון</string>
+  <string name="unfavorite">ביטול הגדרה כזמין באופן לא מקוון</string>
   <string name="common_rename">שינוי שם</string>
   <string name="common_remove">הסרה</string>
-  <string name="confirmation_remove_alert">האם באמת להסיר %1$s?</string>
+  <string name="confirmation_remove_file_alert">האם באמת להסיר %1$s?</string>
   <string name="confirmation_remove_folder_alert">האם באמת להסיר %1$s ואת כל התכולה?</string>
   <string name="confirmation_remove_local">מקומי בלבד</string>
   <string name="remove_success_msg">ההסרה הצליחה</string>
@@ -220,6 +242,7 @@
   <string name="filename_forbidden_charaters_from_server">שם קובץ כולל לפחות תו אחד לא חוקי</string>
   <string name="filename_empty">שם קובץ לא יכול להיות ריק</string>
   <string name="wait_a_moment">נא להמתין רגע</string>
+  <string name="wait_checking_credentials">בודק אישורים שמורים</string>
   <string name="filedisplay_unexpected_bad_get_content">תקלה בלתי צפויה ; נא לבחור בקובץ מיישום אחר</string>
   <string name="filedisplay_no_file_selected">לא נבחרו קבצים</string>
   <string name="activity_chooser_title">שליחת קישור אל ...</string>
@@ -284,6 +307,9 @@
   <string name="activity_chooser_send_file_title">שליחה</string>
   <string name="copy_link">העתקת קישור</string>
   <string name="clipboard_text_copied">הועתק ללוח הגזירים - clipboard</string>
+  <string name="clipboard_no_text_to_copy">לא הוחזר טקסט להעתקה ללוח הגזירים</string>
+  <string name="clipboard_uxexpected_error">שגיאה לא צפויה בזמן העתקה ללוח הגזירים</string>
+  <string name="clipboard_label">טקסט הועתק מ- %1$s</string>
   <string name="error_cant_bind_to_operations_service">שגיאה קריטית: לא ניתן לבצע את הפעולות</string>
   <string name="network_error_socket_exception">שגיאה אירעה בזמן חיבור לשרת.</string>
   <string name="network_error_socket_timeout_exception">שגיאה אירעה בזמן המתנה לשרת, הפעולה לא הייתה ניתנת להשלמה</string>
@@ -375,10 +401,16 @@
   <string name="share_privilege_can_edit_delete">מחיקה</string>
   <string name="edit_share_unshare">הפסקת שיתוף</string>
   <string name="edit_share_done">הסתיים</string>
+  <string name="action_retry_uploads">ניסיון שנית נכשל</string>
+  <string name="action_clear_failed_uploads">ניקוי נכשל</string>
+  <string name="action_clear_successful_uploads">ניקוי הצליח</string>
+  <string name="action_clear_finished_uploads">ניקוי כל הפריטים שהסתיימו</string>
   <string name="action_switch_grid_view">תצוגת טבלה</string>
   <string name="action_switch_list_view">תצוגת רשימה</string>
   <string name="manage_space_title">ניהול מקום</string>
+  <string name="manage_space_description">הגדרות, של אישורי מסד נתונים ושרת מתוך מידע %1$s\'s ימחק לצמיתות. \n\nקבצים שהורדו ישמרו ללא פגע.\n\nתהליך זה יכול להמשך זמן מה.</string>
   <string name="manage_space_clear_data">ניקוי מידע</string>
   <string name="manage_space_error">לא ניתן היה למחוק מספר קבצים.</string>
   <string name="permission_storage_access">נדרשות הרשאות נוספות להעלאה והורדת קבצים.</string>
+  <string name="local_file_not_found_toast">הקובץ לא נמצא במערכת הקבצים המקומית</string>
 </resources>

res/values-hu-rHU/strings.xml

@@ -50,7 +50,6 @@
   <string name="sync_string_files">Fájlok</string>
   <string name="setup_btn_connect">Kapcsolódás</string>
   <string name="uploader_btn_upload_text">Feltöltés</string>
-  <string name="uploader_top_message">Válassz feltöltési mappát:</string>
   <string name="uploader_wrn_no_account_title">Nincs ilyen felhasználói fiók</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Beállítás</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Kilépés</string>
@@ -164,7 +163,7 @@
   <string name="auth_unsupported_multiaccount">%1$s nem támogat több bejelenkezési jogosultságot</string>
   <string name="common_rename">Átnevezés</string>
   <string name="common_remove">Eltávolítás</string>
-  <string name="confirmation_remove_alert">Tényleg el akarod távolítani %1$s?</string>
+  <string name="confirmation_remove_file_alert">Tényleg el akarod távolítani %1$s?</string>
   <string name="confirmation_remove_folder_alert">Tényleg el akarod távolítani a %1$s és tartalmát?</string>
   <string name="confirmation_remove_local">Csak a helyi példány</string>
   <string name="remove_success_msg">Az eltávolítás sikerült</string>

res/values-id/strings.xml

@@ -56,7 +56,6 @@
   <string name="sync_string_files">Berkas</string>
   <string name="setup_btn_connect">Sambungkan</string>
   <string name="uploader_btn_upload_text">Unggah</string>
-  <string name="uploader_top_message">Pilih folder unggah:</string>
   <string name="uploader_wrn_no_account_title">Tidak ada akun yang ditemukan</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Pengaturan</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Keluar</string>
@@ -185,7 +184,7 @@
   <string name="auth_account_does_not_exist">Akun tidak ada di perangkat ini</string>
   <string name="common_rename">Ubah nama</string>
   <string name="common_remove">Hapus</string>
-  <string name="confirmation_remove_alert">Apakah Anda yakin ingin menghapus %1$s?</string>
+  <string name="confirmation_remove_file_alert">Apakah Anda yakin ingin menghapus %1$s?</string>
   <string name="confirmation_remove_folder_alert">Apakah Anda yakin ingin menghapus %1$s dan isinya?</string>
   <string name="confirmation_remove_local">Lokal saja</string>
   <string name="remove_success_msg">Penghapusan berhasil</string>

res/values-is/strings.xml

@@ -57,7 +57,6 @@
   <string name="sync_string_files">Skrár</string>
   <string name="setup_btn_connect">Tengjast</string>
   <string name="uploader_btn_upload_text">Senda inn</string>
-  <string name="uploader_top_message">Veldu innsendingamöppu:</string>
   <string name="uploader_wrn_no_account_title">Enginn notandaaðgangur fannst</string>
   <string name="uploader_wrn_no_account_text">Það eru engir %1$s aðgangar á tækinu þínu. Settu fyrst upp notandaaðgang.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Uppsetning</string>

res/values-it/strings.xml

@@ -58,7 +58,7 @@
   <string name="sync_string_files">File</string>
   <string name="setup_btn_connect">Connetti</string>
   <string name="uploader_btn_upload_text">Carica</string>
-  <string name="uploader_top_message">Scegli la cartella da caricare:</string>
+  <string name="uploader_top_message">Scegli la cartella di caricamento</string>
   <string name="uploader_wrn_no_account_title">Nessun account trovato</string>
   <string name="uploader_wrn_no_account_text">Non ci sono account %1$s sul tuo dispositivo. Configura prima un account.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurazione</string>
@@ -201,7 +201,7 @@
   <string name="auth_account_not_the_same">L\'utente digitato non corrisponde all\'utente di questo account</string>
   <string name="auth_unknown_error_title">Errore sconosciuto</string>
   <string name="auth_unknown_host_title">Impossibile trovare l\'host</string>
-  <string name="auth_incorrect_path_title">Istanza di il server non trovata</string>
+  <string name="auth_incorrect_path_title">Istanza del server non trovata</string>
   <string name="auth_timeout_title">Il server ha richiesto troppo tempo per rispondere</string>
   <string name="auth_incorrect_address_title">Formato indirizzo del server errato</string>
   <string name="auth_ssl_general_error_title">Inizializzazione  SSL non riuscita</string>
@@ -227,7 +227,7 @@
   <string name="unfavorite">Rimuovi come disponibile non in linea</string>
   <string name="common_rename">Rinomina</string>
   <string name="common_remove">Rimuovi</string>
-  <string name="confirmation_remove_alert">Vuoi davvero rimuovere %1$s?</string>
+  <string name="confirmation_remove_file_alert">Vuoi davvero rimuovere %1$s?</string>
   <string name="confirmation_remove_folder_alert">Vuoi davvero rimuovere %1$s e il suo contenuto?</string>
   <string name="confirmation_remove_local">Solo localmente</string>
   <string name="remove_success_msg">Rimozione effettuata con successo</string>

res/values-ja-rJP/strings.xml

@@ -59,7 +59,6 @@
   <string name="sync_string_files">ファイル</string>
   <string name="setup_btn_connect">接続</string>
   <string name="uploader_btn_upload_text">アップロード</string>
-  <string name="uploader_top_message">アップロードするフォルダーを選択:</string>
   <string name="uploader_wrn_no_account_title">アカウントが見つかりません</string>
   <string name="uploader_wrn_no_account_text">端末に %1$s のアカウントがありません。まずアカウントを登録してください。</string>
   <string name="uploader_wrn_no_account_setup_btn_text">設定</string>
@@ -226,7 +225,7 @@
   <string name="auth_account_does_not_exist">デバイス上にまだアカウントが存在しません</string>
   <string name="common_rename">名前を変更</string>
   <string name="common_remove">削除</string>
-  <string name="confirmation_remove_alert">本当に %1$s を削除しますか？</string>
+  <string name="confirmation_remove_file_alert">本当に %1$s を削除しますか？</string>
   <string name="confirmation_remove_folder_alert">本当に %1$s およびそのコンテンツを削除してもよろしいですか？</string>
   <string name="confirmation_remove_local">ローカルのみ</string>
   <string name="remove_success_msg">削除に成功しました</string>

res/values-ko/strings.xml

@@ -52,7 +52,6 @@
   <string name="sync_string_files">파일</string>
   <string name="setup_btn_connect">접속</string>
   <string name="uploader_btn_upload_text">업로드</string>
-  <string name="uploader_top_message">업로드 폴더 선택:</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>
@@ -176,7 +175,7 @@
   <string name="auth_account_does_not_exist">장치에 아직 계정이 없음</string>
   <string name="common_rename">이름 바꾸기</string>
   <string name="common_remove">삭제</string>
-  <string name="confirmation_remove_alert">%1$s을(를) 삭제하시겠습니까?</string>
+  <string name="confirmation_remove_file_alert">%1$s을(를) 삭제하시겠습니까?</string>
   <string name="confirmation_remove_folder_alert">%1$s 및 포함된 내용을 삭제하시겠습니까?</string>
   <string name="confirmation_remove_local">로컬만</string>
   <string name="remove_success_msg">성공적으로 삭제함</string>

res/values-lb/strings.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="about_android">%1$s Android-App</string>
+  <string name="about_android">%1$s Android-App </string>
   <string name="about_version">Versioun %1$s</string>
   <string name="actionbar_sync">Kont opfrëschen</string>
   <string name="actionbar_upload">Eroplueden</string>
@@ -21,22 +21,31 @@
     	<item>Biggest - Smallest</item>-->
   <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
   <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <string name="drawer_item_all_files">All d\'Fichieren</string>
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
+  <string name="drawer_item_settings">Astellungen</string>
+  <string name="drawer_close">Zoumaachen</string>
   <string name="drawer_open">Opmaachen</string>
   <string name="prefs_category_general">Allgemeng</string>
   <string name="prefs_category_more">Méi</string>
   <string name="prefs_accounts">Konten</string>
+  <string name="prefs_manage_accounts">Konte geréieren</string>
+  <string name="prefs_passcode">Passwuert gespaart</string>
   <string name="prefs_instant_upload">Biller direkt eroplueden</string>
   <string name="prefs_instant_upload_summary">Biller vum Fotoapparat direkt eroplueden</string>
   <string name="prefs_instant_video_upload">Videoen direkt eroplueden</string>
   <string name="prefs_instant_video_upload_summary">Biller vun der Kamera direkt eroplueden</string>
   <string name="prefs_log_summary">Heiduerch gi Problemer protokolléiert</string>
   <string name="prefs_log_summary_history">Hei ginn déi enregistréiert Protokoller ugewisen</string>
+  <string name="prefs_log_delete_history_button">Historique läschen</string>
   <string name="prefs_help">Hëllef</string>
   <string name="prefs_recommend">Engem Frënd recommendéieren</string>
   <string name="prefs_feedback">Feedback</string>
   <string name="prefs_imprint">Impressum</string>
+  <string name="prefs_remember_last_share_location">Gedeelte Plaz verhalen</string>
+  <string name="prefs_remember_last_upload_location_summary">Déi leschte gedeelten eropgeluede Plaz verhalen</string>
+  <string name="recommend_subject">Versich %1$s op dengem Smartphone!</string>
   <string name="auth_host_url">Server-Adress https://…</string>
   <string name="auth_username">Benotzernumm</string>
   <string name="auth_password">Passwuert</string>
@@ -44,39 +53,61 @@
   <string name="sync_string_files">Fichieren</string>
   <string name="setup_btn_connect">Verbannen</string>
   <string name="uploader_btn_upload_text">Eroplueden</string>
+  <string name="uploader_top_message">Dossier fir eropzelueden auswielen</string>
   <string name="uploader_wrn_no_account_title">Keen Account fonnt</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Erausgoen</string>
+  <string name="uploader_error_title_no_file_to_upload">Kee Fichier fir eropzeluede</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Fichier kann net eropgeluede ginn</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s huet keng Erlaabnis fir den erhalene Fichier ze liesen</string>
+  <string name="uploader_error_message_source_file_not_copied">Beim Kopéiere vun dësem Fichier op den temporäre Dossier ass e Feeler opgetrueden. Wann ech gelift versicht et nach eng Kéier ze schécken.</string>
   <string name="file_list_seconds_ago">Sekonnen hier</string>
   <string name="file_list_empty">Hei ass näischt. Lued eppes erop!</string>
+  <string name="file_list_loading">Et gëtt gelueden</string>
+  <string name="file_list_no_app_for_file_type">Et gouf keng App fir dësen Typ vu Fichier fonnt!</string>
+  <string name="local_file_list_empty">Et gi keng Fichieren fir dësen Dossier.</string>
   <string name="file_list_folder">Dossier</string>
   <string name="file_list_folders">Dossieren</string>
   <string name="file_list_file">Fichier</string>
   <string name="file_list_files">Fichieren</string>
+  <string name="filedetails_select_file">Tippt op e Fichier fir zousätzlech Informatiounen unzeweisen.</string>
   <string name="filedetails_size">Gréisst:</string>
   <string name="filedetails_type">Typ:</string>
   <string name="filedetails_created">Erstallt:</string>
   <string name="filedetails_modified">Geännert:</string>
   <string name="filedetails_download">Eroflueden</string>
+  <string name="filedetails_sync_file">Synchroniséieren</string>
   <string name="action_share">Deelen</string>
   <string name="common_yes">Jo</string>
   <string name="common_no">Nee</string>
   <string name="common_ok">OK</string>
+  <string name="common_cancel_sync">Synchronisatioun ofbriechen</string>
   <string name="common_cancel">Ofbriechen</string>
   <string name="common_back">Zeréck</string>
   <string name="common_error">Feeler</string>
+  <string name="common_unknown">Onbekannt</string>
   <string name="common_error_unknown">Onbekannte Feeler</string>
   <string name="about_title">Iwwer</string>
   <string name="change_password">Passwuert änneren</string>
+  <string name="delete_account">De Kont läschen</string>
   <string name="create_account">Kont uleeën</string>
   <string name="uploader_info_dirname">Dossiersnumm:</string>
   <string name="uploader_upload_in_progress_ticker">Lueden erop ...</string>
+  <string name="uploader_upload_in_progress_content">%1$d%% eroplueden %2$s</string>
   <string name="uploader_upload_succeeded_ticker">Eroplueden ofgeschloss</string>
+  <string name="uploader_upload_succeeded_content_single">%1$s eropgelueden</string>
   <string name="uploader_upload_failed_ticker">Eropluede feelgeschloen</string>
   <string name="uploader_upload_failed_content_single">Eropluede vun %1$s konnt net ofgeschloss ginn</string>
+  <string name="uploads_view_group_current_uploads">Aktuell</string>
+  <string name="uploads_view_group_failed_uploads">Feelgeschloen (Tipp fir nees ze probéieren)</string>
+  <string name="uploads_view_group_finished_uploads">Eropgelueden</string>
+  <string name="uploads_view_upload_status_succeeded">Erfëllt</string>
+  <string name="uploads_view_upload_status_paused">Gepaust</string>
+  <string name="uploads_view_upload_status_failed_connection_error">Verbindungs Feeler</string>
   <string name="uploads_view_upload_status_unknown_fail">Onbekannte Feeler</string>
   <string name="downloader_download_in_progress_ticker">Lueden erof …</string>
   <string name="downloader_download_succeeded_ticker">Eroflueden ofgeschloss</string>
+  <string name="downloader_download_succeeded_content">%1$s erofgelueden</string>
   <string name="downloader_download_failed_ticker">Erofluede feelgeschloen</string>
   <string name="downloader_download_failed_content">Erofluede vun %1$s konnt net ofgeschloss ginn</string>
   <string name="downloader_not_downloaded_yet">Nach net erofgelueden</string>
@@ -90,6 +121,15 @@
   <string name="foreign_files_fail">Verschidde Fichiere konnten net geréckelt ginn</string>
   <string name="foreign_files_local_text">Lokal: %1$s</string>
   <string name="foreign_files_remote_text">Um Server: %1$s</string>
+  <string name="pass_code_enter_pass_code">Gëff w.e.g. däi Passwuert an</string>
+  <string name="pass_code_configure_your_pass_code">Passwuert aginn</string>
+  <string name="pass_code_configure_your_pass_code_explanation">D\'Passwuert gëtt all Kéiers gefrot wann d\'App gestart gëtt</string>
+  <string name="pass_code_reenter_your_pass_code">Gëff w.e.g. däi Passwuert nach emol an</string>
+  <string name="pass_code_remove_your_pass_code">D\'Passwuert läschen</string>
+  <string name="pass_code_mismatch">D\'Passwierder sinn net d\'selwecht</string>
+  <string name="pass_code_wrong">Ongëltegt Passwuert</string>
+  <string name="pass_code_removed">Passwuert geläscht</string>
+  <string name="pass_code_stored">Passwuert gespeichert</string>
   <string name="media_notif_ticker">%1$s Musek-Programm</string>
   <string name="media_state_playing">%1$s (spillt of)</string>
   <string name="media_state_loading">%1$s (lued)</string>
@@ -123,11 +163,13 @@
   <string name="auth_unauthorized">Falsche Benotzernumm oder falscht Passwuert</string>
   <string name="auth_oauth_error">Authoriséierung net erfollegräich</string>
   <string name="auth_oauth_error_access_denied">Accès duerch den Authoriséierungsserver verweigert</string>
+  <string name="auth_expired_oauth_token_toast">Deng Autorisatioun ass ofgelaf. W.e.g. autoriséier dech nach emol</string>
+  <string name="auth_expired_basic_auth_toast">W.e.g dat aktuellt Passwuert aginn</string>
   <string name="auth_expired_saml_sso_token_toast">Deng Sessioun ass ofgelaf. Connectéier dech nei w.e.g.</string>
   <string name="auth_unsupported_auth_method">De Server ënnerstëtzt dës Authentifizéierungsmethod net</string>
   <string name="common_rename">Ëmbenennen</string>
   <string name="common_remove">Läschen</string>
-  <string name="confirmation_remove_alert">Wëlls du %1$s wierklech läschen?</string>
+  <string name="confirmation_remove_file_alert">Wëlls du %1$s wierklech läschen?</string>
   <string name="confirmation_remove_folder_alert">Wëlls du %1$s an de ganzen Inhalt wierklech läschen?</string>
   <string name="confirmation_remove_local">Nemme lokal</string>
   <string name="remove_success_msg">Erfollegräich geläscht</string>
@@ -160,6 +202,8 @@
   <string name="ssl_validator_label_validity_to">Un:</string>
   <string name="ssl_validator_label_signature">Signatur:</string>
   <string name="ssl_validator_label_signature_algorithm">Algorithmus:</string>
+  <string name="ssl_validator_label_certificate_fingerprint">Fangerofdrock:</string>
+  <string name="certificate_load_problem">Et gëtt e Problem fir de Certificat ze lueden.</string>
   <string name="ssl_validator_null_cert">Den Zertifikat konnt net ugewise ginn.</string>
   <string name="ssl_validator_no_info_about_error">- Keng Informatioun iwwer de Feeler</string>
   <string name="placeholder_sentence">Dëst ass e Plazhaler</string>
@@ -168,15 +212,26 @@
   <string name="placeholder_filesize">389kB</string>
   <string name="placeholder_timestamp">18.05.2012 12:23</string>
   <string name="placeholder_media_time">12:23:45</string>
+  <string name="instant_upload_on_wifi">D\'Biller nëmmen iwwer WiFi eroplueden</string>
+  <string name="instant_video_upload_on_wifi">D\'Videoen nëmmen iwwer WiFi eroplueden</string>
   <string name="conflict_keep_both">Béid halen</string>
+  <string name="conflict_use_local_version">Lokal Versioun</string>
+  <string name="conflict_use_server_version">Server Versioun</string>
   <string name="preview_image_description">Biller-Virschau</string>
   <string name="preview_image_error_unknown_format">Dëst Bild kann net ugewise ginn</string>
   <string name="error__upload__local_file_not_copied">%1$s konnt net an de lokalen Dossier %2$s kopéiert ginn</string>
+  <string name="prefs_instant_upload_path_title">Pad eroplueden</string>
+  <string name="share_link_file_no_exist">Konnt net gedeelt ginn. Kontrolléier w.e.g. ob de Fichier existéiert</string>
+  <string name="share_link_file_error">Beim Deele vun dësem Fichier oder Dossier ass e Feeler opgetrueden</string>
+  <string name="unshare_link_file_no_exist">Konnt net ongedeelt ginn. Kontrolléier w.e.g. ob de Fichier existéiert</string>
+  <string name="unshare_link_file_error">Beim Zesummeleeë vun dësem Fichier oder Dossier ass e Feeler opgetrueden</string>
+  <string name="update_link_file_no_exist">Konnt net aktualiséiert ginn. Kontrolléier w.e.g. ob de Fichier existéiert</string>
   <string name="share_link_password_title">E Passwuert aginn</string>
   <string name="share_link_empty_password">Du muss e Passwuert aginn</string>
   <string name="activity_chooser_send_file_title">Schécken</string>
   <string name="copy_link">Link kopéieren</string>
   <string name="clipboard_text_copied">An d\'Tëschenoflag kopéiert</string>
+  <string name="clipboard_label">Den Text vum %1$s ass kopéiert ginn</string>
   <string name="error_cant_bind_to_operations_service">Kritesche Feeler: D\'Operatioune konnten net ausgeféiert ginn</string>
   <string name="network_error_socket_exception">Bei der Connectioun mam Server ass e Feeler opgetrueden.</string>
   <string name="network_error_socket_timeout_exception">Beim Waarden op de Server ass e Feeler opgetrueden, d\'Operatioun konnt net duerchgeféiert ginn</string>
@@ -194,7 +249,9 @@
   <string name="prefs_category_accounts">Konten</string>
   <string name="prefs_add_account">Kont dobäisetzen</string>
   <string name="actionbar_logger">Protokoller</string>
+  <string name="log_send_history_button">Historique schécken</string>
   <string name="log_send_mail_subject">Protokoller vun der %1$s-Android-App</string>
+  <string name="log_progress_dialog_text">Donnée gi gelueden ...</string>
   <string name="saml_authentication_required_text">Authentifizéierung néideg</string>
   <string name="saml_authentication_wrong_pass">Falscht Passwuert</string>
   <string name="actionbar_move">Réckelen</string>
@@ -205,17 +262,60 @@
   <string name="move_file_invalid_overwrite">De Fichier existéiert schonn am Zildossier</string>
   <string name="move_file_error">Beim Réckele vun dësem Fichier oder Dossier ass e Feeler opgetrueden</string>
   <string name="forbidden_permissions_move">fir dëse Fichier ze réckelen</string>
+  <string name="copy_file_not_found">Konnt net kopéieren. Kontrolléier w.e.g. ob de Fichier existéiert</string>
+  <string name="copy_file_invalid_into_descendent">Et ass net méiglech, den Dossier an en Ënnerdossier vu sech selwer ze réckelen</string>
   <string name="copy_file_invalid_overwrite">De Fichier existéiert schonn am Zildossier</string>
+  <string name="copy_file_error">Beim Versuch dëse Fichier oder Dossier ze kopéieren ass e Feeler opgetrueden</string>
+  <string name="forbidden_permissions_copy">Fir dese Fichier ze kopéieren</string>
+  <string name="prefs_category_instant_uploading">Direkt eropgeluede Fichieren</string>
   <string name="prefs_category_details">Detailer</string>
+  <string name="prefs_instant_video_upload_path_title">Video Pad eroplueden</string>
+  <string name="sync_folder_failed_content">Synchroniséierung vum %1$s Dossier konnt net ofgeschloss ginn</string>
+  <string name="shared_subject_header">gedeelt</string>
+  <string name="with_you_subject_header">Mat dir</string>
   <string name="subject_user_shared_with_you">%1$s huet \"%2$s\" mat dir gedeelt</string>
+  <string name="subject_shared_with_you">\"%1$s\" gouf mat dir gedeelt</string>
   <string name="auth_refresh_button">Connectioun opfrëschen</string>
   <string name="auth_host_address">Server-Adress</string>
+  <string name="common_error_out_memory">Net genuch Memoire</string>
+  <string name="username">Benotzernumm</string>
+  <string name="file_list__footer__folder">1 Dossier</string>
+  <string name="file_list__footer__folders">%1$d Dossieren</string>
+  <string name="file_list__footer__file">1 Fichier</string>
+  <string name="file_list__footer__file_and_folder">1 Fichier, 1 Dossier</string>
+  <string name="file_list__footer__file_and_folders">1 Fichier, %1$d Dossieren</string>
+  <string name="file_list__footer__files">%1$d Fichieren</string>
+  <string name="file_list__footer__files_and_folder">1 Fichier, %1$d Dossieren</string>
+  <string name="file_list__footer__files_and_folders">%1$d Fichieren, %2$d Dossieren</string>
+  <string name="prefs_instant_behaviour_dialogTitle">Den original Fichier gëtt ...</string>
+  <string name="prefs_instant_behaviour_title">Den original Fichier gëtt ...</string>
+  <string name="upload_copy_files">Fichier kopéieren</string>
+  <string name="upload_move_files">Fichier réckelen</string>
+  <string name="pref_behaviour_entries_keep_file">Am original Dossier gehalen</string>
+  <string name="pref_behaviour_entries_move">An den App Fichier geréckelt</string>
+  <string name="share_dialog_title">Gedeelt</string>
+  <string name="share_file">%1$s deelen</string>
+  <string name="share_with_user_section_title">Mat Benotzer a Gruppen deelen</string>
+  <string name="share_no_users">Nach keng Donnéeë mat Benotzer gedeelt</string>
+  <string name="share_add_user_or_group">Benotzer oder Grupp bäisetzen</string>
   <string name="share_via_link_section_title">Link deelen</string>
   <string name="share_via_link_expiration_date_label">Verfallsdatum setzen</string>
   <string name="share_via_link_password_label">Passwuertgeschützt</string>
+  <string name="share_via_link_password_title">Geséchert</string>
+  <string name="share_get_public_link_button">De Link kréien</string>
+  <string name="share_with_title">Deele mat</string>
+  <string name="share_with_edit_title">Mam %1$s deelen</string>
   <string name="share_search">Sichen</string>
+  <string name="search_users_and_groups_hint">Benotzer a Gruppe sichen</string>
+  <string name="share_group_clarification">%1$s (Grupp)</string>
   <string name="share_privilege_can_share">kann deelen</string>
   <string name="share_privilege_can_edit">kann änneren</string>
   <string name="share_privilege_can_edit_create">erstellen</string>
+  <string name="share_privilege_can_edit_change">änneren</string>
   <string name="share_privilege_can_edit_delete">läschen</string>
+  <string name="edit_share_unshare">Deelen ophalen</string>
+  <string name="edit_share_done">gemaacht</string>
+  <string name="manage_space_clear_data">Donnéeë läschen</string>
+  <string name="manage_space_error">Verschidde Fichiere konnten net geläscht ginn.</string>
+  <string name="local_file_not_found_toast">De Fichier konnt net am lokale Fichier System fonnt ginn</string>
 </resources>

res/values-lt-rLT/strings.xml

@@ -52,7 +52,6 @@
   <string name="sync_string_files">Failai</string>
   <string name="setup_btn_connect">Prisijungti</string>
   <string name="uploader_btn_upload_text">Įkelti</string>
-  <string name="uploader_top_message">Nustatyti įkėlimų aplanką:</string>
   <string name="uploader_wrn_no_account_title">Paskyrų nerasta</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nustatymai</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Išeiti</string>
@@ -169,7 +168,7 @@
   <string name="auth_account_does_not_exist">Paskyra neegzistuoja įrenginyje</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_file_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="remove_success_msg">Pašalinta sėkmingai</string>

res/values-mk/strings.xml

@@ -51,7 +51,6 @@
   <string name="sync_string_files">Датотеки</string>
   <string name="setup_btn_connect">Поврзи се</string>
   <string name="uploader_btn_upload_text">Подигни</string>
-  <string name="uploader_top_message">Избери папка за префрлање:</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>
@@ -165,7 +164,7 @@
   <string name="auth_account_does_not_exist">Сметката сеуште не постои на овој уред</string>
   <string name="common_rename">Преименувај</string>
   <string name="common_remove">Отстрани</string>
-  <string name="confirmation_remove_alert">Дали навистина сакаш да ја отстраниш %1$s?</string>
+  <string name="confirmation_remove_file_alert">Дали навистина сакаш да ја отстраниш %1$s?</string>
   <string name="confirmation_remove_folder_alert">Дали навистина сакаш да го отстранам %1$s и неговата содржина?</string>
   <string name="confirmation_remove_local">Само локално</string>
   <string name="remove_success_msg">Одстранувањето е успешно</string>

res/values-nb-rNO/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Filer</string>
   <string name="setup_btn_connect">Koble til</string>
   <string name="uploader_btn_upload_text">Last opp</string>
-  <string name="uploader_top_message">Velg opplastingsmappe:</string>
   <string name="uploader_wrn_no_account_title">Ingen konto funnet</string>
   <string name="uploader_wrn_no_account_text">Det finnes ingen %1$s-kontoer på enheten din. Sett opp en konto først.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Oppsett</string>
@@ -218,7 +217,7 @@
   <string name="auth_account_does_not_exist">Kontoen eksisterer ikke på enheten enda</string>
   <string name="common_rename">Endre navn</string>
   <string name="common_remove">Fjern</string>
-  <string name="confirmation_remove_alert">Vil du virkelig fjerne %1$s?</string>
+  <string name="confirmation_remove_file_alert">Vil du virkelig fjerne %1$s?</string>
   <string name="confirmation_remove_folder_alert">Vil du virkelig fjerne %1$s inkludert innholdet?</string>
   <string name="confirmation_remove_local">Kun lokalt</string>
   <string name="remove_success_msg">Fjerning var vellykket</string>

res/values-nl/strings.xml

@@ -59,7 +59,7 @@ Download hier: %2$s</string>
   <string name="sync_string_files">Bestanden</string>
   <string name="setup_btn_connect">Verbinden</string>
   <string name="uploader_btn_upload_text">Uploaden</string>
-  <string name="uploader_top_message">Kies upload map:</string>
+  <string name="uploader_top_message">Kies een uploadmap</string>
   <string name="uploader_wrn_no_account_title">Geen account gevonden</string>
   <string name="uploader_wrn_no_account_text">Er zijn geen %1$s accounts op dit apparaat. Stel eerst een account in.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configureren</string>
@@ -226,9 +226,11 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
 	</string>
   <string name="auth_can_not_auth_against_server">Kan niet authenticeren tegen deze server</string>
   <string name="auth_account_does_not_exist">Het account bestaat nog niet in dit apparaat</string>
+  <string name="favorite">Instellen als beschikbaar offline</string>
+  <string name="unfavorite">Instellen als niet beschikbaar offline</string>
   <string name="common_rename">Hernoemen</string>
   <string name="common_remove">Verwijderen</string>
-  <string name="confirmation_remove_alert">Wilt u %1$s werkelijk verwijderen?</string>
+  <string name="confirmation_remove_file_alert">Wilt u %1$s werkelijk verwijderen?</string>
   <string name="confirmation_remove_folder_alert">Wilt u %1$s en de inhoud ervan werkelijk verwijderen?</string>
   <string name="confirmation_remove_local">Alleen lokaal</string>
   <string name="remove_success_msg">Succesvol verwijderd</string>

res/values-nn-rNO/strings.xml

@@ -53,7 +53,6 @@
   <string name="sync_string_files">Filer</string>
   <string name="setup_btn_connect">Kopla til</string>
   <string name="uploader_btn_upload_text">Last opp</string>
-  <string name="uploader_top_message">Vel opplastingsmappe:</string>
   <string name="uploader_wrn_no_account_title">Fann ingen konto</string>
   <string name="uploader_wrn_no_account_text">Det finst ingen %1$s-kontoar på eininga di. Ver venleg og set opp ein konto først.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Oppsett</string>

res/values-oc/strings.xml

@@ -54,7 +54,6 @@ Telecargatz-lo aicí : %2$s</string>
   <string name="sync_string_files">Fichièrs</string>
   <string name="setup_btn_connect">Connectar</string>
   <string name="uploader_btn_upload_text">Mandar</string>
-  <string name="uploader_top_message">Seleccionar lo dorsièr de mandadís :</string>
   <string name="uploader_wrn_no_account_title">Cap de compte es pas estat trobat</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configuracion</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Quitar</string>
@@ -182,7 +181,7 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an
   <string name="auth_account_does_not_exist">Lo compte existís pas encara sus aqueste periferic</string>
   <string name="common_rename">Renomenar</string>
   <string name="common_remove">Suprimir</string>
-  <string name="confirmation_remove_alert">Sètz segur que volètz suprimir %1$s ?</string>
+  <string name="confirmation_remove_file_alert">Sètz segur que volètz suprimir %1$s ?</string>
   <string name="confirmation_remove_folder_alert">Sètz segur que volètz suprimir %1$s e son contengut ?</string>
   <string name="confirmation_remove_local">Local solament</string>
   <string name="remove_success_msg">Supression efectuada amb succès</string>

res/values-pl/strings.xml

@@ -58,7 +58,7 @@
   <string name="sync_string_files">Pliki</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>
+  <string name="uploader_top_message">Wybierz folder do wgrywania plików</string>
   <string name="uploader_wrn_no_account_title">Nie znaleziono konta</string>
   <string name="uploader_wrn_no_account_text">Brak kont %1$s na Twoim urządzeniu. Załóż konto.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Ustawienia</string>
@@ -227,7 +227,7 @@
   <string name="unfavorite">Wyłącz udostępnianie w trybie offline</string>
   <string name="common_rename">Zmień nazwę</string>
   <string name="common_remove">Usuń</string>
-  <string name="confirmation_remove_alert">Czy naprawdę chcesz usunąć %1$s?</string>
+  <string name="confirmation_remove_file_alert">Czy naprawdę chcesz usunąć %1$s?</string>
   <string name="confirmation_remove_folder_alert">Czy naprawdę chcesz usunąć %1$s i jego zawartość?</string>
   <string name="confirmation_remove_local">Tylko lokalnie</string>
   <string name="remove_success_msg">Usunięto</string>

res/values-pt-rBR/strings.xml

@@ -2,7 +2,7 @@
 <resources>
   <string name="about_android">%1$s Aplicativo Android</string>
   <string name="about_version">versão %1$s</string>
-  <string name="actionbar_sync">Atualização de conta</string>
+  <string name="actionbar_sync">Atualizar conta</string>
   <string name="actionbar_upload">Enviar</string>
   <string name="actionbar_upload_from_apps">Conteúdo de outros apps</string>
   <string name="actionbar_upload_files">Arquivos</string>
@@ -58,7 +58,7 @@
   <string name="sync_string_files">Arquivos</string>
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Enviar</string>
-  <string name="uploader_top_message">Escolher pasta para enviar:</string>
+  <string name="uploader_top_message">Escolher pasta para envio</string>
   <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
   <string name="uploader_wrn_no_account_text">Não existe nenhuma conta %1$s em seu aparelho. Por favor configure uma conta primeiro.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Instalação</string>
@@ -227,7 +227,7 @@
   <string name="unfavorite">Definir como não disponível offline</string>
   <string name="common_rename">Renomear</string>
   <string name="common_remove">Remover</string>
-  <string name="confirmation_remove_alert">Você realmente deseja remover %1$s?</string>
+  <string name="confirmation_remove_file_alert">Você realmente deseja remover %1$s?</string>
   <string name="confirmation_remove_folder_alert">Você realmente deseja remover %1$s e seus conteúdos?</string>
   <string name="confirmation_remove_local">Somente local</string>
   <string name="remove_success_msg">Removido com sucesso</string>

res/values-pt-rPT/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Ficheiros</string>
   <string name="setup_btn_connect">Ligar</string>
   <string name="uploader_btn_upload_text">Carregar</string>
-  <string name="uploader_top_message">Escolha a pasta de envio:</string>
   <string name="uploader_wrn_no_account_title">Nenhuma conta encontrada</string>
   <string name="uploader_wrn_no_account_text">Não existem as contas %1$s no seu dispositivo. Por favor, configure primeiro uma conta.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurar</string>
@@ -224,7 +223,7 @@
   <string name="auth_account_does_not_exist">A conta ainda não existe no dispositivo</string>
   <string name="common_rename">Renomear</string>
   <string name="common_remove">Remover</string>
-  <string name="confirmation_remove_alert">Tem a certeza que deseja remover %1$s ?</string>
+  <string name="confirmation_remove_file_alert">Tem a certeza que deseja remover %1$s ?</string>
   <string name="confirmation_remove_folder_alert">Deseja realmente remover %1$s e o seu conteúdo?</string>
   <string name="confirmation_remove_local">Apenas localmente</string>
   <string name="remove_success_msg">Removido com sucesso</string>

res/values-ro/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Fișiere</string>
   <string name="setup_btn_connect">Conectare</string>
   <string name="uploader_btn_upload_text">Încărcare</string>
-  <string name="uploader_top_message">Alegeţi dosarul pentru încărcare</string>
   <string name="uploader_wrn_no_account_title">Nici un cont găsit</string>
   <string name="uploader_wrn_no_account_text">Nu există conturi %1$s pe dispozitivul tău. Te rugăm să configurezi unul mai întâi.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Configurare</string>
@@ -191,7 +190,7 @@
   <string name="auth_account_does_not_exist">Contul nu există încă în dispozitiv</string>
   <string name="common_rename">Redenumește</string>
   <string name="common_remove">Elimină</string>
-  <string name="confirmation_remove_alert">Doriti sigur sa stergeti %1$s?</string>
+  <string name="confirmation_remove_file_alert">Doriti sigur sa stergeti %1$s?</string>
   <string name="confirmation_remove_folder_alert">Sigur vrei să elimini %1$s și conținutul său?</string>
   <string name="confirmation_remove_local">Doar local</string>
   <string name="remove_success_msg">Eliminat cu succes</string>

res/values-ru-rRU/strings.xml

@@ -99,11 +99,11 @@
   <string name="fd_keep_in_sync">Обновлять файл</string>
   <string name="common_rename">Переименовать</string>
   <string name="common_remove">Удалить</string>
-  <string name="confirmation_remove_alert">Вы действительно хотите удалить %1$s?</string>
+  <string name="confirmation_remove_file_alert">Вы действительно хотите удалить %1$s?</string>
   <string name="confirmation_remove_folder_alert">Вы действительно хотите удалить %1$s и все содержимое ?</string>
   <string name="confirmation_remove_local">Только локально</string>
   <string name="confirmation_remove_folder_local">Только локальное содержимое</string>
-  <string name="confirmation_remove_remote">Удалить с сервера</string>
+  <string name="confirmation_remove_file_remote">Удалить с сервера</string>
   <string name="confirmation_remove_remote_and_local">Оба, удаленный и локальный</string>
   <string name="remove_success_msg">Успешное удаление</string>
   <string name="remove_fail_msg">Удаление не может быть завершено</string>

res/values-ru/strings.xml

@@ -59,7 +59,7 @@
   <string name="sync_string_files">Файлы</string>
   <string name="setup_btn_connect">Подключиться</string>
   <string name="uploader_btn_upload_text">Загрузить</string>
-  <string name="uploader_top_message">Выберите каталог для загрузки</string>
+  <string name="uploader_top_message">Выбрать каталог для загрузки</string>
   <string name="uploader_wrn_no_account_title">Учётная запись не найдена</string>
   <string name="uploader_wrn_no_account_text">На вашем устройстве нет аккаунтов %1$s. Пожалуйста выполните настройку аккаунта.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Настройка</string>
@@ -228,7 +228,7 @@
   <string name="unfavorite">Убрать доступность автономно</string>
   <string name="common_rename">Переименовать</string>
   <string name="common_remove">Удалить</string>
-  <string name="confirmation_remove_alert">Вы действительно хотите удалить %1$s?</string>
+  <string name="confirmation_remove_file_alert">Вы действительно хотите удалить %1$s?</string>
   <string name="confirmation_remove_folder_alert">Вы действительно хотите удалить %1$s и его содержимое?</string>
   <string name="confirmation_remove_local">Только локально</string>
   <string name="remove_success_msg">Удаление завершено</string>

res/values-sk-rSK/strings.xml

@@ -53,7 +53,6 @@
   <string name="sync_string_files">Súbory</string>
   <string name="setup_btn_connect">Pripojiť</string>
   <string name="uploader_btn_upload_text">Nahrať</string>
-  <string name="uploader_top_message">Vyberte priečinok pre nahrávanie:</string>
   <string name="uploader_wrn_no_account_title">Účet sa nenašiel</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavenie</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Koniec</string>
@@ -178,7 +177,7 @@
   <string name="auth_account_does_not_exist">Účet zatiaľ v zariadení neexistuje</string>
   <string name="common_rename">Premenuj</string>
   <string name="common_remove">Odober</string>
-  <string name="confirmation_remove_alert">Naozaj chcete odstrániť %1$s?</string>
+  <string name="confirmation_remove_file_alert">Naozaj chcete odstrániť %1$s?</string>
   <string name="confirmation_remove_folder_alert">Naozaj chcete odstrániť %1$s a jeho obsah?</string>
   <string name="confirmation_remove_local">Iba lokálne</string>
   <string name="remove_success_msg">Úspešne odstránené</string>

res/values-sl/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Datoteke</string>
   <string name="setup_btn_connect">Poveži</string>
   <string name="uploader_btn_upload_text">Pošlji</string>
-  <string name="uploader_top_message">Izbor mape za pošiljanje:</string>
   <string name="uploader_wrn_no_account_title">Uporabniškega računa ni mogoče najti</string>
   <string name="uploader_wrn_no_account_text">Za %1$s ni določenega računa. Pred nadaljevanjem ga je treba ustvariti.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Nastavi</string>
@@ -227,7 +226,7 @@
   <string name="unfavorite">Odstrani dosegljivost brez povezave</string>
   <string name="common_rename">Preimenuj</string>
   <string name="common_remove">Odstrani</string>
-  <string name="confirmation_remove_alert">Ali res želite odstraniti %1$s?</string>
+  <string name="confirmation_remove_file_alert">Ali res želite odstraniti %1$s?</string>
   <string name="confirmation_remove_folder_alert">Ali res želite odstraniti %1$s skupaj s celotno vsebino?</string>
   <string name="confirmation_remove_local">Le krajevno</string>
   <string name="remove_success_msg">Odstranitev je uspešno končana</string>

res/values-sq/strings.xml

@@ -58,7 +58,7 @@
   <string name="sync_string_files">Kartela</string>
   <string name="setup_btn_connect">Lidhuni</string>
   <string name="uploader_btn_upload_text">Ngarkoni</string>
-  <string name="uploader_top_message">Zgjidhni dosje ngarkimi:</string>
+  <string name="uploader_top_message">Zgjidhni dosje ngarkimi</string>
   <string name="uploader_wrn_no_account_title">S\’u gjet llogari</string>
   <string name="uploader_wrn_no_account_text">S’ka llogari %1$s te pajisja juaj. Ju lutemi, së pari krijoni një llogari.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Rregullim</string>

res/values-sr/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Фајлови</string>
   <string name="setup_btn_connect">Повежи се</string>
   <string name="uploader_btn_upload_text">Отпреми</string>
-  <string name="uploader_top_message">Изаберите фасциклу отпремања:</string>
   <string name="uploader_wrn_no_account_title">Нема налога</string>
   <string name="uploader_wrn_no_account_text">Нема %1$s налога на вашем уређају. Најпре подесите налог.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Подеси</string>
@@ -205,7 +204,7 @@
   <string name="auth_account_does_not_exist">Не постоји налог на уређају</string>
   <string name="common_rename">Преименуј</string>
   <string name="common_remove">Уклони</string>
-  <string name="confirmation_remove_alert">Желите да уклоните %1$s?</string>
+  <string name="confirmation_remove_file_alert">Желите да уклоните %1$s?</string>
   <string name="confirmation_remove_folder_alert">Желите да уклоните %1$s и њен садржај?</string>
   <string name="confirmation_remove_local">Само локално</string>
   <string name="remove_success_msg">Уклањање успешно</string>

res/values-sv/strings.xml

@@ -58,7 +58,7 @@
   <string name="sync_string_files">Filer</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>
+  <string name="uploader_top_message">Välj mapp för uppladdning</string>
   <string name="uploader_wrn_no_account_title">Hittade inget konto</string>
   <string name="uploader_wrn_no_account_text">Det finns inga %1$s-konton på din enhet. Lägg till ett konto först</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Skapa</string>
@@ -223,9 +223,11 @@
 	</string>
   <string name="auth_can_not_auth_against_server">Det går inte att autentisera mot denna server</string>
   <string name="auth_account_does_not_exist">Det finns inget konto på denna enhet än</string>
+  <string name="favorite">Sätt som tillgänglig offline</string>
+  <string name="unfavorite">Ta bort som tillgänglig offline</string>
   <string name="common_rename">Byt namn</string>
   <string name="common_remove">Radera</string>
-  <string name="confirmation_remove_alert">Vill du verkligen ta bort %1$s?</string>
+  <string name="confirmation_remove_file_alert">Vill du verkligen ta bort %1$s?</string>
   <string name="confirmation_remove_folder_alert">Vill du verkligen ta bort %1$s och dess innehåll?</string>
   <string name="confirmation_remove_local">Endast lokalt</string>
   <string name="remove_success_msg">Lyckad radering</string>

res/values-th-rTH/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">ไฟล์</string>
   <string name="setup_btn_connect">เชื่อมต่อ</string>
   <string name="uploader_btn_upload_text">อัพโหลด</string>
-  <string name="uploader_top_message">เลือกโฟลเดอร์ที่ต้องการอัพโหลด:</string>
   <string name="uploader_wrn_no_account_title">ไม่พบบัญชีที่ต้องการ</string>
   <string name="uploader_wrn_no_account_text">ไม่มีบัญชีผู้ใช้ %1$s ในอุปกรณ์ของคุณ กรุณาตั้งค่าบัญชีผู้ใช้ก่อน</string>
   <string name="uploader_wrn_no_account_setup_btn_text">ตั้งค่า</string>
@@ -221,7 +220,7 @@
   <string name="auth_account_does_not_exist">ยังไม่มีบัญชีในอุปกรณ์นี้</string>
   <string name="common_rename">เปลี่ยนชื่อ</string>
   <string name="common_remove">ลบออก</string>
-  <string name="confirmation_remove_alert">คุณต้องการที่จะลบ %1$s?</string>
+  <string name="confirmation_remove_file_alert">คุณต้องการที่จะลบ %1$s?</string>
   <string name="confirmation_remove_folder_alert">คุณต้องการที่จะลบ %1$s และเนื้อหาของมัน?</string>
   <string name="confirmation_remove_local">เฉพาะต้นทางเท่านั้น</string>
   <string name="remove_success_msg">ลบเรียบร้อยแล้ว</string>

res/values-tr/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">Dosyalar</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 klasörünü seçin:</string>
   <string name="uploader_wrn_no_account_title">Hesap bulunamadı</string>
   <string name="uploader_wrn_no_account_text">Cihazınızda hiç %1$s hesabı yok. Lütfen ilk olarak bir hesap ayarlayın.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Kurulum</string>
@@ -223,7 +222,7 @@
   <string name="unfavorite">Çevrimdışı erişimden kaldır</string>
   <string name="common_rename">Yeniden adlandır</string>
   <string name="common_remove">Kaldır</string>
-  <string name="confirmation_remove_alert">Gerçekten %1$s dosyasını kaldırmak istiyor musunuz?</string>
+  <string name="confirmation_remove_file_alert">Gerçekten %1$s dosyasını kaldırmak istiyor musunuz?</string>
   <string name="confirmation_remove_folder_alert">Gerçekten %1$s ve içeriğini kaldırmak istediğinizden emin misiniz?</string>
   <string name="confirmation_remove_local">Sadece yerel</string>
   <string name="remove_success_msg">Kaldırma başarılı</string>

res/values-uk/strings.xml

@@ -55,7 +55,6 @@
   <string name="sync_string_files">Файли</string>
   <string name="setup_btn_connect">З\'єднати</string>
   <string name="uploader_btn_upload_text">Відвантажити</string>
-  <string name="uploader_top_message">Оберіть теку для завантаження:</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>
@@ -185,7 +184,7 @@
   <string name="auth_account_does_not_exist">Користвача в пристрої не існуе</string>
   <string name="common_rename">Перейменувати</string>
   <string name="common_remove">Видалити</string>
-  <string name="confirmation_remove_alert">Ви дійсно бажаєте видалити %1$s?</string>
+  <string name="confirmation_remove_file_alert">Ви дійсно бажаєте видалити %1$s?</string>
   <string name="confirmation_remove_folder_alert">Ви дійсно бажаєте видалити %1$s та весь вміст?</string>
   <string name="confirmation_remove_local">Лише локально</string>
   <string name="remove_success_msg">Успішно видалено</string>

res/values-zh-rCN/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">文件</string>
   <string name="setup_btn_connect">连接</string>
   <string name="uploader_btn_upload_text">上传</string>
-  <string name="uploader_top_message">选择上传文件夹：</string>
   <string name="uploader_wrn_no_account_title">未找到账号</string>
   <string name="uploader_wrn_no_account_text">设备上无 %1$s 账号，需要先创建一个账号。</string>
   <string name="uploader_wrn_no_account_setup_btn_text">设置</string>
@@ -215,7 +214,7 @@
   <string name="auth_account_does_not_exist">设备中还未存在该帐号</string>
   <string name="common_rename">重命名</string>
   <string name="common_remove">删除</string>
-  <string name="confirmation_remove_alert">你确定要删除 %1$s 吗？</string>
+  <string name="confirmation_remove_file_alert">你确定要删除 %1$s 吗？</string>
   <string name="confirmation_remove_folder_alert">您确定要删除 %1$s 及其内容吗？</string>
   <string name="confirmation_remove_local">仅本地</string>
   <string name="remove_success_msg">成功删除</string>

res/values-zh-rTW/strings.xml

@@ -58,7 +58,6 @@
   <string name="sync_string_files">檔案</string>
   <string name="setup_btn_connect">連線</string>
   <string name="uploader_btn_upload_text">上傳</string>
-  <string name="uploader_top_message">選取上傳資料夾:</string>
   <string name="uploader_wrn_no_account_title">找不到帳號</string>
   <string name="uploader_wrn_no_account_text">無%1$s帳號，請先建立帳號。</string>
   <string name="uploader_wrn_no_account_setup_btn_text">設定</string>
@@ -223,9 +222,11 @@
 	</string>
   <string name="auth_can_not_auth_against_server">無法驗證這個伺服器</string>
   <string name="auth_account_does_not_exist">帳號目前不存在於本裝置</string>
+  <string name="favorite">設定為離線可用</string>
+  <string name="unfavorite">取消設定為離線可用</string>
   <string name="common_rename">重新命名</string>
   <string name="common_remove">移除</string>
-  <string name="confirmation_remove_alert">您真的要移除 %1$s ?</string>
+  <string name="confirmation_remove_file_alert">您真的要移除 %1$s ?</string>
   <string name="confirmation_remove_folder_alert">您真的要移除 %1$s 與裡頭的檔案?</string>
   <string name="confirmation_remove_local">只有本地</string>
   <string name="remove_success_msg">成功地移除</string>

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -80,6 +80,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation;
+import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation.UserInfo;
 import com.owncloud.android.operations.DetectAuthenticationMethodOperation.AuthenticationMethod;
 import com.owncloud.android.operations.GetServerInfoOperation;
 import com.owncloud.android.operations.OAuth2GetAccessToken;
@@ -1594,6 +1595,18 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mAccountMgr.setUserData(
                     mAccount, Constants.KEY_OC_BASE_URL,   mServerInfo.mBaseUrl
             );
+            if (authResult.getData() != null) {
+                try {
+                    UserInfo userInfo = (UserInfo) authResult.getData().get(0);
+                    mAccountMgr.setUserData(
+                        mAccount, Constants.KEY_DISPLAY_NAME, userInfo.mDisplayName
+                    );
+                } catch (ClassCastException c) {
+                    Log_OC.w(TAG, "Couldn't get display name for " + username);
+                }
+            } else {
+                Log_OC.w(TAG, "Couldn't get display name for " + username);
+            }
 
             if (isSaml) {
                 mAccountMgr.setUserData(mAccount, Constants.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); 

src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java

@@ -30,6 +30,7 @@ import com.owncloud.android.lib.common.OwnCloudCredentials;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
+import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation;
 
 import java.lang.ref.WeakReference;
 
@@ -44,11 +45,10 @@ public class AuthenticatorAsyncTask  extends AsyncTask<Object, Void, RemoteOpera
 
     private Context mContext;
     private final WeakReference<OnAuthenticatorTaskListener> mListener;
-    protected Activity mActivity;
 
     public AuthenticatorAsyncTask(Activity activity) {
         mContext = activity.getApplicationContext();
-        mListener = new WeakReference<OnAuthenticatorTaskListener>((OnAuthenticatorTaskListener)activity);
+        mListener = new WeakReference<>((OnAuthenticatorTaskListener)activity);
     }
 
     @Override
@@ -64,7 +64,7 @@ public class AuthenticatorAsyncTask  extends AsyncTask<Object, Void, RemoteOpera
             OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(uri, mContext, true);
             client.setCredentials(credentials);
 
-            // Operation
+            // Operation - try credentials
             ExistenceCheckRemoteOperation operation = new ExistenceCheckRemoteOperation(
                     REMOTE_PATH,
                     mContext,
@@ -78,6 +78,12 @@ public class AuthenticatorAsyncTask  extends AsyncTask<Object, Void, RemoteOpera
                 result.setLastPermanentLocation(permanentLocation);
             }
 
+            // Operation - get display name
+            if (result.isSuccess()) {
+                GetRemoteUserInfoOperation remoteUserNameOperation = new GetRemoteUserInfoOperation();
+                result = remoteUserNameOperation.execute(client);
+            }
+
         } else {
             result = new RemoteOperationResult(RemoteOperationResult.ResultCode.UNKNOWN_ERROR);
         }

src/com/owncloud/android/datamodel/OCFile.java

@@ -38,12 +38,12 @@ import third_parties.daveKoeller.AlphanumComparator;
 public class OCFile implements Parcelable, Comparable<OCFile> {
 
     public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {
+
         @Override
         public OCFile createFromParcel(Parcel source) {
             return new OCFile(source);
         }
 
-        @Override
         public OCFile[] newArray(int size) {
             return new OCFile[size];
         }

src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -168,8 +168,10 @@ public class ThumbnailsCacheManager {
 
             try {
                 if (mAccount != null) {
-                    OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount,
-                            MainApp.getAppContext());
+                    OwnCloudAccount ocAccount = new OwnCloudAccount(
+                            mAccount,
+                            MainApp.getAppContext()
+                    );
                     mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                             getClientFor(ocAccount, MainApp.getAppContext());
                 }

src/com/owncloud/android/files/FileMenuFilter.java

@@ -173,7 +173,7 @@ public class FileMenuFilter {
         }
 
         // OPEN WITH (different to preview!)
-        if (!isFile() || !anyFileDown() || synchronizing) {
+        if (!isSingleFile() || !anyFileDown() || synchronizing) {
             toHide.add(R.id.action_open_file_with);
 
         } else {
@@ -214,7 +214,7 @@ public class FileMenuFilter {
         }
 
         // SEE DETAILS
-        if (!isFile()) {
+        if (!isSingleFile()) {
             toHide.add(R.id.action_see_details);
         } else {
             toShow.add(R.id.action_see_details);
@@ -223,21 +223,21 @@ public class FileMenuFilter {
         // SEND
         boolean sendAllowed = (mContext != null &&
                 mContext.getString(R.string.send_files_to_other_apps).equalsIgnoreCase("on"));
-        if (!isFile() || !sendAllowed || synchronizing) {
+        if (!isSingleFile() || !sendAllowed || synchronizing) {
             toHide.add(R.id.action_send_file);
         } else {
             toShow.add(R.id.action_send_file);
         }
 
         // FAVORITES
-        if (!isFile() || synchronizing || allFavorites()) {
+        if (!allFiles() || synchronizing || allFavorites()) {
             toHide.add(R.id.action_favorite_file);
         } else {
             toShow.add(R.id.action_favorite_file);
         }
 
         // UNFAVORITES
-        if (!isFile() || synchronizing || allUnfavorites()) {
+        if (!allFiles() || synchronizing || allUnfavorites()) {
             toHide.add(R.id.action_unfavorite_file);
         } else {
             toShow.add(R.id.action_unfavorite_file);
@@ -249,10 +249,14 @@ public class FileMenuFilter {
         return mFiles.size() == SINGLE_SELECT_ITEMS;
     }
 
-    private boolean isFile() {
+    private boolean isSingleFile() {
         return isSingleSelect() && !mFiles.get(0).isFolder();
     }
 
+    private boolean allFiles() {
+        return mFiles != null && !containsFolder();
+    }
+
     private boolean containsFolder() {
         for(OCFile file: mFiles) {
             if(file.isFolder()) {

src/com/owncloud/android/files/services/FileDownloader.java

@@ -50,10 +50,10 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.files.FileUtils;
-import com.owncloud.android.ui.notifications.NotificationUtils;
 import com.owncloud.android.operations.DownloadFileOperation;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.ui.notifications.NotificationUtils;
 import com.owncloud.android.ui.preview.PreviewImageActivity;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.utils.ErrorMessageAdapter;
@@ -432,7 +432,10 @@ public class FileDownloader extends Service
 
                     // always get client from client manager, to get fresh credentials in case
                     // of update
-                    OwnCloudAccount ocAccount = new OwnCloudAccount(mCurrentAccount, this);
+                    OwnCloudAccount ocAccount = new OwnCloudAccount(
+                            mCurrentAccount,
+                            this
+                    );
                     mDownloadClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                             getClientFor(ocAccount, this);
 

src/com/owncloud/android/files/services/FileUploader.java

@@ -928,7 +928,10 @@ public class FileUploader extends Service
                 }   // else, reuse storage manager from previous operation
 
                 // always get client from client manager, to get fresh credentials in case of update
-                OwnCloudAccount ocAccount = new OwnCloudAccount(mCurrentAccount, this);
+                OwnCloudAccount ocAccount = new OwnCloudAccount(
+                        mCurrentAccount,
+                        this
+                );
                 mUploadClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                         getClientFor(ocAccount, this);
 

src/com/owncloud/android/operations/GetUserProfileOperation.java

@@ -0,0 +1,72 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2016 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.owncloud.android.operations;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+
+import com.owncloud.android.MainApp;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation;
+import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation.UserInfo;
+import com.owncloud.android.operations.common.SyncOperation;
+
+/**
+ * Get and save user's profile from the server.
+ *
+ * Currently only retrieves the display name.
+ */
+public class GetUserProfileOperation extends SyncOperation {
+
+    /**
+     * Performs the operation.
+     *
+     * Target user account is implicit in 'client'.
+     *
+     * Stored account is implicit in {@link #getStorageManager()}.
+     *
+     * @return      Result of the operation. If successful, includes an instance of
+     *              {@link String} with the display name retrieved from the server.
+     *              Call {@link RemoteOperationResult#getData()}.get(0) to get it.
+     */
+    @Override
+    protected RemoteOperationResult run(OwnCloudClient client) {
+
+        // get display name
+        GetRemoteUserInfoOperation getDisplayName = new GetRemoteUserInfoOperation();
+        RemoteOperationResult result = getDisplayName.execute(client);
+
+        if (result.isSuccess()) {
+            // store display name with account data
+            AccountManager accountManager = AccountManager.get(MainApp.getAppContext());
+            UserInfo userInfo = (UserInfo) result.getData().get(0);
+            Account storedAccount = getStorageManager().getAccount();
+            accountManager.setUserData(
+                storedAccount,
+                AccountUtils.Constants.KEY_DISPLAY_NAME,
+                userInfo.mDisplayName
+            );
+        }
+        return result;
+    }
+
+}

src/com/owncloud/android/operations/RefreshFolderOperation.java

@@ -187,7 +187,7 @@ public class RefreshFolderOperation extends RemoteOperation {
         
         if (OCFile.ROOT_PATH.equals(mLocalFolder.getRemotePath()) && !mSyncFullAccount) {
             updateOCVersion(client);
-
+            updateUserProfile();
         }
         
         result = checkForChanges(client);
@@ -226,7 +226,6 @@ public class RefreshFolderOperation extends RemoteOperation {
         
     }
 
-
     private void updateOCVersion(OwnCloudClient client) {
         UpdateOCVersionOperation update = new UpdateOCVersionOperation(mAccount, mContext);
         RemoteOperationResult result = update.execute(client);
@@ -235,14 +234,24 @@ public class RefreshFolderOperation extends RemoteOperation {
 
             // Update Capabilities for this account
             if (update.getOCVersion().isVersionWithCapabilitiesAPI()) {
-                updateCapabilities(client);
+                updateCapabilities();
             } else {
                 Log_OC.d(TAG, "Capabilities API disabled");
             }
         }
     }
 
-    private void updateCapabilities(OwnCloudClient client){
+    private void updateUserProfile() {
+        GetUserProfileOperation update = new GetUserProfileOperation();
+        RemoteOperationResult result = update.execute(mStorageManager, mContext);
+        if (!result.isSuccess()) {
+            Log_OC.w(TAG, "Couldn't update user profile from server");
+        } else {
+            Log_OC.i(TAG, "Got display name: " + result.getData().get(0));
+        }
+    }
+
+    private void updateCapabilities(){
         GetCapabilitiesOperarion getCapabilities = new GetCapabilitiesOperarion();
         RemoteOperationResult  result = getCapabilities.execute(mStorageManager,mContext);
         if (!result.isSuccess()){

src/com/owncloud/android/services/OperationsService.java

@@ -468,8 +468,7 @@ public class OperationsService extends Service {
                     if (mLastTarget == null || !mLastTarget.equals(next.first)) {
                         mLastTarget = next.first;
                         if (mLastTarget.mAccount != null) {
-                            OwnCloudAccount ocAccount = new OwnCloudAccount(mLastTarget.mAccount,
-                                    mService);
+                            OwnCloudAccount ocAccount = new OwnCloudAccount(mLastTarget.mAccount, mService);
                             mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                                     getClientFor(ocAccount, mService);
 

src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java

@@ -25,7 +25,6 @@ package com.owncloud.android.syncadapter;
 import java.io.IOException;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -100,7 +99,6 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 
     protected void initClientForCurrentAccount() throws OperationCanceledException,
             AuthenticatorException, IOException, AccountNotFoundException {
-        AccountUtils.constructFullURLForAccount(getContext(), account);
         OwnCloudAccount ocAccount = new OwnCloudAccount(account, getContext());
         mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                 getClientFor(ocAccount, getContext());

src/com/owncloud/android/ui/activity/FileActivity.java

@@ -456,8 +456,16 @@ public class FileActivity extends AppCompatActivity
     protected void setUsernameInDrawer(View navigationDrawerLayout, Account account) {
         if (navigationDrawerLayout != null && account != null) {
             TextView username = (TextView) navigationDrawerLayout.findViewById(R.id.drawer_username);
-            int lastAtPos = account.name.lastIndexOf("@");
-            username.setText(account.name.substring(0, lastAtPos));
+            try {
+                OwnCloudAccount oca = new OwnCloudAccount(account, this);
+                username.setText(oca.getDisplayName());
+
+            } catch (Exception e) {
+                Log_OC.w(TAG, "Couldn't read display name of account; using account name instead");
+
+                int lastAtPos = account.name.lastIndexOf("@");
+                username.setText(account.name.substring(0, lastAtPos));
+            }
         }
     }
 
@@ -826,8 +834,7 @@ public class FileActivity extends AppCompatActivity
                 account = getAccount();
             }
             OwnCloudClient client;
-            OwnCloudAccount ocAccount =
-                    new OwnCloudAccount(account, context);
+            OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);
             client = (OwnCloudClientManagerFactory.getDefaultSingleton().
                     removeClientFor(ocAccount));
             if (client != null) {

src/com/owncloud/android/ui/activity/Preferences.java

@@ -74,6 +74,7 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileOperationsHelper;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.ui.RadioButtonPreference;
@@ -744,12 +745,24 @@ public class Preferences extends PreferenceActivity
                     null);
         }
         else {
-
+            OwnCloudAccount oca;
             for (Account a : accounts) {
                 RadioButtonPreference accountPreference = new RadioButtonPreference(this);
                 accountPreference.setKey(a.name);
-                // Handle internationalized domain names
-                accountPreference.setTitle(DisplayUtils.convertIdn(a.name, false));
+                try {
+                    oca = new OwnCloudAccount(a, this);
+                    accountPreference.setTitle(
+                        oca.getDisplayName() + " @ " +
+                        DisplayUtils.convertIdn(a.name.substring(a.name.lastIndexOf("@") + 1), false)
+                    );
+                } catch (Exception e) {
+                    Log_OC.w(
+                        TAG,
+                        "Account not found right after being read :\\ ; using account name instead of display name"
+                    );
+                    // Handle internationalized domain names
+                    accountPreference.setTitle(DisplayUtils.convertIdn(a.name, false));
+                }
                 mAccountsPrefCategory.addPreference(accountPreference);
 
                 // Check the current account that is being used

src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -265,14 +265,26 @@ public class ReceiveExternalFilesActivity extends FileActivity
             });
             return builder.create();
         case DIALOG_MULTIPLE_ACCOUNT:
-            CharSequence ac[] = new CharSequence[
-                    mAccountManager.getAccountsByType(MainApp.getAccountType()).length];
-            for (int i = 0; i < ac.length; ++i) {
-                ac[i] = DisplayUtils.convertIdn(
-                        mAccountManager.getAccountsByType(MainApp.getAccountType())[i].name, false);
+            Account accounts[] = mAccountManager.getAccountsByType(MainApp.getAccountType());
+            CharSequence dialogItems[] = new CharSequence[accounts.length];
+            OwnCloudAccount oca;
+            for (int i = 0; i < dialogItems.length; ++i) {
+                try {
+                    oca = new OwnCloudAccount(accounts[i], this);
+                    dialogItems[i] =
+                        oca.getDisplayName() + " @ " +
+                        DisplayUtils.convertIdn(
+                            accounts[i].name.substring(accounts[i].name.lastIndexOf("@") + 1),
+                            false
+                        );
+
+                } catch (Exception e) {
+                    Log_OC.w(TAG, "Couldn't read display name of account; using account name instead");
+                    dialogItems[i] = DisplayUtils.convertIdn(accounts[i].name, false);
+                }
             }
             builder.setTitle(R.string.common_choose_account);
-            builder.setItems(ac, new OnClickListener() {
+            builder.setItems(dialogItems, new OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     setAccount(mAccountManager.getAccountsByType(MainApp.getAccountType())[which]);

src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -19,6 +19,7 @@
  */
 package com.owncloud.android.ui.adapter;
 
+import android.accounts.Account;
 import android.content.Context;
 import android.database.DataSetObserver;
 import android.graphics.Bitmap;
@@ -36,6 +37,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.datamodel.UploadsStorageManager;
@@ -43,6 +45,7 @@ import com.owncloud.android.datamodel.UploadsStorageManager.UploadStatus;
 import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.db.UploadResult;
 import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.FileActivity;
@@ -238,7 +241,17 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
             uploadDateTextView.setText(dateString);
 
             TextView accountNameTextView = (TextView) view.findViewById(R.id.upload_account);
-            accountNameTextView.setText(upload.getAccountName());
+            try {
+                Account account = AccountUtils.getOwnCloudAccountByName(mParentActivity, upload.getAccountName());
+                OwnCloudAccount oca = new OwnCloudAccount(account, mParentActivity);
+                accountNameTextView.setText(
+                    oca.getDisplayName() + " @ " +
+                    DisplayUtils.convertIdn(account.name.substring(account.name.lastIndexOf("@") + 1), false)
+                );
+            } catch (Exception e) {
+                Log_OC.w(TAG, "Couldn't get display name for account, using old style");
+                accountNameTextView.setText(upload.getAccountName());
+            }
 
             TextView statusTextView = (TextView) view.findViewById(R.id.upload_status);
 

src/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -1,25 +1,24 @@
 /**
- *   ownCloud Android client application
- *
- *   @author Bartek Przybylski
- *   @author Tobias Kaminsky
- *   @author David A. Velasco
- *   @author masensio
- *   Copyright (C) 2011  Bartek Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * ownCloud Android client application
  *
+ * @author Bartek Przybylski
+ * @author Tobias Kaminsky
+ * @author David A. Velasco
+ * @author masensio
+ * Copyright (C) 2011  Bartek Przybylski
+ * Copyright (C) 2016 ownCloud Inc.
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.adapter;
 
@@ -94,7 +93,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private HashSet<Long> mSelection = new LinkedHashSet<Long>();
 
     public FileListListAdapter(
-            boolean justFolders, 
+            boolean justFolders,
             Context context,
             ComponentsGetter transferServiceGetter
     ) {
@@ -407,10 +406,11 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 
     /**
      * Change the adapted directory for a new one
-     * @param directory                 New file to adapt. Can be NULL, meaning 
-     *                                  "no content to adapt".
-     * @param updatedStorageManager     Optional updated storage manager; used to replace 
-     *                                  mStorageManager if is different (and not NULL)
+     *
+     * @param directory             New file to adapt. Can be NULL, meaning
+     *                              "no content to adapt".
+     * @param updatedStorageManager Optional updated storage manager; used to replace
+     *                              mStorageManager if is different (and not NULL)
      */
     public void swapDirectory(OCFile directory, FileDataStorageManager updatedStorageManager
             /*, boolean onlyOnDevice*/) {

src/com/owncloud/android/ui/dialog/AccountActionsDialogFragment.java

@@ -39,6 +39,7 @@ public class AccountActionsDialogFragment extends DialogFragment implements
      * Listener interface for the file action fragment.
      */
     public interface FileActionsDialogFragmentListener {
+        // TODO Tobi change to int array?
         public boolean onFileActionChosen(int menuId, int filePosition);
     }
 

src/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -24,7 +24,10 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.view.ActionMode;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;

src/com/owncloud/android/utils/GetShareWithUsersAsyncTask.java

@@ -64,8 +64,10 @@ public class GetShareWithUsersAsyncTask extends AsyncTask<Object, Void, Pair<Rem
             try {
                 // Get shares request
                 operation = new GetSharesForFileOperation(file.getRemotePath(), false, false);
-                OwnCloudAccount ocAccount = new OwnCloudAccount(account,
-                        MainApp.getAppContext());
+                OwnCloudAccount ocAccount = new OwnCloudAccount(
+                        account,
+                        MainApp.getAppContext()
+                );
                 OwnCloudClient client = OwnCloudClientManagerFactory.getDefaultSingleton().
                         getClientFor(ocAccount, MainApp.getAppContext());
                 result = operation.execute(client, fileDataStorageManager);