diff options
Diffstat (limited to 'apps/files_sharing')
84 files changed, 164 insertions, 123 deletions
diff --git a/apps/files_sharing/l10n/ar.js b/apps/files_sharing/l10n/ar.js index 2f067ced7dc..aa2cae7185d 100644 --- a/apps/files_sharing/l10n/ar.js +++ b/apps/files_sharing/l10n/ar.js @@ -258,7 +258,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "بمجرد رفعك للملفات، أنت تعتبر موافقاً على شروط الخدمة.", "View terms of service" : "عرض شروط الخدمة", "Terms of service" : "شروط الخدمة", - "Share with {userName}" : "شارِك مع {userName}", "Share with email {email}" : "مشاركة مع صاحب البريد الإلكتروني {email}", "Share with group" : "شارِك مع مجموعة", "Share in conversation" : "شارِك في محادثة", @@ -408,6 +407,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "لرفع الملفات، يجب أن تكتب اسمك أوّلاً.", "Enter your name" : "أدخِل اسمك", "Submit name" : "إرسال الاسم", + "Share with {userName}" : "شارِك مع {userName}", "Share note" : "ملاحظة عن المشاركة", "Upload files to %s" : "رَفْعُ ملفات إلى %s", "%s shared a folder with you." : "قام %s بمشاركة مجلد معك.", diff --git a/apps/files_sharing/l10n/ar.json b/apps/files_sharing/l10n/ar.json index f7b8af2e100..bac82a1556b 100644 --- a/apps/files_sharing/l10n/ar.json +++ b/apps/files_sharing/l10n/ar.json @@ -256,7 +256,6 @@ "By uploading files, you agree to the terms of service." : "بمجرد رفعك للملفات، أنت تعتبر موافقاً على شروط الخدمة.", "View terms of service" : "عرض شروط الخدمة", "Terms of service" : "شروط الخدمة", - "Share with {userName}" : "شارِك مع {userName}", "Share with email {email}" : "مشاركة مع صاحب البريد الإلكتروني {email}", "Share with group" : "شارِك مع مجموعة", "Share in conversation" : "شارِك في محادثة", @@ -406,6 +405,7 @@ "To upload files, you need to provide your name first." : "لرفع الملفات، يجب أن تكتب اسمك أوّلاً.", "Enter your name" : "أدخِل اسمك", "Submit name" : "إرسال الاسم", + "Share with {userName}" : "شارِك مع {userName}", "Share note" : "ملاحظة عن المشاركة", "Upload files to %s" : "رَفْعُ ملفات إلى %s", "%s shared a folder with you." : "قام %s بمشاركة مجلد معك.", diff --git a/apps/files_sharing/l10n/ast.js b/apps/files_sharing/l10n/ast.js index 475576a969c..ea8f20f0ab2 100644 --- a/apps/files_sharing/l10n/ast.js +++ b/apps/files_sharing/l10n/ast.js @@ -194,7 +194,6 @@ OC.L10N.register( "on {server}" : "en: {server}", "File drop" : "Suelta de ficheros", "Terms of service" : "Términos del serviciu", - "Share with {userName}" : "Compartir con {userName}", "Share with email {email}" : "Compartir cola direición de corréu electrónica {email}", "Share with group" : "Compartir col grupu", "Share in conversation" : "Compartir na conversación", @@ -295,6 +294,7 @@ OC.L10N.register( "Download all files" : "Baxar tolos ficheros", "Search for share recipients" : "Buscar destinatarios del elementu compartíu", "No recommendations. Start typing." : "Nun hai nenguna recomendación. Comienza a escribir", + "Share with {userName}" : "Compartir con {userName}", "Share note" : "Compartir una nota", "Upload files to %s" : "Xubir ficheros a «%s»", "Note" : "Nota", diff --git a/apps/files_sharing/l10n/ast.json b/apps/files_sharing/l10n/ast.json index e95918aad5a..b3d17ed8ca4 100644 --- a/apps/files_sharing/l10n/ast.json +++ b/apps/files_sharing/l10n/ast.json @@ -192,7 +192,6 @@ "on {server}" : "en: {server}", "File drop" : "Suelta de ficheros", "Terms of service" : "Términos del serviciu", - "Share with {userName}" : "Compartir con {userName}", "Share with email {email}" : "Compartir cola direición de corréu electrónica {email}", "Share with group" : "Compartir col grupu", "Share in conversation" : "Compartir na conversación", @@ -293,6 +292,7 @@ "Download all files" : "Baxar tolos ficheros", "Search for share recipients" : "Buscar destinatarios del elementu compartíu", "No recommendations. Start typing." : "Nun hai nenguna recomendación. Comienza a escribir", + "Share with {userName}" : "Compartir con {userName}", "Share note" : "Compartir una nota", "Upload files to %s" : "Xubir ficheros a «%s»", "Note" : "Nota", diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js index 68c3994f58c..42f8702f37b 100644 --- a/apps/files_sharing/l10n/ca.js +++ b/apps/files_sharing/l10n/ca.js @@ -258,7 +258,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "Per la pujada de fitxers, accepteu les condicions del servei.", "View terms of service" : "Consulta els termes del servei", "Terms of service" : "Condicions del servei", - "Share with {userName}" : "Comparteix amb {userName}", "Share with email {email}" : "Comparteix amb l'adreça electrònica {email}", "Share with group" : "Comparteix amb el grup", "Share in conversation" : "Comparteix en la conversa", @@ -408,6 +407,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Per la pujada de fitxers, primer heu de proporcionar el vostre nom.", "Enter your name" : "Introdueix el teu nom", "Submit name" : "Envia el nom", + "Share with {userName}" : "Comparteix amb {userName}", "Share note" : "Nota de l'element compartit", "Upload files to %s" : "Puja fitxers a %s", "%s shared a folder with you." : "%s ha compartit una carpeta amb tu.", diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json index 9ea9ce823ce..7e61ec4eab7 100644 --- a/apps/files_sharing/l10n/ca.json +++ b/apps/files_sharing/l10n/ca.json @@ -256,7 +256,6 @@ "By uploading files, you agree to the terms of service." : "Per la pujada de fitxers, accepteu les condicions del servei.", "View terms of service" : "Consulta els termes del servei", "Terms of service" : "Condicions del servei", - "Share with {userName}" : "Comparteix amb {userName}", "Share with email {email}" : "Comparteix amb l'adreça electrònica {email}", "Share with group" : "Comparteix amb el grup", "Share in conversation" : "Comparteix en la conversa", @@ -406,6 +405,7 @@ "To upload files, you need to provide your name first." : "Per la pujada de fitxers, primer heu de proporcionar el vostre nom.", "Enter your name" : "Introdueix el teu nom", "Submit name" : "Envia el nom", + "Share with {userName}" : "Comparteix amb {userName}", "Share note" : "Nota de l'element compartit", "Upload files to %s" : "Puja fitxers a %s", "%s shared a folder with you." : "%s ha compartit una carpeta amb tu.", diff --git a/apps/files_sharing/l10n/cs.js b/apps/files_sharing/l10n/cs.js index c499e7f731b..bd09f710883 100644 --- a/apps/files_sharing/l10n/cs.js +++ b/apps/files_sharing/l10n/cs.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Soubory úspěšně nahrány", "View terms of service" : "Zobrazit smluvní podmínky", "Terms of service" : "Všeobecné podmínky", - "Share with {userName}" : "Nasdílet pro {userName}", "Share with email {email}" : "Nasdílet e-mailu {email}", "Share with group" : "Nasdílet skupině", "Share in conversation" : "Nasdílet v konverzaci", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Aby bylo možné nahrávat soubory, je třeba nejprve zadat své jméno.", "Enter your name" : "Zadejte své jméno", "Submit name" : "Odeslat jméno", + "Share with {userName}" : "Nasdílet pro {userName}", "Share note" : "Sdílet poznámku", "Upload files to %s" : "Nahrát soubory do %s", "%s shared a folder with you." : "%s vám nasdílel(a) složku.", diff --git a/apps/files_sharing/l10n/cs.json b/apps/files_sharing/l10n/cs.json index feb4c661923..77994a8bd5e 100644 --- a/apps/files_sharing/l10n/cs.json +++ b/apps/files_sharing/l10n/cs.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Soubory úspěšně nahrány", "View terms of service" : "Zobrazit smluvní podmínky", "Terms of service" : "Všeobecné podmínky", - "Share with {userName}" : "Nasdílet pro {userName}", "Share with email {email}" : "Nasdílet e-mailu {email}", "Share with group" : "Nasdílet skupině", "Share in conversation" : "Nasdílet v konverzaci", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Aby bylo možné nahrávat soubory, je třeba nejprve zadat své jméno.", "Enter your name" : "Zadejte své jméno", "Submit name" : "Odeslat jméno", + "Share with {userName}" : "Nasdílet pro {userName}", "Share note" : "Sdílet poznámku", "Upload files to %s" : "Nahrát soubory do %s", "%s shared a folder with you." : "%s vám nasdílel(a) složku.", diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js index 463c1a69221..e0c2a958f45 100644 --- a/apps/files_sharing/l10n/da.js +++ b/apps/files_sharing/l10n/da.js @@ -258,7 +258,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "Ved at uploade filer, acceptere du servicebetingelserne.", "View terms of service" : "Vis servicebetingelser", "Terms of service" : "Servicebetingelser", - "Share with {userName}" : "Del med {userName}", "Share with email {email}" : "Del med e-mail {email}", "Share with group" : "Del med gruppe", "Share in conversation" : "Del i samtale", @@ -408,6 +407,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "For at uploade filer skal du først angive dit navn.", "Enter your name" : "Angiv dit navn", "Submit name" : "Angiv navn", + "Share with {userName}" : "Del med {userName}", "Share note" : "Del note", "Upload files to %s" : "Upload filer til %s", "%s shared a folder with you." : "%s delte en mappe med dig.", diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json index 73f7c3aea8e..fe4f6cb08fd 100644 --- a/apps/files_sharing/l10n/da.json +++ b/apps/files_sharing/l10n/da.json @@ -256,7 +256,6 @@ "By uploading files, you agree to the terms of service." : "Ved at uploade filer, acceptere du servicebetingelserne.", "View terms of service" : "Vis servicebetingelser", "Terms of service" : "Servicebetingelser", - "Share with {userName}" : "Del med {userName}", "Share with email {email}" : "Del med e-mail {email}", "Share with group" : "Del med gruppe", "Share in conversation" : "Del i samtale", @@ -406,6 +405,7 @@ "To upload files, you need to provide your name first." : "For at uploade filer skal du først angive dit navn.", "Enter your name" : "Angiv dit navn", "Submit name" : "Angiv navn", + "Share with {userName}" : "Del med {userName}", "Share note" : "Del note", "Upload files to %s" : "Upload filer til %s", "%s shared a folder with you." : "%s delte en mappe med dig.", diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 083db9d8e8c..1c71b278f2c 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Dateien wurden hochgeladen", "View terms of service" : "Nutzungsbedingungen anzeigen", "Terms of service" : "Nutzungsbedingungen", - "Share with {userName}" : "Mit {userName} teilen", "Share with email {email}" : "Per E-Mail {email} teilen", "Share with group" : "Mit Gruppe teilen", "Share in conversation" : "In Unterhaltungen teilen", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Um Dateien hochzuladen, musst du zunächst deinen Namen angeben.", "Enter your name" : "Gib deinen Namen ein", "Submit name" : "Name übermitteln", + "Share with {userName}" : "Mit {userName} teilen", "Share note" : "Notiz teilen", "Upload files to %s" : "Dateien für %s hochladen", "%s shared a folder with you." : "%s hat einen Ordner mit dir geteilt.", diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index b2d69bc8e8f..549d9794c46 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Dateien wurden hochgeladen", "View terms of service" : "Nutzungsbedingungen anzeigen", "Terms of service" : "Nutzungsbedingungen", - "Share with {userName}" : "Mit {userName} teilen", "Share with email {email}" : "Per E-Mail {email} teilen", "Share with group" : "Mit Gruppe teilen", "Share in conversation" : "In Unterhaltungen teilen", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Um Dateien hochzuladen, musst du zunächst deinen Namen angeben.", "Enter your name" : "Gib deinen Namen ein", "Submit name" : "Name übermitteln", + "Share with {userName}" : "Mit {userName} teilen", "Share note" : "Notiz teilen", "Upload files to %s" : "Dateien für %s hochladen", "%s shared a folder with you." : "%s hat einen Ordner mit dir geteilt.", diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index ae518539e97..2b1243bd0ae 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Dateien wurden hochgeladen", "View terms of service" : "Nutzungsbedingungen anzeigen", "Terms of service" : "Nutzungsbedingungen", - "Share with {userName}" : "Mit {userName} teilen", "Share with email {email}" : "Mit E-Mail {email} teilen", "Share with group" : "Mit Gruppe teilen", "Share in conversation" : "In Unterhaltungen teilen", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Um Dateien hochzuladen, müssen Sie zunächst Ihren Namen angeben.", "Enter your name" : "Geben Sie Ihren Namen ein", "Submit name" : "Name übermitteln", + "Share with {userName}" : "Mit {userName} teilen", "Share note" : "Notiz teilen", "Upload files to %s" : "Dateien für %s hochladen", "%s shared a folder with you." : "%s hat einen Ordner mit Ihnen geteilt.", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 20922680926..94886179321 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Dateien wurden hochgeladen", "View terms of service" : "Nutzungsbedingungen anzeigen", "Terms of service" : "Nutzungsbedingungen", - "Share with {userName}" : "Mit {userName} teilen", "Share with email {email}" : "Mit E-Mail {email} teilen", "Share with group" : "Mit Gruppe teilen", "Share in conversation" : "In Unterhaltungen teilen", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Um Dateien hochzuladen, müssen Sie zunächst Ihren Namen angeben.", "Enter your name" : "Geben Sie Ihren Namen ein", "Submit name" : "Name übermitteln", + "Share with {userName}" : "Mit {userName} teilen", "Share note" : "Notiz teilen", "Upload files to %s" : "Dateien für %s hochladen", "%s shared a folder with you." : "%s hat einen Ordner mit Ihnen geteilt.", diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js index 8cbeeccff4d..ee41546e923 100644 --- a/apps/files_sharing/l10n/en_GB.js +++ b/apps/files_sharing/l10n/en_GB.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Successfully uploaded files", "View terms of service" : "View terms of service", "Terms of service" : "Terms of service", - "Share with {userName}" : "Share with {userName}", "Share with email {email}" : "Share with email {email}", "Share with group" : "Share with group", "Share in conversation" : "Share in conversation", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "To upload files, you need to provide your name first.", "Enter your name" : "Enter your name", "Submit name" : "Submit name", + "Share with {userName}" : "Share with {userName}", "Share note" : "Share note", "Upload files to %s" : "Upload files to %s", "%s shared a folder with you." : "%s shared a folder with you.", diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json index 39cf0ef5314..1c8b5177ac4 100644 --- a/apps/files_sharing/l10n/en_GB.json +++ b/apps/files_sharing/l10n/en_GB.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Successfully uploaded files", "View terms of service" : "View terms of service", "Terms of service" : "Terms of service", - "Share with {userName}" : "Share with {userName}", "Share with email {email}" : "Share with email {email}", "Share with group" : "Share with group", "Share in conversation" : "Share in conversation", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "To upload files, you need to provide your name first.", "Enter your name" : "Enter your name", "Submit name" : "Submit name", + "Share with {userName}" : "Share with {userName}", "Share note" : "Share note", "Upload files to %s" : "Upload files to %s", "%s shared a folder with you." : "%s shared a folder with you.", diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 6db11d86aa0..3d34d029c2c 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Se cargaron los archivos de manera exitosa", "View terms of service" : "Ver los términos del servicio", "Terms of service" : "Términos del servicio", - "Share with {userName}" : "Compartir con {userName}", "Share with email {email}" : "Compartido con {email}", "Share with group" : "Compartir con grupo", "Share in conversation" : "Compartir en conversación", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Para cargar archivos, primero debes indicar tu nombre.", "Enter your name" : "Escriba su nombre", "Submit name" : "Enviar nombre", + "Share with {userName}" : "Compartir con {userName}", "Share note" : "Compartir nota", "Upload files to %s" : "Subir archivos a %s", "%s shared a folder with you." : "%s ha compartido una carpeta contigo.", diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 9d3aef5d575..008b18fd3ef 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Se cargaron los archivos de manera exitosa", "View terms of service" : "Ver los términos del servicio", "Terms of service" : "Términos del servicio", - "Share with {userName}" : "Compartir con {userName}", "Share with email {email}" : "Compartido con {email}", "Share with group" : "Compartir con grupo", "Share in conversation" : "Compartir en conversación", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Para cargar archivos, primero debes indicar tu nombre.", "Enter your name" : "Escriba su nombre", "Submit name" : "Enviar nombre", + "Share with {userName}" : "Compartir con {userName}", "Share note" : "Compartir nota", "Upload files to %s" : "Subir archivos a %s", "%s shared a folder with you." : "%s ha compartido una carpeta contigo.", diff --git a/apps/files_sharing/l10n/es_MX.js b/apps/files_sharing/l10n/es_MX.js index 6077bf303b6..dfc53fb5a89 100644 --- a/apps/files_sharing/l10n/es_MX.js +++ b/apps/files_sharing/l10n/es_MX.js @@ -238,7 +238,6 @@ OC.L10N.register( "Note:" : "Nota:", "File drop" : "Soltar archivo", "Terms of service" : "Términos del servicio", - "Share with {userName}" : "Compartir con {userName}", "Share with email {email}" : "Compartir al correo electrónico {email}", "Share with group" : "Compartir con el grupo", "Share in conversation" : "Compartir en la conversación", @@ -352,6 +351,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Para cargar archivos, primero debe proveer su nombre.", "Enter your name" : "Ingrese su nombre", "Submit name" : "Enviar nombre", + "Share with {userName}" : "Compartir con {userName}", "Share note" : "Compartir nota", "Upload files to %s" : "Cargar archivos a %s", "%s shared a folder with you." : "%s le compartió una carpeta.", diff --git a/apps/files_sharing/l10n/es_MX.json b/apps/files_sharing/l10n/es_MX.json index c4605f0cbb3..3999fd82e82 100644 --- a/apps/files_sharing/l10n/es_MX.json +++ b/apps/files_sharing/l10n/es_MX.json @@ -236,7 +236,6 @@ "Note:" : "Nota:", "File drop" : "Soltar archivo", "Terms of service" : "Términos del servicio", - "Share with {userName}" : "Compartir con {userName}", "Share with email {email}" : "Compartir al correo electrónico {email}", "Share with group" : "Compartir con el grupo", "Share in conversation" : "Compartir en la conversación", @@ -350,6 +349,7 @@ "To upload files, you need to provide your name first." : "Para cargar archivos, primero debe proveer su nombre.", "Enter your name" : "Ingrese su nombre", "Submit name" : "Enviar nombre", + "Share with {userName}" : "Compartir con {userName}", "Share note" : "Compartir nota", "Upload files to %s" : "Cargar archivos a %s", "%s shared a folder with you." : "%s le compartió una carpeta.", diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js index faa937543e9..57cadf5aa9d 100644 --- a/apps/files_sharing/l10n/et_EE.js +++ b/apps/files_sharing/l10n/et_EE.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Failide üleslaadimine õnnestus", "View terms of service" : "Vaata kasutustingimusi", "Terms of service" : "Kasutustingimused", - "Share with {userName}" : "Jaga kasutajaga {userName}", "Share with email {email}" : "Jaga e-posti aadressile {email}", "Share with group" : "Jaga grupiga", "Share in conversation" : "Jaga vestluses", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Faili üleslaadimiseks pead esmalt oma nime sisestama.", "Enter your name" : "Sisesta oma nimi", "Submit name" : "Salvesta nimi", + "Share with {userName}" : "Jaga kasutajaga {userName}", "Share note" : "Jaga märget", "Upload files to %s" : "Laadi failid %s", "%s shared a folder with you." : "%s jagas sinuga kausta.", diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json index 6c63d373f7f..32c6ad27cb4 100644 --- a/apps/files_sharing/l10n/et_EE.json +++ b/apps/files_sharing/l10n/et_EE.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Failide üleslaadimine õnnestus", "View terms of service" : "Vaata kasutustingimusi", "Terms of service" : "Kasutustingimused", - "Share with {userName}" : "Jaga kasutajaga {userName}", "Share with email {email}" : "Jaga e-posti aadressile {email}", "Share with group" : "Jaga grupiga", "Share in conversation" : "Jaga vestluses", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Faili üleslaadimiseks pead esmalt oma nime sisestama.", "Enter your name" : "Sisesta oma nimi", "Submit name" : "Salvesta nimi", + "Share with {userName}" : "Jaga kasutajaga {userName}", "Share note" : "Jaga märget", "Upload files to %s" : "Laadi failid %s", "%s shared a folder with you." : "%s jagas sinuga kausta.", diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js index 5b4caa99625..f4e6afea4e8 100644 --- a/apps/files_sharing/l10n/eu.js +++ b/apps/files_sharing/l10n/eu.js @@ -259,7 +259,6 @@ OC.L10N.register( "Successfully uploaded files" : "Fitxategiak ongi igo dira", "View terms of service" : "Ikusi zerbitzu-balditzak", "Terms of service" : "Erabilera baldintzak", - "Share with {userName}" : "Partekatu {userName}-rekin", "Share with email {email}" : "Partekatu helbide elektronikoarekin {email}", "Share with group" : "Partekatu taldearekin", "Share in conversation" : "Partekatu elkarrizketan", @@ -412,6 +411,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Fitxategiak igotzeko, zure izena eman behar duzu lehenik.", "Enter your name" : "Sartu zure izena", "Submit name" : "Sartu izena", + "Share with {userName}" : "Partekatu {userName}-rekin", "Share note" : "Partekatu oharra", "Upload files to %s" : "Igo fitxategiak hona: %s", "%s shared a folder with you." : "%s zurekin karpeta bat partekatu du.", diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json index c998ff5c0a3..5fafb7b83d5 100644 --- a/apps/files_sharing/l10n/eu.json +++ b/apps/files_sharing/l10n/eu.json @@ -257,7 +257,6 @@ "Successfully uploaded files" : "Fitxategiak ongi igo dira", "View terms of service" : "Ikusi zerbitzu-balditzak", "Terms of service" : "Erabilera baldintzak", - "Share with {userName}" : "Partekatu {userName}-rekin", "Share with email {email}" : "Partekatu helbide elektronikoarekin {email}", "Share with group" : "Partekatu taldearekin", "Share in conversation" : "Partekatu elkarrizketan", @@ -410,6 +409,7 @@ "To upload files, you need to provide your name first." : "Fitxategiak igotzeko, zure izena eman behar duzu lehenik.", "Enter your name" : "Sartu zure izena", "Submit name" : "Sartu izena", + "Share with {userName}" : "Partekatu {userName}-rekin", "Share note" : "Partekatu oharra", "Upload files to %s" : "Igo fitxategiak hona: %s", "%s shared a folder with you." : "%s zurekin karpeta bat partekatu du.", diff --git a/apps/files_sharing/l10n/fi.js b/apps/files_sharing/l10n/fi.js index c474552d180..9b954a9eb63 100644 --- a/apps/files_sharing/l10n/fi.js +++ b/apps/files_sharing/l10n/fi.js @@ -187,7 +187,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "Lähettämällä tiedostot hyväksyt käyttöehdot.", "View terms of service" : "Näytä käyttöehdot", "Terms of service" : "Käyttöehdot", - "Share with {userName}" : "Jaa käyttäjän {userName} kanssa", "Share with group" : "Jaa ryhmän kanssa", "Share in conversation" : "Jaa keskustelussa", "Share with remote group" : "Jaa etäryhmän kanssa", @@ -294,6 +293,7 @@ OC.L10N.register( "Search for share recipients" : "Etsi jaon vastaanottajia", "No recommendations. Start typing." : "Ei suosituksia. Aloita kirjoittaminen.", "Enter your name" : "Kirjoita nimesi", + "Share with {userName}" : "Jaa käyttäjän {userName} kanssa", "Share note" : "Jaa muistiinpano", "Upload files to %s" : "Lähetä tiedostoja käyttäjälle %s", "%s shared a folder with you." : "%s jakoi kansion kanssasi.", diff --git a/apps/files_sharing/l10n/fi.json b/apps/files_sharing/l10n/fi.json index 586155e82a0..393bee9fb31 100644 --- a/apps/files_sharing/l10n/fi.json +++ b/apps/files_sharing/l10n/fi.json @@ -185,7 +185,6 @@ "By uploading files, you agree to the terms of service." : "Lähettämällä tiedostot hyväksyt käyttöehdot.", "View terms of service" : "Näytä käyttöehdot", "Terms of service" : "Käyttöehdot", - "Share with {userName}" : "Jaa käyttäjän {userName} kanssa", "Share with group" : "Jaa ryhmän kanssa", "Share in conversation" : "Jaa keskustelussa", "Share with remote group" : "Jaa etäryhmän kanssa", @@ -292,6 +291,7 @@ "Search for share recipients" : "Etsi jaon vastaanottajia", "No recommendations. Start typing." : "Ei suosituksia. Aloita kirjoittaminen.", "Enter your name" : "Kirjoita nimesi", + "Share with {userName}" : "Jaa käyttäjän {userName} kanssa", "Share note" : "Jaa muistiinpano", "Upload files to %s" : "Lähetä tiedostoja käyttäjälle %s", "%s shared a folder with you." : "%s jakoi kansion kanssasi.", diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index 1769c4f79e3..9d36be7716d 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Fichiers téléversés avec succès", "View terms of service" : "Voir les conditions d'utilisation du service", "Terms of service" : "Conditions d'utilisation", - "Share with {userName}" : "Partager avec {userName}", "Share with email {email}" : "Partager avec l'e-mail {email}", "Share with group" : "Partager avec le groupe", "Share in conversation" : "Partager dans la conversation", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Pour téléverser des fichiers, vous devez fournir votre nom.", "Enter your name" : "Saisissez votre nom", "Submit name" : "Confirmer votre nom", + "Share with {userName}" : "Partager avec {userName}", "Share note" : "Partager la note", "Upload files to %s" : "Téléversement de fichiers dans %s", "%s shared a folder with you." : "%s a partagé un dossier avec vous.", diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 9ed10e3058b..bdf4bf2305b 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Fichiers téléversés avec succès", "View terms of service" : "Voir les conditions d'utilisation du service", "Terms of service" : "Conditions d'utilisation", - "Share with {userName}" : "Partager avec {userName}", "Share with email {email}" : "Partager avec l'e-mail {email}", "Share with group" : "Partager avec le groupe", "Share in conversation" : "Partager dans la conversation", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Pour téléverser des fichiers, vous devez fournir votre nom.", "Enter your name" : "Saisissez votre nom", "Submit name" : "Confirmer votre nom", + "Share with {userName}" : "Partager avec {userName}", "Share note" : "Partager la note", "Upload files to %s" : "Téléversement de fichiers dans %s", "%s shared a folder with you." : "%s a partagé un dossier avec vous.", diff --git a/apps/files_sharing/l10n/ga.js b/apps/files_sharing/l10n/ga.js index 7673f83c1c5..cc409c71eaf 100644 --- a/apps/files_sharing/l10n/ga.js +++ b/apps/files_sharing/l10n/ga.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Uaslódáileadh na comhaid go rathúil", "View terms of service" : "Féach ar théarmaí seirbhíse", "Terms of service" : "Tearmaí Seirbhís", - "Share with {userName}" : "Roinn le {userName}", "Share with email {email}" : "Roinn le ríomhphost {email}", "Share with group" : "Roinn leis an ngrúpa", "Share in conversation" : "Roinn sa chomhrá", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Chun comhaid a uaslódáil, ní mór duit d'ainm a sholáthar ar dtús.", "Enter your name" : "Cuir isteach d'ainm", "Submit name" : "Cuir ainm", + "Share with {userName}" : "Roinn le {userName}", "Share note" : "Roinn nóta", "Upload files to %s" : "Uaslódáil comhaid go %s", "%s shared a folder with you." : "Roinn %s fillteán leat.", diff --git a/apps/files_sharing/l10n/ga.json b/apps/files_sharing/l10n/ga.json index b84a50f2d14..188ad14c051 100644 --- a/apps/files_sharing/l10n/ga.json +++ b/apps/files_sharing/l10n/ga.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Uaslódáileadh na comhaid go rathúil", "View terms of service" : "Féach ar théarmaí seirbhíse", "Terms of service" : "Tearmaí Seirbhís", - "Share with {userName}" : "Roinn le {userName}", "Share with email {email}" : "Roinn le ríomhphost {email}", "Share with group" : "Roinn leis an ngrúpa", "Share in conversation" : "Roinn sa chomhrá", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Chun comhaid a uaslódáil, ní mór duit d'ainm a sholáthar ar dtús.", "Enter your name" : "Cuir isteach d'ainm", "Submit name" : "Cuir ainm", + "Share with {userName}" : "Roinn le {userName}", "Share note" : "Roinn nóta", "Upload files to %s" : "Uaslódáil comhaid go %s", "%s shared a folder with you." : "Roinn %s fillteán leat.", diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 26cc90151bf..7e925123bee 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -257,7 +257,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "Ao enviar ficheiros acepta as condicións de servizo.", "View terms of service" : "Ver as condicións de servizo", "Terms of service" : "Condicións de servizo", - "Share with {userName}" : "Compartir con {userName}", "Share with email {email}" : "Compartir co correo {email}", "Share with group" : "Compartir co grupo", "Share in conversation" : "Compartir na conversa", @@ -408,6 +407,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Para enviar ficheiros, primeiro debes fornecer o teu nome.", "Enter your name" : "Introduza o seu nome", "Submit name" : "Enviar o nome", + "Share with {userName}" : "Compartir con {userName}", "Share note" : "Compartir nota", "Upload files to %s" : "Enviar ficheiros a %s", "%s shared a folder with you." : "%s compartiu un cartafol con Vde.", diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index a3100bc6243..859e280af30 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -255,7 +255,6 @@ "By uploading files, you agree to the terms of service." : "Ao enviar ficheiros acepta as condicións de servizo.", "View terms of service" : "Ver as condicións de servizo", "Terms of service" : "Condicións de servizo", - "Share with {userName}" : "Compartir con {userName}", "Share with email {email}" : "Compartir co correo {email}", "Share with group" : "Compartir co grupo", "Share in conversation" : "Compartir na conversa", @@ -406,6 +405,7 @@ "To upload files, you need to provide your name first." : "Para enviar ficheiros, primeiro debes fornecer o teu nome.", "Enter your name" : "Introduza o seu nome", "Submit name" : "Enviar o nome", + "Share with {userName}" : "Compartir con {userName}", "Share note" : "Compartir nota", "Upload files to %s" : "Enviar ficheiros a %s", "%s shared a folder with you." : "%s compartiu un cartafol con Vde.", diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js index 566bcb7a80f..d1009ed7304 100644 --- a/apps/files_sharing/l10n/is.js +++ b/apps/files_sharing/l10n/is.js @@ -238,7 +238,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "Með því að senda inn skrár, samþykkir þú þjónustuskilmálana.", "View terms of service" : "Skoða þjónustuskilmála", "Terms of service" : "Þjónustuskilmálar", - "Share with {userName}" : "Deila með {userName}", "Share with email {email}" : "Deila í tölvupósti með {email}", "Share with group" : "Deila með hópi", "Share in conversation" : "Deila í samtali", @@ -381,6 +380,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Til að senda inn skrár þarftu fyrst að gefa upp nafnið þitt.", "Enter your name" : "Settu inn nafnið þitt", "Submit name" : "Nafn við innsendingu", + "Share with {userName}" : "Deila með {userName}", "Share note" : "Deila minnispunkti", "Upload files to %s" : "Senda inn skrár á %s", "%s shared a folder with you." : "%s deildi möppu með þér.", diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json index 05bf02285f7..983406e99ac 100644 --- a/apps/files_sharing/l10n/is.json +++ b/apps/files_sharing/l10n/is.json @@ -236,7 +236,6 @@ "By uploading files, you agree to the terms of service." : "Með því að senda inn skrár, samþykkir þú þjónustuskilmálana.", "View terms of service" : "Skoða þjónustuskilmála", "Terms of service" : "Þjónustuskilmálar", - "Share with {userName}" : "Deila með {userName}", "Share with email {email}" : "Deila í tölvupósti með {email}", "Share with group" : "Deila með hópi", "Share in conversation" : "Deila í samtali", @@ -379,6 +378,7 @@ "To upload files, you need to provide your name first." : "Til að senda inn skrár þarftu fyrst að gefa upp nafnið þitt.", "Enter your name" : "Settu inn nafnið þitt", "Submit name" : "Nafn við innsendingu", + "Share with {userName}" : "Deila með {userName}", "Share note" : "Deila minnispunkti", "Upload files to %s" : "Senda inn skrár á %s", "%s shared a folder with you." : "%s deildi möppu með þér.", diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index abf348adbf5..066a4fc273f 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "File caricati correttamente", "View terms of service" : "Visualizza i termini del servizio", "Terms of service" : "Termini del servizio", - "Share with {userName}" : "Condividi con {userName}", "Share with email {email}" : "Condividi con l'email {email}", "Share with group" : "Condividi con gruppo", "Share in conversation" : "Condividi nella conversazione", @@ -423,6 +422,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Per caricare file, devi prima fornire il tuo nome.", "Enter your name" : "Digita il tuo nome", "Submit name" : "Fornisci il nome", + "Share with {userName}" : "Condividi con {userName}", "Share note" : "Condividi nota", "Upload files to %s" : "Carica file su %s", "%s shared a folder with you." : "%s ha condiviso una cartella con te.", diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index c70a92ab32e..efa821dc66e 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "File caricati correttamente", "View terms of service" : "Visualizza i termini del servizio", "Terms of service" : "Termini del servizio", - "Share with {userName}" : "Condividi con {userName}", "Share with email {email}" : "Condividi con l'email {email}", "Share with group" : "Condividi con gruppo", "Share in conversation" : "Condividi nella conversazione", @@ -421,6 +420,7 @@ "To upload files, you need to provide your name first." : "Per caricare file, devi prima fornire il tuo nome.", "Enter your name" : "Digita il tuo nome", "Submit name" : "Fornisci il nome", + "Share with {userName}" : "Condividi con {userName}", "Share note" : "Condividi nota", "Upload files to %s" : "Carica file su %s", "%s shared a folder with you." : "%s ha condiviso una cartella con te.", diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index 59b8dff248e..75e6dcde2c6 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "ファイルのアップロードに成功しました", "View terms of service" : "利用規約を見る", "Terms of service" : "サービス利用規約", - "Share with {userName}" : "{userName} と共有", "Share with email {email}" : "{email} とメールで共有", "Share with group" : "グループと共有する", "Share in conversation" : "会話で共有する", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "ファイルをアップロードするには、最初に名前を入力する必要があります。", "Enter your name" : "あなたの名前を入力", "Submit name" : "名前を送信", + "Share with {userName}" : "{userName} と共有", "Share note" : "共有ノート", "Upload files to %s" : "%s にファイルをアップロード", "%s shared a folder with you." : "%sはあなたとフォルダーを共有しました。", diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index a9d6a841b89..4ac544a8c48 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "ファイルのアップロードに成功しました", "View terms of service" : "利用規約を見る", "Terms of service" : "サービス利用規約", - "Share with {userName}" : "{userName} と共有", "Share with email {email}" : "{email} とメールで共有", "Share with group" : "グループと共有する", "Share in conversation" : "会話で共有する", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "ファイルをアップロードするには、最初に名前を入力する必要があります。", "Enter your name" : "あなたの名前を入力", "Submit name" : "名前を送信", + "Share with {userName}" : "{userName} と共有", "Share note" : "共有ノート", "Upload files to %s" : "%s にファイルをアップロード", "%s shared a folder with you." : "%sはあなたとフォルダーを共有しました。", diff --git a/apps/files_sharing/l10n/ka.js b/apps/files_sharing/l10n/ka.js index d3dbc4ea3ee..f41699a17a5 100644 --- a/apps/files_sharing/l10n/ka.js +++ b/apps/files_sharing/l10n/ka.js @@ -165,7 +165,6 @@ OC.L10N.register( "on {server}" : "on {server}", "File drop" : "File drop", "Terms of service" : "Terms of service", - "Share with {userName}" : "Share with {userName}", "Share with group" : "Share with group", "Share in conversation" : "Share in conversation", "Share with remote group" : "Share with remote group", @@ -262,6 +261,7 @@ OC.L10N.register( "Search for share recipients" : "Search for share recipients", "No recommendations. Start typing." : "No recommendations. Start typing.", "Enter your name" : "Enter your name", + "Share with {userName}" : "Share with {userName}", "Share note" : "Share note", "Upload files to %s" : "Upload files to %s", "Note" : "Note", diff --git a/apps/files_sharing/l10n/ka.json b/apps/files_sharing/l10n/ka.json index fc96e8ef6c0..4f119ce51b4 100644 --- a/apps/files_sharing/l10n/ka.json +++ b/apps/files_sharing/l10n/ka.json @@ -163,7 +163,6 @@ "on {server}" : "on {server}", "File drop" : "File drop", "Terms of service" : "Terms of service", - "Share with {userName}" : "Share with {userName}", "Share with group" : "Share with group", "Share in conversation" : "Share in conversation", "Share with remote group" : "Share with remote group", @@ -260,6 +259,7 @@ "Search for share recipients" : "Search for share recipients", "No recommendations. Start typing." : "No recommendations. Start typing.", "Enter your name" : "Enter your name", + "Share with {userName}" : "Share with {userName}", "Share note" : "Share note", "Upload files to %s" : "Upload files to %s", "Note" : "Note", diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js index 88e83c2d820..3d338bb3568 100644 --- a/apps/files_sharing/l10n/ko.js +++ b/apps/files_sharing/l10n/ko.js @@ -258,7 +258,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "파일을 업로드하면 이용 약관에 동의하는 것을 의미합니다.", "View terms of service" : "이용 약관 보기", "Terms of service" : "이용 약관", - "Share with {userName}" : "{userName}와(과) 공유", "Share with email {email}" : "{email} 이메일에 공유", "Share with group" : "그룹과 공유", "Share in conversation" : "대화방과 공유", @@ -410,6 +409,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "파일을 업로드하려면 먼저 당신의 이름을 알려주세요.", "Enter your name" : "이름을 입력하세요", "Submit name" : "이름 제출", + "Share with {userName}" : "{userName}와(과) 공유", "Share note" : "공유 노트", "Upload files to %s" : "%s에 파일 업로드", "%s shared a folder with you." : "%s님이 당신과 폴더를 공유했습니다", diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json index 148b0dd11ed..a58f08b422d 100644 --- a/apps/files_sharing/l10n/ko.json +++ b/apps/files_sharing/l10n/ko.json @@ -256,7 +256,6 @@ "By uploading files, you agree to the terms of service." : "파일을 업로드하면 이용 약관에 동의하는 것을 의미합니다.", "View terms of service" : "이용 약관 보기", "Terms of service" : "이용 약관", - "Share with {userName}" : "{userName}와(과) 공유", "Share with email {email}" : "{email} 이메일에 공유", "Share with group" : "그룹과 공유", "Share in conversation" : "대화방과 공유", @@ -408,6 +407,7 @@ "To upload files, you need to provide your name first." : "파일을 업로드하려면 먼저 당신의 이름을 알려주세요.", "Enter your name" : "이름을 입력하세요", "Submit name" : "이름 제출", + "Share with {userName}" : "{userName}와(과) 공유", "Share note" : "공유 노트", "Upload files to %s" : "%s에 파일 업로드", "%s shared a folder with you." : "%s님이 당신과 폴더를 공유했습니다", diff --git a/apps/files_sharing/l10n/lt_LT.js b/apps/files_sharing/l10n/lt_LT.js index db12f4c1db5..30300ff8b20 100644 --- a/apps/files_sharing/l10n/lt_LT.js +++ b/apps/files_sharing/l10n/lt_LT.js @@ -178,7 +178,6 @@ OC.L10N.register( "Note:" : "Pastaba:", "File drop" : "Failų įkėlimas", "Terms of service" : "Naudojimosi sąlygos", - "Share with {userName}" : "Bendrinti su {userName}", "Share with email {email}" : "Bendrinti su el. pašto adresu {email}", "Share with group" : "Bendrinti su grupe", "Share in conversation" : "Bendrinti pokalbyje", @@ -274,6 +273,7 @@ OC.L10N.register( "Search for share recipients" : "Ieškoti viešinio gavėjų", "No recommendations. Start typing." : "Rekomendacijų nėra. Pradėkite rašyti.", "Enter your name" : "Įveskite savo vardą", + "Share with {userName}" : "Bendrinti su {userName}", "Share note" : "Pasidalinimo pastaba", "Upload files to %s" : "Įkelkite failus į %s", "%s shared a folder with you." : "%s pradėjo bendrinti su jumis aplanką.", diff --git a/apps/files_sharing/l10n/lt_LT.json b/apps/files_sharing/l10n/lt_LT.json index 4e4862f04b4..73a159b78ac 100644 --- a/apps/files_sharing/l10n/lt_LT.json +++ b/apps/files_sharing/l10n/lt_LT.json @@ -176,7 +176,6 @@ "Note:" : "Pastaba:", "File drop" : "Failų įkėlimas", "Terms of service" : "Naudojimosi sąlygos", - "Share with {userName}" : "Bendrinti su {userName}", "Share with email {email}" : "Bendrinti su el. pašto adresu {email}", "Share with group" : "Bendrinti su grupe", "Share in conversation" : "Bendrinti pokalbyje", @@ -272,6 +271,7 @@ "Search for share recipients" : "Ieškoti viešinio gavėjų", "No recommendations. Start typing." : "Rekomendacijų nėra. Pradėkite rašyti.", "Enter your name" : "Įveskite savo vardą", + "Share with {userName}" : "Bendrinti su {userName}", "Share note" : "Pasidalinimo pastaba", "Upload files to %s" : "Įkelkite failus į %s", "%s shared a folder with you." : "%s pradėjo bendrinti su jumis aplanką.", diff --git a/apps/files_sharing/l10n/mk.js b/apps/files_sharing/l10n/mk.js index 0cdf3e86239..6efdb4f913f 100644 --- a/apps/files_sharing/l10n/mk.js +++ b/apps/files_sharing/l10n/mk.js @@ -259,7 +259,6 @@ OC.L10N.register( "Successfully uploaded files" : "Успешно прикачени датотеки", "View terms of service" : "Прочитај ги условите за користење", "Terms of service" : "Услови за користење", - "Share with {userName}" : "Сподели со {userName}", "Share with email {email}" : "Сподели со е-пошта {email}", "Share with group" : "Сподели со група", "Share in conversation" : "Сподели во разговор", @@ -423,6 +422,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "За да прикачите датотеки, мора да го наведете вашето име.", "Enter your name" : "Внесете го вашето име", "Submit name" : "Испрати име", + "Share with {userName}" : "Сподели со {userName}", "Share note" : "Споделување со забелешка ", "Upload files to %s" : "Прикачи датотеки во %s", "%s shared a folder with you." : "%s сподели папка со вас.", diff --git a/apps/files_sharing/l10n/mk.json b/apps/files_sharing/l10n/mk.json index 092b47a70de..048d1576b4b 100644 --- a/apps/files_sharing/l10n/mk.json +++ b/apps/files_sharing/l10n/mk.json @@ -257,7 +257,6 @@ "Successfully uploaded files" : "Успешно прикачени датотеки", "View terms of service" : "Прочитај ги условите за користење", "Terms of service" : "Услови за користење", - "Share with {userName}" : "Сподели со {userName}", "Share with email {email}" : "Сподели со е-пошта {email}", "Share with group" : "Сподели со група", "Share in conversation" : "Сподели во разговор", @@ -421,6 +420,7 @@ "To upload files, you need to provide your name first." : "За да прикачите датотеки, мора да го наведете вашето име.", "Enter your name" : "Внесете го вашето име", "Submit name" : "Испрати име", + "Share with {userName}" : "Сподели со {userName}", "Share note" : "Споделување со забелешка ", "Upload files to %s" : "Прикачи датотеки во %s", "%s shared a folder with you." : "%s сподели папка со вас.", diff --git a/apps/files_sharing/l10n/nb.js b/apps/files_sharing/l10n/nb.js index 60c151054fb..e054f247d3e 100644 --- a/apps/files_sharing/l10n/nb.js +++ b/apps/files_sharing/l10n/nb.js @@ -242,7 +242,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "Ved å laste opp filer godtar du bruksvilkårene.", "View terms of service" : "Vis bruksvilkårene", "Terms of service" : "Betingelser for tjenesten", - "Share with {userName}" : "Del med {userName}", "Share with email {email}" : "Del med e-post {email}", "Share with group" : "Del med gruppe", "Share in conversation" : "Del i samtalen", @@ -366,6 +365,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "For å laste opp filer må du først oppgi navnet ditt.", "Enter your name" : "Skriv inn navnet ditt", "Submit name" : "Send inn navn", + "Share with {userName}" : "Del med {userName}", "Share note" : "Delingsnotat", "Upload files to %s" : "Last opp filer til %s", "%s shared a folder with you." : "%s delte en mappe med deg.", diff --git a/apps/files_sharing/l10n/nb.json b/apps/files_sharing/l10n/nb.json index fab0e4526bb..f881dff7c93 100644 --- a/apps/files_sharing/l10n/nb.json +++ b/apps/files_sharing/l10n/nb.json @@ -240,7 +240,6 @@ "By uploading files, you agree to the terms of service." : "Ved å laste opp filer godtar du bruksvilkårene.", "View terms of service" : "Vis bruksvilkårene", "Terms of service" : "Betingelser for tjenesten", - "Share with {userName}" : "Del med {userName}", "Share with email {email}" : "Del med e-post {email}", "Share with group" : "Del med gruppe", "Share in conversation" : "Del i samtalen", @@ -364,6 +363,7 @@ "To upload files, you need to provide your name first." : "For å laste opp filer må du først oppgi navnet ditt.", "Enter your name" : "Skriv inn navnet ditt", "Submit name" : "Send inn navn", + "Share with {userName}" : "Del med {userName}", "Share note" : "Delingsnotat", "Upload files to %s" : "Last opp filer til %s", "%s shared a folder with you." : "%s delte en mappe med deg.", diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index b5d0fce48cb..548dbbe4964 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Succesvol geüploade bestanden", "View terms of service" : "Toon gebruiksvoorwaarden", "Terms of service" : "Gebruiksvoorwaarden", - "Share with {userName}" : "Deel met {userName}", "Share with email {email}" : "Deel met e-mail {email}", "Share with group" : "Deel met groep", "Share in conversation" : "Deel in gesprek", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Om bestanden te uploaden moet je eerste je naam opgeven.", "Enter your name" : "Geef je naam op", "Submit name" : "Naam doorgeven", + "Share with {userName}" : "Deel met {userName}", "Share note" : "Notitie delen", "Upload files to %s" : "Upload bestanden naar %s", "%s shared a folder with you." : "%s heeft een map met je gedeeld", diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index 5fa8137aef9..758fba7aec1 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Succesvol geüploade bestanden", "View terms of service" : "Toon gebruiksvoorwaarden", "Terms of service" : "Gebruiksvoorwaarden", - "Share with {userName}" : "Deel met {userName}", "Share with email {email}" : "Deel met e-mail {email}", "Share with group" : "Deel met groep", "Share in conversation" : "Deel in gesprek", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Om bestanden te uploaden moet je eerste je naam opgeven.", "Enter your name" : "Geef je naam op", "Submit name" : "Naam doorgeven", + "Share with {userName}" : "Deel met {userName}", "Share note" : "Notitie delen", "Upload files to %s" : "Upload bestanden naar %s", "%s shared a folder with you." : "%s heeft een map met je gedeeld", diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js index 47109393c25..71f8eac92a2 100644 --- a/apps/files_sharing/l10n/pl.js +++ b/apps/files_sharing/l10n/pl.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Pomyślnie przesłano pliki", "View terms of service" : "Zobacz warunki korzystania z usługi", "Terms of service" : "Warunki usługi", - "Share with {userName}" : "Podziel się z {userName}", "Share with email {email}" : "Udostępnij na e-mail {email}", "Share with group" : "Udostępnij grupie", "Share in conversation" : "Udostępnij w rozmowie", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Aby przesłać pliki, musisz najpierw podać swoje imię i nazwisko.", "Enter your name" : "Wpisz swoją nazwę", "Submit name" : "Wyślij nazwę", + "Share with {userName}" : "Podziel się z {userName}", "Share note" : "Notatka udostępnienia", "Upload files to %s" : "Wyślij pliki do %s", "%s shared a folder with you." : "%s udostępnił Ci katalog.", diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json index fcc88eb97ad..4fed6b579bc 100644 --- a/apps/files_sharing/l10n/pl.json +++ b/apps/files_sharing/l10n/pl.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Pomyślnie przesłano pliki", "View terms of service" : "Zobacz warunki korzystania z usługi", "Terms of service" : "Warunki usługi", - "Share with {userName}" : "Podziel się z {userName}", "Share with email {email}" : "Udostępnij na e-mail {email}", "Share with group" : "Udostępnij grupie", "Share in conversation" : "Udostępnij w rozmowie", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Aby przesłać pliki, musisz najpierw podać swoje imię i nazwisko.", "Enter your name" : "Wpisz swoją nazwę", "Submit name" : "Wyślij nazwę", + "Share with {userName}" : "Podziel się z {userName}", "Share note" : "Notatka udostępnienia", "Upload files to %s" : "Wyślij pliki do %s", "%s shared a folder with you." : "%s udostępnił Ci katalog.", diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index 90f4f0badc8..bab705a8680 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Arquivos carregados com sucesso", "View terms of service" : "Ver os termos de serviço", "Terms of service" : "Termos de serviço", - "Share with {userName}" : "Compartilhar com {userName}", "Share with email {email}" : "Compartilhar com e-mail {email}", "Share with group" : "Compartilhar com grupo", "Share in conversation" : "Compartilhar na conversa", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Para fazer upload de arquivos, primeiro você precisa fornecer seu nome.", "Enter your name" : "Digite seu nome", "Submit name" : "Enviar nome", + "Share with {userName}" : "Compartilhar com {userName}", "Share note" : "Compartilhar nota", "Upload files to %s" : "Enviar arquivos para %s", "%s shared a folder with you." : "%s compartilhou uma pasta com você.", diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index ebeedc16373..4ab1a335c34 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Arquivos carregados com sucesso", "View terms of service" : "Ver os termos de serviço", "Terms of service" : "Termos de serviço", - "Share with {userName}" : "Compartilhar com {userName}", "Share with email {email}" : "Compartilhar com e-mail {email}", "Share with group" : "Compartilhar com grupo", "Share in conversation" : "Compartilhar na conversa", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Para fazer upload de arquivos, primeiro você precisa fornecer seu nome.", "Enter your name" : "Digite seu nome", "Submit name" : "Enviar nome", + "Share with {userName}" : "Compartilhar com {userName}", "Share note" : "Compartilhar nota", "Upload files to %s" : "Enviar arquivos para %s", "%s shared a folder with you." : "%s compartilhou uma pasta com você.", diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index 07500c11fa8..117a13f1d1e 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Файлы успешно загружены", "View terms of service" : "Ознакомиться с условиями предоставления услуг", "Terms of service" : "Условия использования", - "Share with {userName}" : "Поделиться с {userName}", "Share with email {email}" : "Поделитесь с помощью электронной почты", "Share with group" : "Поделиться с группой", "Share in conversation" : "Поделиться в чате", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Чтобы загрузить файлы, вам необходимо сначала указать свое имя.", "Enter your name" : "Введите своё имя", "Submit name" : "Отправить имя", + "Share with {userName}" : "Поделиться с {userName}", "Share note" : "Комментарий к общему ресурсу", "Upload files to %s" : "Загрузка файлов в %s", "%s shared a folder with you." : "%s поделился с вами папкой.", diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index e92a2f686e0..3505631ae52 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Файлы успешно загружены", "View terms of service" : "Ознакомиться с условиями предоставления услуг", "Terms of service" : "Условия использования", - "Share with {userName}" : "Поделиться с {userName}", "Share with email {email}" : "Поделитесь с помощью электронной почты", "Share with group" : "Поделиться с группой", "Share in conversation" : "Поделиться в чате", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Чтобы загрузить файлы, вам необходимо сначала указать свое имя.", "Enter your name" : "Введите своё имя", "Submit name" : "Отправить имя", + "Share with {userName}" : "Поделиться с {userName}", "Share note" : "Комментарий к общему ресурсу", "Upload files to %s" : "Загрузка файлов в %s", "%s shared a folder with you." : "%s поделился с вами папкой.", diff --git a/apps/files_sharing/l10n/sk.js b/apps/files_sharing/l10n/sk.js index fe7b83c3241..ffcce03be1f 100644 --- a/apps/files_sharing/l10n/sk.js +++ b/apps/files_sharing/l10n/sk.js @@ -258,7 +258,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "Nahraním súborov vyjadrujete súhlas s podmienkami služby.", "View terms of service" : "Zobraziť podmienky používania", "Terms of service" : "Všeobecné podmienky", - "Share with {userName}" : "Zdiľať s {userName}", "Share with email {email}" : "Zdieľať s emailom {email}", "Share with group" : "Zdieľať so skupinou", "Share in conversation" : "Zdieľať v rozhovore", @@ -409,6 +408,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Pre nahranie súborov, musíte najprv zdať svoje meno.", "Enter your name" : "Zadajte svoje meno", "Submit name" : "Odoslať meno", + "Share with {userName}" : "Zdiľať s {userName}", "Share note" : "Poznámka k zdieľaniu", "Upload files to %s" : "Nahrať súbory do %s", "%s shared a folder with you." : "%s vám zozdieľal adresár.", diff --git a/apps/files_sharing/l10n/sk.json b/apps/files_sharing/l10n/sk.json index cddca62ea35..f26219a3a9f 100644 --- a/apps/files_sharing/l10n/sk.json +++ b/apps/files_sharing/l10n/sk.json @@ -256,7 +256,6 @@ "By uploading files, you agree to the terms of service." : "Nahraním súborov vyjadrujete súhlas s podmienkami služby.", "View terms of service" : "Zobraziť podmienky používania", "Terms of service" : "Všeobecné podmienky", - "Share with {userName}" : "Zdiľať s {userName}", "Share with email {email}" : "Zdieľať s emailom {email}", "Share with group" : "Zdieľať so skupinou", "Share in conversation" : "Zdieľať v rozhovore", @@ -407,6 +406,7 @@ "To upload files, you need to provide your name first." : "Pre nahranie súborov, musíte najprv zdať svoje meno.", "Enter your name" : "Zadajte svoje meno", "Submit name" : "Odoslať meno", + "Share with {userName}" : "Zdiľať s {userName}", "Share note" : "Poznámka k zdieľaniu", "Upload files to %s" : "Nahrať súbory do %s", "%s shared a folder with you." : "%s vám zozdieľal adresár.", diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js index 9dcb5a4196f..07c847f0260 100644 --- a/apps/files_sharing/l10n/sr.js +++ b/apps/files_sharing/l10n/sr.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Фајлови су успешно отпремљени", "View terms of service" : "Прикажи услове коришћења", "Terms of service" : "Услови коришћења", - "Share with {userName}" : "Подели са {userName}", "Share with email {email}" : "Подели и-мејлом {email}", "Share with group" : "Подели са групом", "Share in conversation" : "Подели у разговор", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Да бисте могли да отпремите фајлове, најпре наведите своје име.", "Enter your name" : "Унесите Ваше име", "Submit name" : "Поднеси име", + "Share with {userName}" : "Подели са {userName}", "Share note" : "Белешка дељења", "Upload files to %s" : "Отпремите фајлове на%s", "%s shared a folder with you." : "%s је са вама поделио фолдер.", diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json index 289b841814b..7c07c87df2f 100644 --- a/apps/files_sharing/l10n/sr.json +++ b/apps/files_sharing/l10n/sr.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Фајлови су успешно отпремљени", "View terms of service" : "Прикажи услове коришћења", "Terms of service" : "Услови коришћења", - "Share with {userName}" : "Подели са {userName}", "Share with email {email}" : "Подели и-мејлом {email}", "Share with group" : "Подели са групом", "Share in conversation" : "Подели у разговор", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Да бисте могли да отпремите фајлове, најпре наведите своје име.", "Enter your name" : "Унесите Ваше име", "Submit name" : "Поднеси име", + "Share with {userName}" : "Подели са {userName}", "Share note" : "Белешка дељења", "Upload files to %s" : "Отпремите фајлове на%s", "%s shared a folder with you." : "%s је са вама поделио фолдер.", diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js index 64231f3a248..18dfc8866f5 100644 --- a/apps/files_sharing/l10n/sv.js +++ b/apps/files_sharing/l10n/sv.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Filer har laddats upp", "View terms of service" : "Visa användarvillkoren", "Terms of service" : "Användarvillkor", - "Share with {userName}" : "Dela med {userName}", "Share with email {email}" : "Dela med e-post {email}", "Share with group" : "Dela med grupp", "Share in conversation" : "Dela i konversation", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "För att ladda upp filer måste du först ange ditt namn.", "Enter your name" : "Ange ditt namn", "Submit name" : "Skicka namn", + "Share with {userName}" : "Dela med {userName}", "Share note" : "Dela kommentar", "Upload files to %s" : "Ladda upp filer till %s", "%s shared a folder with you." : "%s delade en mapp med dig.", diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json index 46574809f57..4b99792d8ee 100644 --- a/apps/files_sharing/l10n/sv.json +++ b/apps/files_sharing/l10n/sv.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Filer har laddats upp", "View terms of service" : "Visa användarvillkoren", "Terms of service" : "Användarvillkor", - "Share with {userName}" : "Dela med {userName}", "Share with email {email}" : "Dela med e-post {email}", "Share with group" : "Dela med grupp", "Share in conversation" : "Dela i konversation", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "För att ladda upp filer måste du först ange ditt namn.", "Enter your name" : "Ange ditt namn", "Submit name" : "Skicka namn", + "Share with {userName}" : "Dela med {userName}", "Share note" : "Dela kommentar", "Upload files to %s" : "Ladda upp filer till %s", "%s shared a folder with you." : "%s delade en mapp med dig.", diff --git a/apps/files_sharing/l10n/sw.js b/apps/files_sharing/l10n/sw.js index b92adb4f8ca..b53b00c5ed1 100644 --- a/apps/files_sharing/l10n/sw.js +++ b/apps/files_sharing/l10n/sw.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : " Faili zimepakiwa kikamilifu", "View terms of service" : "Tazama masharti ya huduma", "Terms of service" : "Masharti ya huduma", - "Share with {userName}" : "Shiriki na {userName}", "Share with email {email}" : "Shiriki na barua pepe {email}", "Share with group" : "Shiriki na kundi", "Share in conversation" : "Shiriki katika mazungumzo", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Ili kupakia faili, unahitaji kutoa jina lako kwanza.", "Enter your name" : "Ingiza jina lako ", "Submit name" : "Wasilisha jina", + "Share with {userName}" : "Shiriki na {userName}", "Share note" : "Shiriki dokezo", "Upload files to %s" : "Pakia faili kwa %s", "%s shared a folder with you." : "%s ameshiriki folda nawe.", diff --git a/apps/files_sharing/l10n/sw.json b/apps/files_sharing/l10n/sw.json index b8c4da07c60..50b4a13d33e 100644 --- a/apps/files_sharing/l10n/sw.json +++ b/apps/files_sharing/l10n/sw.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : " Faili zimepakiwa kikamilifu", "View terms of service" : "Tazama masharti ya huduma", "Terms of service" : "Masharti ya huduma", - "Share with {userName}" : "Shiriki na {userName}", "Share with email {email}" : "Shiriki na barua pepe {email}", "Share with group" : "Shiriki na kundi", "Share in conversation" : "Shiriki katika mazungumzo", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Ili kupakia faili, unahitaji kutoa jina lako kwanza.", "Enter your name" : "Ingiza jina lako ", "Submit name" : "Wasilisha jina", + "Share with {userName}" : "Shiriki na {userName}", "Share note" : "Shiriki dokezo", "Upload files to %s" : "Pakia faili kwa %s", "%s shared a folder with you." : "%s ameshiriki folda nawe.", diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index 9b48f187e49..b33538f290d 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Dosyalar yüklendi", "View terms of service" : "Hizmet koşullarını görüntüle", "Terms of service" : "Hizmet koşulları", - "Share with {userName}" : "{userName} ile paylaş", "Share with email {email}" : "{email} e-posta adresi ile paylaş", "Share with group" : "Grupla paylaş", "Share in conversation" : "Görüşmede paylaş", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Dosyaları yükleyebilmek için önce adınızı yazmalısınız.", "Enter your name" : "Adınızı yazın", "Submit name" : "Adı gönder", + "Share with {userName}" : "{userName} ile paylaş", "Share note" : "Notu paylaş", "Upload files to %s" : "Dosyaları %s konumuna yükle", "%s shared a folder with you." : "%s sizinle bir klasör paylaştı.", diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index 315949ca7d0..cace02f0cf4 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Dosyalar yüklendi", "View terms of service" : "Hizmet koşullarını görüntüle", "Terms of service" : "Hizmet koşulları", - "Share with {userName}" : "{userName} ile paylaş", "Share with email {email}" : "{email} e-posta adresi ile paylaş", "Share with group" : "Grupla paylaş", "Share in conversation" : "Görüşmede paylaş", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Dosyaları yükleyebilmek için önce adınızı yazmalısınız.", "Enter your name" : "Adınızı yazın", "Submit name" : "Adı gönder", + "Share with {userName}" : "{userName} ile paylaş", "Share note" : "Notu paylaş", "Upload files to %s" : "Dosyaları %s konumuna yükle", "%s shared a folder with you." : "%s sizinle bir klasör paylaştı.", diff --git a/apps/files_sharing/l10n/ug.js b/apps/files_sharing/l10n/ug.js index 07ed931958d..3a059f98cb2 100644 --- a/apps/files_sharing/l10n/ug.js +++ b/apps/files_sharing/l10n/ug.js @@ -242,7 +242,6 @@ OC.L10N.register( "By uploading files, you agree to the terms of service." : "ھۆججەتلەرنى يوللاش ئارقىلىق مۇلازىمەت شەرتلىرىگە قوشۇلىسىز.", "View terms of service" : "مۇلازىمەت شەرتلىرىنى كۆرۈش", "Terms of service" : "مۇلازىمەت شەرتلىرى", - "Share with {userName}" : "{userName} بىلەن ئورتاقلىشىڭ", "Share with email {email}" : "ئېلېكترونلۇق خەت {email} خەت}", "Share with group" : "گۇرۇپپا بىلەن ئورتاقلىشىش", "Share in conversation" : "سۆھبەتتە ئورتاقلىشىڭ", @@ -370,6 +369,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "ھۆججەتلەرنى يوللاش ئۈچۈن ئالدى بىلەن ئىسمىڭىزنى تەمىنلىشىڭىز كېرەك.", "Enter your name" : "ئىسمىڭىزنى كىرگۈزۈڭ", "Submit name" : "ئىسىم يوللاڭ", + "Share with {userName}" : "{userName} بىلەن ئورتاقلىشىڭ", "Share note" : "ئورتاقلىشىش خاتىرىسى", "Upload files to %s" : "ھۆججەتلەرنى% s غا يۈكلەڭ", "%s shared a folder with you." : "% s ھۆججەت قىسقۇچنى سىز بىلەن ئورتاقلاشتى.", diff --git a/apps/files_sharing/l10n/ug.json b/apps/files_sharing/l10n/ug.json index 228e3144714..e69e5b95059 100644 --- a/apps/files_sharing/l10n/ug.json +++ b/apps/files_sharing/l10n/ug.json @@ -240,7 +240,6 @@ "By uploading files, you agree to the terms of service." : "ھۆججەتلەرنى يوللاش ئارقىلىق مۇلازىمەت شەرتلىرىگە قوشۇلىسىز.", "View terms of service" : "مۇلازىمەت شەرتلىرىنى كۆرۈش", "Terms of service" : "مۇلازىمەت شەرتلىرى", - "Share with {userName}" : "{userName} بىلەن ئورتاقلىشىڭ", "Share with email {email}" : "ئېلېكترونلۇق خەت {email} خەت}", "Share with group" : "گۇرۇپپا بىلەن ئورتاقلىشىش", "Share in conversation" : "سۆھبەتتە ئورتاقلىشىڭ", @@ -368,6 +367,7 @@ "To upload files, you need to provide your name first." : "ھۆججەتلەرنى يوللاش ئۈچۈن ئالدى بىلەن ئىسمىڭىزنى تەمىنلىشىڭىز كېرەك.", "Enter your name" : "ئىسمىڭىزنى كىرگۈزۈڭ", "Submit name" : "ئىسىم يوللاڭ", + "Share with {userName}" : "{userName} بىلەن ئورتاقلىشىڭ", "Share note" : "ئورتاقلىشىش خاتىرىسى", "Upload files to %s" : "ھۆججەتلەرنى% s غا يۈكلەڭ", "%s shared a folder with you." : "% s ھۆججەت قىسقۇچنى سىز بىلەن ئورتاقلاشتى.", diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js index 03d3d5eb8fb..26450a7991a 100644 --- a/apps/files_sharing/l10n/uk.js +++ b/apps/files_sharing/l10n/uk.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "Успішно завантажено файли", "View terms of service" : "Переглянути умови користування.", "Terms of service" : "Умови використання", - "Share with {userName}" : "Поділитися з {userName}", "Share with email {email}" : "Поділитися через ел.пошту {email}", "Share with group" : "Поділитися з групою", "Share in conversation" : "Поширити в розмові ", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "Щоби завантажити файли, спочатку зазначте ваше ім'я.", "Enter your name" : "Зазначте ваше ім'я", "Submit name" : "Надайте ім'я", + "Share with {userName}" : "Поділитися з {userName}", "Share note" : "Поділитися нотаткою", "Upload files to %s" : "Завантажити файли до %s", "%s shared a folder with you." : "%s поділив(-ла)ся з вами каталогом.", diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json index e3a73695290..6277c20366f 100644 --- a/apps/files_sharing/l10n/uk.json +++ b/apps/files_sharing/l10n/uk.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "Успішно завантажено файли", "View terms of service" : "Переглянути умови користування.", "Terms of service" : "Умови використання", - "Share with {userName}" : "Поділитися з {userName}", "Share with email {email}" : "Поділитися через ел.пошту {email}", "Share with group" : "Поділитися з групою", "Share in conversation" : "Поширити в розмові ", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "Щоби завантажити файли, спочатку зазначте ваше ім'я.", "Enter your name" : "Зазначте ваше ім'я", "Submit name" : "Надайте ім'я", + "Share with {userName}" : "Поділитися з {userName}", "Share note" : "Поділитися нотаткою", "Upload files to %s" : "Завантажити файли до %s", "%s shared a folder with you." : "%s поділив(-ла)ся з вами каталогом.", diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index 2be5b54648c..a4a785557b3 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "已成功上传文件", "View terms of service" : "查看服务条款", "Terms of service" : "服务条款", - "Share with {userName}" : "分享至 {userName}", "Share with email {email}" : "与邮箱 {email} 分享", "Share with group" : "分享至群组", "Share in conversation" : "分享至对话", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "要上传文件，您需要先提供名称。", "Enter your name" : "输入名称", "Submit name" : "提交名称", + "Share with {userName}" : "分享至 {userName}", "Share note" : "共享笔记", "Upload files to %s" : "上传文件到 %s", "%s shared a folder with you." : "%s 与您分享了一个文件夹。", diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index bda0608cbe5..223b4a17b2e 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "已成功上传文件", "View terms of service" : "查看服务条款", "Terms of service" : "服务条款", - "Share with {userName}" : "分享至 {userName}", "Share with email {email}" : "与邮箱 {email} 分享", "Share with group" : "分享至群组", "Share in conversation" : "分享至对话", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "要上传文件，您需要先提供名称。", "Enter your name" : "输入名称", "Submit name" : "提交名称", + "Share with {userName}" : "分享至 {userName}", "Share note" : "共享笔记", "Upload files to %s" : "上传文件到 %s", "%s shared a folder with you." : "%s 与您分享了一个文件夹。", diff --git a/apps/files_sharing/l10n/zh_HK.js b/apps/files_sharing/l10n/zh_HK.js index d15d5a81e3a..92bfd2fb23f 100644 --- a/apps/files_sharing/l10n/zh_HK.js +++ b/apps/files_sharing/l10n/zh_HK.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "檔案上傳成功", "View terms of service" : "檢視服務條款", "Terms of service" : "服務條款", - "Share with {userName}" : "與 {userName} 分享", "Share with email {email}" : "與電郵地址 {email} 分享", "Share with group" : "與群組分享", "Share in conversation" : "在對話中分享", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "要上傳檔案，您需要先提供您的姓名。", "Enter your name" : "輸入您的名稱", "Submit name" : "遞交名字", + "Share with {userName}" : "與 {userName} 分享", "Share note" : "分享筆記", "Upload files to %s" : "上傳檔案到 %s", "%s shared a folder with you." : "%s 與您分享了一個資料夾。", diff --git a/apps/files_sharing/l10n/zh_HK.json b/apps/files_sharing/l10n/zh_HK.json index 9b5d944f362..7ec9aaf17a8 100644 --- a/apps/files_sharing/l10n/zh_HK.json +++ b/apps/files_sharing/l10n/zh_HK.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "檔案上傳成功", "View terms of service" : "檢視服務條款", "Terms of service" : "服務條款", - "Share with {userName}" : "與 {userName} 分享", "Share with email {email}" : "與電郵地址 {email} 分享", "Share with group" : "與群組分享", "Share in conversation" : "在對話中分享", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "要上傳檔案，您需要先提供您的姓名。", "Enter your name" : "輸入您的名稱", "Submit name" : "遞交名字", + "Share with {userName}" : "與 {userName} 分享", "Share note" : "分享筆記", "Upload files to %s" : "上傳檔案到 %s", "%s shared a folder with you." : "%s 與您分享了一個資料夾。", diff --git a/apps/files_sharing/l10n/zh_TW.js b/apps/files_sharing/l10n/zh_TW.js index 4352773dda8..94ee6439e8f 100644 --- a/apps/files_sharing/l10n/zh_TW.js +++ b/apps/files_sharing/l10n/zh_TW.js @@ -260,7 +260,6 @@ OC.L10N.register( "Successfully uploaded files" : "已成功上傳檔案", "View terms of service" : "檢視服務條款", "Terms of service" : "服務條款", - "Share with {userName}" : "與 {userName} 分享", "Share with email {email}" : "與電子郵件 {email} 分享", "Share with group" : "與群組分享", "Share in conversation" : "在對話中分享", @@ -424,6 +423,7 @@ OC.L10N.register( "To upload files, you need to provide your name first." : "要上傳檔案，您必須先提供您的名字。", "Enter your name" : "輸入您的名稱", "Submit name" : "遞交名稱", + "Share with {userName}" : "與 {userName} 分享", "Share note" : "分享備註", "Upload files to %s" : "上傳檔案到 %s", "%s shared a folder with you." : "%s 與您分享了一個資料夾。", diff --git a/apps/files_sharing/l10n/zh_TW.json b/apps/files_sharing/l10n/zh_TW.json index d23b831db0d..1851c022454 100644 --- a/apps/files_sharing/l10n/zh_TW.json +++ b/apps/files_sharing/l10n/zh_TW.json @@ -258,7 +258,6 @@ "Successfully uploaded files" : "已成功上傳檔案", "View terms of service" : "檢視服務條款", "Terms of service" : "服務條款", - "Share with {userName}" : "與 {userName} 分享", "Share with email {email}" : "與電子郵件 {email} 分享", "Share with group" : "與群組分享", "Share in conversation" : "在對話中分享", @@ -422,6 +421,7 @@ "To upload files, you need to provide your name first." : "要上傳檔案，您必須先提供您的名字。", "Enter your name" : "輸入您的名稱", "Submit name" : "遞交名稱", + "Share with {userName}" : "與 {userName} 分享", "Share note" : "分享備註", "Upload files to %s" : "上傳檔案到 %s", "%s shared a folder with you." : "%s 與您分享了一個資料夾。", diff --git a/apps/files_sharing/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php index b4fe5a1bb73..cbb9b5cd2f2 100644 --- a/apps/files_sharing/lib/Capabilities.php +++ b/apps/files_sharing/lib/Capabilities.php @@ -7,6 +7,7 @@ */ namespace OCA\Files_Sharing; +use OCP\App\IAppManager; use OCP\Capabilities\ICapability; use OCP\Constants; use OCP\IConfig; @@ -18,10 +19,10 @@ use OCP\Share\IManager; * @package OCA\Files_Sharing */ class Capabilities implements ICapability { - public function __construct( private IConfig $config, private IManager $shareManager, + private IAppManager $appManager, ) { } @@ -158,14 +159,23 @@ class Capabilities implements ICapability { } //Federated sharing - $res['federation'] = [ - 'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(), - 'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes', - // old bogus one, expire_date was not working before, keeping for compatibility - 'expire_date' => ['enabled' => true], - // the real deal, signifies that expiration date can be set on federated shares - 'expire_date_supported' => ['enabled' => true], - ]; + if ($this->appManager->isEnabledForAnyone('federation')) { + $res['federation'] = [ + 'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(), + 'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes', + // old bogus one, expire_date was not working before, keeping for compatibility + 'expire_date' => ['enabled' => true], + // the real deal, signifies that expiration date can be set on federated shares + 'expire_date_supported' => ['enabled' => true], + ]; + } else { + $res['federation'] = [ + 'outgoing' => false, + 'incoming' => false, + 'expire_date' => ['enabled' => false], + 'expire_date_supported' => ['enabled' => false], + ]; + } // Sharee searches $res['sharee'] = [ diff --git a/apps/files_sharing/lib/Listener/LoadSidebarListener.php b/apps/files_sharing/lib/Listener/LoadSidebarListener.php index 88c39f38545..17fee71978f 100644 --- a/apps/files_sharing/lib/Listener/LoadSidebarListener.php +++ b/apps/files_sharing/lib/Listener/LoadSidebarListener.php @@ -15,6 +15,7 @@ use OCA\Files_Sharing\Config\ConfigLexicon; use OCP\AppFramework\Services\IInitialState; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; +use OCP\GlobalScale\IConfig; use OCP\IAppConfig; use OCP\Server; use OCP\Share\IManager; @@ -35,10 +36,15 @@ class LoadSidebarListener implements IEventListener { if (!($event instanceof LoadSidebar)) { return; } + Util::addScript(Application::APP_ID, 'files_sharing_tab', 'files'); $appConfig = Server::get(IAppConfig::class); - $this->initialState->provideInitialState('showFederatedSharesAsInternal', $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_AS_INTERNAL)); - $this->initialState->provideInitialState('showFederatedSharesToTrustedServersAsInternal', $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_TO_TRUSTED_AS_INTERNAL)); - Util::addScript(Application::APP_ID, 'files_sharing_tab', 'files'); + $gsConfig = Server::get(IConfig::class); + $showFederatedToTrustedAsInternal = $gsConfig->isGlobalScaleEnabled() || $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_TO_TRUSTED_AS_INTERNAL); + $showFederatedAsInternal = ($gsConfig->isGlobalScaleEnabled() && $gsConfig->onlyInternalFederation()) + || $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_AS_INTERNAL); + + $this->initialState->provideInitialState('showFederatedSharesAsInternal', $showFederatedAsInternal); + $this->initialState->provideInitialState('showFederatedSharesToTrustedServersAsInternal', $showFederatedToTrustedAsInternal); } } diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue index 1fbe740cb11..342b40ce384 100644 --- a/apps/files_sharing/src/components/SharingEntry.vue +++ b/apps/files_sharing/src/components/SharingEntry.vue @@ -19,8 +19,9 @@ :href="share.shareWithLink" class="sharing-entry__summary__desc"> <span>{{ title }} - <span v-if="!isUnique" class="sharing-entry__summary__desc-unique"> ({{ - share.shareWithDisplayNameUnique }})</span> + <span v-if="!isUnique" class="sharing-entry__summary__desc-unique"> + ({{ share.shareWithDisplayNameUnique }}) + </span> <small v-if="hasStatus && share.status.message">({{ share.status.message }})</small> </span> </component> @@ -73,13 +74,17 @@ export default { computed: { title() { let title = this.share.shareWithDisplayName - if (this.share.type === ShareType.Group) { + + const showAsInternal = this.config.showFederatedSharesAsInternal + || (this.share.isTrustedServer && this.config.showFederatedSharesToTrustedServersAsInternal) + + if (this.share.type === ShareType.Group || (this.share.type === ShareType.RemoteGroup && showAsInternal)) { title += ` (${t('files_sharing', 'group')})` } else if (this.share.type === ShareType.Room) { title += ` (${t('files_sharing', 'conversation')})` - } else if (this.share.type === ShareType.Remote && !this.share.isTrustedServer) { + } else if (this.share.type === ShareType.Remote && !showAsInternal) { title += ` (${t('files_sharing', 'remote')})` - } else if (this.share.type === ShareType.RemoteGroup && !this.share.isTrustedServer) { + } else if (this.share.type === ShareType.RemoteGroup) { title += ` (${t('files_sharing', 'remote group')})` } else if (this.share.type === ShareType.Guest) { title += ` (${t('files_sharing', 'guest')})` diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue index f50dc96fc08..46bacef0c6c 100644 --- a/apps/files_sharing/src/components/SharingInput.vue +++ b/apps/files_sharing/src/components/SharingInput.vue @@ -195,17 +195,15 @@ export default { const remoteTypes = [ShareType.Remote, ShareType.RemoteGroup] const shareType = [] - const showFederatedAsInternal - = this.config.showFederatedSharesAsInternal - || this.config.showFederatedSharesToTrustedServersAsInternal - - const shouldAddRemoteTypes - // For internal users, add remote types if config says to show them as internal - = (!this.isExternal && showFederatedAsInternal) - // For external users, add them if config *doesn't* say to show them as internal - || (this.isExternal && !showFederatedAsInternal) - // Edge case: federated-to-trusted is a separate "add" trigger for external users - || (this.isExternal && this.config.showFederatedSharesToTrustedServersAsInternal) + const showFederatedAsInternal = this.config.showFederatedSharesAsInternal + || this.config.showFederatedSharesToTrustedServersAsInternal + + // For internal users, add remote types if config says to show them as internal + const shouldAddRemoteTypes = (!this.isExternal && showFederatedAsInternal) + // For external users, add them if config *doesn't* say to show them as internal + || (this.isExternal && !showFederatedAsInternal) + // Edge case: federated-to-trusted is a separate "add" trigger for external users + || (this.isExternal && this.config.showFederatedSharesToTrustedServersAsInternal) if (this.isExternal) { if (getCapabilities().files_sharing.public.enabled === true) { @@ -244,13 +242,10 @@ export default { return } - const data = request.data.ocs.data - const exact = request.data.ocs.data.exact - data.exact = [] // removing exact from general results - + const { exact, ...data } = request.data.ocs.data // flatten array of arrays - const rawExactSuggestions = Object.values(exact).reduce((arr, elem) => arr.concat(elem), []) - const rawSuggestions = Object.values(data).reduce((arr, elem) => arr.concat(elem), []) + const rawExactSuggestions = Object.values(exact).flat() + const rawSuggestions = Object.values(data).flat() // remove invalid data and format to user-select layout const exactSuggestions = this.filterOutExistingShares(rawExactSuggestions) @@ -470,14 +465,19 @@ export default { */ formatForMultiselect(result) { let subname + let displayName = result.name || result.label + if (result.value.shareType === ShareType.User && this.config.shouldAlwaysShowUnique) { subname = result.shareWithDisplayNameUnique ?? '' - } else if ((result.value.shareType === ShareType.Remote - || result.value.shareType === ShareType.RemoteGroup - ) && result.value.server) { - subname = t('files_sharing', 'on {server}', { server: result.value.server }) } else if (result.value.shareType === ShareType.Email) { subname = result.value.shareWith + } else if (result.value.shareType === ShareType.Remote || result.value.shareType === ShareType.RemoteGroup) { + if (this.config.showFederatedSharesAsInternal) { + subname = result.extra?.email?.value ?? '' + displayName = result.extra?.name?.value ?? displayName + } else if (result.value.server) { + subname = t('files_sharing', 'on {server}', { server: result.value.server }) + } } else { subname = result.shareWithDescription ?? '' } @@ -487,7 +487,7 @@ export default { shareType: result.value.shareType, user: result.uuid || result.value.shareWith, isNoUser: result.value.shareType !== ShareType.User, - displayName: result.name || result.label, + displayName, subname, shareWithDisplayNameUnique: result.shareWithDisplayNameUnique || '', ...this.shareTypeToIcon(result.value.shareType), diff --git a/apps/files_sharing/src/services/ConfigService.ts b/apps/files_sharing/src/services/ConfigService.ts index f75f34c7936..547038f362d 100644 --- a/apps/files_sharing/src/services/ConfigService.ts +++ b/apps/files_sharing/src/services/ConfigService.ts @@ -213,6 +213,13 @@ export default class Config { } /** + * Is federation enabled ? + */ + get isFederationEnabled(): boolean { + return this._capabilities?.files_sharing?.federation?.outgoing === true + } + + /** * Is public sharing enabled ? */ get isPublicShareAllowed(): boolean { diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue index ee902a24c8a..b3a3b95d92e 100644 --- a/apps/files_sharing/src/views/SharingDetailsTab.vue +++ b/apps/files_sharing/src/views/SharingDetailsTab.vue @@ -373,7 +373,7 @@ export default { title() { switch (this.share.type) { case ShareType.User: - return t('files_sharing', 'Share with {userName}', { userName: this.share.shareWithDisplayName }) + return t('files_sharing', 'Share with {user}', { user: this.share.shareWithDisplayName }) case ShareType.Email: return t('files_sharing', 'Share with email {email}', { email: this.share.shareWith }) case ShareType.Link: @@ -384,6 +384,9 @@ export default { return t('files_sharing', 'Share in conversation') case ShareType.Remote: { const [user, server] = this.share.shareWith.split('@') + if (this.config.showFederatedSharesAsInternal) { + return t('files_sharing', 'Share with {user}', { user }) + } return t('files_sharing', 'Share with {user} on remote server {server}', { user, server }) } case ShareType.RemoteGroup: diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue index dc200c61df4..9900d6c562d 100644 --- a/apps/files_sharing/src/views/SharingTab.vue +++ b/apps/files_sharing/src/views/SharingTab.vue @@ -268,21 +268,20 @@ export default { }, internalShareInputPlaceholder() { - return this.config.showFederatedSharesAsInternal + return this.config.showFederatedSharesAsInternal && this.config.isFederationEnabled ? t('files_sharing', 'Share with accounts, teams, federated cloud IDs') : t('files_sharing', 'Share with accounts and teams') }, externalShareInputPlaceholder() { if (!this.isLinkSharingAllowed) { - return t('files_sharing', 'Federated cloud ID') + return this.config.isFederationEnabled ? t('files_sharing', 'Federated cloud ID') : '' } - return this.config.showFederatedSharesAsInternal + return !this.config.showFederatedSharesAsInternal && !this.config.isFederationEnabled ? t('files_sharing', 'Email') : t('files_sharing', 'Email, federated cloud ID') }, }, - methods: { /** * Update current fileInfo and fetch new data @@ -294,7 +293,6 @@ export default { this.resetState() this.getShares() }, - /** * Get the existing shares infos */ diff --git a/apps/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php index 2600bd9d925..2fe221703a5 100644 --- a/apps/files_sharing/tests/CapabilitiesTest.php +++ b/apps/files_sharing/tests/CapabilitiesTest.php @@ -11,6 +11,7 @@ use OC\KnownUser\KnownUserService; use OC\Share20\Manager; use OC\Share20\ShareDisableChecker; use OCA\Files_Sharing\Capabilities; +use OCP\App\IAppManager; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\IRootFolder; use OCP\Files\Mount\IMountManager; @@ -55,9 +56,11 @@ class CapabilitiesTest extends \Test\TestCase { * @param (string[])[] $map Map of arguments to return types for the getAppValue function in the mock * @return string[] */ - private function getResults(array $map) { + private function getResults(array $map, bool $federationEnabled = true) { $config = $this->getMockBuilder(IConfig::class)->disableOriginalConstructor()->getMock(); + $appManager = $this->getMockBuilder(IAppManager::class)->disableOriginalConstructor()->getMock(); $config->method('getAppValue')->willReturnMap($map); + $appManager->method('isEnabledForAnyone')->with('federation')->willReturn($federationEnabled); $shareManager = new Manager( $this->createMock(LoggerInterface::class), $config, @@ -79,7 +82,7 @@ class CapabilitiesTest extends \Test\TestCase { $this->createMock(IDateTimeZone::class), $this->createMock(IAppConfig::class), ); - $cap = new Capabilities($config, $shareManager); + $cap = new Capabilities($config, $shareManager, $appManager); $result = $this->getFilesSharingPart($cap->getCapabilities()); return $result; } @@ -323,4 +326,13 @@ class CapabilitiesTest extends \Test\TestCase { $this->assertEquals(['enabled' => true], $result['federation']['expire_date']); $this->assertEquals(['enabled' => true], $result['federation']['expire_date_supported']); } + + public function testFederatedSharingDisabled(): void { + $result = $this->getResults([], false); + $this->assertArrayHasKey('federation', $result); + $this->assertFalse($result['federation']['incoming']); + $this->assertFalse($result['federation']['outgoing']); + $this->assertEquals(['enabled' => false], $result['federation']['expire_date']); + $this->assertEquals(['enabled' => false], $result['federation']['expire_date_supported']); + } } |