[tx-robot] updated from transifex

src/main/res/values-ca/strings.xml

@@ -710,6 +710,7 @@
     <string name="upload_file_dialog_title">Introduïu el nom del fitxer i el seu tipus per carregar-lo</string>
     <string name="upload_files">Carrega fitxers</string>
     <string name="upload_item_action_button">Botó d\'acció de càrrega d\'element</string>
+    <string name="upload_list_delete">Eliminar</string>
     <string name="upload_list_empty_headline">No hi ha càrregues disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Carregueu algun contingut o activeu la càrrega automàtica.</string>
     <string name="upload_local_storage_full">L\'emmagatzematge local és ple</string>

src/main/res/values-cs-rCZ/strings.xml

@@ -362,6 +362,7 @@
     <string name="hint_password">Heslo</string>
     <string name="host_not_available">Server není k dispozici</string>
     <string name="host_your_own_server">Hostovat svůj vlastní server</string>
+    <string name="instant_upload_existing">Také nahrát existující soubory</string>
     <string name="instant_upload_on_charging">Nahrávat pouze při nabíjení</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="learn_more">Zjistit více</string>
@@ -747,6 +748,7 @@ Jak vývojová tak produkční verze je k dispozici na F-droidu a mohou být nai
     <string name="upload_list_delete">Smazat</string>
     <string name="upload_list_empty_headline">Nic k nahrání</string>
     <string name="upload_list_empty_text_auto_upload">Nahrajte nějaký obsah nebo zapněte automatické nahrávání.</string>
+    <string name="upload_list_resolve_conflict">Vyřešit konflikt</string>
     <string name="upload_local_storage_full">Místní úložiště je plné</string>
     <string name="upload_local_storage_not_copied">Soubor se nepodařilo zkopírovat na místní úložiště</string>
     <string name="upload_lock_failed">Uzamčení složky se nezdařilo</string>
@@ -766,6 +768,8 @@ Jak vývojová tak produkční verze je k dispozici na F-droidu a mohou být nai
     <string name="uploader_top_message">Vybrat složku pro nahrávání</string>
     <string name="uploader_upload_failed_content_single">Nepodařilo se nahrát %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Nahrání se nezdařilo, znovu se přihlaste</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Konflikt při nahrávání souboru</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Zvolte kterou verzi %1$s ponechat</string>
     <string name="uploader_upload_failed_ticker">Odesílání se nezdařilo</string>
     <string name="uploader_upload_files_behaviour">Předvolba nahrávání:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Přesunout soubor do složky %1$s</string>
@@ -794,6 +798,7 @@ Jak vývojová tak produkční verze je k dispozici na F-droidu a mohou být nai
     <string name="uploads_view_upload_status_failed_localfile_error">Místní soubor nenalezen</string>
     <string name="uploads_view_upload_status_failed_permission_error">Chyba oprávnění</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Nedůvěryhodný certifikát serveru</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Získávání verze serveru…</string>
     <string name="uploads_view_upload_status_service_interrupted">Aplikace ukončena</string>
     <string name="uploads_view_upload_status_succeeded">Dokončeno</string>
     <string name="uploads_view_upload_status_unknown_fail">Neznámá chyba</string>

src/main/res/values-da/strings.xml

@@ -708,6 +708,7 @@ Enheds legitimationsoplysninger er sat op
     <string name="upload_file_dialog_title">Indtast filnavn og filtype at sende</string>
     <string name="upload_files">Send filer</string>
     <string name="upload_item_action_button">Send artikel knap</string>
+    <string name="upload_list_delete">Slet</string>
     <string name="upload_list_empty_headline">Ingen uploads tilgængelige</string>
     <string name="upload_list_empty_text_auto_upload">Upload noget indhold eller aktiver auto upload.</string>
     <string name="upload_local_storage_full">Lokalt lager fuldt</string>

src/main/res/values-de/strings.xml

@@ -362,6 +362,7 @@
     <string name="hint_password">Passwort</string>
     <string name="host_not_available">Server nicht verfügbar</string>
     <string name="host_your_own_server">Eigenen Server betreiben</string>
+    <string name="instant_upload_existing">Vorhandene Dateien ebenfalls hochladen</string>
     <string name="instant_upload_on_charging">Nur während des Ladens der Batterie hochladen</string>
     <string name="instant_upload_path">/SofortUpload</string>
     <string name="learn_more">Mehr</string>
@@ -727,6 +728,7 @@
     <string name="upload_list_delete">Löschen</string>
     <string name="upload_list_empty_headline">Keine Uploads verfügbar</string>
     <string name="upload_list_empty_text_auto_upload">Laden Sie Inhalte hoch oder aktivieren Sie den Auto Upload.</string>
+    <string name="upload_list_resolve_conflict">Konflikt lösen</string>
     <string name="upload_local_storage_full">Lokaler Speicher voll</string>
     <string name="upload_local_storage_not_copied">Datei konnte nicht in den lokalen Speicher kopiert werden</string>
     <string name="upload_lock_failed">Fehler beim Sperren des Ordners</string>
@@ -746,6 +748,8 @@
     <string name="uploader_top_message">Hochladeordner auswählen</string>
     <string name="uploader_upload_failed_content_single">Konnte %1$s nicht hochladen</string>
     <string name="uploader_upload_failed_credentials_error">Hochladen fehlgeschlagen, bitte erneut anmelden</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Dateikonflikt beim Hochladen</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Wählen Sie, welche Version von %1$s behalten werden soll</string>
     <string name="uploader_upload_failed_ticker">Hochladen fehlgeschlagen</string>
     <string name="uploader_upload_files_behaviour">Upload Option:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Datei in Ordner %1$s verschieben</string>
@@ -774,6 +778,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Lokale Datei nicht gefunden</string>
     <string name="uploads_view_upload_status_failed_permission_error">Berechtigungsfehler</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Serverzertifikat ist nicht vertrauenswürdig</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Serverversion wird abgerufen …</string>
     <string name="uploads_view_upload_status_service_interrupted">App beendet</string>
     <string name="uploads_view_upload_status_succeeded">Fertiggestellt</string>
     <string name="uploads_view_upload_status_unknown_fail">Unbekannter Fehler</string>

src/main/res/values-el/strings.xml

@@ -723,6 +723,7 @@
     <string name="upload_file_dialog_title">Εισαγωγή ονόματος και τύπου αρχείου μεταφόρτωσης</string>
     <string name="upload_files">Μεταφόρτωση αρχείων</string>
     <string name="upload_item_action_button">Κουμπί μεταφόρτωσης αντικειμένου</string>
+    <string name="upload_list_delete">Διαγραφή</string>
     <string name="upload_list_empty_headline">Μη διαθέσιμες μεταφορτώσεις</string>
     <string name="upload_list_empty_text_auto_upload">Μεταφορτώστε περιεχόμενο ή ενεργοποιήστε την αυτόματη μεταφόρτωση.</string>
     <string name="upload_local_storage_full">Η τοπική αποθήκη είναι πλήρης</string>

src/main/res/values-eo/strings.xml

@@ -665,6 +665,7 @@
     <string name="upload_file_dialog_title">Entajpu la alŝutotan dosiernomon kaj ĝian tipon </string>
     <string name="upload_files">Alŝuti dosierojn</string>
     <string name="upload_item_action_button">Butono pri alŝuto</string>
+    <string name="upload_list_delete">Forigi</string>
     <string name="upload_list_empty_headline">Neniu alŝuto disponeblas</string>
     <string name="upload_list_empty_text_auto_upload">Alŝutu ion aŭ aktivigu aŭtomatan alŝuton.</string>
     <string name="upload_local_storage_full">Loka konservejo plenas</string>

src/main/res/values-es-rAR/strings.xml

@@ -699,6 +699,7 @@
     <string name="upload_file_dialog_title">Ingrese el nombre y el tipo del archivo a cargar</string>
     <string name="upload_files">Subiendo archivos</string>
     <string name="upload_item_action_button">Subir botón de acción del elemento</string>
+    <string name="upload_list_delete">Eliminar</string>
     <string name="upload_list_empty_headline">No hay cargas disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Cargue algún contenido o active la carga automática</string>
     <string name="upload_local_storage_full">Memoria interna llena</string>

src/main/res/values-es-rCR/strings.xml

@@ -550,6 +550,7 @@
     <string name="upload_file_dialog_title">Ingresa el nombre y el tipo del archivo a cargar</string>
     <string name="upload_files">Cargar archivos</string>
     <string name="upload_item_action_button">Botón de cargar elemento</string>
+    <string name="upload_list_delete">Borrar</string>
     <string name="upload_list_empty_headline">No hay cargas disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Carga algún contenido o activa la carga automática</string>
     <string name="upload_query_move_foreign_files">El espacio insuficiente evita que se copien los archivos seleccionados dentro de la carpeta %1$s. ¿Te gustaría moverlos ahí en su lugar?</string>

src/main/res/values-es-rEC/strings.xml

@@ -550,6 +550,7 @@
     <string name="upload_file_dialog_title">Ingresa el nombre y el tipo del archivo a cargar</string>
     <string name="upload_files">Cargar archivos</string>
     <string name="upload_item_action_button">Botón de cargar elemento</string>
+    <string name="upload_list_delete">Borrar</string>
     <string name="upload_list_empty_headline">No hay cargas disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Carga algún contenido o activa la carga automática</string>
     <string name="upload_query_move_foreign_files">El espacio insuficiente evita que se copien los archivos seleccionados dentro de la carpeta %1$s. ¿Te gustaría moverlos ahí en su lugar?</string>

src/main/res/values-es-rGT/strings.xml

@@ -550,6 +550,7 @@
     <string name="upload_file_dialog_title">Ingresa el nombre y el tipo del archivo a cargar</string>
     <string name="upload_files">Cargar archivos</string>
     <string name="upload_item_action_button">Botón de cargar elemento</string>
+    <string name="upload_list_delete">Borrar</string>
     <string name="upload_list_empty_headline">No hay cargas disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Carga algún contenido o activa la carga automática</string>
     <string name="upload_query_move_foreign_files">El espacio insuficiente evita que se copien los archivos seleccionados dentro de la carpeta %1$s. ¿Te gustaría moverlos ahí en su lugar?</string>

src/main/res/values-es-rMX/strings.xml

@@ -578,6 +578,7 @@
     <string name="upload_file_dialog_title">Ingresa el nombre y el tipo del archivo a cargar</string>
     <string name="upload_files">Cargar archivos</string>
     <string name="upload_item_action_button">Botón de cargar elemento</string>
+    <string name="upload_list_delete">Borrar</string>
     <string name="upload_list_empty_headline">No hay cargas disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Carga algún contenido o activa la carga automática</string>
     <string name="upload_query_move_foreign_files">El espacio insuficiente evita que se copien los archivos seleccionados dentro de la carpeta %1$s. ¿Te gustaría moverlos ahí en su lugar?</string>

src/main/res/values-es-rPA/strings.xml

@@ -451,6 +451,7 @@
     <string name="upload_file_dialog_title">Ingresa el nombre y el tipo del archivo a cargar</string>
     <string name="upload_files">Cargar archivos</string>
     <string name="upload_item_action_button">Botón de cargar elemento</string>
+    <string name="upload_list_delete">Borrar</string>
     <string name="upload_list_empty_headline">No hay cargas disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Carga algún contenido o activa la carga automática</string>
     <string name="upload_query_move_foreign_files">El espacio insuficiente evita que se copien los archivos seleccionados dentro de la carpeta %1$s. ¿Te gustaría moverlos ahí en su lugar?</string>

src/main/res/values-es-rSV/strings.xml

@@ -550,6 +550,7 @@
     <string name="upload_file_dialog_title">Ingresa el nombre y el tipo del archivo a cargar</string>
     <string name="upload_files">Cargar archivos</string>
     <string name="upload_item_action_button">Botón de cargar elemento</string>
+    <string name="upload_list_delete">Borrar</string>
     <string name="upload_list_empty_headline">No hay cargas disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Carga algún contenido o activa la carga automática</string>
     <string name="upload_query_move_foreign_files">El espacio insuficiente evita que se copien los archivos seleccionados dentro de la carpeta %1$s. ¿Te gustaría moverlos ahí en su lugar?</string>

src/main/res/values-es/strings.xml

@@ -362,6 +362,7 @@
     <string name="hint_password">Contraseña</string>
     <string name="host_not_available">Servidor no disponible</string>
     <string name="host_your_own_server">Aloja tu propio servidor</string>
+    <string name="instant_upload_existing">Subir también archivos existentes</string>
     <string name="instant_upload_on_charging">Subir solo al cargar batería</string>
     <string name="instant_upload_path">/SubidaInstantánea</string>
     <string name="learn_more">Aprender más</string>
@@ -726,6 +727,7 @@
     <string name="upload_list_delete">Eliminar</string>
     <string name="upload_list_empty_headline">No hay subidas disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Sube algún contenido o active la subida automática.</string>
+    <string name="upload_list_resolve_conflict">Resolver conflicto</string>
     <string name="upload_local_storage_full">Almacenamiento local lleno</string>
     <string name="upload_local_storage_not_copied">No se ha podido copiar el archivo al almacenamiento local</string>
     <string name="upload_lock_failed">Fallo al bloquear la carpeta</string>
@@ -745,6 +747,8 @@
     <string name="uploader_top_message">Elegir carpeta de subida</string>
     <string name="uploader_upload_failed_content_single">No se ha podido subir %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Subida fallida, vuelve a iniciar sesión</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Conflicto en la subida del archivo</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Elija qué versión mantener %1$s</string>
     <string name="uploader_upload_failed_ticker">Error en la subida</string>
     <string name="uploader_upload_files_behaviour">Opción de subida:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Mover el archivo a la carpeta de %1$s</string>
@@ -773,6 +777,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Archivo local no encontrado</string>
     <string name="uploads_view_upload_status_failed_permission_error">Error de permisos</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">El certificado del servidor no es de confianza</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Obteniendo la versión del servidor…</string>
     <string name="uploads_view_upload_status_service_interrupted">La aplicación se ha interrumpido</string>
     <string name="uploads_view_upload_status_succeeded">Completado</string>
     <string name="uploads_view_upload_status_unknown_fail">Error desconocido</string>

src/main/res/values-fr/strings.xml

@@ -364,6 +364,7 @@ Attention la suppression est irréversible.</string>
     <string name="hint_password">Mot de passe</string>
     <string name="host_not_available">Serveur indisponible</string>
     <string name="host_your_own_server">Hébergez votre propre serveur</string>
+    <string name="instant_upload_existing">Téléverser aussi les fichiers existants</string>
     <string name="instant_upload_on_charging">Envoyer uniquement si le chargeur est branché</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="learn_more">En savoir plus</string>
@@ -725,8 +726,10 @@ Attention la suppression est irréversible.</string>
     <string name="upload_file_dialog_title">Spécifiez le nom et le type du fichier à envoyer</string>
     <string name="upload_files">Téléverser des fichiers</string>
     <string name="upload_item_action_button">Bouton d\'action d\'upload</string>
+    <string name="upload_list_delete">Supprimer</string>
     <string name="upload_list_empty_headline">Aucun historique d\'envoi</string>
     <string name="upload_list_empty_text_auto_upload">Envoyez du contenu ou activez l\'envoi automatique.</string>
+    <string name="upload_list_resolve_conflict">Résoudre le conflit</string>
     <string name="upload_local_storage_full">Stockage local plein</string>
     <string name="upload_local_storage_not_copied">Le fichier n\'a pas pu être copié sur le stockage local</string>
     <string name="upload_lock_failed">Impossible de verrouiller le dossier</string>
@@ -746,6 +749,8 @@ Attention la suppression est irréversible.</string>
     <string name="uploader_top_message">Sélectionnez le dossier d\'envoi</string>
     <string name="uploader_upload_failed_content_single">Impossible d\'envoyer %1$s</string>
     <string name="uploader_upload_failed_credentials_error">L\'envoi a échoué, reconnectez-vous</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Conflit de fichier lors du téléversement</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Sélectionnez la version de %1$s à conserver</string>
     <string name="uploader_upload_failed_ticker">Échec de l\'envoi</string>
     <string name="uploader_upload_files_behaviour">Option d\'envoi :</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Déplacer le fichier dans le dossier %1$s</string>
@@ -774,6 +779,7 @@ Attention la suppression est irréversible.</string>
     <string name="uploads_view_upload_status_failed_localfile_error">Fichier local non trouvé</string>
     <string name="uploads_view_upload_status_failed_permission_error">Erreur de permissions</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Certificat du serveur non approuvé</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Récupération de la version serveur …</string>
     <string name="uploads_view_upload_status_service_interrupted">L\'application s\'est arrêtée</string>
     <string name="uploads_view_upload_status_succeeded">Terminé</string>
     <string name="uploads_view_upload_status_unknown_fail">Erreur inconnue </string>

src/main/res/values-gl/strings.xml

@@ -362,6 +362,7 @@
     <string name="hint_password">Contrasinal</string>
     <string name="host_not_available">Servidor non dispoñíbel</string>
     <string name="host_your_own_server">Hospede o seu propio servidor</string>
+    <string name="instant_upload_existing">Envíar tamén os ficheiros existentes</string>
     <string name="instant_upload_on_charging">Enviar só cando estea cargando</string>
     <string name="instant_upload_path">/EnvíoInstantáneo</string>
     <string name="learn_more">Aprender máis</string>
@@ -727,6 +728,7 @@
     <string name="upload_list_delete">Eliminar</string>
     <string name="upload_list_empty_headline">Non hai envíos dispoñíbeis</string>
     <string name="upload_list_empty_text_auto_upload">Envíe algún contido ou active o envío automático.</string>
+    <string name="upload_list_resolve_conflict">Resolver conflitos</string>
     <string name="upload_local_storage_full">O almacenamento local está cheo</string>
     <string name="upload_local_storage_not_copied">Non foi posíbel copiar o ficheiro no almacenamento local</string>
     <string name="upload_lock_failed">Produciuse un fallo ao bloquear o cartafol</string>
@@ -746,6 +748,8 @@
     <string name="uploader_top_message">Seleccione o cartafol de envío</string>
     <string name="uploader_upload_failed_content_single">Non foi posíbel enviar: %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Produciuse un fallo no envío, acceda de novo.</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Conflitos no envío de ficheiros</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Escolla a versión para conservar de %1$s</string>
     <string name="uploader_upload_failed_ticker">Produciuse un fallo no envío</string>
     <string name="uploader_upload_files_behaviour">Opción de envío:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Mover o ficheiro para o cartafol %1$s</string>
@@ -774,6 +778,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Non se atopou o ficheiro local</string>
     <string name="uploads_view_upload_status_failed_permission_error"> Produciuse un erro de permisos</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">O certificado do servidor non é fiábel</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Obtendo a versión do servidor…</string>
     <string name="uploads_view_upload_status_service_interrupted">Aplicación finalizada</string>
     <string name="uploads_view_upload_status_succeeded">Completado</string>
     <string name="uploads_view_upload_status_unknown_fail">Produciuse un erro descoñecido</string>

src/main/res/values-hr/strings.xml

@@ -717,6 +717,7 @@
     <string name="upload_file_dialog_title">Unesite naziv datoteke i vrstu datoteke za otpremanje</string>
     <string name="upload_files">Otpremi datoteke</string>
     <string name="upload_item_action_button">Gumb za otpremanje stavke</string>
+    <string name="upload_list_delete">Izbriši</string>
     <string name="upload_list_empty_headline">Nema dostupnih otprema</string>
     <string name="upload_list_empty_text_auto_upload">Otpremite neki sadržaj ili aktivirajte automatsko otpremanje.</string>
     <string name="upload_local_storage_full">Lokalni prostor za pohranu je pun</string>

src/main/res/values-hu-rHU/strings.xml

@@ -741,6 +741,7 @@ A Nextcloud itt érhető el: https://nextcloud.com</string>
     <string name="upload_file_dialog_title">Add meg a feltöltendő fájl nevét és a típusát</string>
     <string name="upload_files">Fájlok feltöltése</string>
     <string name="upload_item_action_button">Elem feltöltése műveletgomb</string>
+    <string name="upload_list_delete">Törlés</string>
     <string name="upload_list_empty_headline">Nincsenek feltöltések</string>
     <string name="upload_list_empty_text_auto_upload">Töltsön fel valamilyen tartalmat, vagy aktiválja az automatikus feltöltést.</string>
     <string name="upload_local_storage_full">A helyi tároló megtelt</string>

src/main/res/values-is/strings.xml

@@ -723,6 +723,7 @@
     <string name="upload_file_dialog_title">Settu inn skráarheiti og skráategund fyrir innsendingu</string>
     <string name="upload_files">Senda inn skrár</string>
     <string name="upload_item_action_button">Aðgerðarhnappur til að senda inn atriði</string>
+    <string name="upload_list_delete">Eyða</string>
     <string name="upload_list_empty_headline">Engar innsendingar tiltækar</string>
     <string name="upload_list_empty_text_auto_upload">Sendu inn einhverjar myndir eða virkjaðu sjálfvirka innsendingu.</string>
     <string name="upload_local_storage_full">Staðvær gagnageymsla er full</string>

src/main/res/values-it/strings.xml

@@ -362,6 +362,7 @@
     <string name="hint_password">Password</string>
     <string name="host_not_available">Server non disponibile</string>
     <string name="host_your_own_server">Ospita il tuo server</string>
+    <string name="instant_upload_existing">Carica anche i file esistenti</string>
     <string name="instant_upload_on_charging">Carica solo durante la ricarica</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="learn_more">Scopri altro</string>
@@ -726,6 +727,7 @@
     <string name="upload_list_delete">Elimina</string>
     <string name="upload_list_empty_headline">Nessun caricamento disponibile</string>
     <string name="upload_list_empty_text_auto_upload">Carica alcuni contenuti o attiva il caricamento automatico.</string>
+    <string name="upload_list_resolve_conflict">Risolvi conflitto</string>
     <string name="upload_local_storage_full">Archiviazione locale piena</string>
     <string name="upload_local_storage_not_copied">Il file non può essere copiato nell\'archiviazione locale</string>
     <string name="upload_lock_failed">Blocco della cartella non riuscito</string>
@@ -745,6 +747,8 @@
     <string name="uploader_top_message">Scegli la cartella di caricamento</string>
     <string name="uploader_upload_failed_content_single">Impossibile caricare %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Caricamento non riuscito, effettua nuovamente l\'accesso</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Conflitto caricamento file</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Scegli quale versione mantenere di %1$s</string>
     <string name="uploader_upload_failed_ticker">Caricamento non riuscito</string>
     <string name="uploader_upload_files_behaviour">Opzione di caricamento:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Sposta il file nella cartella %1$s</string>
@@ -773,6 +777,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">File locale non trovato</string>
     <string name="uploads_view_upload_status_failed_permission_error">Errore di permessi</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Certificato server non fidato</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Recupero versione del server…</string>
     <string name="uploads_view_upload_status_service_interrupted">Applicazione terminata</string>
     <string name="uploads_view_upload_status_succeeded">Completati</string>
     <string name="uploads_view_upload_status_unknown_fail">Errore sconosciuto</string>

src/main/res/values-iw/strings.xml

@@ -711,6 +711,7 @@
     <string name="upload_file_dialog_title">נא לציין שם קובץ וסוג קובץ לשליחה</string>
     <string name="upload_files">העלאת קבצים</string>
     <string name="upload_item_action_button">כפתור פעולת העלאת פריט</string>
+    <string name="upload_list_delete">מחיקה</string>
     <string name="upload_list_empty_headline">אין העלאות זמינות</string>
     <string name="upload_list_empty_text_auto_upload">יש להעלות תוכן כלשהו או להפעיל העלאה אוטומטית.</string>
     <string name="upload_local_storage_full">האחסון המקומי מלא</string>

src/main/res/values-ko/strings.xml

@@ -169,11 +169,14 @@
     <string name="copy_move_to_encrypted_folder_not_supported">암호화된 폴더로 복사/이동은 아직 지원하지 않습니다.</string>
     <string name="copy_to">다음으로 복사</string>
     <string name="could_not_download_image">전체 이미지를 다운로드 할 수 없습니다.</string>
+    <string name="could_not_retrieve_url">주소를 불러올 수 없었습니다</string>
     <string name="create_dir_fail_msg">폴더를 만들 수 없음</string>
+    <string name="create_new">새로 만들기</string>
     <string name="create_new_document">새 문서 작성</string>
     <string name="create_new_folder">새 폴더 생성</string>
     <string name="create_new_presentation">새 프리젠테이션 작성</string>
     <string name="create_new_spreadsheet">새 스프레드시트 작성</string>
+    <string name="create_rich_workspace">폴더 정보 추가</string>
     <string name="credentials_disabled">인증 비활성화됨</string>
     <string name="date_unknown">알 수 없음</string>
     <string name="default_credentials_wrong">인증 정보 틀림</string>
@@ -224,6 +227,7 @@
     <string name="drawer_quota_unlimited">%1$s 사용됨</string>
     <string name="drawer_synced_folders">자동 업로드</string>
     <string name="edit_permission_label">편집</string>
+    <string name="edit_rich_workspace">폴더 정보 수정</string>
     <string name="encrypted">암호화하도록 설정</string>
     <string name="end_to_end_encryption_confirm_button">암호화 설정</string>
     <string name="end_to_end_encryption_decrypting">복호화중…</string>
@@ -257,6 +261,7 @@
     <string name="fab_label">추가 또는 업로드</string>
     <string name="failed_to_download">다운로드 관리자에게 파일을 전달할 수 없음</string>
     <string name="failed_to_print">파일을 출력할 수 없음</string>
+    <string name="failed_to_start_editor">에디터 실행 실패</string>
     <string name="fallback_weblogin_back">뒤로</string>
     <string name="fallback_weblogin_text">이전 로그인 방식으로 변경</string>
     <string name="favorite">즐겨찾기에 추가</string>
@@ -372,6 +377,7 @@
     <string name="logs_menu_search">로그 검색</string>
     <string name="logs_menu_send">이메일로 로그 보내기</string>
     <string name="logs_status_loading">불러오는 중…</string>
+    <string name="logs_status_not_filtered">기록: %1$dkB, 필터 없음</string>
     <string name="logs_title">로그</string>
     <string name="maintenance_mode">서버가 유지 관리 모드임</string>
     <string name="manage_space_clear_data">데이터 지우기</string>
@@ -536,6 +542,8 @@
     <string name="screenshot_04_accounts_subline">한곳에서</string>
     <string name="screenshot_05_autoUpload_heading">자동 업로드</string>
     <string name="screenshot_05_autoUpload_subline">사진 &amp; 동영상</string>
+    <string name="screenshot_06_davdroid_heading">달력 &amp; 연락처</string>
+    <string name="screenshot_06_davdroid_subline">DAVx5와 동기화</string>
     <string name="search_users_and_groups_hint">사용자와 그룹 검색</string>
     <string name="select_all">모두 선택</string>
     <string name="select_template">템플릿 선택</string>
@@ -658,6 +666,9 @@
     <string name="sync_foreign_files_forgotten_explanation">버전 1.3.16부터 단일 파일을 여러 계정과 동기화 시 자료 손실을 방지하기 위하여 이 장치에서 업로드된 파일은 로컬 %1$s 폴더에 일단 복사됩니다.\n\n이 변경 사항으로 인하여 이전 버전 앱에서 업로드한 모든 파일을 %2$s 폴더로 복사했습니다. 하지만 계정 동기화 중 오류가 발생하여 이 작업이 중단되었습니다. 파일을 그대로 두고 %3$s 연결을 삭제하거나, 파일을 %1$s 폴더로 이동하고 %4$s 연결을 그대로 유지할 수 있습니다.\n\n아래의 목록은 로컬 파일과 연결된 %5$s에 있는 원격 파일 목록입니다.</string>
     <string name="sync_foreign_files_forgotten_ticker">일부 로컬 파일이 사라짐</string>
     <string name="sync_in_progress">이 파일의 최신 버전을 가져옵니다.</string>
+    <string name="sync_not_enough_space_dialog_action_choose">동기화 대상 선택</string>
+    <string name="sync_not_enough_space_dialog_action_free_space">남는 공간 늘리기</string>
+    <string name="sync_not_enough_space_dialog_title">남은 공간 부족</string>
     <string name="sync_status_button">동기화 상태 단추</string>
     <string name="sync_string_files">파일</string>
     <string name="synced_folder_settings_button">설정 단추</string>
@@ -704,11 +715,14 @@
     <string name="upload_file_dialog_title">업로드할 파일 이름과 형식 입력</string>
     <string name="upload_files">파일 업로드</string>
     <string name="upload_item_action_button">항목 업로드 동작 단추</string>
+    <string name="upload_list_delete">삭제</string>
     <string name="upload_list_empty_headline">업로드 없음</string>
     <string name="upload_list_empty_text_auto_upload">콘텐츠를 업로드하거나 자동 업로드를 활성화하십시오.</string>
+    <string name="upload_list_resolve_conflict">문제 해결</string>
     <string name="upload_local_storage_full">로컬 저장소가 가득 참</string>
     <string name="upload_local_storage_not_copied">파일을 로컬 저장소로 복사 할 수 없음</string>
     <string name="upload_lock_failed">폴더 잠금 실패</string>
+    <string name="upload_old_android">암호화는 안드로이드 5.0 이상 가능합니다</string>
     <string name="upload_query_move_foreign_files">공간이 부족해서 선택한 파일을 %1$s 폴더로 복사할 수 없습니다. 대신 이동하시겠습니까?</string>
     <string name="upload_sync_conflict">동기화 충돌, 수동으로 해결하십시오.</string>
     <string name="upload_unknown_error">알 수 없는 오류</string>
@@ -724,6 +738,8 @@
     <string name="uploader_top_message">업로드 폴더 선택</string>
     <string name="uploader_upload_failed_content_single">%1$s을(를) 업로드할 수 없음</string>
     <string name="uploader_upload_failed_credentials_error">업로드 실패, 다시 로그인하십시오</string>
+    <string name="uploader_upload_failed_sync_conflict_error">파일 업로드 충돌</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">유지할 버전 %1$s중 선택</string>
     <string name="uploader_upload_failed_ticker">업로드 실패</string>
     <string name="uploader_upload_files_behaviour">업로드 설정:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">%1$s폴더로 이동</string>
@@ -752,6 +768,7 @@
     <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_failed_ssl_certificate_not_trusted">신뢰할 수 없는 서버 인증서</string>
+    <string name="uploads_view_upload_status_fetching_server_version">서버 버전 가져오는중...</string>
     <string name="uploads_view_upload_status_service_interrupted">앱 종료됨</string>
     <string name="uploads_view_upload_status_succeeded">완료됨</string>
     <string name="uploads_view_upload_status_unknown_fail">알 수 없는 오류</string>

src/main/res/values-lt-rLT/strings.xml

@@ -466,6 +466,7 @@
     <string name="saml_authentication_wrong_pass">Neteisingas slaptažodis</string>
     <string name="scanQR_description">Prisijungti per QR kodą</string>
     <string name="screenshot_02_listView_heading">Naršyti ir bendrinti</string>
+    <string name="screenshot_03_drawer_heading">Veikla, viešiniai, …</string>
     <string name="screenshot_06_davdroid_heading">Kalendorius ir adresatai</string>
     <string name="search_users_and_groups_hint">Ieškoti naudotojų ar grupių</string>
     <string name="select_all">Pažymėti viską</string>

src/main/res/values-nl/strings.xml

@@ -362,6 +362,7 @@
     <string name="hint_password">Wachtwoord</string>
     <string name="host_not_available">Server niet beschikbaar</string>
     <string name="host_your_own_server">Host je eigen server</string>
+    <string name="instant_upload_existing">Upload ook bestaande bestanden</string>
     <string name="instant_upload_on_charging">Alleen uploaden bij opladen</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="learn_more">Meer weten</string>
@@ -675,6 +676,7 @@
     <string name="sync_in_progress">Meest recente versie van het bestand wordt opgehaald.</string>
     <string name="sync_not_enough_space_dialog_action_choose">Selectieve synchronisatie</string>
     <string name="sync_not_enough_space_dialog_action_free_space">Ruimte vrijmaken</string>
+    <string name="sync_not_enough_space_dialog_placeholder">%1$s is %2$s, maar er is alleen %3$sbeschikbaar op het apparaat.</string>
     <string name="sync_not_enough_space_dialog_title">Onvoldoende ruimte</string>
     <string name="sync_status_button">Sync status knop</string>
     <string name="sync_string_files">Bestanden</string>
@@ -725,6 +727,7 @@
     <string name="upload_list_delete">Verwijderen</string>
     <string name="upload_list_empty_headline">Geen uploads beschikbaar</string>
     <string name="upload_list_empty_text_auto_upload">Upload enkele gegevens of activeer auto-upload.</string>
+    <string name="upload_list_resolve_conflict">Los conflict op</string>
     <string name="upload_local_storage_full">Lokale opslag vol</string>
     <string name="upload_local_storage_not_copied">Bestand kan niet naar de lokale opschlag gekopieerd worden</string>
     <string name="upload_lock_failed">Vergrendeling van de map mislukt</string>
@@ -744,6 +747,8 @@
     <string name="uploader_top_message">Kies een uploadmap</string>
     <string name="uploader_upload_failed_content_single">Kon %1$s niet uploaden</string>
     <string name="uploader_upload_failed_credentials_error">Uploaden mislukt, je moet opnieuw inloggen</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Bestandsupload-conflict</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Kies welke versie bewaard wordt van %1$s</string>
     <string name="uploader_upload_failed_ticker">Uploaden mislukt</string>
     <string name="uploader_upload_files_behaviour">Uploadoptie:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Verplaats bestand naar %1$s-map</string>
@@ -772,6 +777,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Lokaal bestand niet gevonden</string>
     <string name="uploads_view_upload_status_failed_permission_error">Permissiefout</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Niet vertrouwd servercertificaat</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Server versie ophalen...</string>
     <string name="uploads_view_upload_status_service_interrupted">App afgesloten</string>
     <string name="uploads_view_upload_status_succeeded">Voltooid</string>
     <string name="uploads_view_upload_status_unknown_fail">Onbekende fout</string>

src/main/res/values-pl/strings.xml

@@ -362,6 +362,7 @@
     <string name="hint_password">Hasło</string>
     <string name="host_not_available">Serwer jest niedostępny</string>
     <string name="host_your_own_server">Hostuj własny serwer</string>
+    <string name="instant_upload_existing">Prześlij również istniejące pliki</string>
     <string name="instant_upload_on_charging">Wysyłaj tylko podczas ładowania</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="learn_more">Dowiedz się więcej</string>
@@ -726,6 +727,7 @@
     <string name="upload_list_delete">Usuń</string>
     <string name="upload_list_empty_headline">Brak wysłanych plików</string>
     <string name="upload_list_empty_text_auto_upload">Wyślij pliki lub włącz automatyczne wysyłanie.</string>
+    <string name="upload_list_resolve_conflict">Rozwiązać konflikt</string>
     <string name="upload_local_storage_full">Pamięć lokalna pełna</string>
     <string name="upload_local_storage_not_copied">Nie można skopiować pliku do lokalnej pamięci</string>
     <string name="upload_lock_failed">Nie udało się zablokować katalogu</string>
@@ -745,6 +747,8 @@
     <string name="uploader_top_message">Wybierz katalog do wysłania</string>
     <string name="uploader_upload_failed_content_single">Nie udało się wysłać %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Wysyłanie nie powiodło się, zaloguj się ponownie</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Konflikt przesyłania pliku</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Wybierz, którą wersję zachować z %1$s</string>
     <string name="uploader_upload_failed_ticker">Wysyłanie nie powiodło się</string>
     <string name="uploader_upload_files_behaviour">Opcja wysłania:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Przenieś plik do katalogu %1$s</string>
@@ -773,6 +777,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Nie odnaleziono pliku lokalnego</string>
     <string name="uploads_view_upload_status_failed_permission_error">Błąd uprawnień</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Certyfikat serwera nie jest zaufany</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Pobieram wersję serwera…</string>
     <string name="uploads_view_upload_status_service_interrupted">Aplikacja została zatrzymana</string>
     <string name="uploads_view_upload_status_succeeded">Ukończono</string>
     <string name="uploads_view_upload_status_unknown_fail">Nieznany błąd</string>

src/main/res/values-pt-rBR/strings.xml

@@ -362,6 +362,7 @@
     <string name="hint_password">Senha</string>
     <string name="host_not_available">Servidor indisponível</string>
     <string name="host_your_own_server">Hospede seu próprio servidor</string>
+    <string name="instant_upload_existing">Carregar arquivos existentes também</string>
     <string name="instant_upload_on_charging">Só enviar quando carregando</string>
     <string name="instant_upload_path">/EnvioAutomático</string>
     <string name="learn_more">Saiba mais</string>
@@ -726,6 +727,7 @@
     <string name="upload_list_delete">Excluir</string>
     <string name="upload_list_empty_headline">Nenhum envio disponível</string>
     <string name="upload_list_empty_text_auto_upload">Envie algum conteúdo ou ative o envio automático.</string>
+    <string name="upload_list_resolve_conflict">Resolver conflito</string>
     <string name="upload_local_storage_full">O armazenamento local está cheio.</string>
     <string name="upload_local_storage_not_copied">O arquivo não pôde ser copiado para o armazenamento local</string>
     <string name="upload_lock_failed">Falha ao bloquear pasta</string>
@@ -745,6 +747,8 @@
     <string name="uploader_top_message">Escolher pasta para envio</string>
     <string name="uploader_upload_failed_content_single">Não foi possível enviar %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Envio falhou. Logue-se novamente</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Conflito no envio de arquivo</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Escolha qual versão manter de %1$s</string>
     <string name="uploader_upload_failed_ticker">Falha no envio</string>
     <string name="uploader_upload_files_behaviour">Opção de envio:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Mover arquivo para a pasta %1$s</string>
@@ -773,6 +777,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Arquivo local não encontrado</string>
     <string name="uploads_view_upload_status_failed_permission_error">Erro de permissão</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Certificado de servidor não confiável</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Buscando versão do servidor…</string>
     <string name="uploads_view_upload_status_service_interrupted">Aplicativo finalizado</string>
     <string name="uploads_view_upload_status_succeeded">Concluído</string>
     <string name="uploads_view_upload_status_unknown_fail">Erro desconhecido</string>

src/main/res/values-ru/strings.xml

@@ -718,6 +718,7 @@
     <string name="upload_file_dialog_title">Имя и типа файла для автозагрузки </string>
     <string name="upload_files">Отправить файлы</string>
     <string name="upload_item_action_button">Кнопка «выгрузить объект»</string>
+    <string name="upload_list_delete">Удалить</string>
     <string name="upload_list_empty_headline">Нет файлов, ожидающих передачу на сервер.</string>
     <string name="upload_list_empty_text_auto_upload">Сохраните здесь что-нибудь или включите автоматическую передачу файлов!</string>
     <string name="upload_local_storage_full">Закончилось свободное место в локальном хранилище</string>

src/main/res/values-sr-rSP/strings.xml

@@ -714,6 +714,7 @@
     <string name="upload_file_dialog_title">Unesite ime i tip fajla za otpremanje</string>
     <string name="upload_files">Otpremi fajlove</string>
     <string name="upload_item_action_button">Dugme otpremanja stavke</string>
+    <string name="upload_list_delete">Obriši</string>
     <string name="upload_list_empty_headline">Nema dostupnih otpremanja</string>
     <string name="upload_list_empty_text_auto_upload">Otpremite neki sadržaj ili uključite automatsko otpremanje.</string>
     <string name="upload_local_storage_full">Lokalno skladište puno</string>

src/main/res/values-sv/strings.xml

@@ -362,6 +362,7 @@
     <string name="hint_password">Lösenord</string>
     <string name="host_not_available">Server inte tillgänglig</string>
     <string name="host_your_own_server">Använd egen server</string>
+    <string name="instant_upload_existing">Ladda även upp befintliga filer</string>
     <string name="instant_upload_on_charging">Ladda enbart upp när enheten laddas</string>
     <string name="instant_upload_path">/AutomatiskUppladdning</string>
     <string name="learn_more">Läs mer</string>
@@ -540,6 +541,7 @@
     <string name="saml_authentication_wrong_pass">Fel lösenord</string>
     <string name="scanQR_description">Logga in via QR-kod</string>
     <string name="screenshot_01_gridView_heading">Skydda dina data</string>
+    <string name="screenshot_01_gridView_subline">egenhyst produktivitet</string>
     <string name="screenshot_02_listView_heading">Bläddra och dela</string>
     <string name="screenshot_02_listView_subline">alla åtgärder till hands</string>
     <string name="screenshot_03_drawer_heading">Aktivitet, delningar, …</string>
@@ -726,6 +728,7 @@
     <string name="upload_list_delete">Radera</string>
     <string name="upload_list_empty_headline">Inga nerladdningar tillgängliga</string>
     <string name="upload_list_empty_text_auto_upload">Ladda upp något innehåll eller aktivera automatisk uppladdning.</string>
+    <string name="upload_list_resolve_conflict">Lös konflikt</string>
     <string name="upload_local_storage_full">Lokal lagring full</string>
     <string name="upload_local_storage_not_copied">Filen kunde inte kopieras till lokal lagringsplats</string>
     <string name="upload_lock_failed">Misslyckades låsa mappen</string>
@@ -745,6 +748,8 @@
     <string name="uploader_top_message">Välj mapp för uppladdning</string>
     <string name="uploader_upload_failed_content_single">Kunde inte ladda upp %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Uppladdningen misslyckades, logga in igen</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Konflikt vid filuppladdning</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Välj vilken version att spara av %1$s</string>
     <string name="uploader_upload_failed_ticker">Misslyckad uppladdning</string>
     <string name="uploader_upload_files_behaviour">Uppladdningsalternativ:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Flytta filen till %1$s mappen</string>
@@ -773,6 +778,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Lokal fil hittades inte</string>
     <string name="uploads_view_upload_status_failed_permission_error">Behörighetsfel</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Otillförlitligt servercertifikat</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Hämtar serverversion</string>
     <string name="uploads_view_upload_status_service_interrupted">App avslutad</string>
     <string name="uploads_view_upload_status_succeeded">Slutförande</string>
     <string name="uploads_view_upload_status_unknown_fail">Okänt fel</string>