[tx-robot] updated from transifex

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

@@ -142,14 +142,9 @@
     <string name="confirmation_remove_folders_alert">هل توَدُّ حقاً حذف العناصر المختارة وما يحتوّه؟</string>
     <string name="confirmation_remove_local">محليا فقط</string>
     <string name="conflict_already_existing_file">الملف موجود بالفعل</string>
-    <string name="conflict_keep_both">الاحتفاظ بالنسختين</string>
-    <string name="conflict_message">أي ملفات تود أن تحفظها؟ عند إختيارك للنسختين من الملفات، سيضاف رقم في آخر إسم النسخة المحلية.</string>
     <string name="conflict_message_description">إذا قمت باختيار كلا الاصدارين, الملف المحلي سيحتوي على رقم ملحق باسم الملف.</string>
     <string name="conflict_message_headline">ماهي الملفات التي ترغب في إبقاءها ؟</string>
     <string name="conflict_new_file">الملف الجديد</string>
-    <string name="conflict_title">تعارُض الملف</string>
-    <string name="conflict_use_local_version">النسخة المحلية</string>
-    <string name="conflict_use_server_version">نسخة السيرفر</string>
     <string name="contaclist_restore_selected">إسترجع جهات الإتصال المختارة</string>
     <string name="contactlist_account_chooser_title">إختر الحساب الذي تود استرجاعه</string>
     <string name="contactlist_item_icon">أيقونة المستخدمين المتواجدين في قائمة جهات الإتصال</string>
@@ -243,7 +238,6 @@
     <string name="fallback_weblogin_back">العودة</string>
     <string name="favorite">أضفه إلى المفضلة</string>
     <string name="favorite_icon">المفضلة</string>
-    <string name="file">file</string>
     <string name="file_delete">حذف </string>
     <string name="file_icon">الملف</string>
     <string name="file_list_empty">قم برفع بعض المحتوى أو زامن مع أجهزتك</string>
@@ -275,7 +269,6 @@
     <string name="filename_empty">لا يجوز أن يُترك إسم الملف فارغًا</string>
     <string name="filename_forbidden_characters">رموز ممنوعة: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">اسم الملف</string>
-    <string name="folder">folder</string>
     <string name="folder_already_exists">المجلد موجود مسبقاً</string>
     <string name="folder_confirm_create">إنشاء</string>
     <string name="folder_icon">أيقونة المجلد</string>

src/main/res/values-b+en+001/strings.xml

@@ -142,14 +142,9 @@
     <string name="confirmation_remove_folders_alert">Do you really want to delete the selected items and their contents?</string>
     <string name="confirmation_remove_local">Local only</string>
     <string name="conflict_already_existing_file">Already existing file</string>
-    <string name="conflict_keep_both">Keep both</string>
-    <string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number appended to its name.</string>
     <string name="conflict_message_description">If you select both versions, the local file will have a number appended to its name.</string>
     <string name="conflict_message_headline">Which files do you wish to keep?</string>
     <string name="conflict_new_file">New file</string>
-    <string name="conflict_title">File conflict</string>
-    <string name="conflict_use_local_version">local version</string>
-    <string name="conflict_use_server_version">server version</string>
     <string name="contaclist_restore_selected">Restore selected contacts</string>
     <string name="contactlist_account_chooser_title">Choose account to import</string>
     <string name="contactlist_item_icon">User icon for contact list</string>
@@ -282,7 +277,6 @@
     <string name="fallback_weblogin_text">Revert to old login method</string>
     <string name="favorite">Add to favorites</string>
     <string name="favorite_icon">Favorite</string>
-    <string name="file">file</string>
     <string name="file_delete">Delete</string>
     <string name="file_detail_activity_error">Error retrieving activities for file</string>
     <string name="file_details_no_content">Failed to load details</string>
@@ -352,7 +346,6 @@
     <string name="first_run_2_text">Secure collaboration &amp; file exchange</string>
     <string name="first_run_3_text">Easy-to-use web mail, calendering &amp; contacts</string>
     <string name="first_run_4_text">Screensharing, online meetings &amp; web conferences</string>
-    <string name="folder">folder</string>
     <string name="folder_already_exists">Folder already exists</string>
     <string name="folder_confirm_create">Create</string>
     <string name="folder_icon">Folder icon</string>
@@ -585,7 +578,6 @@
     <string name="share_get_public_link_button">Get link</string>
     <string name="share_group_clarification">%1$s (group)</string>
     <string name="share_internal_link">Share internal link</string>
-    <string name="share_internal_link_text">Only works for users with access to this %1$s</string>
     <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
     <string name="share_internal_link_to_folder_text">Internal share link only works for users with access to this folder</string>
     <string name="share_known_remote_clarification">%1$s ( at %2$s )</string>

src/main/res/values-b+es+419/strings.xml

@@ -110,12 +110,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_no_permission">No se han otorgado privilegios, nada fue importado.</string>
@@ -181,7 +176,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -215,7 +209,6 @@
     <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">Nombre del archivo</string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

src/main/res/values-bg-rBG/strings.xml

@@ -133,12 +133,7 @@
     <string name="confirmation_remove_folder_alert">Наистина ли желаете %1$s и съдържанието ѝ да бъдат изтрито?</string>
     <string name="confirmation_remove_folders_alert">Наистина ли желаете избраните елементи и съдържанието им да бъдат премахнати?</string>
     <string name="confirmation_remove_local">Само локално</string>
-    <string name="conflict_keep_both">Запазване и на двата</string>
-    <string name="conflict_message">Кои файлове желаете да запазите? Ако изберете и двете версии, към името на локалния файл ще бъде добавено число.</string>
     <string name="conflict_message_headline">Кои файлове желете да запазите?</string>
-    <string name="conflict_title">Файлов конфликт</string>
-    <string name="conflict_use_local_version">локалната версия</string>
-    <string name="conflict_use_server_version">версията на сървъра</string>
     <string name="contaclist_restore_selected">Възстанови избраните контакти</string>
     <string name="contactlist_account_chooser_title">Изберете профил за внасяне</string>
     <string name="contactlist_item_icon">Потребителска икона за списъка с контакти</string>
@@ -227,7 +222,6 @@
     <string name="fallback_weblogin_text">Връщане към стария метод за вписване</string>
     <string name="favorite">Добави към любимите</string>
     <string name="favorite_icon">Любими</string>
-    <string name="file">файл</string>
     <string name="file_delete">Изтрий</string>
     <string name="file_icon">Файл</string>
     <string name="file_keep">Запази</string>
@@ -293,7 +287,6 @@
     <string name="files_drop_not_supported">Това е функционалност на Nextcloud, моля актуализирайте.</string>
     <string name="first_run_1_text">Съхранявате данните си на сигурно място и под ваш контрол</string>
     <string name="first_run_4_text">Споделяне на екрана, online meetings и уеб конференции</string>
-    <string name="folder">папка</string>
     <string name="folder_already_exists">Папката вече съществува</string>
     <string name="folder_confirm_create">Създай</string>
     <string name="folder_icon">Икона на папката</string>

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

@@ -141,12 +141,7 @@
     <string name="confirmation_remove_folder_alert">Esteu segur que voleu suprimir %1$s i els seus continguts?</string>
     <string name="confirmation_remove_folders_alert">Esteu segur que voleu suprimir els elements seleccionats i el seu contingut?</string>
     <string name="confirmation_remove_local">Només local</string>
-    <string name="conflict_keep_both">Mantén-los ambdós</string>
-    <string name="conflict_message">Quins fitxers voleu mantenir? Si seleccioneu ambdues versions, el fitxer local tindrà un número afegit al seu nom.</string>
     <string name="conflict_message_headline">Quins fitxers voleu conservar?</string>
-    <string name="conflict_title">Conflicte de fitxers</string>
-    <string name="conflict_use_local_version">Versió local</string>
-    <string name="conflict_use_server_version">versió del servidor</string>
     <string name="contaclist_restore_selected">Restaura els contactes seleccionats</string>
     <string name="contactlist_account_chooser_title">Escolliu un compte per a importar</string>
     <string name="contactlist_item_icon">Icona d\'usuari per a la llista de contactes</string>
@@ -264,7 +259,6 @@
     <string name="fallback_weblogin_text">Revertiu l\'antic mètode d\'inici de sessió</string>
     <string name="favorite">Afegix a preferits</string>
     <string name="favorite_icon">Preferits</string>
-    <string name="file">arxiu</string>
     <string name="file_delete">Suprimeix</string>
     <string name="file_detail_activity_error">Hi ha hagut un error mentre es recuperaven les activitats per al fitxer</string>
     <string name="file_details_no_content">No s\'han pogut carregar els detalls</string>
@@ -334,7 +328,6 @@
     <string name="first_run_2_text">Intercanvi de fitxers &amp; amb coŀlaboració segura</string>
     <string name="first_run_3_text">Correu web, agenda i contactes fàcils de fer servir</string>
     <string name="first_run_4_text">Compartició de pantalles, reunions en línia i conferències web</string>
-    <string name="folder">carpeta</string>
     <string name="folder_already_exists">La carpeta ja existeix</string>
     <string name="folder_confirm_create">Crea</string>
     <string name="folder_icon">Icona de la carpeta</string>
@@ -563,7 +556,6 @@
     <string name="share_get_public_link_button">Obtén l\'enllaç</string>
     <string name="share_group_clarification">%1$s (grup)</string>
     <string name="share_internal_link">Compartir l\'enllaç intern</string>
-    <string name="share_internal_link_text">Només funciona amb els usuaris que poden accedir a %1$s</string>
     <string name="share_known_remote_clarification">%1$s (a %2$s)</string>
     <string name="share_link_empty_password">Heu d\'escriure una contrasenya</string>
     <string name="share_link_file_error">S\'ha produït un error mentre s\'intentava compartir aquest fitxer o carpeta</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Pouze místní</string>
     <string name="conflict_already_existing_file">Už existující soubor</string>
     <string name="conflict_dialog_error">Chyba při vytváření dialogu ke konfliktu!</string>
-    <string name="conflict_keep_both">Ponechat oba</string>
-    <string name="conflict_message">Které soubory chcete ponechat? Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.</string>
     <string name="conflict_message_description">Pokud zvolíte obě verze, k názvu místního souboru bude připojeno číslo.</string>
     <string name="conflict_message_headline">Které soubory chcete ponechat?</string>
     <string name="conflict_new_file">Nový soubor</string>
-    <string name="conflict_title">Konflikt souboru</string>
-    <string name="conflict_use_local_version">místní verze</string>
-    <string name="conflict_use_server_version">verze na serveru</string>
     <string name="contaclist_restore_selected">Obnovit vybrané kontakty</string>
     <string name="contactlist_account_chooser_title">Vyberte účet, který chcete importovat</string>
     <string name="contactlist_item_icon">Ikona uživatele v seznamu kontaktů</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Vrátit se ke starému způsobu přihlašování</string>
     <string name="favorite">Přidat do oblíbených</string>
     <string name="favorite_icon">Oblíbené</string>
-    <string name="file">soubor</string>
     <string name="file_delete">Smazat</string>
     <string name="file_detail_activity_error">Při načítání aktivit u souboru došlo k chybě</string>
     <string name="file_details_no_content">Nepodařilo se načíst podrobnosti.</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Zabezpečená spolupráce a výměna souborů</string>
     <string name="first_run_3_text">Snadno použitelný webový e-mailový klient, kalendáře a kontakty</string>
     <string name="first_run_4_text">Sdílení obrazovky, schůzky na dálku a webové konference</string>
-    <string name="folder">složka</string>
     <string name="folder_already_exists">Složka už existuje</string>
     <string name="folder_confirm_create">Vytvořit</string>
     <string name="folder_icon">Ikona složky</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Získat odkaz</string>
     <string name="share_group_clarification">%1$s (skupina)</string>
     <string name="share_internal_link">Sdílet vnitřní odkaz</string>
-    <string name="share_internal_link_text">Bude fungovat pouze uživatelům, kteří mají přístup k tomuto %1$s</string>
     <string name="share_internal_link_to_file_text">Sdílení interním odkazem funguje pouze pro uživatele, kteří mají k tomuto souboru přístup</string>
     <string name="share_internal_link_to_folder_text">Sdílení interním odkazem funguje pouze pro uživatele, kteří mají k této složce přístup</string>
     <string name="share_known_remote_clarification">%1$s (v %2$s)</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Kun lokal</string>
     <string name="conflict_already_existing_file">Eksisterende photo</string>
     <string name="conflict_dialog_error">Fejl ved skabelse af konfliktdialog</string>
-    <string name="conflict_keep_both">Behold begge</string>
-    <string name="conflict_message">Hvilke filer ønsker du at beholde? Hvis du vælger begge versioner, så vil den lokale fil få et tal tilføjet til sit navn.</string>
     <string name="conflict_message_description">Hvis du vælger begge versioner, vil den lokale fil få tilføjet et nummer til sit navn.</string>
     <string name="conflict_message_headline">Hvilke filer ønsker du at beholde?</string>
     <string name="conflict_new_file">Ny fil</string>
-    <string name="conflict_title">Filkonflikt</string>
-    <string name="conflict_use_local_version">lokal version</string>
-    <string name="conflict_use_server_version">serverversion</string>
     <string name="contaclist_restore_selected">Genskab valgte kontakter</string>
     <string name="contactlist_account_chooser_title">Vælg konto at importere</string>
     <string name="contactlist_item_icon">Bruger ikon til kontaktliste</string>
@@ -283,7 +278,6 @@
     <string name="fallback_weblogin_text">Tilbage til foregående login metode</string>
     <string name="favorite">Tilføj til favoritter</string>
     <string name="favorite_icon">Favorit</string>
-    <string name="file">fil</string>
     <string name="file_delete">Slet</string>
     <string name="file_detail_activity_error">Fejl ved indlæsning af aktiviteter for fil</string>
     <string name="file_details_no_content">Fejl ved indlæsning af detaljer</string>
@@ -353,7 +347,6 @@
     <string name="first_run_2_text">Sikker kollaboration&amp; fil udveksling</string>
     <string name="first_run_3_text">Nemt at bruge web mail, kalender &amp; kontakter</string>
     <string name="first_run_4_text">Skærmdeling, onlinemøder &amp; web konferencer</string>
-    <string name="folder">mappe</string>
     <string name="folder_already_exists">Mappe findes allerede</string>
     <string name="folder_confirm_create">Opret</string>
     <string name="folder_icon">Mappe ikon</string>
@@ -588,7 +581,6 @@ Enheds legitimationsoplysninger er sat op
     <string name="share_get_public_link_button">Få link</string>
     <string name="share_group_clarification">%1$s (gruppe)</string>
     <string name="share_internal_link">Del internt link</string>
-    <string name="share_internal_link_text">Virker kun for brugere med adgang til %1$s</string>
     <string name="share_internal_link_to_file_text">Internt dele link virker kun for brugere med adgang til denne fil</string>
     <string name="share_known_remote_clarification">%1$s ( ved %2$s)</string>
     <string name="share_link_empty_password">Du skal angive et kodeord</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Nur lokal</string>
     <string name="conflict_already_existing_file">Bereits existierende Datei</string>
     <string name="conflict_dialog_error">Fehler beim Erstellen des Konfliktdialoges</string>
-    <string name="conflict_keep_both">Beide behalten</string>
-    <string name="conflict_message">Welche Datei soll behalten werden? Wenn Sie beide Versionen wählen, wird der lokalen Datei eine Zahl am Ende des Dateinamens angefügt.</string>
     <string name="conflict_message_description">Falls beide Versionen gewählt werden, wird bei der lokalen Datei eine Zahl am Ende des Dateinamens hinzugefügt.</string>
     <string name="conflict_message_headline">Welche Dateien möchten Sie behalten?</string>
     <string name="conflict_new_file">Neue Datei</string>
-    <string name="conflict_title">Dateikonfilikt</string>
-    <string name="conflict_use_local_version">Lokale Version</string>
-    <string name="conflict_use_server_version">Serverversion</string>
     <string name="contaclist_restore_selected">Ausgewählte Adressen wiederherstellen</string>
     <string name="contactlist_account_chooser_title">Konto für den Import auswählen</string>
     <string name="contactlist_item_icon">Nutzericon für Kontaktliste</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Zur alten Anmeldungsmethode zurückkehren</string>
     <string name="favorite">Zu den Favoriten hinzufügen</string>
     <string name="favorite_icon">Favoriten</string>
-    <string name="file">Datei</string>
     <string name="file_delete">Löschen</string>
     <string name="file_detail_activity_error">Fehler beim Abrufen der Aktivitäten für die Datei</string>
     <string name="file_details_no_content">Fehler beim Laden der Details</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Sichere Zusammenarbeit &amp; Dateiaustausch</string>
     <string name="first_run_3_text">Leicht verwendbares Web-Mail, Kalender &amp; Kontakte</string>
     <string name="first_run_4_text">Bildschirm teilen, Online-Meetings&amp; Web-Konferenzen</string>
-    <string name="folder">Ordner</string>
     <string name="folder_already_exists">Ordner existiert bereits</string>
     <string name="folder_confirm_create">Erstellen</string>
     <string name="folder_icon">Ordnersymbol</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Link erhalten</string>
     <string name="share_group_clarification">%1$s (Gruppe)</string>
     <string name="share_internal_link">Internen Link teilen</string>
-    <string name="share_internal_link_text">Funktioniert nur für Benutzer, die Zugriff auf diese(n) %1$s haben</string>
     <string name="share_internal_link_to_file_text">Der interne Freigabelink funktioniert nur für Benutzer mit Zugriff auf diese Datei</string>
     <string name="share_internal_link_to_folder_text">Der interne Freigabelink funktioniert nur für Benutzer mit Zugriff auf diesen Ordner</string>
     <string name="share_known_remote_clarification">%1$s ( at %2$s )</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Μόνο τοπικά</string>
     <string name="conflict_already_existing_file">Το αρχείο υπάρχει ήδη</string>
     <string name="conflict_dialog_error">Σφάλμα δημιουργίας αναφοράς διένεξης!</string>
-    <string name="conflict_keep_both">Διατήρηση και των δύο</string>
-    <string name="conflict_message">Ποια αρχεία θέλετε να διατηρήσετε; Αν επιλέξετε και τις δύο εκδόσεις, θα προστεθεί ένας αριθμός στο όνομα του τοπικού αρχείου.</string>
     <string name="conflict_message_description">Εάν επιλέξετε και τις δύο εκδόσεις, στο όνομα του τοπικού αρχείου θα προστεθεί ένας αριθμός.</string>
     <string name="conflict_message_headline">Ποια αρχεία θέλετε να κρατήσετε;</string>
     <string name="conflict_new_file">Νέο αρχείο</string>
-    <string name="conflict_title">Διένεξη αρχείων</string>
-    <string name="conflict_use_local_version">τοπική έκδοση</string>
-    <string name="conflict_use_server_version">έκδοση διακομιστή</string>
     <string name="contaclist_restore_selected">Επαναφορά επιλεγμένων επαφών</string>
     <string name="contactlist_account_chooser_title">Επιλογή λογαριασμού για εισαγωγή</string>
     <string name="contactlist_item_icon">Εικονίδιο χρήστη για τη λίστα επαφών</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Επαναφορά στην παλιά μέθοδο σύνδεσης</string>
     <string name="favorite">Προσθήκη στα αγαπημένα</string>
     <string name="favorite_icon">Αγαπημένο</string>
-    <string name="file">αρχείο</string>
     <string name="file_delete">Διαγραφή</string>
     <string name="file_detail_activity_error">Σφάλμα ανάκτησης δραστηριοτήτων για το αρχείο</string>
     <string name="file_details_no_content">Αποτυχία φόρτωσης λεπτομερειών</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Ασφαλής συνεργασία &amp; ανταλλαγή αρχείων</string>
     <string name="first_run_3_text">Εύχρηστο web mail, ημερολόγιο &amp; επαφές</string>
     <string name="first_run_4_text">Κοινή χρήση οθόνης, ηλεκτρονικές συναντήσεις &amp; συνέδρια</string>
-    <string name="folder">φάκελος</string>
     <string name="folder_already_exists">Ο φάκελος υπάρχει ήδη</string>
     <string name="folder_confirm_create">Δημιουργία</string>
     <string name="folder_icon">Εικονίδιο φακέλου</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Λήψη συνδέσμου</string>
     <string name="share_group_clarification">%1$s (ομάδα)</string>
     <string name="share_internal_link">Κοινή χρήση εσωτερικού συνδέσμου</string>
-    <string name="share_internal_link_text">Λειτουργεί μόνο για χρήστες με πρόσβαση στο %1$s</string>
     <string name="share_internal_link_to_file_text">Οι εσωτερικοί κοινόχρηστοι σύνδεσμοι λειτουργούν μόνο για χρήστες με πρόσβαση στο αρχείο</string>
     <string name="share_internal_link_to_folder_text">Οι εσωτερικοί κοινόχρηστοι σύνδεσμοι λειτουργούν μόνο για χρήστες με πρόσβαση στο φάκελο</string>
     <string name="share_known_remote_clarification">%1$s ( στο %2$s )</string>

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

@@ -136,12 +136,7 @@
     <string name="confirmation_remove_folder_alert">Ĉu vi ja volas forigi %1$s kaj ĝian enhavon?</string>
     <string name="confirmation_remove_folders_alert">Ĉu vi ja volas forigi la elektitajn elementojn kaj ilian enhavon?</string>
     <string name="confirmation_remove_local">Nur loka</string>
-    <string name="conflict_keep_both">Konservi ambaŭ</string>
-    <string name="conflict_message">Kiujn dosierojn vi volas konservi? Se vi elektos ambaŭ eldonojn, la loka dosiero havos numeron aldonitan al sia nomo.</string>
     <string name="conflict_message_headline">Kiujn dosierojn vi volas konservi?</string>
-    <string name="conflict_title">Dosierkonflikto</string>
-    <string name="conflict_use_local_version">loka eldono</string>
-    <string name="conflict_use_server_version">servila eldono</string>
     <string name="contaclist_restore_selected">Restaŭri elektitajn kontaktojn</string>
     <string name="contactlist_account_chooser_title">Elekti konton importota</string>
     <string name="contactlist_item_icon">Uzanto-piktogramo por la kontaktlisto</string>
@@ -247,7 +242,6 @@
     <string name="fallback_weblogin_text">Reiri al la malnova konektmetodo</string>
     <string name="favorite">Aldoni al pliŝataĵoj</string>
     <string name="favorite_icon">Pliŝatataj</string>
-    <string name="file">dosiero</string>
     <string name="file_delete">Forigi</string>
     <string name="file_details_no_content">Ŝargo de detaloj malsukcesis</string>
     <string name="file_icon">Dosiero</string>
@@ -316,7 +310,6 @@
     <string name="first_run_2_text">Sekura kunlaborado kaj dosiera interŝanĝo</string>
     <string name="first_run_3_text">Faciluza enreta retpoŝtilo, kalendaro kaj kontaktaro</string>
     <string name="first_run_4_text">Ekrandividado, retkunsidoj kaj reta konferencoj</string>
-    <string name="folder">folder</string>
     <string name="folder_already_exists">La dosierujo jam ekzistas</string>
     <string name="folder_confirm_create">Krei</string>
     <string name="folder_icon">Piktogramo de dosierujo</string>

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

@@ -139,12 +139,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y su contenido?</string>
     <string name="confirmation_remove_folders_alert">¿Realmente desea eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desea mantener? Si selecciona ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos desea mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Seleccione la cuenta a importar</string>
     <string name="contactlist_item_icon">Icono de usuario para la lista de contactos</string>
@@ -259,7 +254,6 @@
     <string name="fallback_weblogin_text">Volver al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a favoritos</string>
     <string name="favorite_icon">Favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_detail_activity_error">Error al recuperar actividades para el archivo</string>
     <string name="file_details_no_content">Error al cargar los detalles</string>
@@ -329,7 +323,6 @@
     <string name="first_run_2_text">Colaboración segura &amp; intercambio de archivos</string>
     <string name="first_run_3_text">Correo web fácil de usar, calendario &amp; y contactos</string>
     <string name="first_run_4_text">Compartir pantalla, reuniones en línea &amp; y conferencias web</string>
-    <string name="folder">carpeta</string>
     <string name="folder_already_exists">Carpeta ya existente</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Icono de carpeta</string>

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

@@ -122,12 +122,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_item_icon">Ícono de usuario para la lista de contactos</string>
@@ -217,7 +212,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -278,7 +272,6 @@
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un carácter inválido</string>
     <string name="filename_hint">Nombre del archivo</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, por favor actualiza. </string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -122,12 +122,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_item_icon">Ícono de usuario para la lista de contactos</string>
@@ -217,7 +212,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -278,7 +272,6 @@
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un carácter inválido</string>
     <string name="filename_hint">Nombre del archivo</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, por favor actualiza. </string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -122,12 +122,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_item_icon">Ícono de usuario para la lista de contactos</string>
@@ -217,7 +212,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -278,7 +272,6 @@
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un carácter inválido</string>
     <string name="filename_hint">Nombre del archivo</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, por favor actualiza. </string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -122,12 +122,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_item_icon">Ícono de usuario para la lista de contactos</string>
@@ -217,7 +212,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -278,7 +272,6 @@
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un carácter inválido</string>
     <string name="filename_hint">Nombre del archivo</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, por favor actualiza. </string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -122,12 +122,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_item_icon">Ícono de usuario para la lista de contactos</string>
@@ -217,7 +212,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -278,7 +272,6 @@
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un carácter inválido</string>
     <string name="filename_hint">Nombre del archivo</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, por favor actualiza. </string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -122,12 +122,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_item_icon">Ícono de usuario para la lista de contactos</string>
@@ -217,7 +212,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -278,7 +272,6 @@
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un carácter inválido</string>
     <string name="filename_hint">Nombre del archivo</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, por favor actualiza. </string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -110,12 +110,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_no_permission">No se han otorgado privilegios, nada fue importado.</string>
@@ -181,7 +176,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -215,7 +209,6 @@
     <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">Nombre del archivo</string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -128,12 +128,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_item_icon">Ícono de usuario para la lista de contactos</string>
@@ -224,7 +219,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_keep">Mantener</string>
@@ -286,7 +280,6 @@
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un carácter inválido</string>
     <string name="filename_hint">Nombre del archivo</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, por favor actualiza. </string>
-    <string name="folder">carpeta</string>
     <string name="folder_already_exists">Carpeta ya existente</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>

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

@@ -110,12 +110,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_no_permission">No se han otorgado privilegios, nada fue importado.</string>
@@ -181,7 +176,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -215,7 +209,6 @@
     <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">Nombre del archivo</string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -110,12 +110,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_no_permission">No se han otorgado privilegios, nada fue importado.</string>
@@ -181,7 +176,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -215,7 +209,6 @@
     <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">Nombre del archivo</string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -110,12 +110,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_no_permission">No se han otorgado privilegios, nada fue importado.</string>
@@ -181,7 +176,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -215,7 +209,6 @@
     <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">Nombre del archivo</string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -110,12 +110,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_no_permission">No se han otorgado privilegios, nada fue importado.</string>
@@ -181,7 +176,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -215,7 +209,6 @@
     <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">Nombre del archivo</string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -110,12 +110,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_no_permission">No se han otorgado privilegios, nada fue importado.</string>
@@ -181,7 +176,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -215,7 +209,6 @@
     <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">Nombre del archivo</string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -122,12 +122,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_item_icon">Ícono de usuario para la lista de contactos</string>
@@ -217,7 +212,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -278,7 +272,6 @@
     <string name="filename_forbidden_charaters_from_server">El nombre del archivo contiene al menos un carácter inválido</string>
     <string name="filename_hint">Nombre del archivo</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, por favor actualiza. </string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -110,12 +110,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
-    <string name="conflict_keep_both">Mantener ambas</string>
-    <string name="conflict_message">¿Qué archivos desesa mantener? Si seleccionas ambas versiones, se le agregará un número al nombre del archivo local.</string>
     <string name="conflict_message_headline">¿Cuales archivos deseas mantener?</string>
-    <string name="conflict_title">Conflicto de archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión de servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Selecciona la cuenta a importar</string>
     <string name="contactlist_no_permission">No se han otorgado privilegios, nada fue importado.</string>
@@ -181,7 +176,6 @@
     <string name="fallback_weblogin_text">Regresar al antiguo método de inicio de sesión</string>
     <string name="favorite">Agregar a tus favoritos</string>
     <string name="favorite_icon">Hacer favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Borrar</string>
     <string name="file_icon">Archivo</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
@@ -215,7 +209,6 @@
     <string name="filedisplay_no_file_selected">No se ha seleccionado algún archivo</string>
     <string name="filename_forbidden_characters">Caracteres inválidos: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">Nombre del archivo</string>
-    <string name="folder">carpeta</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Ícono de carpeta</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Solo local</string>
     <string name="conflict_already_existing_file">Archivo ya existente</string>
     <string name="conflict_dialog_error">¡Error al crear el diálogo de conflicto!</string>
-    <string name="conflict_keep_both">Mantener ambos</string>
-    <string name="conflict_message">¿Qué archivos desea mantener? Si selecciona ambas versiones, el archivo local tendrá un número añadido a su nombre.</string>
     <string name="conflict_message_description">Si seleccionas ambas versiones, el archivo local tendrá un número añadido a su nombre.</string>
     <string name="conflict_message_headline">¿Qué archivos desea mantener?</string>
     <string name="conflict_new_file">Nuevo archivo</string>
-    <string name="conflict_title">Conflicto con archivo</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión del servidor</string>
     <string name="contaclist_restore_selected">Restaurar los contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Escoge la cuenta para importar</string>
     <string name="contactlist_item_icon">Icono de usuario para lista de contactos</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Volver al método de registro antiguo</string>
     <string name="favorite">Añadir a favoritos</string>
     <string name="favorite_icon">Favorito</string>
-    <string name="file">archivo</string>
     <string name="file_delete">Eliminar</string>
     <string name="file_detail_activity_error">Error al recuperar las actividades del archivo</string>
     <string name="file_details_no_content">Fallo al cargar los detalles</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Colaboración segura e intercambio de archivos</string>
     <string name="first_run_3_text">Correo web, calendario y contactos fáciles de usar</string>
     <string name="first_run_4_text">Compartir pantalla, reuniones online y conferencias web</string>
-    <string name="folder">carpeta</string>
     <string name="folder_already_exists">La carpeta ya existe</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Icono de carpeta</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Obtener enlace</string>
     <string name="share_group_clarification">%1$s (grupo)</string>
     <string name="share_internal_link">Compartir enlace interno</string>
-    <string name="share_internal_link_text">Sólo funciona para usuarios con acceso a esto %1$s</string>
     <string name="share_internal_link_to_file_text">Los links compartidos internos solo funcionan para los usuarios con acceso a este archivo</string>
     <string name="share_internal_link_to_folder_text">Los links compartidos internos solo funcionan para los usuarios con acceso a esta carpeta</string>
     <string name="share_known_remote_clarification">%1$s ( en %2$s )</string>

src/main/res/values-et-rEE/strings.xml

@@ -103,12 +103,7 @@
     <string name="community_testing_report_text">Teavita probleemist GitHubis</string>
     <string name="community_testing_version_text">Oled huvitatud aitamisest uut versiooni testides?</string>
     <string name="confirmation_remove_local">Ainult kohalik</string>
-    <string name="conflict_keep_both">Säilita mõlemad</string>
-    <string name="conflict_message">Millist faili sa soovid säilitada? Kui valid mõlemad versioonid, siis lisatakse kohaliku faili nimele number.</string>
     <string name="conflict_message_headline">Milliseid faile sa soovid alles hoida?</string>
-    <string name="conflict_title">Failikonflikt</string>
-    <string name="conflict_use_local_version">kohalik versioon</string>
-    <string name="conflict_use_server_version">serveri versioon</string>
     <string name="contacts_automatic_backup">Automaatne varundus</string>
     <string name="contacts_backup_button">Varunda kohe</string>
     <string name="contacts_last_backup">Viimane varukoopia</string>
@@ -165,7 +160,6 @@
     <string name="fallback_weblogin_back">Tagasi</string>
     <string name="favorite">Lisa lemmikutesse</string>
     <string name="favorite_icon">Lemmik</string>
-    <string name="file">file</string>
     <string name="file_delete">Kustuta</string>
     <string name="file_icon">Fail</string>
     <string name="file_list_empty">Lae midagi üles või sünkroniseeri oma seadmetega.</string>
@@ -205,7 +199,6 @@
     <string name="filename_forbidden_characters">Keelatud sümbolid:  / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Faili nimes on vähemalt üks keelatud märk</string>
     <string name="filename_hint">Faili nimi</string>
-    <string name="folder">folder</string>
     <string name="folder_confirm_create">Loo</string>
     <string name="folder_icon">Kausta ikoon</string>
     <string name="folder_list_empty_headline">Siin ei ole kaustu</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Lokala bakarrik</string>
     <string name="conflict_already_existing_file">Dagoeneko existitzen den fitxategia</string>
     <string name="conflict_dialog_error">Errorea gatazkaren elkarrizketa-koadroa sortzean!</string>
-    <string name="conflict_keep_both">Mantendu biak</string>
-    <string name="conflict_message">Ze fitxategi mantendu nahi dituzu? Bi bertsioak hautatzen badituzu, fitxategi lokalaren izenari zenbaki bat gehituko zaio.</string>
     <string name="conflict_message_description">Bi bertsioak hautatzen badituzu, fitxategi lokalaren izenari zenbaki bat gehituko zaio.</string>
     <string name="conflict_message_headline">Ze fitxategi mantendu nahi dituzu?</string>
     <string name="conflict_new_file">Fitxategi berria</string>
-    <string name="conflict_title">Fitxategi gatazka</string>
-    <string name="conflict_use_local_version">bertsio lokala</string>
-    <string name="conflict_use_server_version">zerbitzariaren bertsioa</string>
     <string name="contaclist_restore_selected">Leheneratu hautatutako kontaktuak</string>
     <string name="contactlist_account_chooser_title">Aukeratu kontu bat inportatzeko</string>
     <string name="contactlist_item_icon">Erabiltzailearen ikonoa kontaktuen zerrendarako</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Lehengoratu saioa hasteko metodo zaharrera</string>
     <string name="favorite">Gogokoenetara gehitu</string>
     <string name="favorite_icon">Gogokoa</string>
-    <string name="file">fitxategia</string>
     <string name="file_delete">Ezabatu</string>
     <string name="file_detail_activity_error">Errorea fitxategiaren jarduerak berreskuratzen</string>
     <string name="file_details_no_content">Huts egin du zehaztapenak kargatzen</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Lankidetza &amp; fitxategi partekatze segurua</string>
     <string name="first_run_3_text">Web posta, egutegi &amp; kontaktu erabilerraza</string>
     <string name="first_run_4_text">Pantaila partekatzea, online bilerak &amp;web konferentziak</string>
-    <string name="folder">karpeta</string>
     <string name="folder_already_exists">Karpeta dagoeneko existitzen da</string>
     <string name="folder_confirm_create">Sortu</string>
     <string name="folder_icon">Karpetaren ikonoa</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Esteka lortu</string>
     <string name="share_group_clarification">%1$s (taldea)</string>
     <string name="share_internal_link">Partekatu barne-esteka</string>
-    <string name="share_internal_link_text">%1$s honetara sartzeko baimena duten erabiltzaileentzat bakarrik funtzionatzen du</string>
     <string name="share_internal_link_to_file_text">Barneko partekatzeko estekak fitxategi honetarako sarrera duten erabiltzaileentzat bakarrik balio du</string>
     <string name="share_internal_link_to_folder_text">Barneko partekatzeko estekak karpetarako sarrera duten erabiltzaileentzat bakarrik balio du</string>
     <string name="share_known_remote_clarification">%1$s (%2$s-n)</string>

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

@@ -141,12 +141,7 @@
     <string name="confirmation_remove_folder_alert">آیا واقعا می خواهید %1$s و محتویات آن را حذف کنید؟</string>
     <string name="confirmation_remove_folders_alert">آیا واقعاً می خواهید موارد انتخاب شده و محتوای آنها حذف شود؟</string>
     <string name="confirmation_remove_local">فقط محلی</string>
-    <string name="conflict_keep_both">نگهداشتن هر دو</string>
-    <string name="conflict_message">کدام فایل ها را می خواهید نگه دارید؟ اگر هر دو نسخه را انتخاب کنید ، فایل محلی شماره ای به نام آن اضافه خواهد شد.</string>
     <string name="conflict_message_headline">کدام فایل ها را می خواهید نگه دارید ؟</string>
-    <string name="conflict_title">تضاد در فایل</string>
-    <string name="conflict_use_local_version">نسخه‌ی محلی</string>
-    <string name="conflict_use_server_version">نسخه سرور</string>
     <string name="contaclist_restore_selected">بازیابی مخاطبین انتخاب شده</string>
     <string name="contactlist_account_chooser_title">حساب را برای وارد کردن انتخاب کنید</string>
     <string name="contactlist_item_icon">آیکون کاربر برای لیست تماس</string>
@@ -269,7 +264,6 @@
     <string name="fallback_weblogin_text">به روش ورود به سیستم قدیمی برگردید</string>
     <string name="favorite">Add to favorites</string>
     <string name="favorite_icon">برگزیده</string>
-    <string name="file">file</string>
     <string name="file_delete">حذف</string>
     <string name="file_detail_activity_error">خطا در بازیابی فعالیت ها برای پرونده</string>
     <string name="file_details_no_content">بارگیری جزئیات انجام نشد</string>
@@ -339,7 +333,6 @@
     <string name="first_run_2_text">همکاری ایمن &amp; تبادل پرونده</string>
     <string name="first_run_3_text">آسان برای استفاده از ایمیل وب ، تقویم &amp; مخاطبین</string>
     <string name="first_run_4_text">اشتراک گذاری صفحه ، جلسات آنلاین &amp; کنفرانس های وب</string>
-    <string name="folder">folder</string>
     <string name="folder_already_exists">پوشه از قبل موجود است</string>
     <string name="folder_confirm_create">ایجاد کردن</string>
     <string name="folder_icon">آیکون پوشه</string>
@@ -571,7 +564,6 @@
     <string name="share_get_public_link_button">دریافت لینک</string>
     <string name="share_group_clarification">%1$s (گروه)</string>
     <string name="share_internal_link">پیوند داخلی را به اشتراک بگذارید</string>
-    <string name="share_internal_link_text">فقط برای کاربرانی که دسترسی به این کار دارند ، کار می کند %1$s</string>
     <string name="share_known_remote_clarification">%1$s ( در%2$s )</string>
     <string name="share_link_empty_password">شما باید یک رمزعبور را وارد کنید</string>
     <string name="share_link_file_error">در حین اشتراک گذاری این فایل یا پوشه خطایی رخ داده است</string>

src/main/res/values-fi-rFI/strings.xml

@@ -142,14 +142,9 @@
     <string name="confirmation_remove_folders_alert">Haluatko varmasti poistaa valitut kohteet ja niiden sisällön?</string>
     <string name="confirmation_remove_local">Vain paikallisen</string>
     <string name="conflict_already_existing_file">Jo olemassa olevat tiedostot</string>
-    <string name="conflict_keep_both">Säilytä molemmat</string>
-    <string name="conflict_message">Mitkä tiedostot haluat säilyttää? Jos valitset kummatkin versiot, paikallisen version tiedoston nimeen lisätään numero.</string>
     <string name="conflict_message_description">Jos valitset molemmat versiot, paikallisen tiedoston nimeen lisätään numero.</string>
     <string name="conflict_message_headline">Mitkä tiedostot haluat säilyttää?</string>
     <string name="conflict_new_file">Uusi tiedosto</string>
-    <string name="conflict_title">Tiedoston ristiriita</string>
-    <string name="conflict_use_local_version">paikallinen versio</string>
-    <string name="conflict_use_server_version">palvelimen versio</string>
     <string name="contaclist_restore_selected">Palauta valitut yhteystiedot</string>
     <string name="contactlist_account_chooser_title">Valitse tuotava tili</string>
     <string name="contactlist_item_icon">Käyttäjäkuvake yhteystietoihin</string>
@@ -282,7 +277,6 @@
     <string name="fallback_weblogin_text">Palaa vanhaan kirjautumistapaan</string>
     <string name="favorite">Lisää suosikkeihin</string>
     <string name="favorite_icon">Suosikki</string>
-    <string name="file">tiedosto</string>
     <string name="file_delete">Poista</string>
     <string name="file_detail_activity_error">Toimintojen palauttaminen tiedostolle epäonnistui</string>
     <string name="file_details_no_content">Lisätietoja ei voitu lataa.</string>
@@ -352,7 +346,6 @@
     <string name="first_run_2_text">Turvallista yhteistyötä ja tiedostonvaihtoa</string>
     <string name="first_run_3_text">Helppokäyttöinen selaimessa toimiva sähköposti, kalenteri ja yhteystiedot</string>
     <string name="first_run_4_text">Näytönjakaminen, verkkotapaamiset ja web-konfrenssit</string>
-    <string name="folder">kansio</string>
     <string name="folder_already_exists">Kansio on jo olemassa</string>
     <string name="folder_confirm_create">Luo</string>
     <string name="folder_icon">Kansiokuvake</string>
@@ -587,7 +580,6 @@ GNU yleinen lisenssi, versio 2</string>
     <string name="share_get_public_link_button">Hanki linkki</string>
     <string name="share_group_clarification">%1$s (ryhmä)</string>
     <string name="share_internal_link">Jaa sisäinen linkki</string>
-    <string name="share_internal_link_text">Toimii vain käyttäjillä, joilla on oikeudet tähän %1$s</string>
     <string name="share_internal_link_to_file_text">Sisäinen jaettu linkki toimii vain käyttäjillä, joilla on oikeudet tähän tiedostoon</string>
     <string name="share_internal_link_to_folder_text">Sisäinen jaettu linkki toimii vain kayttäjillä, joilla on oikeudet tähän kansioon</string>
     <string name="share_known_remote_clarification">%1$s ( %2$s:lla )</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Local seulement</string>
     <string name="conflict_already_existing_file">Fichier déjà existant</string>
     <string name="conflict_dialog_error">Une erreur qui crée un dialogue conflictuel !</string>
-    <string name="conflict_keep_both">Conserver les deux</string>
-    <string name="conflict_message">Quels fichiers voulez-vous conserver ? Si vous sélectionnez les deux, un chiffre sera ajouté au nom du fichier local.</string>
     <string name="conflict_message_description">Si vous sélectionnez les deux versions, le fichier local aura un numéro ajouté à son nom.</string>
     <string name="conflict_message_headline">Quels fichiers souhaitez-vous conserver ?</string>
     <string name="conflict_new_file">Nouveau fichier</string>
-    <string name="conflict_title">Conflit de fichiers</string>
-    <string name="conflict_use_local_version">version locale</string>
-    <string name="conflict_use_server_version">version serveur</string>
     <string name="contaclist_restore_selected">Restaurer les contacts sélectionnés</string>
     <string name="contactlist_account_chooser_title">Choisissez un compte pour importer</string>
     <string name="contactlist_item_icon">L\'icône de l\'utilisateur pour la liste des contacts</string>
@@ -286,7 +281,6 @@ Attention la suppression est irréversible.</string>
     <string name="fallback_weblogin_text">Revenir à l\'ancienne méthode de connexion</string>
     <string name="favorite">Ajouter aux favoris</string>
     <string name="favorite_icon">Favoris</string>
-    <string name="file">fichier</string>
     <string name="file_delete">Supprimer</string>
     <string name="file_detail_activity_error">Erreur lors de la récupération de l’activité du fichier</string>
     <string name="file_details_no_content">Impossible de charger les détails</string>
@@ -356,7 +350,6 @@ Attention la suppression est irréversible.</string>
     <string name="first_run_2_text">Collaboration &amp; et échange de fichiers sécurisés</string>
     <string name="first_run_3_text">Messagerie web, Agenda et Contacts faciles d\'utilisation</string>
     <string name="first_run_4_text">Partage d\'écran et réunion en ligne</string>
-    <string name="folder">dossier</string>
     <string name="folder_already_exists">Le dossier existe déjà</string>
     <string name="folder_confirm_create">Créer</string>
     <string name="folder_icon">Icône de dossier</string>
@@ -589,7 +582,6 @@ Attention la suppression est irréversible.</string>
     <string name="share_get_public_link_button">Partager le lien</string>
     <string name="share_group_clarification">%1$s (groupe)</string>
     <string name="share_internal_link">Partager le lien interne</string>
-    <string name="share_internal_link_text">Fonctionne uniquement pour les utilisateurs ayant accès à ce %1$s</string>
     <string name="share_internal_link_to_file_text">le partage de lien interne fonctionne uniquement pour les utilisateurs qui ont accès à ce fichier</string>
     <string name="share_internal_link_to_folder_text">le partage de lien interne fonctionne uniquement pour les utilisateurs qui ont accès à ce dossier</string>
     <string name="share_known_remote_clarification">%1$s (sur %2$s)</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Só local</string>
     <string name="conflict_already_existing_file">O  ficheiro xa existe</string>
     <string name="conflict_dialog_error">Produciuse un erro ao crear o diálogo de conflitos!</string>
-    <string name="conflict_keep_both">Conservar ambos</string>
-    <string name="conflict_message">Que ficheiros quere conservar? Se selecciona ámbalas dúas versións, engadiráselle un número ao nome do ficheiro local.</string>
     <string name="conflict_message_description">Se selecciona ambas versións, o ficheiro local terá un número engadido ao nome.</string>
     <string name="conflict_message_headline">Que ficheiros quere conservar?</string>
     <string name="conflict_new_file">Novo ficheiro</string>
-    <string name="conflict_title">Conflito de ficheiro</string>
-    <string name="conflict_use_local_version">versión local</string>
-    <string name="conflict_use_server_version">versión no servidor</string>
     <string name="contaclist_restore_selected">Restaurar os contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Escolla unha conta para importala</string>
     <string name="contactlist_item_icon">Icona do usuario para a lista de contactos</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Volver ao método de acceso antigo</string>
     <string name="favorite">Engadir a favoritos</string>
     <string name="favorite_icon">Favorito</string>
-    <string name="file">ficheiro</string>
     <string name="file_delete">Eliminar</string>
     <string name="file_detail_activity_error">Produciuse un erro ao recuperar actividades para o ficheiro</string>
     <string name="file_details_no_content">Produciuse un fallo ao cargar os detalles</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Colaboración segura e intercambio de ficheiros</string>
     <string name="first_run_3_text">Correo web, calendario e contactos doados de usar</string>
     <string name="first_run_4_text">Compartir a pantalla, xuntanzas en liña e conferencias web</string>
-    <string name="folder">cartafol</string>
     <string name="folder_already_exists">Xa existe o cartafol</string>
     <string name="folder_confirm_create">Crear</string>
     <string name="folder_icon">Icona do cartafol</string>
@@ -588,7 +581,6 @@
     <string name="share_get_public_link_button">Obter a ligazón</string>
     <string name="share_group_clarification">%1$s (grupo)</string>
     <string name="share_internal_link">Compartir a ligazón interna</string>
-    <string name="share_internal_link_text">Só funciona para usuarios con acceso a este %1$s</string>
     <string name="share_internal_link_to_file_text">A ligazón de compartición interna só funciona para usuarios con acceso a este ficheiro</string>
     <string name="share_internal_link_to_folder_text">A ligazón de compartición interna só funciona para usuarios con acceso a este cartafol</string>
     <string name="share_known_remote_clarification">%1$s ( en %2$s )</string>

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

@@ -141,12 +141,7 @@
     <string name="confirmation_remove_folder_alert">Želite li zaista izbrisati %1$s i pripadajući sadržaj?</string>
     <string name="confirmation_remove_folders_alert">Želite li zaista izbrisati odabrane stavke i pripadajući sadržaj?</string>
     <string name="confirmation_remove_local">Samo lokalno</string>
-    <string name="conflict_keep_both">Zadrži obje</string>
-    <string name="conflict_message">Koje datoteke želite zadržati? Ako odaberete obje inačice, lokalna će datoteka uz naziv imati i broj.</string>
     <string name="conflict_message_headline">Koje datoteke želite zadržati?</string>
-    <string name="conflict_title">Nepodudaranje datoteka</string>
-    <string name="conflict_use_local_version">lokalna inačica</string>
-    <string name="conflict_use_server_version">inačica poslužitelja</string>
     <string name="contaclist_restore_selected">Vraćanje odabranih kontakata</string>
     <string name="contactlist_account_chooser_title">Odaberite račun za uvoz</string>
     <string name="contactlist_item_icon">Ikona korisnika za popis kontakata</string>
@@ -268,7 +263,6 @@
     <string name="fallback_weblogin_text">Vrati na stari način prijave</string>
     <string name="favorite">Dodaj u favorite</string>
     <string name="favorite_icon">Favorit</string>
-    <string name="file">datoteka</string>
     <string name="file_delete">Izbriši</string>
     <string name="file_detail_activity_error">Pogreška pri dohvaćanju aktivnosti za datoteku</string>
     <string name="file_details_no_content">Učitavanje pojedinosti nije uspjelo</string>
@@ -338,7 +332,6 @@
     <string name="first_run_2_text">Sigurna suradnja i razmjena datoteka</string>
     <string name="first_run_3_text">Jednostavna e-pošta putem interneta, kalendar i kontakti</string>
     <string name="first_run_4_text">Dijeljenje zaslona, sastanci na mreži i web konferencije</string>
-    <string name="folder">mapa</string>
     <string name="folder_already_exists">Mapa već postoji</string>
     <string name="folder_confirm_create">Stvori</string>
     <string name="folder_icon">Ikona mape</string>
@@ -569,7 +562,6 @@
     <string name="share_get_public_link_button">Preuzmi poveznicu</string>
     <string name="share_group_clarification">%1$s (grupa)</string>
     <string name="share_internal_link">Dijeli internu poveznicu</string>
-    <string name="share_internal_link_text">Samo za korisnike koji smiju pristupiti %1$s</string>
     <string name="share_known_remote_clarification">%1$s (na %2$s)</string>
     <string name="share_link_empty_password">Morate unijeti zaporku</string>
     <string name="share_link_file_error">Došlo je do pogreške prilikom dijeljenja ove datoteke ili mape</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Csak a helyi példány</string>
     <string name="conflict_already_existing_file">Már létező fájl</string>
     <string name="conflict_dialog_error">Hiba a konfliktus párbeszéd létrehozásakor!</string>
-    <string name="conflict_keep_both">Mindkettő megtartása</string>
-    <string name="conflict_message">Melyik fájlt akarja megtartani? Ha mindkettőt kiválasztja, akkor a helyi nevéhez egy szám lesz fűzve.</string>
     <string name="conflict_message_description">Amennyiben mindkét verziót kiválasztja, a helyi fájl neve egy számmal lesz kibővítve.</string>
     <string name="conflict_message_headline">Mely fájlokat akarja megtartani?</string>
     <string name="conflict_new_file">Új fájl</string>
-    <string name="conflict_title">Fájl ütközés</string>
-    <string name="conflict_use_local_version">helyi verzió</string>
-    <string name="conflict_use_server_version">kiszolgáló verziója</string>
     <string name="contaclist_restore_selected">Kiválasztott névjegyek visszaállítása</string>
     <string name="contactlist_account_chooser_title">Válasszon importálandó fiókot</string>
     <string name="contactlist_item_icon">Felhasználó ikon a névjegylistához</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Visszatérés a régi bejelentkezési módhoz</string>
     <string name="favorite">Hozzáadás a kedvencekhez </string>
     <string name="favorite_icon">Kedvenc</string>
-    <string name="file">fájlhoz</string>
     <string name="file_delete">Törlés</string>
     <string name="file_detail_activity_error">Hiba a fájl tevékenységeinek lekérésekor</string>
     <string name="file_details_no_content">A részletek betöltése sikertelen</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Biztonságos csoportmunka és fájlmegosztás</string>
     <string name="first_run_3_text">Könnyen használható webes levelezés, naptárkezelés és névjegyek</string>
     <string name="first_run_4_text">Képernyőmegosztás, online megbeszélések és webes konferenciák</string>
-    <string name="folder">mappához</string>
     <string name="folder_already_exists">A mappa már létezik</string>
     <string name="folder_confirm_create">Létrehozás</string>
     <string name="folder_icon">Mappaikon</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Hivatkozás beszerzése</string>
     <string name="share_group_clarification">%1$s (csoport)</string>
     <string name="share_internal_link">Belső hivatkozás megosztása</string>
-    <string name="share_internal_link_text">Csak azoknál a felhasználóknál működik, akiknek hozzáférése van ehhez a %1$s</string>
     <string name="share_internal_link_to_file_text">A belső megosztási link csak azon felhasználók számára működik, amelyeknek van hozzáférésük ehhez a fájlhoz</string>
     <string name="share_internal_link_to_folder_text">A belső megosztási link csak azon felhasználók számára működik, amelyeknek van hozzáférésük ehhez a mappához</string>
     <string name="share_known_remote_clarification">%1$s ( itt: %2$s )</string>

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

@@ -125,12 +125,7 @@
     <string name="confirmation_remove_folder_alert">Apakah anda yakin ingin menghapus %1$s beserta isinya?</string>
     <string name="confirmation_remove_folders_alert">Apa anda yakin ingin menghapus item yang terpilih beserta isinya?</string>
     <string name="confirmation_remove_local">Lokal saja</string>
-    <string name="conflict_keep_both">Biarkan keduannya</string>
-    <string name="conflict_message">Berkas mana yang ingin Anda simpan? Jika Anda memilih kedua versi, berkas lokal akan memiliki angka yang ditambahkan di akhir namanya.</string>
     <string name="conflict_message_headline">Berkas mana yang ingin anda pertahankan?</string>
-    <string name="conflict_title">Berkas konflik</string>
-    <string name="conflict_use_local_version">versi lokal</string>
-    <string name="conflict_use_server_version">versi server</string>
     <string name="contaclist_restore_selected">Memulihkan kontak pilihan.</string>
     <string name="contactlist_account_chooser_title">Pilih akun untuk di impor</string>
     <string name="contactlist_no_permission">Tidak ada perizinan diberikan, tidak ada yang terimpor</string>
@@ -214,7 +209,6 @@
     <string name="fallback_weblogin_back">Kembali</string>
     <string name="favorite">Tambah ke favorit</string>
     <string name="favorite_icon">Favorit</string>
-    <string name="file">file</string>
     <string name="file_delete">Hapus</string>
     <string name="file_icon">Berkas</string>
     <string name="file_keep">Simpan</string>
@@ -274,7 +268,6 @@
     <string name="filename_forbidden_characters">Karakter yang dilarang: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Nama berkas mengandung setidaknya satu karakter yang tidak sah</string>
     <string name="filename_hint">Nama berkas</string>
-    <string name="folder">folder</string>
     <string name="folder_already_exists">Direktori sudah ada</string>
     <string name="folder_confirm_create">Buat</string>
     <string name="folder_list_empty_headline">Tidak ada folder</string>

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

@@ -141,12 +141,7 @@
     <string name="confirmation_remove_folder_alert">Ertu viss um að þú viljir eyða %1$s og innihaldi þess?</string>
     <string name="confirmation_remove_folders_alert">Ertu viss um að þú viljir eyða völdum atriðum og innihaldi þeirra?</string>
     <string name="confirmation_remove_local">Einungis staðvært</string>
-    <string name="conflict_keep_both">Halda báðum</string>
-    <string name="conflict_message">Hvaða skrám viltu halda? Ef þú velur báðar útgáfur, þá mun verða bætt tölustaf aftan við heiti afrituðu skrárinnar.</string>
     <string name="conflict_message_headline">Hvaða skrám vilt þú vilt halda eftir?</string>
-    <string name="conflict_title">Árekstur skráa</string>
-    <string name="conflict_use_local_version">útgáfu á tölvu</string>
-    <string name="conflict_use_server_version">útgáfu á þjóni</string>
     <string name="contaclist_restore_selected">Endurheimta valda tengiliði</string>
     <string name="contactlist_account_chooser_title">Veldu aðgang til að flytja inn</string>
     <string name="contactlist_item_icon">Táknmynd notanda fyrir tengiliðalista</string>
@@ -270,7 +265,6 @@
     <string name="fallback_weblogin_text">Fara til baka í gömlu innskráningaraðferðina</string>
     <string name="favorite">Bæta í eftirlæti</string>
     <string name="favorite_icon">Eftirlæti</string>
-    <string name="file">skrá</string>
     <string name="file_delete">Eyða</string>
     <string name="file_detail_activity_error">Villa við að ná í virkni fyrir skrá</string>
     <string name="file_details_no_content">Mistókst að hlaða inn ítarupplýsingum</string>
@@ -340,7 +334,6 @@
     <string name="first_run_2_text">Örugg samvinna og skráaskipti</string>
     <string name="first_run_3_text">Einfaldur og auðveldur vefpóstur, dagatal &amp; tengiliðir</string>
     <string name="first_run_4_text">Skjádeiling, netfundir og vefráðstefnur</string>
-    <string name="folder">mappa</string>
     <string name="folder_already_exists">Mappa er þegar til</string>
     <string name="folder_confirm_create">Búa til</string>
     <string name="folder_icon">Táknmynd fyrir möppu</string>
@@ -571,7 +564,6 @@
     <string name="share_get_public_link_button">Ná í tengil</string>
     <string name="share_group_clarification">%1$s (hópur)</string>
     <string name="share_internal_link">Deila innri tengli</string>
-    <string name="share_internal_link_text">Virkar bara fyrir notendur sem eiga aðgang að þessari %1$s</string>
     <string name="share_known_remote_clarification">%1$s ( á %2$s )</string>
     <string name="share_link_empty_password">Þú verður að setja inn lykilorð</string>
     <string name="share_link_file_error">Villa kom upp við að reyna að deila þessari skrá eða möppu</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Solo localmente</string>
     <string name="conflict_already_existing_file">File già esistente</string>
     <string name="conflict_dialog_error">Errore di creazione della finestra di conflitto!</string>
-    <string name="conflict_keep_both">Mantieni entrambi</string>
-    <string name="conflict_message">Quali file vuoi mantenere? Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file locale.</string>
     <string name="conflict_message_description">Se selezioni entrambe le versioni, il file locale ha un numero aggiunto al suo nome.</string>
     <string name="conflict_message_headline">Quali file vuoi mantenere?</string>
     <string name="conflict_new_file">Nuovo file</string>
-    <string name="conflict_title">File in conflitto</string>
-    <string name="conflict_use_local_version">Versione locale</string>
-    <string name="conflict_use_server_version">versione del server</string>
     <string name="contaclist_restore_selected">Ripristina contatti selezionati</string>
     <string name="contactlist_account_chooser_title">Scegli account da importare</string>
     <string name="contactlist_item_icon">Icona utente della lista contatti</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Torna al vecchio metodo di accesso</string>
     <string name="favorite">Aggiungi ai preferiti</string>
     <string name="favorite_icon">Preferito</string>
-    <string name="file">file</string>
     <string name="file_delete">Elimina</string>
     <string name="file_detail_activity_error">Errore durante il recupero delle attività per i file</string>
     <string name="file_details_no_content">Caricamento dettagli non riuscito</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Rendi sicuri la collaborazione e lo scambio di file</string>
     <string name="first_run_3_text">Web mail, calendari e contatti di semplice utilizzo</string>
     <string name="first_run_4_text">Condivisione dello schermo, riunioni in linea e conferenze web</string>
-    <string name="folder">cartella</string>
     <string name="folder_already_exists">La cartella esiste già</string>
     <string name="folder_confirm_create">Crea</string>
     <string name="folder_icon">Icona delle cartelle</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Ottieni collegamento</string>
     <string name="share_group_clarification">%1$s (gruppo)</string>
     <string name="share_internal_link">Condividi collegamento interno</string>
-    <string name="share_internal_link_text">Funziona solo per gli utenti con accesso a questo/a %1$s</string>
     <string name="share_internal_link_to_file_text">Il collegamento di condivisione funziona solo per gli utenti con accesso a questo file</string>
     <string name="share_internal_link_to_folder_text">Il collegamento di condivisione funziona solo per gli utenti con accesso a questa cartella</string>
     <string name="share_known_remote_clarification">%1$s ( su %2$s )</string>

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

@@ -141,12 +141,7 @@
     <string name="confirmation_remove_folder_alert">למחוק את %1$s על תוכנו?</string>
     <string name="confirmation_remove_folders_alert">למחוק את הפריטים הנבחרים ואת תוכנם?</string>
     <string name="confirmation_remove_local">מקומי בלבד</string>
-    <string name="conflict_keep_both">להשאיר את שניהם</string>
-    <string name="conflict_message">איזה קבצים לשמור? אם יבחרו שתי הגרסאות, הקובץ המקומי יקבל מספר שיצורף לשמו.</string>
     <string name="conflict_message_headline">אילו קבצים ברצונך לשמור?</string>
-    <string name="conflict_title">התנגשות בין קבצים</string>
-    <string name="conflict_use_local_version">גרסה מקומית</string>
-    <string name="conflict_use_server_version">גרסת שרת</string>
     <string name="contaclist_restore_selected">שחזור אנשי הקשר הנבחרים</string>
     <string name="contactlist_account_chooser_title">נא לבחור חשבון לייבוא</string>
     <string name="contactlist_item_icon">סמן משתמש לרשימת אנשי קשר</string>
@@ -264,7 +259,6 @@
     <string name="fallback_weblogin_text">החזרה לשיטת כניסה ישנה</string>
     <string name="favorite">הוספה למועדפים</string>
     <string name="favorite_icon">סימון כמועדף</string>
-    <string name="file">קובץ</string>
     <string name="file_delete">מחיקה</string>
     <string name="file_detail_activity_error">שגיאה בקבלת הפעילויות לקובץ</string>
     <string name="file_details_no_content">טעינת הפרטים נכשלה</string>
@@ -334,7 +328,6 @@
     <string name="first_run_2_text">שיתוף פעולה והעברת קבצים באופן מאובטח</string>
     <string name="first_run_3_text">אתר מייל, לוח שנה ואנשי קשר נוחים לשימוש</string>
     <string name="first_run_4_text">שיתוף מסך, פגישות מקוונות וכנסים מקוונים</string>
-    <string name="folder">תיקייה</string>
     <string name="folder_already_exists">התיקייה כבר קיימת</string>
     <string name="folder_confirm_create">יצירה</string>
     <string name="folder_icon">סמל תיקייה</string>
@@ -565,7 +558,6 @@
     <string name="share_get_public_link_button">קבלת קישור</string>
     <string name="share_group_clarification">%1$s (קבוצה)</string>
     <string name="share_internal_link">שיתוף קישור פנימי</string>
-    <string name="share_internal_link_text">עובד עבור משתמשים עם גישה ל%1$s הזו</string>
     <string name="share_known_remote_clarification">%1$s ( ב- %2$s )</string>
     <string name="share_link_empty_password">יש להכניס סיסמא</string>
     <string name="share_link_file_error">שגיאה אירעה בזמן ניסיון לשתף קובץ זה או תיקייה זו</string>

src/main/res/values-ja-rJP/strings.xml

@@ -141,13 +141,8 @@
     <string name="confirmation_remove_folder_alert">本当に %1$s を中身も一緒に削除しますか？</string>
     <string name="confirmation_remove_folders_alert">本当に選択したアイテムとその内容を削除しますか？</string>
     <string name="confirmation_remove_local">ローカルのみ</string>
-    <string name="conflict_keep_both">両方を保持</string>
-    <string name="conflict_message">どちらのファイルを保存したいですか？両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。</string>
     <string name="conflict_message_headline">どちらのファイルを保持しますか？</string>
     <string name="conflict_new_file">新しいファイル</string>
-    <string name="conflict_title">ファイル競合</string>
-    <string name="conflict_use_local_version">ローカルのもの</string>
-    <string name="conflict_use_server_version">サーバーのバージョン</string>
     <string name="contaclist_restore_selected">選択したアドレス帳を復元</string>
     <string name="contactlist_account_chooser_title">インポートするアカウントを選択</string>
     <string name="contactlist_item_icon">連絡先リストのユーザーアイコン</string>
@@ -277,7 +272,6 @@
     <string name="fallback_weblogin_text">古いログイン方法へ戻す</string>
     <string name="favorite">お気に入りに追加</string>
     <string name="favorite_icon">お気に入り</string>
-    <string name="file">ファイル</string>
     <string name="file_delete">削除</string>
     <string name="file_detail_activity_error">ファイルのアクティビティ取得エラー</string>
     <string name="file_details_no_content">詳細のロードに失敗しました</string>
@@ -347,7 +341,6 @@
     <string name="first_run_2_text">セキュアなコラボレーションとファイル交換</string>
     <string name="first_run_3_text">使いやすいWebメールやカレンダーや連絡先</string>
     <string name="first_run_4_text">画面共有やオンラインミーティングやウェブ会議</string>
-    <string name="folder">フォルダー</string>
     <string name="folder_already_exists">フォルダーはすでに存在します</string>
     <string name="folder_confirm_create">作成</string>
     <string name="folder_icon">フォルダアイコン</string>
@@ -579,7 +572,6 @@
     <string name="share_get_public_link_button">リンクを取得</string>
     <string name="share_group_clarification">%1$s (グループ)</string>
     <string name="share_internal_link">内部リンクを共有</string>
-    <string name="share_internal_link_text">この %1$sにアクセスできるユーザーにのみ機能します</string>
     <string name="share_known_remote_clarification">%1$s ( %2$s で)</string>
     <string name="share_link_empty_password">パスワードを入力しなければなりません</string>
     <string name="share_link_file_error">このファイルまたはフォルダーを共有する際にエラーが発生しました</string>

src/main/res/values-ka-rGE/strings.xml

@@ -116,12 +116,7 @@
     <string name="confirmation_remove_folder_alert">ნამდვილად გსურთ %1$s-ის და შემცველობის გაუქმება?</string>
     <string name="confirmation_remove_folders_alert">დარწმუნებული ხართ, რომ გსურთ არჩეული ჩანაწერებისა და მათი შემცველობის გაუქმება?</string>
     <string name="confirmation_remove_local">მხოლოდ ლოკალური</string>
-    <string name="conflict_keep_both">ორივეს შენარჩუნება</string>
-    <string name="conflict_message">რომელი ფაილების შენარჩუნება გსურთ? თუ აირჩევთ ორივე ვერისას, ლოკალური ფაილის სახელს წინ დაერთვება ციფრი.</string>
     <string name="conflict_message_headline">რომელი ფაილების დატოვება გსურთ?</string>
-    <string name="conflict_title">ფაილის კონფლიქტი</string>
-    <string name="conflict_use_local_version">ლოკალური ვერსია</string>
-    <string name="conflict_use_server_version">სერვერის ვერსია</string>
     <string name="contaclist_restore_selected">არჩეული კონტაქტების აღდგენა</string>
     <string name="contactlist_account_chooser_title">იმპორტისთვის აირჩიეთ ანგარიში</string>
     <string name="contactlist_item_icon">მომხმარებლის პიქტოგრამა კონტაქტების სიისთვის</string>
@@ -202,7 +197,6 @@
     <string name="fallback_weblogin_text">უკან ძველი ავტორიზაციის მეთოდისკენ</string>
     <string name="favorite">რჩეულებში დამატება</string>
     <string name="favorite_icon">რჩეული</string>
-    <string name="file">ფაილი</string>
     <string name="file_delete">წაშლა</string>
     <string name="file_icon">ფაილი</string>
     <string name="file_list_empty">ატვირთეთ რამე ან გაუწიეთ თქვნს მოწყობილობას სინქრონიზაცია.</string>
@@ -255,7 +249,6 @@
     <string name="filename_forbidden_charaters_from_server">ფაილის სახელი შეიცავს მინ. 1 არასწორ ნიშანს</string>
     <string name="filename_hint">ფაილის სახელი</string>
     <string name="files_drop_not_supported">ეს Nextcloud ფუნქციაა, გთხოვთ განაახლოთ.</string>
-    <string name="folder">დირექტორია</string>
     <string name="folder_confirm_create">შექმნა</string>
     <string name="folder_icon">დირექტორიის პიქტოგრამა</string>
     <string name="folder_list_empty_headline">აქ დირექტორიები არაა</string>

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

@@ -141,12 +141,7 @@
     <string name="confirmation_remove_folder_alert">%1$s 및 포함된 모든 내용을 삭제하시겠습니까?</string>
     <string name="confirmation_remove_folders_alert">선택한 항목과 포함된 내용을 삭제하시겠습니까?</string>
     <string name="confirmation_remove_local">로컬만</string>
-    <string name="conflict_keep_both">모두 저장</string>
-    <string name="conflict_message">어떤 파일을 저장하시겠습니까? 모두 저장을 선택하면 로컬 버전의 파일 이름에 숫자를 추가합니다.</string>
     <string name="conflict_message_headline">어느 파일을 유지하시겠습니까?</string>
-    <string name="conflict_title">파일 충돌</string>
-    <string name="conflict_use_local_version">로컬 버전</string>
-    <string name="conflict_use_server_version">서버 버전</string>
     <string name="contaclist_restore_selected">선택한 주소록 복원</string>
     <string name="contactlist_account_chooser_title">가져올 계정 선택</string>
     <string name="contactlist_item_icon">연락처 목록 사용자 아이콘</string>
@@ -269,7 +264,6 @@
     <string name="fallback_weblogin_text">이전 로그인 방식으로 변경</string>
     <string name="favorite">즐겨찾기에 추가</string>
     <string name="favorite_icon">즐겨찾기</string>
-    <string name="file">파일</string>
     <string name="file_delete">삭제</string>
     <string name="file_detail_activity_error">파일에 대한 작업 검색 중 오류 발생</string>
     <string name="file_details_no_content">자세한 정보를 불러오는데 실패했습니다.</string>
@@ -339,7 +333,6 @@
     <string name="first_run_2_text">안전한 협력 &amp;파일 교환</string>
     <string name="first_run_3_text">사용하기 쉬운 웹 메일, 달력 &amp; 연락처</string>
     <string name="first_run_4_text">화면 공유, 온라인 회의 &amp; 웹 회의</string>
-    <string name="folder">폴더</string>
     <string name="folder_already_exists">폴더가 이미 존재함</string>
     <string name="folder_confirm_create">생성</string>
     <string name="folder_icon">폴더 아이콘</string>
@@ -565,7 +558,6 @@
     <string name="share_get_public_link_button">링크 얻기</string>
     <string name="share_group_clarification">%1$s(그룹)</string>
     <string name="share_internal_link">내부 링크 공유</string>
-    <string name="share_internal_link_text">이 %1$s에 액세스하는 사용자에게만 해당됩니다.</string>
     <string name="share_known_remote_clarification">%1$s(%2$s에서)</string>
     <string name="share_link_empty_password">암호를 입력해야 합니다</string>
     <string name="share_link_file_error">이 파일이나 폴더를 공유하는 중 오류 발생</string>

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

@@ -127,13 +127,8 @@
     <string name="confirmation_remove_folders_alert">Ar tikrai norite ištrinti pažymėtus elementus ir jų turinį?</string>
     <string name="confirmation_remove_local">Tik vietiniai</string>
     <string name="conflict_already_existing_file">Jau esamas failas</string>
-    <string name="conflict_keep_both">Palikti abu</string>
-    <string name="conflict_message">Kurį failą renkates? Jeigu renkates abu failus, suteikite kitą vardą (pavadinimą)</string>
     <string name="conflict_message_headline">Kuriuos failus norite pasilikti?</string>
     <string name="conflict_new_file">Naujas failas</string>
-    <string name="conflict_title">Failų konfliktas</string>
-    <string name="conflict_use_local_version">Vietinė versija</string>
-    <string name="conflict_use_server_version">Versija serveryje</string>
     <string name="contaclist_restore_selected">Atkurti pasirinktus adresatus</string>
     <string name="contactlist_account_chooser_title">Pasirinkite failą </string>
     <string name="contactlist_no_permission">Leidimas nesuteiktas, nieko neimportuota.</string>
@@ -239,7 +234,6 @@
     <string name="fallback_weblogin_back">Atgal</string>
     <string name="favorite">Pridėti į mėgstamus</string>
     <string name="favorite_icon">Mėgstami</string>
-    <string name="file">failas</string>
     <string name="file_delete">Ištrinti</string>
     <string name="file_details_no_content">Nepavyko įkelti išsamesnės informacijos</string>
     <string name="file_icon">Failas</string>
@@ -303,7 +297,6 @@
     <string name="first_run_2_text">Saugus bendradarbiavimas ir apsikeitimas failais</string>
     <string name="first_run_3_text">Lengvai naudojamas el. paštas, kalendorius bei adresatai</string>
     <string name="first_run_4_text">Ekrano bendrinimas, internetiniai susitikimai bei konferencijos</string>
-    <string name="folder">aplankas</string>
     <string name="folder_already_exists">Aplankas jau yra</string>
     <string name="folder_confirm_create">Sukurti</string>
     <string name="folder_icon">Aplanko piktograma</string>
@@ -488,7 +481,6 @@
     <string name="share_file">Dalintis %1$s</string>
     <string name="share_get_public_link_button">Gauti nuorodą</string>
     <string name="share_group_clarification">%1$s (grupė)</string>
-    <string name="share_internal_link_text">Veikia tik naudotojams, turintiems prieigą prie šio %1$s</string>
     <string name="share_known_remote_clarification">%1$s (šiame %2$s)</string>
     <string name="share_link_empty_password">Privalote įvesti slaptažodį</string>
     <string name="share_link_file_error">Įvyko klaida bandant dalinti šį failą ar aplanką</string>

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

@@ -121,12 +121,7 @@
     <string name="confirmation_remove_folder_alert">Vai tiešām vēlaties izdzēst %1$s un tā saturu?</string>
     <string name="confirmation_remove_folders_alert">Vai tiešām vēlies dzēst izvēlētos objektus un to saturu?</string>
     <string name="confirmation_remove_local">Tikai lokālos</string>
-    <string name="conflict_keep_both">Paturēt abas</string>
-    <string name="conflict_message">Kuras datnes vālaties paturēt? Ja izvēlēsieties abas versijas, lokālai datnei nosaukumam tiks pievienots numurs.</string>
     <string name="conflict_message_headline">Kuras datnes vēlies paturēt?</string>
-    <string name="conflict_title">Datne konfliktē</string>
-    <string name="conflict_use_local_version">lokālā versija</string>
-    <string name="conflict_use_server_version">servera versija</string>
     <string name="contaclist_restore_selected">Atjaunot izvēlētos kontaktus</string>
     <string name="contactlist_account_chooser_title">Izvēlieties kontu importēšanai</string>
     <string name="contactlist_no_permission">Nav dota atļauja, importēšana neizdevās</string>
@@ -200,7 +195,6 @@
     <string name="fallback_weblogin_back">Atpakaļ</string>
     <string name="favorite">Pievienot favorītiem</string>
     <string name="favorite_icon">Favorīts</string>
-    <string name="file">datne</string>
     <string name="file_delete">Dzēst</string>
     <string name="file_icon">Datne</string>
     <string name="file_list_empty">Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!</string>
@@ -261,7 +255,6 @@
     <string name="filename_hint">Datnes nosaukums</string>
     <string name="files_drop_not_supported">Šī ir Nextcloud funkcija, lūdzu atjauniniet.</string>
     <string name="first_run_1_text">Turi savus datus drošībā un zem savas kontroles</string>
-    <string name="folder">folder</string>
     <string name="folder_confirm_create">Izveidot</string>
     <string name="folder_list_empty_headline">Šeit nav mapju</string>
     <string name="folder_picker_choose_button_text">Izvēlieties</string>

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

@@ -141,12 +141,7 @@
     <string name="confirmation_remove_folder_alert">али си сигурен дека сакаш да ја избришеш %1$s и содржината во истата?</string>
     <string name="confirmation_remove_folders_alert">Дали си сигурен дека сакаш да ја избришеш означената ставкаи содржината во неа?</string>
     <string name="confirmation_remove_local">Само локално</string>
-    <string name="conflict_keep_both">Задржи ги и двете</string>
-    <string name="conflict_message">Кои датотеки сакате да ги зачувате? Ако сакате да ги чувате двете верзии, на локалната датотека ќе биде додаден број на нејзиното име.</string>
     <string name="conflict_message_headline">Кои датотеки сакате да ги задржите?</string>
-    <string name="conflict_title">Конфликт во датотека</string>
-    <string name="conflict_use_local_version">верзија на уредот</string>
-    <string name="conflict_use_server_version">верзија на серверот</string>
     <string name="contaclist_restore_selected">Врати ги означените контакти</string>
     <string name="contactlist_account_chooser_title">Избери сметка за увоз</string>
     <string name="contactlist_item_icon">Корисничка икона за листа со контакти</string>
@@ -263,7 +258,6 @@
     <string name="fallback_weblogin_text">Врти се на стариот начин на за најавување</string>
     <string name="favorite">Додади во фаворити</string>
     <string name="favorite_icon">Омилен</string>
-    <string name="file">датотека</string>
     <string name="file_delete">Избриши</string>
     <string name="file_detail_activity_error">Грешка при превземањето на активностите за датотеката</string>
     <string name="file_details_no_content">Неуспешно вчитување на деталите</string>
@@ -333,7 +327,6 @@
     <string name="first_run_2_text">Безбедна соработка &amp; пренос на датотеки</string>
     <string name="first_run_3_text">Лесно за користење веб базирана е-пошта &amp; контакти</string>
     <string name="first_run_4_text">Споделување на екранот, онлајн состаноци &amp; веб конференции</string>
-    <string name="folder">папка</string>
     <string name="folder_already_exists">Папката веќе постои</string>
     <string name="folder_confirm_create">Креирај</string>
     <string name="folder_icon">Икона на папка</string>
@@ -561,7 +554,6 @@
     <string name="share_get_public_link_button">Земете линк</string>
     <string name="share_group_clarification">%1$s (група)</string>
     <string name="share_internal_link">Сподели внатрешен линк</string>
-    <string name="share_internal_link_text">Функционира само за корисници со пристап до оваа %1$s</string>
     <string name="share_known_remote_clarification">%1$s ( на %2$s )</string>
     <string name="share_link_empty_password">Морате да внесете лозинка</string>
     <string name="share_link_file_error">Се случи грешка кога пробав да ја споделам оваа папка</string>

src/main/res/values-nb-rNO/strings.xml

@@ -140,12 +140,7 @@
     <string name="confirmation_remove_folder_alert">Ønsker du virkelig å slette %1$s og dets innhold?</string>
     <string name="confirmation_remove_folders_alert">Vil du virkelig fjerne de valgte elementene og dets innhold?</string>
     <string name="confirmation_remove_local">Kun lokalt</string>
-    <string name="conflict_keep_both">Behold begge</string>
-    <string name="conflict_message">Hvilke filer ønsker du å beholder? Hvis du velger begge versjonene, får den lokale filen lagt til et tall i navnet.</string>
     <string name="conflict_message_headline">Hvilke filer vil du beholde?</string>
-    <string name="conflict_title">Filkonflikt</string>
-    <string name="conflict_use_local_version">lokal versjon</string>
-    <string name="conflict_use_server_version">serverversjon</string>
     <string name="contaclist_restore_selected">Gjenopprett valgte kontakter</string>
     <string name="contactlist_account_chooser_title">Velg konto å importere</string>
     <string name="contactlist_item_icon">Brukerikon for kontaktliste</string>
@@ -260,7 +255,6 @@
     <string name="fallback_weblogin_text">Gå tilbake til gammel innloggingsmetode</string>
     <string name="favorite">Legg til i favoritter</string>
     <string name="favorite_icon">Favoritt</string>
-    <string name="file">fil</string>
     <string name="file_delete">Slett</string>
     <string name="file_details_no_content">Klarte ikke å laste inn detaljer</string>
     <string name="file_icon">Fil</string>
@@ -329,7 +323,6 @@
     <string name="first_run_2_text">Sikkert samarbeid &amp; fil utveksling</string>
     <string name="first_run_3_text">Brukervennlig e-post på web, kalender &amp; kontakter </string>
     <string name="first_run_4_text">Deling av skjerm, online møter &amp; samtaler på web</string>
-    <string name="folder">mappe</string>
     <string name="folder_already_exists">Mappe finnes allerede</string>
     <string name="folder_confirm_create">Opprett</string>
     <string name="folder_icon">Mappeikon</string>

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

@@ -142,14 +142,10 @@
     <string name="confirmation_remove_folders_alert">Wil je de geselecteerde objecten en hun inhoud echt verwijderen?</string>
     <string name="confirmation_remove_local">Alleen lokaal</string>
     <string name="conflict_already_existing_file">Al bestaand bestand</string>
-    <string name="conflict_keep_both">Beide bewaren</string>
-    <string name="conflict_message">Welke bestanden wil je bewaren? Als je beide versies selecteert zal het lokale bestand een volgnummer aan de naam toegevoegd krijgen.</string>
+    <string name="conflict_dialog_error">Fout bij het maken van conflict dialoog!</string>
     <string name="conflict_message_description">Als je beide versies selecteerde, zal het lokale bestand een nummer aan de naam toegevoegd krijgen.</string>
     <string name="conflict_message_headline">Welke bestanden wil je bewaren?</string>
     <string name="conflict_new_file">Nieuw bestand</string>
-    <string name="conflict_title">Bestandsconflict</string>
-    <string name="conflict_use_local_version">lokale versie</string>
-    <string name="conflict_use_server_version">serverversie</string>
     <string name="contaclist_restore_selected">Herstel de geselecteerde contactpersonen</string>
     <string name="contactlist_account_chooser_title">Kies een account voor import</string>
     <string name="contactlist_item_icon">Contactpersonen pictogram</string>
@@ -265,9 +261,11 @@
     <string name="etm_background_job_progress">Voortgang</string>
     <string name="etm_background_job_started">Gestart</string>
     <string name="etm_background_job_state">Staat</string>
+    <string name="etm_background_job_user">Gebruiker</string>
     <string name="etm_background_job_uuid">UUID</string>
     <string name="etm_background_jobs">Achtergrondtaken</string>
     <string name="etm_background_jobs_cancel_all">Annuleer alle jobs</string>
+    <string name="etm_background_jobs_prune">Inactieve taken opruimen</string>
     <string name="etm_background_jobs_start_test_job">Start Test Job</string>
     <string name="etm_background_jobs_stop_test_job">Stop Test Job</string>
     <string name="etm_migrations">Migratie (app upgrade)</string>
@@ -281,7 +279,6 @@
     <string name="fallback_weblogin_text">Terug naar vorige login-methode</string>
     <string name="favorite">Toevoegen aan favorieten</string>
     <string name="favorite_icon">Favoriet</string>
-    <string name="file">bestand</string>
     <string name="file_delete">Verwijderen</string>
     <string name="file_detail_activity_error">Fout bij ophalen activiteiten van bestand</string>
     <string name="file_details_no_content">Kon details niet laden</string>
@@ -351,7 +348,6 @@
     <string name="first_run_2_text">Beveiligde samenwerking &amp; bestand uitwisseling</string>
     <string name="first_run_3_text">Eenvoudige webmail, agenda &amp; contacten</string>
     <string name="first_run_4_text">Schermdelen, online afspraken &amp; web conferenties</string>
-    <string name="folder">map</string>
     <string name="folder_already_exists">Map bestaat al</string>
     <string name="folder_confirm_create">Aanmaken</string>
     <string name="folder_icon">Map pictogram</string>
@@ -584,7 +580,6 @@
     <string name="share_get_public_link_button">Link ophalen </string>
     <string name="share_group_clarification">%1$s (groep)</string>
     <string name="share_internal_link">Deel interne link</string>
-    <string name="share_internal_link_text">Dit werkt enkel voor gebruikers met toegang tot %1$s</string>
     <string name="share_internal_link_to_file_text">Interne link voor delen werkt alleen voor gebruikers met toegang tot dit bestand</string>
     <string name="share_internal_link_to_folder_text">Interne link voor delen werkt alleen voor gebruikers met toegang tot deze map</string>
     <string name="share_known_remote_clarification">%1$s ( op %2$s )</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Tylko lokalnie</string>
     <string name="conflict_already_existing_file">Już istniejący plik</string>
     <string name="conflict_dialog_error">Błąd podczas tworzenia dialogu konfliktu!</string>
-    <string name="conflict_keep_both">Zatrzymaj oba</string>
-    <string name="conflict_message">Które pliki chcesz zachować? Jeżeli wybierzesz obie wersje, do nazwy pliku lokalnego zostanie dodana liczba.</string>
     <string name="conflict_message_description">Jeśli wybierzesz obie wersje, to do lokalnego pliku będzie dodany numer.</string>
     <string name="conflict_message_headline">Które pliki chcesz zachować?</string>
     <string name="conflict_new_file">Nowy plik</string>
-    <string name="conflict_title">Konflikt pliku</string>
-    <string name="conflict_use_local_version">wersja lokalna</string>
-    <string name="conflict_use_server_version">wersja zdalna</string>
     <string name="contaclist_restore_selected">Przywróć wybrane kontakty</string>
     <string name="contactlist_account_chooser_title">Wybierz konto do zaimportiwania</string>
     <string name="contactlist_item_icon">Ikona użytkownika w liście kontaktów</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Przywróć starą metodę logowania</string>
     <string name="favorite">Dodaj do ulubionych</string>
     <string name="favorite_icon">Ulubiony</string>
-    <string name="file">plik</string>
     <string name="file_delete">Usuń</string>
     <string name="file_detail_activity_error">Błąd podczas pobierania aktywności dla pliku</string>
     <string name="file_details_no_content">Nie udało się załadować szczegółów</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Bezpieczna współpraca i wymiana plików</string>
     <string name="first_run_3_text">Łatwy w użyciu klient poczty, kalendarz i kontakty</string>
     <string name="first_run_4_text">Udostępnianie ekranu, spotkania i konferencje online</string>
-    <string name="folder">katalog</string>
     <string name="folder_already_exists">Katalog już istnieje</string>
     <string name="folder_confirm_create">Utwórz</string>
     <string name="folder_icon">Ikona katalogu</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Pobierz link</string>
     <string name="share_group_clarification">%1$s (grupa)</string>
     <string name="share_internal_link">Udostępnij link wewnętrzny</string>
-    <string name="share_internal_link_text">Działa tylko dla użytkowników mających dostęp do %1$s</string>
     <string name="share_internal_link_to_file_text">Wewnętrzny link udostępniania działa tylko dla użytkowników z dostępem do tego pliku</string>
     <string name="share_internal_link_to_folder_text">Wewnętrzny link udostępniania działa tylko dla użytkowników z dostępem do tego katalogu</string>
     <string name="share_known_remote_clarification">%1$s ( w %2$s )</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Somente local</string>
     <string name="conflict_already_existing_file">Arquivo já existe</string>
     <string name="conflict_dialog_error">Erro ao criar diálogo de conflito!</string>
-    <string name="conflict_keep_both">Manter ambos</string>
-    <string name="conflict_message">Quais arquivos você quer manter? Se você selecionar ambos, o arquivo local terá um número adicionado ao seu nome.</string>
     <string name="conflict_message_description">Se você selecionar as duas versões, o arquivo local terá um número anexado ao seu nome.</string>
     <string name="conflict_message_headline">Quais arquivos você quer manter?</string>
     <string name="conflict_new_file">Novo arquivo</string>
-    <string name="conflict_title">Conflito de arquivo</string>
-    <string name="conflict_use_local_version">versão local</string>
-    <string name="conflict_use_server_version">versão do servidor</string>
     <string name="contaclist_restore_selected">Restaurar contatos selecionados</string>
     <string name="contactlist_account_chooser_title">Escolha a conta para importar</string>
     <string name="contactlist_item_icon">Ícone de usuário para a lista de contatos</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Voltar ao antigo método de login</string>
     <string name="favorite">Adicionar aos favoritos</string>
     <string name="favorite_icon">Favorito</string>
-    <string name="file">arquivo</string>
     <string name="file_delete">Excluir</string>
     <string name="file_detail_activity_error">Erro ao recuperar atividades do arquivo</string>
     <string name="file_details_no_content">Falha ao carregar detalhes</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Colaboração segura &amp; troca de arquivos</string>
     <string name="first_run_3_text">Webmail fácil de usar, calendário &amp; contatos</string>
     <string name="first_run_4_text">Compartilhamento de tela, reuniões online &amp; conferência via web</string>
-    <string name="folder">pasta</string>
     <string name="folder_already_exists">Pasta já existe</string>
     <string name="folder_confirm_create">Criar</string>
     <string name="folder_icon">Ícone de pasta</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Obter link</string>
     <string name="share_group_clarification">%1$s (grupo)</string>
     <string name="share_internal_link">Compartilhar o link interno</string>
-    <string name="share_internal_link_text">Funciona apenas para usuários com acesso a esta %1$s</string>
     <string name="share_internal_link_to_file_text">O link de compartilhamento interno só funciona para usuários com acesso a este arquivo</string>
     <string name="share_internal_link_to_folder_text">O link de compartilhamento interno só funciona para usuários com acesso a esta pasta</string>
     <string name="share_known_remote_clarification">%1$s ( em %2$s )</string>

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

@@ -139,13 +139,8 @@
     <string name="confirmation_remove_folder_alert">Deseja realmente apagar %1$s e o seu conteúdo?</string>
     <string name="confirmation_remove_folders_alert">Quer realmente apagar os itens seleccionados e os seus conteúdos?</string>
     <string name="confirmation_remove_local">Apenas localmente</string>
-    <string name="conflict_keep_both">Manter ambos</string>
-    <string name="conflict_message">Quais os ficheiros que pretende manter? Se seleccionar ambas as versões, o ficheiro local terá um número adicionado ao se nome</string>
     <string name="conflict_message_headline">Quais os ficheiros que pretende manter?</string>
     <string name="conflict_new_file">Ficheiro novo</string>
-    <string name="conflict_title">Conflito de ficheiro</string>
-    <string name="conflict_use_local_version">versão local</string>
-    <string name="conflict_use_server_version">versão servidor</string>
     <string name="contaclist_restore_selected">Restaurar contactos seleccionados</string>
     <string name="contactlist_account_chooser_title">Escolher conta a importar</string>
     <string name="contactlist_item_icon">Ícone de utilizador de lista de contactos</string>
@@ -260,7 +255,6 @@
     <string name="fallback_weblogin_text">Reverter para método de início de sessão anterior</string>
     <string name="favorite">Adicionar aos favoritos</string>
     <string name="favorite_icon">Favorito</string>
-    <string name="file">ficheiro</string>
     <string name="file_delete">Apagar</string>
     <string name="file_details_no_content">Falha ao carregar detalhes</string>
     <string name="file_icon">Ficheiro</string>
@@ -329,7 +323,6 @@
     <string name="first_run_2_text">Colaboração &amp; partilha de ficheiros segura</string>
     <string name="first_run_3_text">Email web fácil de utilizar, calendarização &amp; contactos</string>
     <string name="first_run_4_text">Partilha de ecrã, reuniões online &amp; conferências web</string>
-    <string name="folder">pasta</string>
     <string name="folder_already_exists">A pasta já existe</string>
     <string name="folder_confirm_create">Criar</string>
     <string name="folder_icon">Ícone de pasta</string>

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

@@ -135,12 +135,7 @@
     <string name="confirmation_remove_folder_alert">Sigur vreți să eliminați %1$s și conținutul său?</string>
     <string name="confirmation_remove_folders_alert">Doriți să ștergeți elementele selectate și conținutul lor?</string>
     <string name="confirmation_remove_local">Doar local</string>
-    <string name="conflict_keep_both">Pastreaza amandoua</string>
-    <string name="conflict_message">Ce fișiere doriți să păstrați? Dacă selectați ambele versiuni, fișierul local va avea un număr atașat la numele acestuia.</string>
     <string name="conflict_message_headline">Ce fișiere vrei să păstrezi?</string>
-    <string name="conflict_title">Conflict de fișiere</string>
-    <string name="conflict_use_local_version">versiunea locală</string>
-    <string name="conflict_use_server_version">versiunea de pe server</string>
     <string name="contaclist_restore_selected">Restaurează contactele selectate</string>
     <string name="contactlist_account_chooser_title">Selectează contul de importat</string>
     <string name="contactlist_no_permission">Nu sunt acordate permisiuni, nu s-a importat nimic.</string>
@@ -239,7 +234,6 @@
     <string name="fallback_weblogin_back">Înapoi</string>
     <string name="favorite">Adăugați la favorite</string>
     <string name="favorite_icon">Favorite</string>
-    <string name="file">file</string>
     <string name="file_delete">Ștergeți</string>
     <string name="file_icon">Fișier</string>
     <string name="file_keep">Păstrare</string>
@@ -300,7 +294,6 @@
     <string name="filename_forbidden_charaters_from_server">Numele fișierului conține cel puțin un caracter invalid</string>
     <string name="filename_hint">Nume fișier</string>
     <string name="files_drop_not_supported">Aceasta este o funcționalitate Nextcloud, vă rugăm să actulizați aplicația.</string>
-    <string name="folder">folder</string>
     <string name="folder_already_exists">Dosar existent</string>
     <string name="folder_confirm_create">Creați</string>
     <string name="folder_list_empty_headline">Niciun dosar aici</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Только локально</string>
     <string name="conflict_already_existing_file">Файл уже существует</string>
     <string name="conflict_dialog_error">Не удалось создать диалоговое окно разрешения конфликта синхронизации.</string>
-    <string name="conflict_keep_both">Сохранить оба</string>
-    <string name="conflict_message">Какие файлы вы хотите сохранить? Если вы выберете обе версии, локальный файл будет иметь номер, добавленный к его имени.</string>
     <string name="conflict_message_description">Если вы выберете обе версии, локальный файл будет иметь номер, добавленный к его имени.</string>
     <string name="conflict_message_headline">Какие файлы вы хотите сохранить?</string>
     <string name="conflict_new_file">Новый файл</string>
-    <string name="conflict_title">Конфликт файлов</string>
-    <string name="conflict_use_local_version">Версию на устройстве</string>
-    <string name="conflict_use_server_version">Версия сервера</string>
     <string name="contaclist_restore_selected">Восстановить выбранные контакты</string>
     <string name="contactlist_account_chooser_title">Выберите аккаунт для импорта</string>
     <string name="contactlist_item_icon">Значок пользователя в списке контактов</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Использовать прежний метод авторизации</string>
     <string name="favorite">Добавить в избранное</string>
     <string name="favorite_icon">Избранное</string>
-    <string name="file">файл</string>
     <string name="file_delete">Удалить</string>
     <string name="file_detail_activity_error">Ошибка получения истории событий, связанных с файлом</string>
     <string name="file_details_no_content">Не удалось получить подробные сведения</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Защищённое совместная работа &amp;обмен файлами</string>
     <string name="first_run_3_text">Простые в использовании приложения для работы с почтой, календарями и контактами</string>
     <string name="first_run_4_text">Доступ к изображению на экране, онлайн общение и веб-конференции</string>
-    <string name="folder">папка</string>
     <string name="folder_already_exists">Папка уже существует</string>
     <string name="folder_confirm_create">Создать</string>
     <string name="folder_icon">Значок папки</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Получить ссылку</string>
     <string name="share_group_clarification">%1$s (группа)</string>
     <string name="share_internal_link">Опубликовать внутреннюю ссылку</string>
-    <string name="share_internal_link_text">Только для пользователей этого сервера %1$s</string>
     <string name="share_internal_link_to_file_text">Внутренние ссылки могут быть использованы только пользователями, у которых есть доступ к этому файлу</string>
     <string name="share_internal_link_to_folder_text">Внутренние ссылки могут быть использованы только пользователями, у которых есть доступ к этой папке</string>
     <string name="share_known_remote_clarification">%1$s ( в %2$s )</string>

src/main/res/values-sk-rSK/strings.xml

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Iba lokálne</string>
     <string name="conflict_already_existing_file">Súbor už existuje </string>
     <string name="conflict_dialog_error">Chyba pri vytváraní konfliktného dialógového okna!</string>
-    <string name="conflict_keep_both">Ponechať oba</string>
-    <string name="conflict_message">Ktoré súbory si prajate ponachať? Pokiaľ to budú obe verzie, lokálnej pribudne k názvu číslo.</string>
     <string name="conflict_message_description">Ak vyberiete obe verzie, miestny súbor bude mať k svojmu názvu pridané číslo.</string>
     <string name="conflict_message_headline">Ktoré súbory chcete ponechať?</string>
     <string name="conflict_new_file">Nový súbor</string>
-    <string name="conflict_title">Konflikt súborov</string>
-    <string name="conflict_use_local_version">lokálnu verziu</string>
-    <string name="conflict_use_server_version">serverovú verziu</string>
     <string name="contaclist_restore_selected">Obnoviť vybrané kontakty</string>
     <string name="contactlist_account_chooser_title">Zvoliť účet na importovanie</string>
     <string name="contactlist_item_icon">Používateľská ikona pre zoznam kontaktov</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Vrátiť sa k pôvodnému spôsobu prihlásenia</string>
     <string name="favorite">Pridať do obľúbených</string>
     <string name="favorite_icon">Obľúbené</string>
-    <string name="file">súbor</string>
     <string name="file_delete">Zmazať</string>
     <string name="file_detail_activity_error">Chyba pri načítavaní aktivít pre súbor</string>
     <string name="file_details_no_content">Nepodarilo sa načítať podrobnosti</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Bezpečná kolaborácia&amp;výmena súborov</string>
     <string name="first_run_3_text">Jednoduché použitie web mailu, kalendára &amp; kontaktov</string>
     <string name="first_run_4_text">Zdieľanie obrazovky, online meetingy &amp; web konferencie</string>
-    <string name="folder">priečinok</string>
     <string name="folder_already_exists">Priečinok už existuje</string>
     <string name="folder_confirm_create">Vytvoriť</string>
     <string name="folder_icon">Ikona priečinku</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Získať odkaz</string>
     <string name="share_group_clarification">%1$s (skupina)</string>
     <string name="share_internal_link">Sprístupniť interný odkaz</string>
-    <string name="share_internal_link_text">Funguje len pre používateľov s prístupom k tomuto %1$s</string>
     <string name="share_internal_link_to_file_text">Interný odkaz na zdieľanie funguje iba pre používateľov s prístupom k tomuto súboru</string>
     <string name="share_internal_link_to_folder_text">Interný odkaz na zdieľanie funguje iba pre používateľov s prístupom k tomuto adresáru</string>
     <string name="share_known_remote_clarification">%1$s ( na %2$s )</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Le krajevno</string>
     <string name="conflict_already_existing_file">Obstoječa datoteka</string>
     <string name="conflict_dialog_error">Prišlo je do napake med pogovornega okna spora!</string>
-    <string name="conflict_keep_both">Ohrani obe</string>
-    <string name="conflict_message">Katere datoteke želiš ohraniti? Če izbereš obe različici, bo lokalni datoteki dodatna k imenu še številka.</string>
     <string name="conflict_message_description">Če izberete obe različici, bo k imenu krajevne datoteke dodana številka.</string>
     <string name="conflict_message_headline">Katere datoteke želite ohraniti?</string>
     <string name="conflict_new_file">Nova datoteka</string>
-    <string name="conflict_title">Neskladje datotek</string>
-    <string name="conflict_use_local_version">krajevna različica</string>
-    <string name="conflict_use_server_version">različica strežnika</string>
     <string name="contaclist_restore_selected">Obnovi izbrane stike</string>
     <string name="contactlist_account_chooser_title">Izberi račun za uvoz</string>
     <string name="contactlist_item_icon">Ikona uporabnika za seznam stikov</string>
@@ -283,7 +278,6 @@
     <string name="fallback_weblogin_text">Povrni na star način prijave</string>
     <string name="favorite">Dodaj med priljubljene</string>
     <string name="favorite_icon">Priljubljeno</string>
-    <string name="file">datoteka</string>
     <string name="file_delete">Izbriši</string>
     <string name="file_detail_activity_error">Napaka pridobivanja dejavnosti za datoteko</string>
     <string name="file_details_no_content">Nalaganje podrobnosti je spodletelo.</string>
@@ -353,7 +347,6 @@
     <string name="first_run_2_text">Varno sodelovanje in izmenjava datotek</string>
     <string name="first_run_3_text">Enostavna uporaba spletne pošte, koledarja in stikov</string>
     <string name="first_run_4_text">Souporaba zaslona, spletni sestanki in konference</string>
-    <string name="folder">mapa</string>
     <string name="folder_already_exists">Mapa že obstaja</string>
     <string name="folder_confirm_create">Ustvari</string>
     <string name="folder_icon">Ikona mape</string>
@@ -584,7 +577,6 @@
     <string name="share_get_public_link_button">Pridobi povezavo</string>
     <string name="share_group_clarification">%1$s (skupina)</string>
     <string name="share_internal_link">Notranja povezava mesta souporabe</string>
-    <string name="share_internal_link_text">Deluje le za uporabnike z dostopom do %1$s</string>
     <string name="share_internal_link_to_file_text">Notranja povezava mesta souporabe deluje le za uporabnike z dostopom do datoteke.</string>
     <string name="share_internal_link_to_folder_text">Notranja povezava mesta souporabe deluje le za uporabnike z dostopom do mape.</string>
     <string name="share_known_remote_clarification">%1$s ( pri %2$s )</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Vetëm vendorja</string>
     <string name="conflict_already_existing_file">Skedar ekzistues</string>
     <string name="conflict_dialog_error">Gabim në krijimin e dialogut për konflikte!</string>
-    <string name="conflict_keep_both">Mbaji të dyja</string>
-    <string name="conflict_message">Cilat kartela doni të mbani? Nëse përzgjidhni të dy versionet, skedarit vendorë do t\’i shtohet një numër te emri.</string>
     <string name="conflict_message_description">Nëse zgjidhni të dy versionet, skedari lokal do të ketë një numër të bashkangjitur në emër</string>
     <string name="conflict_message_headline">Cilat kartela doni të mbani?</string>
     <string name="conflict_new_file">Skedë e re</string>
-    <string name="conflict_title">Përplasje skedarësh</string>
-    <string name="conflict_use_local_version">versionin vendor</string>
-    <string name="conflict_use_server_version">versionin e shërbyesit</string>
     <string name="contaclist_restore_selected">Rikthe kontaktet e zgjedhura</string>
     <string name="contactlist_account_chooser_title">Zgjidh llogarinë që do të importohet</string>
     <string name="contactlist_item_icon">Ikona e përdoruesit për listën e kontakteve</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Rikthehu në metodën e vjetër te identifikimit</string>
     <string name="favorite">Shtoje tek të parapëlqyerat</string>
     <string name="favorite_icon">E parapëlqyer</string>
-    <string name="file">skedari</string>
     <string name="file_delete">Fshini</string>
     <string name="file_detail_activity_error">Gabim gjatë marrjes së aktiviteteve të skedarit</string>
     <string name="file_details_no_content">Dështoi ngarkimi i detajeve</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Bashkëpunim i sigurtë &amp;skedar i ndryshuar</string>
     <string name="first_run_3_text">E-mail i thjeshtë për t\'u përdorur në web, kalendari &amp;i kontakteve</string>
     <string name="first_run_4_text">Ndarja e ekranit, takime në internet &amp; konferenca në web</string>
-    <string name="folder">dosja</string>
     <string name="folder_already_exists">Dosja ekziston tashmë</string>
     <string name="folder_confirm_create">Krijo</string>
     <string name="folder_icon">Ikona e dosjes</string>
@@ -587,7 +580,6 @@
     <string name="share_get_public_link_button">Merreni lidhjen</string>
     <string name="share_group_clarification">%1$s (grup)</string>
     <string name="share_internal_link">Shpërnda linkun e brendshëm</string>
-    <string name="share_internal_link_text">Punon vetëm për përdoruesit që kanë akses në %1$s</string>
     <string name="share_internal_link_to_file_text">Lidhja e brendshme të ndarjes funksionon vetëm për përdoruesit që kanë qasje në këtë skedar</string>
     <string name="share_internal_link_to_folder_text">Lidhja e ndarjes së brendshme funksionon vetëm për përdoruesit me qasje në këtë dosje</string>
     <string name="share_known_remote_clarification">%1$s ( te %2$s )</string>

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

@@ -142,11 +142,6 @@
     <string name="confirmation_remove_folder_alert">Da li stvarno želite da obrišete %1$s i sav dodatni sadržaj odatle?</string>
     <string name="confirmation_remove_folders_alert">Da li stvarno želite da obrišete označene stavke i sav njihov sadržaj?</string>
     <string name="confirmation_remove_local">Samo lokalno</string>
-    <string name="conflict_keep_both">Zadrži oba</string>
-    <string name="conflict_message">Koje fajlove želite da sačuvate? Ako izaberete obe verzije, lokalnom fajlu će biti dodat broj u naziv.</string>
-    <string name="conflict_title">Konflikt fajlova</string>
-    <string name="conflict_use_local_version">lokalna verzija</string>
-    <string name="conflict_use_server_version">verzija servera</string>
     <string name="contaclist_restore_selected">Povrati označene kontakte</string>
     <string name="contactlist_account_chooser_title">Odaberite naloge za uvoz</string>
     <string name="contactlist_item_icon">Ikona korisnika za listu kontakata</string>
@@ -262,7 +257,6 @@
     <string name="fallback_weblogin_text">Vrati se na stari način prijave</string>
     <string name="favorite">Dodaj u omiljene</string>
     <string name="favorite_icon">Omiljeni</string>
-    <string name="file">Fajl</string>
     <string name="file_delete">Obriši</string>
     <string name="file_detail_activity_error">Greška pri dohvatanju aktivnosti fajla</string>
     <string name="file_details_no_content">Greška pri učitavanju detalja</string>
@@ -332,7 +326,6 @@
     <string name="first_run_2_text">Bezbedna saradnja &amp; i razmena fajlova</string>
     <string name="first_run_3_text">Veb pošta laka za korišćenje, kalendar &amp; kontakti</string>
     <string name="first_run_4_text">Deljenje ekrana, sastanci na internetu &amp; veb konferencije</string>
-    <string name="folder">Folder</string>
     <string name="folder_already_exists">Fascikla već postoji</string>
     <string name="folder_confirm_create">Napravi</string>
     <string name="folder_icon">Ikona fascikle</string>
@@ -563,7 +556,6 @@
     <string name="share_get_public_link_button">Dobavi vezu</string>
     <string name="share_group_clarification">%1$s (grupa)</string>
     <string name="share_internal_link">Podeli internu vezu</string>
-    <string name="share_internal_link_text">Radi samo za korisike sa pristupom ovome %1$s</string>
     <string name="share_known_remote_clarification">%1$s (na %2$s)</string>
     <string name="share_link_empty_password">Morate uneti lozinku</string>
     <string name="share_link_file_error">Došlo je do greške prilikom pokušaja deljenja ovog fajla ili fascikle</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Само локално</string>
     <string name="conflict_already_existing_file">Већ постојећи фајл</string>
     <string name="conflict_dialog_error">Грешка при прављењу дијалога сукоба!</string>
-    <string name="conflict_keep_both">Задржи оба</string>
-    <string name="conflict_message">Које фајлове желите да сачувате? Ако изаберете обе верзије, локалном фајлу ће бити додат број у назив.</string>
     <string name="conflict_message_description">Ако изаберете обе верзије, локални фајл имаће број придодат свом називу.</string>
     <string name="conflict_message_headline">Које фајлове желите да задржите?</string>
     <string name="conflict_new_file">Нови фајл</string>
-    <string name="conflict_title">Сукоб фајлова</string>
-    <string name="conflict_use_local_version">локална верзија</string>
-    <string name="conflict_use_server_version">верзија сервера</string>
     <string name="contaclist_restore_selected">Поврати означене контакте</string>
     <string name="contactlist_account_chooser_title">Одаберите налог за увоз</string>
     <string name="contactlist_item_icon">Икона корисника за листу контаката</string>
@@ -283,7 +278,6 @@
     <string name="fallback_weblogin_text">Врати се на стари начин пријаве</string>
     <string name="favorite">Додај у омиљене</string>
     <string name="favorite_icon">Омиљени</string>
-    <string name="file">фајлу</string>
     <string name="file_delete">Обриши</string>
     <string name="file_detail_activity_error">Грешка при добављању активности за фајл</string>
     <string name="file_details_no_content">Грешка при учитавању детаља</string>
@@ -353,7 +347,6 @@
     <string name="first_run_2_text">Безбедна сарадња и размена фајлова</string>
     <string name="first_run_3_text">Веб пошта лака за коришћење, календар и контакти</string>
     <string name="first_run_4_text">Дељење екрана, састанци и веб конференције</string>
-    <string name="folder">фасцикли</string>
     <string name="folder_already_exists">Фасцикла већ постоји</string>
     <string name="folder_confirm_create">Направи</string>
     <string name="folder_icon">Икона фасцикле</string>
@@ -586,7 +579,6 @@
     <string name="share_get_public_link_button">Добави везу</string>
     <string name="share_group_clarification">%1$s (група)</string>
     <string name="share_internal_link">Подели интерну везу</string>
-    <string name="share_internal_link_text">Ради само за корисике који имају приступ %1$s</string>
     <string name="share_internal_link_to_file_text">Интерна веза дељења ради само за кориснике који имају приступ фајлу</string>
     <string name="share_internal_link_to_folder_text">Интерна веза дељења ради само за кориснике који имају приступ фасцикли</string>
     <string name="share_known_remote_clarification">%1$s (на %2$s)</string>

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

@@ -143,14 +143,9 @@
     <string name="confirmation_remove_local">Endast lokalt</string>
     <string name="conflict_already_existing_file">Filen finns redan</string>
     <string name="conflict_dialog_error">Fel vid skapande av konfliktdialog!</string>
-    <string name="conflict_keep_both">Behåll båda</string>
-    <string name="conflict_message">Vilka filer vill du behålla? Om du väljer båda versioner kommer den lokala filen att ha ett nummer kopplat till dess namn.</string>
     <string name="conflict_message_description">Om du väljer båda versionerna kommer den lokala filen få ett nummer tillagt i filnamnet.</string>
     <string name="conflict_message_headline">Vilka filer vill du behålla?</string>
     <string name="conflict_new_file">Ny fil</string>
-    <string name="conflict_title">Filkonflikt</string>
-    <string name="conflict_use_local_version">lokala versionen</string>
-    <string name="conflict_use_server_version">serverversionen</string>
     <string name="contaclist_restore_selected">Återställ valda kontakter</string>
     <string name="contactlist_account_chooser_title">Välj konto att importera</string>
     <string name="contactlist_item_icon">Användarikon för kontaktlista</string>
@@ -284,7 +279,6 @@
     <string name="fallback_weblogin_text">Gå tillbaka till gammal inloggningsmetod</string>
     <string name="favorite">Lägg till favoriter</string>
     <string name="favorite_icon">Favoritisera</string>
-    <string name="file">fil</string>
     <string name="file_delete">Radera</string>
     <string name="file_detail_activity_error">Fel vid hämtning av aktiviteter för fil</string>
     <string name="file_details_no_content">Kunde inte ladda detaljer</string>
@@ -354,7 +348,6 @@
     <string name="first_run_2_text">Säkert samarbete och filutbyte</string>
     <string name="first_run_3_text">Lättanvänd webmail, kalender och kontakter</string>
     <string name="first_run_4_text">Skärmdelning, onlinemöten och webbkonferenser</string>
-    <string name="folder">mapp</string>
     <string name="folder_already_exists">Mapp finns redan</string>
     <string name="folder_confirm_create">Skapa</string>
     <string name="folder_icon">Mappikon</string>
@@ -588,7 +581,6 @@
     <string name="share_get_public_link_button">Hämta länk</string>
     <string name="share_group_clarification">%1$s (grupp)</string>
     <string name="share_internal_link">Dela intern länk</string>
-    <string name="share_internal_link_text">Fungerar bara för användare med tillgång till den här %1$s</string>
     <string name="share_internal_link_to_file_text">Intern länkdelning fungerar bara för användare med åtkomst till den här filen</string>
     <string name="share_internal_link_to_folder_text">Intern länkdelning fungerar bara för användare med åtkomst till den här mappen</string>
     <string name="share_known_remote_clarification">%1$s ( på %2$s )</string>

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

@@ -142,14 +142,9 @@
     <string name="confirmation_remove_folders_alert">Seçilmiş ögeleri ve içindekileri gerçekten silmek istiyor musunuz?</string>
     <string name="confirmation_remove_local">Yalnız yerel</string>
     <string name="conflict_already_existing_file">Dosya zaten var</string>
-    <string name="conflict_keep_both">İkisi de tutulsun</string>
-    <string name="conflict_message">Hangi dosyaları tutmak istiyorsunuz? Her ikisini de tutmayı seçerseniz yerel dosyanın adına bir sayı eklenecek.</string>
     <string name="conflict_message_description">İki sürümü de saklamayı seçerseniz, yerel dosyanın adına bir numara eklenecek.</string>
     <string name="conflict_message_headline">Hangi dosyaları saklamak istiyorsunuz?</string>
     <string name="conflict_new_file">Yeni dosya</string>
-    <string name="conflict_title">Dosya çakışması</string>
-    <string name="conflict_use_local_version">yerel sürümü</string>
-    <string name="conflict_use_server_version">sunucu sürümünü</string>
     <string name="contaclist_restore_selected">Seçilmiş kişileri geri yükle</string>
     <string name="contactlist_account_chooser_title">İçe aktarılacak hesabı seçin</string>
     <string name="contactlist_item_icon">Kişi listesi kullanıcı simgesi</string>
@@ -282,7 +277,6 @@
     <string name="fallback_weblogin_text">Eski oturum açma yöntemine dön</string>
     <string name="favorite">Sık Kullanılanlara Ekle</string>
     <string name="favorite_icon">Sık Kullanılanlara Ekle</string>
-    <string name="file">dosya</string>
     <string name="file_delete">Sil</string>
     <string name="file_detail_activity_error">Dosya işlemleri alınırken sorun çıktı</string>
     <string name="file_details_no_content">Ayrıntılar yüklenemedi</string>
@@ -352,7 +346,6 @@
     <string name="first_run_2_text">Güvenli iş birliği ve dosya değiş tokuşu</string>
     <string name="first_run_3_text">Kolay kullanılan web e-posta, takvim ve kişiler</string>
     <string name="first_run_4_text">Ekran paylaşımı, çevrimiçi görüşmeler ve web toplantıları</string>
-    <string name="folder">klasör</string>
     <string name="folder_already_exists">Klasör zaten var</string>
     <string name="folder_confirm_create">Ekle</string>
     <string name="folder_icon">Klasör Simgesi</string>
@@ -585,7 +578,6 @@
     <string name="share_get_public_link_button">Bağlantıyı al</string>
     <string name="share_group_clarification">%1$s (grup)</string>
     <string name="share_internal_link">İç bağlantıyı paylaş</string>
-    <string name="share_internal_link_text">Yalnız bu %1$s ögesine erişebilen kullanıcılar için geçerlidir</string>
     <string name="share_internal_link_to_file_text">İç bağlantı paylaşımı yalnız bu dosyaya erişebilen kullanıcılar için geçerlidir</string>
     <string name="share_internal_link_to_folder_text">İç bağlantı paylaşımı yalnız bu klasöre erişebilen kullanıcılar için geçerlidir</string>
     <string name="share_known_remote_clarification">%1$s (%2$s üzerinde)</string>

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

@@ -133,12 +133,8 @@
     <string name="confirmation_remove_folder_alert">Ви справді бажаєте вилучити %1$s та його вміст?</string>
     <string name="confirmation_remove_local">Лише локально</string>
     <string name="conflict_already_existing_file">Файл, який вже наявний</string>
-    <string name="conflict_keep_both">Залишити обидва</string>
     <string name="conflict_message_headline">Які файли ви хочете залишити?</string>
     <string name="conflict_new_file">Новий файл</string>
-    <string name="conflict_title">Конфлікт файлу</string>
-    <string name="conflict_use_local_version">Локальна версія</string>
-    <string name="conflict_use_server_version">Версія сервера</string>
     <string name="contaclist_restore_selected">Відновити вибрані контакти</string>
     <string name="contactlist_account_chooser_title">Виберіть обліковий запис для імпорту</string>
     <string name="contactlist_item_icon">Іконка списку контактів</string>
@@ -252,7 +248,6 @@
     <string name="fallback_weblogin_back">Назад</string>
     <string name="favorite">Додати до обраного</string>
     <string name="favorite_icon">Улюблений</string>
-    <string name="file">file</string>
     <string name="file_delete">Видалити</string>
     <string name="file_icon">Файл</string>
     <string name="file_keep">Зберегти</string>
@@ -289,7 +284,6 @@
     <string name="filename_forbidden_characters">Заборонені символи: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">У назві файлу міститься щонайменше один неправильний символ</string>
     <string name="filename_hint">Ім\'я файлу</string>
-    <string name="folder">folder</string>
     <string name="folder_confirm_create">Створити</string>
     <string name="folder_list_empty_headline">Тут немає папок</string>
     <string name="folder_picker_choose_button_text">Обрати</string>

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

@@ -81,9 +81,7 @@
     <string name="confirmation_remove_file_alert">Bạn thực sự muốn xóa %1$s?</string>
     <string name="confirmation_remove_files_alert">Bạn thực sự muốn xóa mục lựa chọn này?</string>
     <string name="confirmation_remove_local">Chỉ cục bộ</string>
-    <string name="conflict_keep_both">Giữ cho cả hai</string>
     <string name="conflict_message_headline">Bạn muốn tiếp tục với những tập tin nào?</string>
-    <string name="conflict_use_server_version">phiên bản máy chủ</string>
     <string name="contactlist_item_icon">Sử dụng biểu tượng cho danh mục liên hệ</string>
     <string name="contacts_preference_backup_never">không thay đổi</string>
     <string name="contacts_preference_choose_date">Chọn ngày</string>
@@ -147,7 +145,6 @@
     <string name="fallback_weblogin_back">Quay lại</string>
     <string name="favorite">Thêm vào ưa thích</string>
     <string name="favorite_icon">Ưa thích</string>
-    <string name="file">file</string>
     <string name="file_delete">Xóa</string>
     <string name="file_icon">Tập tin</string>
     <string name="file_keep">Giữ</string>
@@ -190,7 +187,6 @@
     <string name="filename_forbidden_characters">Những kí tự không được dùng: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_hint">Tên tập tin</string>
     <string name="files_drop_not_supported">Đây là một tính năng của Hệ thống, hãy nâng cấp nó.</string>
-    <string name="folder">folder</string>
     <string name="folder_already_exists">Thư mục đã tồn tại</string>
     <string name="folder_confirm_create">Tạo</string>
     <string name="folder_icon">Biểu tượng thư mục</string>

src/main/res/values-zh-rCN/strings.xml

@@ -142,14 +142,9 @@
     <string name="confirmation_remove_folders_alert">确定删除选中项及其内容？</string>
     <string name="confirmation_remove_local">仅本地</string>
     <string name="conflict_already_existing_file">已经存在的文件</string>
-    <string name="conflict_keep_both">保留两者</string>
-    <string name="conflict_message">您要保留哪个文件？ 如果您同时选择这两个版本，则本地文件的名称后将附加一个数字。</string>
     <string name="conflict_message_description">如果您选择两个版本，则本地文件的名称后面将附加一个数字。</string>
     <string name="conflict_message_headline">请选择需要保留的文件？</string>
     <string name="conflict_new_file">新文件</string>
-    <string name="conflict_title">文件冲突</string>
-    <string name="conflict_use_local_version">本地版本</string>
-    <string name="conflict_use_server_version">服务器版本</string>
     <string name="contaclist_restore_selected">恢复选中的联系人</string>
     <string name="contactlist_account_chooser_title">选择要导入的账号</string>
     <string name="contactlist_item_icon">联系人列表的用户图标</string>
@@ -282,7 +277,6 @@
     <string name="fallback_weblogin_text">采用旧的登录方式</string>
     <string name="favorite">添加到收藏列表</string>
     <string name="favorite_icon">收藏</string>
-    <string name="file">文件</string>
     <string name="file_delete">删除</string>
     <string name="file_detail_activity_error">获取文件动态时出错</string>
     <string name="file_details_no_content">加载详情失败</string>
@@ -352,7 +346,6 @@
     <string name="first_run_2_text">安全协作和文件交换</string>
     <string name="first_run_3_text">易于使用的网页邮件、日历和联系人</string>
     <string name="first_run_4_text">屏幕共享，线上见面和网络会议</string>
-    <string name="folder">文件夹</string>
     <string name="folder_already_exists">目录已经存在</string>
     <string name="folder_confirm_create">创建</string>
     <string name="folder_icon">目录图标</string>
@@ -585,7 +578,6 @@
     <string name="share_get_public_link_button">获取链接</string>
     <string name="share_group_clarification">%1$s (群组)</string>
     <string name="share_internal_link">共享内部链接</string>
-    <string name="share_internal_link_text">仅适用于有权限访问 %1$s 的用户</string>
     <string name="share_internal_link_to_file_text">内部共享链接仅对有权访问此文件的用户有效</string>
     <string name="share_internal_link_to_folder_text">内部共享链接仅对有权访问此文件夹的用户有效</string>
     <string name="share_known_remote_clarification">%1$s ( 在 %2$s )</string>

src/main/res/values-zh-rTW/strings.xml

@@ -142,13 +142,8 @@
     <string name="confirmation_remove_folders_alert">您真的想要刪除所選項目和裡面的內容嗎？</string>
     <string name="confirmation_remove_local">只有本地</string>
     <string name="conflict_already_existing_file">檔案已存在</string>
-    <string name="conflict_keep_both">保留兩者</string>
-    <string name="conflict_message">您想保留哪個檔案?如果選擇兩個版本皆保留,本地檔案會在檔名後方加上編號</string>
     <string name="conflict_message_headline">您要保留哪一個檔案？</string>
     <string name="conflict_new_file">新增檔案</string>
-    <string name="conflict_title">檔案衝突</string>
-    <string name="conflict_use_local_version">本地版本</string>
-    <string name="conflict_use_server_version">伺服器版本</string>
     <string name="contaclist_restore_selected">還原所選的聯絡人</string>
     <string name="contactlist_account_chooser_title">選擇帳戶以匯入</string>
     <string name="contactlist_item_icon">聯絡清單的使用者圖示</string>
@@ -279,7 +274,6 @@
     <string name="fallback_weblogin_text">還原舊的登入方式</string>
     <string name="favorite">加到我的最愛</string>
     <string name="favorite_icon">我的最愛</string>
-    <string name="file">檔案</string>
     <string name="file_delete">刪除</string>
     <string name="file_detail_activity_error">取得檔案活動時發生錯誤</string>
     <string name="file_details_no_content">載入詳細資訊失敗</string>
@@ -349,7 +343,6 @@
     <string name="first_run_2_text">安全地協作及傳輸檔案</string>
     <string name="first_run_3_text">容易使用的Webmail,行事曆&amp;聯絡人</string>
     <string name="first_run_4_text">分享螢幕畫面，線上會議&amp;研討會</string>
-    <string name="folder">資料夾</string>
     <string name="folder_already_exists">文件夾已存在</string>
     <string name="folder_confirm_create">建立</string>
     <string name="folder_icon">資料夾圖示</string>
@@ -583,7 +576,6 @@
     <string name="share_get_public_link_button">取得連結</string>
     <string name="share_group_clarification">%1$s （群組）</string>
     <string name="share_internal_link">分享內部鏈結</string>
-    <string name="share_internal_link_text">只適用於有權存取 %1$s 的使用者</string>
     <string name="share_internal_link_to_file_text">內部分享連結僅對有權存取這個檔案的使用者有效</string>
     <string name="share_internal_link_to_folder_text">內部分享連結僅對有權存取這個資料夾的使用者有效</string>
     <string name="share_known_remote_clarification">%1$s （在 %2$s ）</string>