diff options
Diffstat (limited to 'apps')
80 files changed, 128 insertions, 537 deletions
diff --git a/apps/files_sharing/l10n/bg.js b/apps/files_sharing/l10n/bg.js index 5b1f93aa3a5..db46df401d1 100644 --- a/apps/files_sharing/l10n/bg.js +++ b/apps/files_sharing/l10n/bg.js @@ -122,7 +122,6 @@ OC.L10N.register( "Note" : "Бележка", "Select or drop files" : "Изберете файл или преместете с мишката", "Uploaded files:" : "Качени файлове:", - "Name …" : "Име ...", "Uploading files…" : "Качване на файлове…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/bg.json b/apps/files_sharing/l10n/bg.json index 9962ef596da..34648051f3b 100644 --- a/apps/files_sharing/l10n/bg.json +++ b/apps/files_sharing/l10n/bg.json @@ -120,7 +120,6 @@ "Note" : "Бележка", "Select or drop files" : "Изберете файл или преместете с мишката", "Uploaded files:" : "Качени файлове:", - "Name …" : "Име ...", "Uploading files…" : "Качване на файлове…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js index 8b1642a8b43..5decb3709dc 100644 --- a/apps/files_sharing/l10n/ca.js +++ b/apps/files_sharing/l10n/ca.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Càrregant fitxers", "Uploaded files:" : "Fitxers carregats:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Si carregueu els fitxers accepteu les %1$scondicions del servei%2$s.", - "Name or email address …" : "Nom o adreça de correu ...", - "Name or federated cloud ID …" : "Nom o ID de Núvol Federat …", - "Name, federated cloud ID or email address …" : "Nom, ID de núvol federat o adreça de correu …", - "Name …" : "Nom …", "Uploading files…" : "S'està carregant fitxers…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json index 90ce6f969d3..eb1954b701e 100644 --- a/apps/files_sharing/l10n/ca.json +++ b/apps/files_sharing/l10n/ca.json @@ -226,10 +226,6 @@ "Uploading files" : "Càrregant fitxers", "Uploaded files:" : "Fitxers carregats:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Si carregueu els fitxers accepteu les %1$scondicions del servei%2$s.", - "Name or email address …" : "Nom o adreça de correu ...", - "Name or federated cloud ID …" : "Nom o ID de Núvol Federat …", - "Name, federated cloud ID or email address …" : "Nom, ID de núvol federat o adreça de correu …", - "Name …" : "Nom …", "Uploading files…" : "S'està carregant fitxers…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/cs.js b/apps/files_sharing/l10n/cs.js index 727a1635f2d..c2e77110197 100644 --- a/apps/files_sharing/l10n/cs.js +++ b/apps/files_sharing/l10n/cs.js @@ -230,10 +230,6 @@ OC.L10N.register( "Uploading files" : "Nahrávání souborů", "Uploaded files:" : "Nahrané soubory:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Nahráním souborů vyjadřujete souhlas s %1$svšeobecnými podmínkami%2$s.", - "Name or email address …" : "Jméno nebo e-mailová adresa…", - "Name or federated cloud ID …" : "Jméno nebo identifikátor v rámci sdruženého cloudu…", - "Name, federated cloud ID or email address …" : "Jméno, identifikátor v rámci sdruženého cloudu, nebo e-mailová adresa…", - "Name …" : "Jméno…", "Uploading files…" : "Nahrávání souborů…" }, "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"); diff --git a/apps/files_sharing/l10n/cs.json b/apps/files_sharing/l10n/cs.json index ed975c99b63..7acc6c9272d 100644 --- a/apps/files_sharing/l10n/cs.json +++ b/apps/files_sharing/l10n/cs.json @@ -228,10 +228,6 @@ "Uploading files" : "Nahrávání souborů", "Uploaded files:" : "Nahrané soubory:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Nahráním souborů vyjadřujete souhlas s %1$svšeobecnými podmínkami%2$s.", - "Name or email address …" : "Jméno nebo e-mailová adresa…", - "Name or federated cloud ID …" : "Jméno nebo identifikátor v rámci sdruženého cloudu…", - "Name, federated cloud ID or email address …" : "Jméno, identifikátor v rámci sdruženého cloudu, nebo e-mailová adresa…", - "Name …" : "Jméno…", "Uploading files…" : "Nahrávání souborů…" },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 6c6ba86d3d3..d5638f275b1 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -230,10 +230,6 @@ OC.L10N.register( "Uploading files" : "Dateien werden hochgeladen", "Uploaded files:" : "Hochgeladene Dateien: ", "By uploading files, you agree to the %1$sterms of service%2$s." : "Durch das Hochladen von Dateien stimmst Du den %1$sNutzungsbedingungen%2$s zu.", - "Name or email address …" : "Name oder E-Mailadresse", - "Name or federated cloud ID …" : "Name oder Federated-Cloud-ID …", - "Name, federated cloud ID or email address …" : "Name, Federated-Cloud-ID oder E-Mail-Adresse …", - "Name …" : "Name …", "Uploading files…" : "Dateien werden hochgeladen…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 3aa283aa814..dab1e72af01 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -228,10 +228,6 @@ "Uploading files" : "Dateien werden hochgeladen", "Uploaded files:" : "Hochgeladene Dateien: ", "By uploading files, you agree to the %1$sterms of service%2$s." : "Durch das Hochladen von Dateien stimmst Du den %1$sNutzungsbedingungen%2$s zu.", - "Name or email address …" : "Name oder E-Mailadresse", - "Name or federated cloud ID …" : "Name oder Federated-Cloud-ID …", - "Name, federated cloud ID or email address …" : "Name, Federated-Cloud-ID oder E-Mail-Adresse …", - "Name …" : "Name …", "Uploading files…" : "Dateien werden hochgeladen…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 7fcce734f48..6100b71b346 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -230,10 +230,6 @@ OC.L10N.register( "Uploading files" : "Dateien werden hochgeladen", "Uploaded files:" : "Hochgeladene Dateien: ", "By uploading files, you agree to the %1$sterms of service%2$s." : "Durch das Hochladen von Dateien stimmen Sie den %1$sNutzungsbedingungen%2$s zu.", - "Name or email address …" : "Name oder E-Mailadresse", - "Name or federated cloud ID …" : "Name oder Federated-Cloud-ID…", - "Name, federated cloud ID or email address …" : "Name, Federated-Cloud-ID oder E-Mail-Adresse …", - "Name …" : "Name …", "Uploading files…" : "Dateien werden hochgeladen…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 6cfbe196896..5d6a36eb14e 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -228,10 +228,6 @@ "Uploading files" : "Dateien werden hochgeladen", "Uploaded files:" : "Hochgeladene Dateien: ", "By uploading files, you agree to the %1$sterms of service%2$s." : "Durch das Hochladen von Dateien stimmen Sie den %1$sNutzungsbedingungen%2$s zu.", - "Name or email address …" : "Name oder E-Mailadresse", - "Name or federated cloud ID …" : "Name oder Federated-Cloud-ID…", - "Name, federated cloud ID or email address …" : "Name, Federated-Cloud-ID oder E-Mail-Adresse …", - "Name …" : "Name …", "Uploading files…" : "Dateien werden hochgeladen…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js index 7633e440247..5d1f1891603 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Μεταφόρτωση αρχείων", "Uploaded files:" : "Αποστολή αρχείων:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Με την μεταφόρτωση αρχείων, συμφωνείτε με %1$sόρους χρήσεως %2$s.", - "Name or email address …" : "Όνομα ή διεύθυνση ηλεκτρονικού ταχυδρομείου...", - "Name or federated cloud ID …" : "Όνομα ταυτότητας ή ομοσπονδιακού σύννεφου ...", - "Name, federated cloud ID or email address …" : "Όνομα ταυτότητας, ομοσπονδιακού σύννεφου ή διεύθυνση ηλεκτρονικού ταχυδρομείου…", - "Name …" : "Όνομα ...", "Uploading files…" : "Αποστολή αρχείων ..." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 134072074e0..6aa4081349a 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -226,10 +226,6 @@ "Uploading files" : "Μεταφόρτωση αρχείων", "Uploaded files:" : "Αποστολή αρχείων:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Με την μεταφόρτωση αρχείων, συμφωνείτε με %1$sόρους χρήσεως %2$s.", - "Name or email address …" : "Όνομα ή διεύθυνση ηλεκτρονικού ταχυδρομείου...", - "Name or federated cloud ID …" : "Όνομα ταυτότητας ή ομοσπονδιακού σύννεφου ...", - "Name, federated cloud ID or email address …" : "Όνομα ταυτότητας, ομοσπονδιακού σύννεφου ή διεύθυνση ηλεκτρονικού ταχυδρομείου…", - "Name …" : "Όνομα ...", "Uploading files…" : "Αποστολή αρχείων ..." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 10465e72a48..881c0674ff8 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Subiendo archivos", "Uploaded files:" : "Archivos subidos:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Al subir archivos, aceptas los %1$stérminos del servicio%2$s.", - "Name or email address …" : "Nombre o dirección de correo electrónico ...", - "Name or federated cloud ID …" : "Nombre o ID de nube federada ...", - "Name, federated cloud ID or email address …" : "Nombre, ID de nube federada o dirección de correo electrónico ...", - "Name …" : "Nombre ...", "Uploading files…" : "Subiendo archivos…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 5be90f1b749..96719732819 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -226,10 +226,6 @@ "Uploading files" : "Subiendo archivos", "Uploaded files:" : "Archivos subidos:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Al subir archivos, aceptas los %1$stérminos del servicio%2$s.", - "Name or email address …" : "Nombre o dirección de correo electrónico ...", - "Name or federated cloud ID …" : "Nombre o ID de nube federada ...", - "Name, federated cloud ID or email address …" : "Nombre, ID de nube federada o dirección de correo electrónico ...", - "Name …" : "Nombre ...", "Uploading files…" : "Subiendo archivos…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js index 70b89a2c394..7e415cd088e 100644 --- a/apps/files_sharing/l10n/et_EE.js +++ b/apps/files_sharing/l10n/et_EE.js @@ -172,7 +172,6 @@ OC.L10N.register( "Note" : "Märge", "Select or drop files" : "Vali või lohista failid", "Uploaded files:" : "Üleslaetud failid:", - "Name …" : "Nimi ...", "Uploading files…" : "Failide üleslaadimine…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json index d691e02375b..9b0e35c5ac3 100644 --- a/apps/files_sharing/l10n/et_EE.json +++ b/apps/files_sharing/l10n/et_EE.json @@ -170,7 +170,6 @@ "Note" : "Märge", "Select or drop files" : "Vali või lohista failid", "Uploaded files:" : "Üleslaetud failid:", - "Name …" : "Nimi ...", "Uploading files…" : "Failide üleslaadimine…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js index 42b6b8df61c..04dc658129c 100644 --- a/apps/files_sharing/l10n/eu.js +++ b/apps/files_sharing/l10n/eu.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Fitxategiak kargatzen", "Uploaded files:" : "Igotako fitxategiak:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Fitxategiak kargatzean, %1$szerbitzu-baldintzak%2$s onartzen dituzu.", - "Name or email address …" : "Izena edo helbide elektronikoa...", - "Name or federated cloud ID …" : "Izena edo federatutako hodeiaren IDa", - "Name, federated cloud ID or email address …" : "Izena, federatutako hodeiaren IDa edo helbide elektronikoa...", - "Name …" : "Izena...", "Uploading files…" : "Fitxategiak igotzen…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json index 0977e389012..5bef51127b8 100644 --- a/apps/files_sharing/l10n/eu.json +++ b/apps/files_sharing/l10n/eu.json @@ -226,10 +226,6 @@ "Uploading files" : "Fitxategiak kargatzen", "Uploaded files:" : "Igotako fitxategiak:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Fitxategiak kargatzean, %1$szerbitzu-baldintzak%2$s onartzen dituzu.", - "Name or email address …" : "Izena edo helbide elektronikoa...", - "Name or federated cloud ID …" : "Izena edo federatutako hodeiaren IDa", - "Name, federated cloud ID or email address …" : "Izena, federatutako hodeiaren IDa edo helbide elektronikoa...", - "Name …" : "Izena...", "Uploading files…" : "Fitxategiak igotzen…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js index d50468798b7..0f2e6f63d5c 100644 --- a/apps/files_sharing/l10n/fa.js +++ b/apps/files_sharing/l10n/fa.js @@ -222,10 +222,6 @@ OC.L10N.register( "Select or drop files" : "پرونده ها را انتخاب یا رها کنید", "Uploaded files:" : "پرونده های بارگذاری شده:", "By uploading files, you agree to the %1$sterms of service%2$s." : "%2$sبا بارگذاری پرونده ها ، شما با %1$sشرایط خدمات موافقت می کنید", - "Name or email address …" : "نام یا آدرس ایمیل…", - "Name or federated cloud ID …" : "نام یا شناسه ابر فدرال شده ...", - "Name, federated cloud ID or email address …" : "نام ، شناسه ابر فدرال شده یا آدرس ایمیل…", - "Name …" : "نام …", "Uploading files…" : "بارگذاری پرونده ها ..." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json index 091c3692b2a..4af17b685de 100644 --- a/apps/files_sharing/l10n/fa.json +++ b/apps/files_sharing/l10n/fa.json @@ -220,10 +220,6 @@ "Select or drop files" : "پرونده ها را انتخاب یا رها کنید", "Uploaded files:" : "پرونده های بارگذاری شده:", "By uploading files, you agree to the %1$sterms of service%2$s." : "%2$sبا بارگذاری پرونده ها ، شما با %1$sشرایط خدمات موافقت می کنید", - "Name or email address …" : "نام یا آدرس ایمیل…", - "Name or federated cloud ID …" : "نام یا شناسه ابر فدرال شده ...", - "Name, federated cloud ID or email address …" : "نام ، شناسه ابر فدرال شده یا آدرس ایمیل…", - "Name …" : "نام …", "Uploading files…" : "بارگذاری پرونده ها ..." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fi.js b/apps/files_sharing/l10n/fi.js index e874fd49dcd..d4d5ac0018b 100644 --- a/apps/files_sharing/l10n/fi.js +++ b/apps/files_sharing/l10n/fi.js @@ -190,8 +190,6 @@ OC.L10N.register( "Uploading files" : "Lähetetään tiedostoja", "Uploaded files:" : "Lähetetyt tiedostot:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Tiedostoja lähettämällä hyväksyt %1$skäyttöehdot%2$s.", - "Name or email address …" : "Nimi tai sähköpostiosoite…", - "Name …" : "Nimi…", "Uploading files…" : "Lähetetään tiedostoja…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/fi.json b/apps/files_sharing/l10n/fi.json index 8d898181648..25bdb0b03e4 100644 --- a/apps/files_sharing/l10n/fi.json +++ b/apps/files_sharing/l10n/fi.json @@ -188,8 +188,6 @@ "Uploading files" : "Lähetetään tiedostoja", "Uploaded files:" : "Lähetetyt tiedostot:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Tiedostoja lähettämällä hyväksyt %1$skäyttöehdot%2$s.", - "Name or email address …" : "Nimi tai sähköpostiosoite…", - "Name …" : "Nimi…", "Uploading files…" : "Lähetetään tiedostoja…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index 819204fc500..df637b295b5 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Envoi des fichiers en cours ...", "Uploaded files:" : "Fichiers envoyés :", "By uploading files, you agree to the %1$sterms of service%2$s." : "En envoyant des fichiers, vous acceptez les %1$sconditions d'utilisation%2$s.", - "Name or email address …" : "Nom ou adresse courriel ...", - "Name or federated cloud ID …" : "Nom ou ID du cloud fédéré...", - "Name, federated cloud ID or email address …" : "Nom, ID du cloud fédéré ou adresse mail…", - "Name …" : "Nom …", "Uploading files…" : "Envoi des fichiers..." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 3f1a09fc5a6..c6f40e18c4e 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -226,10 +226,6 @@ "Uploading files" : "Envoi des fichiers en cours ...", "Uploaded files:" : "Fichiers envoyés :", "By uploading files, you agree to the %1$sterms of service%2$s." : "En envoyant des fichiers, vous acceptez les %1$sconditions d'utilisation%2$s.", - "Name or email address …" : "Nom ou adresse courriel ...", - "Name or federated cloud ID …" : "Nom ou ID du cloud fédéré...", - "Name, federated cloud ID or email address …" : "Nom, ID du cloud fédéré ou adresse mail…", - "Name …" : "Nom …", "Uploading files…" : "Envoi des fichiers..." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 1ef80937b5f..7a698d4d189 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -230,10 +230,6 @@ OC.L10N.register( "Uploading files" : "Enviando ficheiros", "Uploaded files:" : "Ficheiros enviados:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Ao enviar ficheiros acepta os %1$s termos do servizo %2$s.", - "Name or email address …" : "Nome ou enderezo de correo…", - "Name or federated cloud ID …" : "Nome ou ID da nube federada...", - "Name, federated cloud ID or email address …" : "Nome, ID da nube federada ou enderezo de correo…", - "Name …" : "Nome...", "Uploading files…" : "Enviando ficheiros…" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index b1a58600755..065d37d5d22 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -228,10 +228,6 @@ "Uploading files" : "Enviando ficheiros", "Uploaded files:" : "Ficheiros enviados:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Ao enviar ficheiros acepta os %1$s termos do servizo %2$s.", - "Name or email address …" : "Nome ou enderezo de correo…", - "Name or federated cloud ID …" : "Nome ou ID da nube federada...", - "Name, federated cloud ID or email address …" : "Nome, ID da nube federada ou enderezo de correo…", - "Name …" : "Nome...", "Uploading files…" : "Enviando ficheiros…" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/he.js b/apps/files_sharing/l10n/he.js index 2efe748b57e..ace32c3cac0 100644 --- a/apps/files_sharing/l10n/he.js +++ b/apps/files_sharing/l10n/he.js @@ -215,10 +215,6 @@ OC.L10N.register( "Uploading files" : "מועלים קבצים", "Uploaded files:" : "קבצים שהועלו:", "By uploading files, you agree to the %1$sterms of service%2$s." : "עצם העלאתם של קבצים מביעה את הסכמתך ל%1$sתנאי השירות%2$s.", - "Name or email address …" : "שם או כתובת דוא״ל…", - "Name or federated cloud ID …" : "שם או מזהה ענן מאוגד…", - "Name, federated cloud ID or email address …" : "שם, מזהה ענן מאוגד או כתובת דוא״ל…", - "Name …" : "שם…", "Uploading files…" : "קבצים מועלים…" }, "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"); diff --git a/apps/files_sharing/l10n/he.json b/apps/files_sharing/l10n/he.json index 550d24aca30..4a022c5d365 100644 --- a/apps/files_sharing/l10n/he.json +++ b/apps/files_sharing/l10n/he.json @@ -213,10 +213,6 @@ "Uploading files" : "מועלים קבצים", "Uploaded files:" : "קבצים שהועלו:", "By uploading files, you agree to the %1$sterms of service%2$s." : "עצם העלאתם של קבצים מביעה את הסכמתך ל%1$sתנאי השירות%2$s.", - "Name or email address …" : "שם או כתובת דוא״ל…", - "Name or federated cloud ID …" : "שם או מזהה ענן מאוגד…", - "Name, federated cloud ID or email address …" : "שם, מזהה ענן מאוגד או כתובת דוא״ל…", - "Name …" : "שם…", "Uploading files…" : "קבצים מועלים…" },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/hr.js b/apps/files_sharing/l10n/hr.js index 19c813c741e..950fa7adc92 100644 --- a/apps/files_sharing/l10n/hr.js +++ b/apps/files_sharing/l10n/hr.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Otpremanje datoteka", "Uploaded files:" : "Otpremljene datoteke:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Otpremanjem datoteka prihvaćate %1$ uvjete korištenja usluge%2$s.", - "Name or email address …" : "Ime i adresa e-pošte…", - "Name or federated cloud ID …" : "Naziv ili ID udruženog oblaka…", - "Name, federated cloud ID or email address …" : "Naziv, ID udruženog oblaka ili adresa e-pošte…", - "Name …" : "Ime…", "Uploading files…" : "Otpremanje datoteka..." }, "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/hr.json b/apps/files_sharing/l10n/hr.json index f59dcae2128..20fe644d3df 100644 --- a/apps/files_sharing/l10n/hr.json +++ b/apps/files_sharing/l10n/hr.json @@ -226,10 +226,6 @@ "Uploading files" : "Otpremanje datoteka", "Uploaded files:" : "Otpremljene datoteke:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Otpremanjem datoteka prihvaćate %1$ uvjete korištenja usluge%2$s.", - "Name or email address …" : "Ime i adresa e-pošte…", - "Name or federated cloud ID …" : "Naziv ili ID udruženog oblaka…", - "Name, federated cloud ID or email address …" : "Naziv, ID udruženog oblaka ili adresa e-pošte…", - "Name …" : "Ime…", "Uploading files…" : "Otpremanje datoteka..." },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js index cba888ce6d5..cb58bf0c608 100644 --- a/apps/files_sharing/l10n/is.js +++ b/apps/files_sharing/l10n/is.js @@ -178,10 +178,6 @@ OC.L10N.register( "Select or drop files" : "Veldu eða slepptu skrám", "Uploaded files:" : "Innsendar skrár:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Með því að senda inn skrár, samþykkir þú %1$sþjónustuskilmálana%2$s.", - "Name or email address …" : "Nafn eða tölvupóstfang …", - "Name or federated cloud ID …" : "Nafn eða skýjasambandsauðkenni (Federated Cloud ID) …", - "Name, federated cloud ID or email address …" : "Nafn, skýjasambandsauðkenni eða tölvupóstfang …", - "Name …" : "Nafn …", "Uploading files…" : "Sendi inn skrár…" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json index c095ef6b19f..1c68c95fe95 100644 --- a/apps/files_sharing/l10n/is.json +++ b/apps/files_sharing/l10n/is.json @@ -176,10 +176,6 @@ "Select or drop files" : "Veldu eða slepptu skrám", "Uploaded files:" : "Innsendar skrár:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Með því að senda inn skrár, samþykkir þú %1$sþjónustuskilmálana%2$s.", - "Name or email address …" : "Nafn eða tölvupóstfang …", - "Name or federated cloud ID …" : "Nafn eða skýjasambandsauðkenni (Federated Cloud ID) …", - "Name, federated cloud ID or email address …" : "Nafn, skýjasambandsauðkenni eða tölvupóstfang …", - "Name …" : "Nafn …", "Uploading files…" : "Sendi inn skrár…" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index f346f2ae5f2..9a082df6a89 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -230,10 +230,6 @@ OC.L10N.register( "Uploading files" : "Caricamento file", "Uploaded files:" : "File caricati:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Caricando i file, accetti i %1$stermini del servizio%2$s.", - "Name or email address …" : "Nome o indirizzo email...", - "Name or federated cloud ID …" : "Nome o ID di cloud federata...", - "Name, federated cloud ID or email address …" : "Nome, ID di cloud federata o indirizzo email…", - "Name …" : "Nome…", "Uploading files…" : "Caricamento file in corso..." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index c0950fa357d..2a78ff2e85b 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -228,10 +228,6 @@ "Uploading files" : "Caricamento file", "Uploaded files:" : "File caricati:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Caricando i file, accetti i %1$stermini del servizio%2$s.", - "Name or email address …" : "Nome o indirizzo email...", - "Name or federated cloud ID …" : "Nome o ID di cloud federata...", - "Name, federated cloud ID or email address …" : "Nome, ID di cloud federata o indirizzo email…", - "Name …" : "Nome…", "Uploading files…" : "Caricamento file in corso..." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index 490b123ee4c..3decbaf7dab 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "ファイルをアップロード中", "Uploaded files:" : "アップロード済ファイル:", "By uploading files, you agree to the %1$sterms of service%2$s." : "ファイルをアップロードすると、%1$s のサービス条件 %2$s に同意したことになります。", - "Name or email address …" : "名前またはメールアドレス", - "Name or federated cloud ID …" : "ユーザ名または連携クラウドID", - "Name, federated cloud ID or email address …" : "ユーザ名、連携クラウドIDまたはメールアドレス", - "Name …" : "名前", "Uploading files…" : "ファイルをアップロード中..." }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index 2185f20d7d0..c97459a5736 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -226,10 +226,6 @@ "Uploading files" : "ファイルをアップロード中", "Uploaded files:" : "アップロード済ファイル:", "By uploading files, you agree to the %1$sterms of service%2$s." : "ファイルをアップロードすると、%1$s のサービス条件 %2$s に同意したことになります。", - "Name or email address …" : "名前またはメールアドレス", - "Name or federated cloud ID …" : "ユーザ名または連携クラウドID", - "Name, federated cloud ID or email address …" : "ユーザ名、連携クラウドIDまたはメールアドレス", - "Name …" : "名前", "Uploading files…" : "ファイルをアップロード中..." },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js index e3aebc96782..af8f4a5b69d 100644 --- a/apps/files_sharing/l10n/ko.js +++ b/apps/files_sharing/l10n/ko.js @@ -182,8 +182,6 @@ OC.L10N.register( "Uploading files" : "파일 업로드", "Uploaded files:" : "업로드한 파일:", "By uploading files, you agree to the %1$sterms of service%2$s." : "파일을 업로드하면 %1$s이용 약관%2$s에 동의하는 것을 의미합니다.", - "Name or email address …" : "이름 또는 이메일 주소", - "Name …" : "이름 ...", "Uploading files…" : "파일 업로드 중…" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json index d0659bd7fa5..f857809af32 100644 --- a/apps/files_sharing/l10n/ko.json +++ b/apps/files_sharing/l10n/ko.json @@ -180,8 +180,6 @@ "Uploading files" : "파일 업로드", "Uploaded files:" : "업로드한 파일:", "By uploading files, you agree to the %1$sterms of service%2$s." : "파일을 업로드하면 %1$s이용 약관%2$s에 동의하는 것을 의미합니다.", - "Name or email address …" : "이름 또는 이메일 주소", - "Name …" : "이름 ...", "Uploading files…" : "파일 업로드 중…" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/lt_LT.js b/apps/files_sharing/l10n/lt_LT.js index 6696b59ef4b..9d30708ed8a 100644 --- a/apps/files_sharing/l10n/lt_LT.js +++ b/apps/files_sharing/l10n/lt_LT.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Įkeliami failai", "Uploaded files:" : "Įkelti failai:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Įkeldami failus, sutinkate su %1$snaudojimosi sąlygomis%2$s.", - "Name or email address …" : "Vardas ar el. pašto adresas…", - "Name or federated cloud ID …" : "Vardas ar federacinės debesijos ID…", - "Name, federated cloud ID or email address …" : "Vardas, federacinės debesijos ID arba el. pašto adresas…", - "Name …" : "Vardas…", "Uploading files…" : "Įkeliami failai…" }, "nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"); diff --git a/apps/files_sharing/l10n/lt_LT.json b/apps/files_sharing/l10n/lt_LT.json index 7bbc7326cda..069dd09f17e 100644 --- a/apps/files_sharing/l10n/lt_LT.json +++ b/apps/files_sharing/l10n/lt_LT.json @@ -226,10 +226,6 @@ "Uploading files" : "Įkeliami failai", "Uploaded files:" : "Įkelti failai:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Įkeldami failus, sutinkate su %1$snaudojimosi sąlygomis%2$s.", - "Name or email address …" : "Vardas ar el. pašto adresas…", - "Name or federated cloud ID …" : "Vardas ar federacinės debesijos ID…", - "Name, federated cloud ID or email address …" : "Vardas, federacinės debesijos ID arba el. pašto adresas…", - "Name …" : "Vardas…", "Uploading files…" : "Įkeliami failai…" },"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/mk.js b/apps/files_sharing/l10n/mk.js index 86d5dc4ad55..05e4b031aaa 100644 --- a/apps/files_sharing/l10n/mk.js +++ b/apps/files_sharing/l10n/mk.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Прикачување на датотеки", "Uploaded files:" : "Прикачени датотеки:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Со прикачување на датотеките, се согласувате со %1$sусловите за користење%2$s.", - "Name or email address …" : "Име или е-пошта адреса ...", - "Name or federated cloud ID …" : "Име или федерален ИД ...", - "Name, federated cloud ID or email address …" : "Име, федерален ID или адреса на е-пошта …", - "Name …" : "Име ...", "Uploading files…" : "Прикачување датотеки…" }, "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"); diff --git a/apps/files_sharing/l10n/mk.json b/apps/files_sharing/l10n/mk.json index e13dce8da25..d85c7c1842e 100644 --- a/apps/files_sharing/l10n/mk.json +++ b/apps/files_sharing/l10n/mk.json @@ -226,10 +226,6 @@ "Uploading files" : "Прикачување на датотеки", "Uploaded files:" : "Прикачени датотеки:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Со прикачување на датотеките, се согласувате со %1$sусловите за користење%2$s.", - "Name or email address …" : "Име или е-пошта адреса ...", - "Name or federated cloud ID …" : "Име или федерален ИД ...", - "Name, federated cloud ID or email address …" : "Име, федерален ID или адреса на е-пошта …", - "Name …" : "Име ...", "Uploading files…" : "Прикачување датотеки…" },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index 541386e08ca..d10bcac26ce 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Uploaden bestanden", "Uploaded files:" : "Geüploade bestanden", "By uploading files, you agree to the %1$sterms of service%2$s." : "Door het uploaden van bestanden stem je in met de %1$sgebruiksvoorwaarden%2$s.", - "Name or email address …" : "Naam of e-mailadres …", - "Name or federated cloud ID …" : "Naam of gefedereerd Cloud ID ...", - "Name, federated cloud ID or email address …" : "Naam, gefedereerde Cloud ID of een e-mailadres …", - "Name …" : "Naam …", "Uploading files…" : "Uploaden bestanden..." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index b9604c3b7bb..5e0310bdf9c 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -226,10 +226,6 @@ "Uploading files" : "Uploaden bestanden", "Uploaded files:" : "Geüploade bestanden", "By uploading files, you agree to the %1$sterms of service%2$s." : "Door het uploaden van bestanden stem je in met de %1$sgebruiksvoorwaarden%2$s.", - "Name or email address …" : "Naam of e-mailadres …", - "Name or federated cloud ID …" : "Naam of gefedereerd Cloud ID ...", - "Name, federated cloud ID or email address …" : "Naam, gefedereerde Cloud ID of een e-mailadres …", - "Name …" : "Naam …", "Uploading files…" : "Uploaden bestanden..." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js index ae8f9351f40..3592710ec91 100644 --- a/apps/files_sharing/l10n/pl.js +++ b/apps/files_sharing/l10n/pl.js @@ -230,10 +230,6 @@ OC.L10N.register( "Uploading files" : "Wysyłanie plików", "Uploaded files:" : "Wysłane pliki:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Przesyłając pliki, akceptujesz %1$swarunki usługi%2$s.", - "Name or email address …" : "Nazwa lub adres e-mail…", - "Name or federated cloud ID …" : "Nazwa lub ID Chmury Federacyjnej…", - "Name, federated cloud ID or email address …" : "Nazwa, ID Chmury Federacyjnej lub adres e-mail…", - "Name …" : "Nazwa...", "Uploading files…" : "Wysyłanie plików…" }, "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"); diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json index 2f080326026..c18373b8e9c 100644 --- a/apps/files_sharing/l10n/pl.json +++ b/apps/files_sharing/l10n/pl.json @@ -228,10 +228,6 @@ "Uploading files" : "Wysyłanie plików", "Uploaded files:" : "Wysłane pliki:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Przesyłając pliki, akceptujesz %1$swarunki usługi%2$s.", - "Name or email address …" : "Nazwa lub adres e-mail…", - "Name or federated cloud ID …" : "Nazwa lub ID Chmury Federacyjnej…", - "Name, federated cloud ID or email address …" : "Nazwa, ID Chmury Federacyjnej lub adres e-mail…", - "Name …" : "Nazwa...", "Uploading files…" : "Wysyłanie plików…" },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index edd46bced87..81607d2e354 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Enviando arquivos...", "Uploaded files:" : "Arquivos enviados:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Ao enviar arquivos, você concorda com os %1$stermos de serviço%2$s.", - "Name or email address …" : "Nome ou e-mail...", - "Name or federated cloud ID …" : "Nome ou ID da nuvem federada...", - "Name, federated cloud ID or email address …" : "Nome, ID da nuvem federada ou e-mail...", - "Name …" : "Nome...", "Uploading files…" : "Enviando arquivos..." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 5d2e74358b2..d7ee77c8fb8 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -226,10 +226,6 @@ "Uploading files" : "Enviando arquivos...", "Uploaded files:" : "Arquivos enviados:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Ao enviar arquivos, você concorda com os %1$stermos de serviço%2$s.", - "Name or email address …" : "Nome ou e-mail...", - "Name or federated cloud ID …" : "Nome ou ID da nuvem federada...", - "Name, federated cloud ID or email address …" : "Nome, ID da nuvem federada ou e-mail...", - "Name …" : "Nome...", "Uploading files…" : "Enviando arquivos..." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index 246a366dd77..6cc7439fd7f 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Загрузка файлов", "Uploaded files:" : "Отправленные файлы:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Передачей файлов на сервер, вы принимаете %1$sусловия обслуживания%2$s.", - "Name or email address …" : "Имя или адрес эл.почты…", - "Name or federated cloud ID …" : "Имя или ID межсерверного обмена…", - "Name, federated cloud ID or email address …" : "Имя, ID межсерверного обмена или адрес эл.почты…", - "Name …" : "Имя…", "Uploading files…" : "Файлы передаются на сервер…" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index a14eb829373..55389838e28 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -226,10 +226,6 @@ "Uploading files" : "Загрузка файлов", "Uploaded files:" : "Отправленные файлы:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Передачей файлов на сервер, вы принимаете %1$sусловия обслуживания%2$s.", - "Name or email address …" : "Имя или адрес эл.почты…", - "Name or federated cloud ID …" : "Имя или ID межсерверного обмена…", - "Name, federated cloud ID or email address …" : "Имя, ID межсерверного обмена или адрес эл.почты…", - "Name …" : "Имя…", "Uploading files…" : "Файлы передаются на сервер…" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sk.js b/apps/files_sharing/l10n/sk.js index 79baf9bd6d9..072268a5406 100644 --- a/apps/files_sharing/l10n/sk.js +++ b/apps/files_sharing/l10n/sk.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Nahrávanie súborov", "Uploaded files:" : "Nahrané súbory...", "By uploading files, you agree to the %1$sterms of service%2$s." : "Nahraním súborov vyjadrujete súhlas so všeobecnými podmienkami %1$s %2$s.", - "Name or email address …" : "Meno alebo e-mailová adresa…", - "Name or federated cloud ID …" : "Meno alebo ID v rámci združeného cloudu…", - "Name, federated cloud ID or email address …" : "Meno, ID v rámci združeného cloudu, alebo e-mailová adresa…", - "Name …" : "Meno …", "Uploading files…" : "Nahrávanie súborov..." }, "nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"); diff --git a/apps/files_sharing/l10n/sk.json b/apps/files_sharing/l10n/sk.json index 182b76d5373..c811b11de01 100644 --- a/apps/files_sharing/l10n/sk.json +++ b/apps/files_sharing/l10n/sk.json @@ -226,10 +226,6 @@ "Uploading files" : "Nahrávanie súborov", "Uploaded files:" : "Nahrané súbory...", "By uploading files, you agree to the %1$sterms of service%2$s." : "Nahraním súborov vyjadrujete súhlas so všeobecnými podmienkami %1$s %2$s.", - "Name or email address …" : "Meno alebo e-mailová adresa…", - "Name or federated cloud ID …" : "Meno alebo ID v rámci združeného cloudu…", - "Name, federated cloud ID or email address …" : "Meno, ID v rámci združeného cloudu, alebo e-mailová adresa…", - "Name …" : "Meno …", "Uploading files…" : "Nahrávanie súborov..." },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index eaa3ec2f2a6..0f700a24c56 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -207,10 +207,6 @@ OC.L10N.register( "Uploading files" : "Pošiljanje datotek", "Uploaded files:" : "Poslane datoteke:", "By uploading files, you agree to the %1$sterms of service%2$s." : "S pošiljanjem datotek v oblak sprejemate tudi %1$spogoje uporabe storitve%2$s.", - "Name or email address …" : "Ime ali elektronski naslov ...", - "Name or federated cloud ID …" : "Ime ali ID zveznega oblaka ...", - "Name, federated cloud ID or email address …" : "Ime, ID zveznega oblaka ali elektronski naslov ...", - "Name …" : "Ime ...", "Uploading files…" : "Poteka pošiljanje datotek ..." }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index 41d05871fd6..04bd4cd076e 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -205,10 +205,6 @@ "Uploading files" : "Pošiljanje datotek", "Uploaded files:" : "Poslane datoteke:", "By uploading files, you agree to the %1$sterms of service%2$s." : "S pošiljanjem datotek v oblak sprejemate tudi %1$spogoje uporabe storitve%2$s.", - "Name or email address …" : "Ime ali elektronski naslov ...", - "Name or federated cloud ID …" : "Ime ali ID zveznega oblaka ...", - "Name, federated cloud ID or email address …" : "Ime, ID zveznega oblaka ali elektronski naslov ...", - "Name …" : "Ime ...", "Uploading files…" : "Poteka pošiljanje datotek ..." },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js index 260b2755ca1..b89fcc30b86 100644 --- a/apps/files_sharing/l10n/sr.js +++ b/apps/files_sharing/l10n/sr.js @@ -230,10 +230,6 @@ OC.L10N.register( "Uploading files" : "Отпремам фајлове", "Uploaded files:" : "Отпремљени фајлови:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Отпремањем фајлова, слажете се са %1$sусловима коришћења%2$s.", - "Name or email address …" : "Име или адреса е-поште…", - "Name or federated cloud ID …" : "Име или ID здруженог облака…", - "Name, federated cloud ID or email address …" : "Име, ID здруженог облака или адреса е-поште…", - "Name …" : "Име…", "Uploading files…" : "Отпремам фајлове…" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json index c8e5508b953..3df9c2fa51a 100644 --- a/apps/files_sharing/l10n/sr.json +++ b/apps/files_sharing/l10n/sr.json @@ -228,10 +228,6 @@ "Uploading files" : "Отпремам фајлове", "Uploaded files:" : "Отпремљени фајлови:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Отпремањем фајлова, слажете се са %1$sусловима коришћења%2$s.", - "Name or email address …" : "Име или адреса е-поште…", - "Name or federated cloud ID …" : "Име или ID здруженог облака…", - "Name, federated cloud ID or email address …" : "Име, ID здруженог облака или адреса е-поште…", - "Name …" : "Име…", "Uploading files…" : "Отпремам фајлове…" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js index 767acc3facc..95068f13e0a 100644 --- a/apps/files_sharing/l10n/sv.js +++ b/apps/files_sharing/l10n/sv.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Laddar upp filer", "Uploaded files:" : "Uppladdade filer:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Genom att ladda upp filer godkänner du %1$sanvändarvillkoren %2$s.", - "Name or email address …" : "Namn eller e-postadress ...", - "Name or federated cloud ID …" : "Namn eller federerat moln-ID ...", - "Name, federated cloud ID or email address …" : "Namn, federerat moln-ID eller e-postadress ...", - "Name …" : "Namn ...", "Uploading files…" : "Laddar upp filer..." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json index 65467abc99c..a8ca9a6f388 100644 --- a/apps/files_sharing/l10n/sv.json +++ b/apps/files_sharing/l10n/sv.json @@ -226,10 +226,6 @@ "Uploading files" : "Laddar upp filer", "Uploaded files:" : "Uppladdade filer:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Genom att ladda upp filer godkänner du %1$sanvändarvillkoren %2$s.", - "Name or email address …" : "Namn eller e-postadress ...", - "Name or federated cloud ID …" : "Namn eller federerat moln-ID ...", - "Name, federated cloud ID or email address …" : "Namn, federerat moln-ID eller e-postadress ...", - "Name …" : "Namn ...", "Uploading files…" : "Laddar upp filer..." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index 6405ed4a94a..42c528d1884 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "Dosyalar yükleniyor", "Uploaded files:" : "Yüklenmiş dosyalar:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Dosya yükleyerek %1$shizmet koşullarını%2$s kabul etmiş olursunuz.", - "Name or email address …" : "Ad ya da e-posta adresi …", - "Name or federated cloud ID …" : "Ad ya da birleşik bulut kodu …", - "Name, federated cloud ID or email address …" : "Ad, birleşik bulut kodu ya da e-posta adresi …", - "Name …" : "Ad …", "Uploading files…" : "Dosyalar yükleniyor …" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index a57d971687a..97ff244e09f 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -226,10 +226,6 @@ "Uploading files" : "Dosyalar yükleniyor", "Uploaded files:" : "Yüklenmiş dosyalar:", "By uploading files, you agree to the %1$sterms of service%2$s." : "Dosya yükleyerek %1$shizmet koşullarını%2$s kabul etmiş olursunuz.", - "Name or email address …" : "Ad ya da e-posta adresi …", - "Name or federated cloud ID …" : "Ad ya da birleşik bulut kodu …", - "Name, federated cloud ID or email address …" : "Ad, birleşik bulut kodu ya da e-posta adresi …", - "Name …" : "Ad …", "Uploading files…" : "Dosyalar yükleniyor …" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index d19283705f4..38a82ba1021 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -228,10 +228,6 @@ OC.L10N.register( "Uploading files" : "正在上传文件", "Uploaded files:" : "上传的文件： ", "By uploading files, you agree to the %1$sterms of service%2$s." : "通过上传文件，您同意了 %1$s 服务条款 %2$s。", - "Name or email address …" : "名称或电子邮箱地址...", - "Name or federated cloud ID …" : "名称或联合云 ID…", - "Name, federated cloud ID or email address …" : "名称，联合云 ID 或电子邮件地址…", - "Name …" : "名称 …", "Uploading files…" : "正在上传文件... " }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index 02e20fa6a1b..1960e10a46c 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -226,10 +226,6 @@ "Uploading files" : "正在上传文件", "Uploaded files:" : "上传的文件： ", "By uploading files, you agree to the %1$sterms of service%2$s." : "通过上传文件，您同意了 %1$s 服务条款 %2$s。", - "Name or email address …" : "名称或电子邮箱地址...", - "Name or federated cloud ID …" : "名称或联合云 ID…", - "Name, federated cloud ID or email address …" : "名称，联合云 ID 或电子邮件地址…", - "Name …" : "名称 …", "Uploading files…" : "正在上传文件... " },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 5c7bb4a85ef..94eb7d2a715 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -614,6 +614,7 @@ Raw output 'authtoken' => ['id'], 'bruteforce_attempts' => ['id'], 'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'], + 'filecache_extended' => ['fileid'], 'file_locks' => ['id'], 'jobs' => ['id'], 'mimetypes' => ['id'], diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml index cbfb0cc1c33..61197e2fd12 100644 --- a/apps/user_ldap/appinfo/info.xml +++ b/apps/user_ldap/appinfo/info.xml @@ -40,6 +40,17 @@ A user logs into Nextcloud with their LDAP or AD credentials, and is granted acc </post-migration> </repair-steps> + <commands> + <command>OCA\User_LDAP\Command\CheckUser</command> + <command>OCA\User_LDAP\Command\CreateEmptyConfig</command> + <command>OCA\User_LDAP\Command\DeleteConfig</command> + <command>OCA\User_LDAP\Command\Search</command> + <command>OCA\User_LDAP\Command\SetConfig</command> + <command>OCA\User_LDAP\Command\ShowConfig</command> + <command>OCA\User_LDAP\Command\ShowRemnants</command> + <command>OCA\User_LDAP\Command\TestConfig</command> + </commands> + <settings> <admin>OCA\User_LDAP\Settings\Admin</admin> <admin-section>OCA\User_LDAP\Settings\Section</admin-section> diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php deleted file mode 100644 index cdfc6fd9b16..00000000000 --- a/apps/user_ldap/appinfo/register_command.php +++ /dev/null @@ -1,61 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * @author Joas Schilling <coding@schilljs.com> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Roger Szabo <roger.szabo@web.de> - * @author Vinicius Cubas Brand <vinicius@eita.org.br> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -use OCA\User_LDAP\Helper; -use OCA\User_LDAP\LDAP; -use OCA\User_LDAP\User_Proxy; -use OCA\User_LDAP\Mapping\UserMapping; -use OCA\User_LDAP\User\DeletedUsersIndex; - -$dbConnection = \OC::$server->getDatabaseConnection(); -$userMapping = new UserMapping($dbConnection); -$helper = new Helper(\OC::$server->getConfig()); -$ocConfig = \OC::$server->getConfig(); -$uBackend = new User_Proxy( - $helper->getServerConfigurationPrefixes(true), - new LDAP(), - $ocConfig, - \OC::$server->getNotificationManager(), - \OC::$server->getUserSession(), - \OC::$server->query(\OCA\User_LDAP\UserPluginManager::class) -); -$deletedUsersIndex = new DeletedUsersIndex( - $ocConfig, $dbConnection, $userMapping -); - -$application->add(new OCA\User_LDAP\Command\ShowConfig($helper)); -$application->add(new OCA\User_LDAP\Command\SetConfig()); -$application->add(new OCA\User_LDAP\Command\TestConfig()); -$application->add(new OCA\User_LDAP\Command\CreateEmptyConfig($helper)); -$application->add(new OCA\User_LDAP\Command\DeleteConfig($helper)); -$application->add(new OCA\User_LDAP\Command\Search($ocConfig)); -$application->add(new OCA\User_LDAP\Command\ShowRemnants( - $deletedUsersIndex, \OC::$server->getDateTimeFormatter()) -); -$application->add(new OCA\User_LDAP\Command\CheckUser( - $uBackend, $helper, $deletedUsersIndex, $userMapping) -); diff --git a/apps/user_ldap/lib/AppInfo/Application.php b/apps/user_ldap/lib/AppInfo/Application.php index 93f7ccb379d..8dad63fbaf8 100644 --- a/apps/user_ldap/lib/AppInfo/Application.php +++ b/apps/user_ldap/lib/AppInfo/Application.php @@ -46,11 +46,9 @@ use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\AppFramework\IAppContainer; use OCP\EventDispatcher\IEventDispatcher; -use OCP\IConfig; use OCP\IGroupManager; use OCP\IL10N; use OCP\IServerContainer; -use OCP\IUserSession; use OCP\Notification\IManager as INotificationManager; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -86,28 +84,23 @@ class Application extends App implements IBootstrap { } public function boot(IBootContext $context): void { - $context->injectFn(function (IConfig $config, - INotificationManager $notificationManager, - IUserSession $userSession, - IAppContainer $appContainer, - EventDispatcherInterface $legacyDispatcher, - IEventDispatcher $dispatcher, - IGroupManager $groupManager) { - $helper = new Helper($config); + $context->injectFn(function ( + INotificationManager $notificationManager, + IAppContainer $appContainer, + EventDispatcherInterface $legacyDispatcher, + IEventDispatcher $dispatcher, + IGroupManager $groupManager, + User_Proxy $userBackend, + Group_Proxy $groupBackend, + Helper $helper + ) { $configPrefixes = $helper->getServerConfigurationPrefixes(true); if (count($configPrefixes) > 0) { - $ldapWrapper = new LDAP(); - $notificationManager->registerNotifierService(Notifier::class); $userPluginManager = $appContainer->get(UserPluginManager::class); $groupPluginManager = $appContainer->get(GroupPluginManager::class); - $userBackend = new User_Proxy( - $configPrefixes, $ldapWrapper, $config, $notificationManager, $userSession, $userPluginManager - ); - $groupBackend = new Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager); - \OC_User::useBackend($userBackend); $groupManager->addBackend($groupBackend); diff --git a/apps/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php index 5086f3a0c1a..2ee83e0f22b 100644 --- a/apps/user_ldap/lib/Command/Search.php +++ b/apps/user_ldap/lib/Command/Search.php @@ -29,11 +29,9 @@ namespace OCA\User_LDAP\Command; use OCA\User_LDAP\Group_Proxy; -use OCA\User_LDAP\GroupPluginManager; use OCA\User_LDAP\Helper; use OCA\User_LDAP\LDAP; use OCA\User_LDAP\User_Proxy; -use OCA\User_LDAP\UserPluginManager; use OCP\IConfig; use Symfony\Component\Console\Command\Command; @@ -45,13 +43,16 @@ use Symfony\Component\Console\Output\OutputInterface; class Search extends Command { /** @var \OCP\IConfig */ protected $ocConfig; + /** @var User_Proxy */ + private $userProxy; + /** @var Group_Proxy */ + private $groupProxy; - /** - * @param \OCP\IConfig $ocConfig - */ - public function __construct(IConfig $ocConfig) { - $this->ocConfig = $ocConfig; + public function __construct(IConfig $ocConfig, User_Proxy $userProxy, Group_Proxy $groupProxy) { parent::__construct(); + $this->ocConfig = $ocConfig; + $this->userProxy = $userProxy; + $this->groupProxy = $groupProxy; } protected function configure() { @@ -117,7 +118,7 @@ class Search extends Command { $this->validateOffsetAndLimit($offset, $limit); if ($input->getOption('group')) { - $proxy = new Group_Proxy($configPrefixes, $ldapWrapper, \OC::$server->query(GroupPluginManager::class)); + $proxy = $this->groupProxy; $getMethod = 'getGroups'; $printID = false; // convert the limit of groups to null. This will show all the groups available instead of @@ -126,14 +127,7 @@ class Search extends Command { $limit = null; } } else { - $proxy = new User_Proxy( - $configPrefixes, - $ldapWrapper, - $this->ocConfig, - \OC::$server->getNotificationManager(), - \OC::$server->getUserSession(), - \OC::$server->query(UserPluginManager::class) - ); + $proxy = $this->userProxy; $getMethod = 'getDisplayNames'; $printID = true; } diff --git a/apps/user_ldap/lib/Group_Proxy.php b/apps/user_ldap/lib/Group_Proxy.php index 4b17c020d59..490eab44462 100644 --- a/apps/user_ldap/lib/Group_Proxy.php +++ b/apps/user_ldap/lib/Group_Proxy.php @@ -34,13 +34,9 @@ class Group_Proxy extends Proxy implements \OCP\GroupInterface, IGroupLDAP, IGet private $backends = []; private $refBackend = null; - /** - * Constructor - * - * @param string[] $serverConfigPrefixes array containing the config Prefixes - */ - public function __construct($serverConfigPrefixes, ILDAPWrapper $ldap, GroupPluginManager $groupPluginManager) { + public function __construct(Helper $helper, ILDAPWrapper $ldap, GroupPluginManager $groupPluginManager) { parent::__construct($ldap); + $serverConfigPrefixes = $helper->getServerConfigurationPrefixes(true); foreach ($serverConfigPrefixes as $configPrefix) { $this->backends[$configPrefix] = new \OCA\User_LDAP\Group_LDAP($this->getAccess($configPrefix), $groupPluginManager); diff --git a/apps/user_ldap/lib/Helper.php b/apps/user_ldap/lib/Helper.php index a8d66998148..86712534f40 100644 --- a/apps/user_ldap/lib/Helper.php +++ b/apps/user_ldap/lib/Helper.php @@ -76,7 +76,7 @@ class Helper { * except the default (first) server shall be connected to. * */ - public function getServerConfigurationPrefixes($activeConfigurations = false) { + public function getServerConfigurationPrefixes($activeConfigurations = false): array { $referenceConfigkey = 'ldap_configuration_active'; $keys = $this->getServersConfig($referenceConfigkey); @@ -188,18 +188,11 @@ class Helper { /** * checks whether there is one or more disabled LDAP configurations - * - * @return bool - * @throws \Exception */ - public function haveDisabledConfigurations() { + public function haveDisabledConfigurations(): bool { $all = $this->getServerConfigurationPrefixes(false); $active = $this->getServerConfigurationPrefixes(true); - if (!is_array($all) || !is_array($active)) { - throw new \Exception('Unexpected Return Value'); - } - return count($all) !== count($active) || count($all) === 0; } @@ -312,20 +305,7 @@ class Helper { throw new \Exception('key uid is expected to be set in $param'); } - //ain't it ironic? - $helper = new Helper(\OC::$server->getConfig()); - - $configPrefixes = $helper->getServerConfigurationPrefixes(true); - $ldapWrapper = new LDAP(); - $ocConfig = \OC::$server->getConfig(); - $notificationManager = \OC::$server->getNotificationManager(); - - $userSession = \OC::$server->getUserSession(); - $userPluginManager = \OC::$server->query(UserPluginManager::class); - - $userBackend = new User_Proxy( - $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager - ); + $userBackend = \OC::$server->get(User_Proxy::class); $uid = $userBackend->loginName2UserName($param['uid']); if ($uid !== false) { $param['uid'] = $uid; diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php index 8f729ae4372..6bb44b3e6ae 100644 --- a/apps/user_ldap/lib/Jobs/CleanUp.php +++ b/apps/user_ldap/lib/Jobs/CleanUp.php @@ -35,7 +35,6 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User\DeletedUsersIndex; use OCA\User_LDAP\User_LDAP; use OCA\User_LDAP\User_Proxy; -use OCA\User_LDAP\UserPluginManager; /** * Class CleanUp @@ -69,10 +68,11 @@ class CleanUp extends TimedJob { /** @var DeletedUsersIndex */ protected $dui; - public function __construct() { + public function __construct(User_Proxy $userBackend) { $minutes = \OC::$server->getConfig()->getSystemValue( 'ldapUserCleanupInterval', (string)$this->defaultIntervalMin); $this->setInterval((int)$minutes * 60); + $this->userBackend = $userBackend; } /** @@ -99,15 +99,6 @@ class CleanUp extends TimedJob { if (isset($arguments['userBackend'])) { $this->userBackend = $arguments['userBackend']; - } else { - $this->userBackend = new User_Proxy( - $this->ldapHelper->getServerConfigurationPrefixes(true), - new LDAP(), - $this->ocConfig, - \OC::$server->getNotificationManager(), - \OC::$server->getUserSession(), - \OC::$server->query(UserPluginManager::class) - ); } if (isset($arguments['db'])) { diff --git a/apps/user_ldap/lib/Jobs/UpdateGroups.php b/apps/user_ldap/lib/Jobs/UpdateGroups.php index 33587f8bdb2..34dddb3d287 100644 --- a/apps/user_ldap/lib/Jobs/UpdateGroups.php +++ b/apps/user_ldap/lib/Jobs/UpdateGroups.php @@ -33,42 +33,36 @@ namespace OCA\User_LDAP\Jobs; -use OCA\User_LDAP\Access; -use OCA\User_LDAP\Connection; -use OCA\User_LDAP\FilesystemHelper; -use OCA\User_LDAP\GroupPluginManager; -use OCA\User_LDAP\Helper; -use OCA\User_LDAP\LDAP; -use OCA\User_LDAP\LogWrapper; -use OCA\User_LDAP\Mapping\GroupMapping; -use OCA\User_LDAP\Mapping\UserMapping; -use OCA\User_LDAP\User\Manager; +use OC\BackgroundJob\TimedJob; +use OCA\User_LDAP\Group_Proxy; use OCP\EventDispatcher\IEventDispatcher; use OCP\Group\Events\UserAddedEvent; use OCP\Group\Events\UserRemovedEvent; use OCP\ILogger; -class UpdateGroups extends \OC\BackgroundJob\TimedJob { - private static $groupsFromDB; +class UpdateGroups extends TimedJob { + private $groupsFromDB; - private static $groupBE; + /** @var Group_Proxy */ + private $groupBackend; - public function __construct() { - $this->interval = self::getRefreshInterval(); + public function __construct(Group_Proxy $groupBackend) { + $this->interval = $this->getRefreshInterval(); + $this->groupBackend = $groupBackend; } /** * @param mixed $argument */ public function run($argument) { - self::updateGroups(); + $this->updateGroups(); } - public static function updateGroups() { + public function updateGroups() { \OCP\Util::writeLog('user_ldap', 'Run background job "updateGroups"', ILogger::DEBUG); - $knownGroups = array_keys(self::getKnownGroups()); - $actualGroups = self::getGroupBE()->getGroups(); + $knownGroups = array_keys($this->getKnownGroups()); + $actualGroups = $this->groupBackend->getGroups(); if (empty($actualGroups) && empty($knownGroups)) { \OCP\Util::writeLog('user_ldap', @@ -77,9 +71,9 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { return; } - self::handleKnownGroups(array_intersect($actualGroups, $knownGroups)); - self::handleCreatedGroups(array_diff($actualGroups, $knownGroups)); - self::handleRemovedGroups(array_diff($knownGroups, $actualGroups)); + $this->handleKnownGroups(array_intersect($actualGroups, $knownGroups)); + $this->handleCreatedGroups(array_diff($actualGroups, $knownGroups)); + $this->handleRemovedGroups(array_diff($knownGroups, $actualGroups)); \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', ILogger::DEBUG); } @@ -87,7 +81,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @return int */ - private static function getRefreshInterval() { + private function getRefreshInterval() { //defaults to every hour return \OC::$server->getConfig()->getAppValue('user_ldap', 'bgjRefreshInterval', 3600); } @@ -95,7 +89,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @param string[] $groups */ - private static function handleKnownGroups($groups) { + private function handleKnownGroups($groups) { /** @var IEventDispatcher $dispatcher */ $dispatcher = \OC::$server->query(IEventDispatcher::class); $groupManager = \OC::$server->getGroupManager(); @@ -107,10 +101,12 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { SET `owncloudusers` = ? WHERE `owncloudname` = ? '); + if (!is_array($this->groupsFromDB)) { + $this->getKnownGroups(); + } foreach ($groups as $group) { - //we assume, that self::$groupsFromDB has been retrieved already - $knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']); - $actualUsers = self::getGroupBE()->usersInGroup($group); + $knownUsers = unserialize($this->groupsFromDB[$group]['owncloudusers']); + $actualUsers = $this->groupBackend->usersInGroup($group); $hasChanged = false; $groupObject = $groupManager->get($group); @@ -142,7 +138,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @param string[] $createdGroups */ - private static function handleCreatedGroups($createdGroups) { + private function handleCreatedGroups($createdGroups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', ILogger::DEBUG); $query = \OC_DB::prepare(' INSERT @@ -153,7 +149,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – new group "'.$createdGroup.'" found.', ILogger::INFO); - $users = serialize(self::getGroupBE()->usersInGroup($createdGroup)); + $users = serialize($this->groupBackend->usersInGroup($createdGroup)); $query->execute([$createdGroup, $users]); } \OCP\Util::writeLog('user_ldap', @@ -164,7 +160,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @param string[] $removedGroups */ - private static function handleRemovedGroups($removedGroups) { + private function handleRemovedGroups($removedGroups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', ILogger::DEBUG); $query = \OC_DB::prepare(' DELETE @@ -183,58 +179,22 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { } /** - * @return \OCA\User_LDAP\Group_LDAP|\OCA\User_LDAP\Group_Proxy - */ - private static function getGroupBE() { - if (!is_null(self::$groupBE)) { - return self::$groupBE; - } - $helper = new Helper(\OC::$server->getConfig()); - $configPrefixes = $helper->getServerConfigurationPrefixes(true); - $ldapWrapper = new LDAP(); - if (count($configPrefixes) === 1) { - //avoid the proxy when there is only one LDAP server configured - $dbc = \OC::$server->getDatabaseConnection(); - $userManager = new Manager( - \OC::$server->getConfig(), - new FilesystemHelper(), - new LogWrapper(), - \OC::$server->getAvatarManager(), - new \OCP\Image(), - $dbc, - \OC::$server->getUserManager(), - \OC::$server->getNotificationManager()); - $connector = new Connection($ldapWrapper, $configPrefixes[0]); - $ldapAccess = new Access($connector, $ldapWrapper, $userManager, $helper, \OC::$server->getConfig(), \OC::$server->getUserManager()); - $groupMapper = new GroupMapping($dbc); - $userMapper = new UserMapping($dbc); - $ldapAccess->setGroupMapper($groupMapper); - $ldapAccess->setUserMapper($userMapper); - self::$groupBE = new \OCA\User_LDAP\Group_LDAP($ldapAccess, \OC::$server->query(GroupPluginManager::class)); - } else { - self::$groupBE = new \OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper, \OC::$server->query(GroupPluginManager::class)); - } - - return self::$groupBE; - } - - /** * @return array */ - private static function getKnownGroups() { - if (is_array(self::$groupsFromDB)) { - return self::$groupsFromDB; + private function getKnownGroups() { + if (is_array($this->groupsFromDB)) { + $this->groupsFromDB; } $query = \OC_DB::prepare(' SELECT `owncloudname`, `owncloudusers` FROM `*PREFIX*ldap_group_members` '); $result = $query->execute()->fetchAll(); - self::$groupsFromDB = []; + $this->groupsFromDB = []; foreach ($result as $dataset) { - self::$groupsFromDB[$dataset['owncloudname']] = $dataset; + $this->groupsFromDB[$dataset['owncloudname']] = $dataset; } - return self::$groupsFromDB; + return $this->groupsFromDB; } } diff --git a/apps/user_ldap/lib/Migration/UUIDFix.php b/apps/user_ldap/lib/Migration/UUIDFix.php index 8648f979211..ba2264c3c63 100644 --- a/apps/user_ldap/lib/Migration/UUIDFix.php +++ b/apps/user_ldap/lib/Migration/UUIDFix.php @@ -50,11 +50,4 @@ abstract class UUIDFix extends QueuedJob { } } } - - /** - * @param Proxy $proxy - */ - public function overrideProxy(Proxy $proxy) { - $this->proxy = $proxy; - } } diff --git a/apps/user_ldap/lib/Migration/UUIDFixGroup.php b/apps/user_ldap/lib/Migration/UUIDFixGroup.php index b40cc8881e6..2cf961f550a 100644 --- a/apps/user_ldap/lib/Migration/UUIDFixGroup.php +++ b/apps/user_ldap/lib/Migration/UUIDFixGroup.php @@ -26,18 +26,12 @@ namespace OCA\User_LDAP\Migration; -use OCA\User_LDAP\Helper; -use OCA\User_LDAP\LDAP; +use OCA\User_LDAP\Group_Proxy; use OCA\User_LDAP\Mapping\GroupMapping; -use OCA\User_LDAP\User_Proxy; -use OCA\User_LDAP\UserPluginManager; -use OCP\IConfig; class UUIDFixGroup extends UUIDFix { - public function __construct(GroupMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) { + public function __construct(GroupMapping $mapper, Group_Proxy $proxy) { $this->mapper = $mapper; - $this->proxy = new User_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config, - \OC::$server->getNotificationManager(), \OC::$server->getUserSession(), - \OC::$server->query(UserPluginManager::class)); + $this->proxy = $proxy; } } diff --git a/apps/user_ldap/lib/Migration/UUIDFixUser.php b/apps/user_ldap/lib/Migration/UUIDFixUser.php index f2be0c5ed96..4ea58c45620 100644 --- a/apps/user_ldap/lib/Migration/UUIDFixUser.php +++ b/apps/user_ldap/lib/Migration/UUIDFixUser.php @@ -26,17 +26,12 @@ namespace OCA\User_LDAP\Migration; -use OCA\User_LDAP\Group_Proxy; -use OCA\User_LDAP\GroupPluginManager; -use OCA\User_LDAP\Helper; -use OCA\User_LDAP\LDAP; +use OCA\User_LDAP\User_Proxy; use OCA\User_LDAP\Mapping\UserMapping; -use OCP\IConfig; class UUIDFixUser extends UUIDFix { - public function __construct(UserMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) { + public function __construct(UserMapping $mapper, User_Proxy $proxy) { $this->mapper = $mapper; - $groupPluginManager = \OC::$server->query(GroupPluginManager::class); - $this->proxy = new Group_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $groupPluginManager); + $this->proxy = $proxy; } } diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php index 6445af89112..e8d0a6d6948 100644 --- a/apps/user_ldap/lib/User_Proxy.php +++ b/apps/user_ldap/lib/User_Proxy.php @@ -42,17 +42,8 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface, /** @var User_LDAP */ private $refBackend = null; - /** - * Constructor - * - * @param array $serverConfigPrefixes array containing the config Prefixes - * @param ILDAPWrapper $ldap - * @param IConfig $ocConfig - * @param INotificationManager $notificationManager - * @param IUserSession $userSession - */ public function __construct( - array $serverConfigPrefixes, + Helper $helper, ILDAPWrapper $ldap, IConfig $ocConfig, INotificationManager $notificationManager, @@ -60,6 +51,7 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface, UserPluginManager $userPluginManager ) { parent::__construct($ldap); + $serverConfigPrefixes = $helper->getServerConfigurationPrefixes(true); foreach ($serverConfigPrefixes as $configPrefix) { $this->backends[$configPrefix] = new User_LDAP($this->getAccess($configPrefix), $ocConfig, $notificationManager, $userSession, $userPluginManager); diff --git a/apps/user_ldap/tests/Jobs/CleanUpTest.php b/apps/user_ldap/tests/Jobs/CleanUpTest.php index 1e88694f7bf..533bb041f75 100644 --- a/apps/user_ldap/tests/Jobs/CleanUpTest.php +++ b/apps/user_ldap/tests/Jobs/CleanUpTest.php @@ -26,44 +26,49 @@ namespace OCA\User_LDAP\Tests\Jobs; +use Exception; use OCA\User_LDAP\Helper; +use OCA\User_LDAP\Jobs\CleanUp; +use OCA\User_LDAP\User\DeletedUsersIndex; +use OCA\User_LDAP\User_Proxy; use OCP\IConfig; use OCP\IDBConnection; +use Test\TestCase; -class CleanUpTest extends \Test\TestCase { - public function getMocks() { - $mocks = []; - $mocks['userBackend'] = - $this->getMockBuilder('\OCA\User_LDAP\User_Proxy') - ->disableOriginalConstructor() - ->getMock(); - $mocks['deletedUsersIndex'] = - $this->getMockBuilder('\OCA\User_LDAP\User\DeletedUsersIndex') - ->disableOriginalConstructor() - ->getMock(); - $mocks['ocConfig'] = $this->createMock(IConfig::class); - $mocks['db'] = $this->createMock(IDBConnection::class); - $mocks['helper'] = $this->createMock(Helper::class); - - return $mocks; +class CleanUpTest extends TestCase { + /** @var CleanUp */ + protected $bgJob; + + /** @var array */ + protected $mocks; + + public function setUp(): void { + $this->createMocks(); + $this->bgJob = new CleanUp($this->mocks['userBackend']); + $this->bgJob->setArguments($this->mocks); + } + + protected function createMocks(): void { + $this->mocks = []; + $this->mocks['userBackend'] = $this->createMock(User_Proxy::class); + $this->mocks['deletedUsersIndex'] = $this->createMock(DeletedUsersIndex::class); + $this->mocks['ocConfig'] = $this->createMock(IConfig::class); + $this->mocks['db'] = $this->createMock(IDBConnection::class); + $this->mocks['helper'] = $this->createMock(Helper::class); } /** * clean up job must not run when there are disabled configurations */ public function test_runNotAllowedByDisabledConfigurations() { - $args = $this->getMocks(); - $args['helper']->expects($this->once()) + $this->mocks['helper']->expects($this->once()) ->method('haveDisabledConfigurations') ->willReturn(true); - $args['ocConfig']->expects($this->never()) + $this->mocks['ocConfig']->expects($this->never()) ->method('getSystemValue'); - $bgJob = new \OCA\User_LDAP\Jobs\CleanUp(); - $bgJob->setArguments($args); - - $result = $bgJob->isCleanUpAllowed(); + $result = $this->bgJob->isCleanUpAllowed(); $this->assertSame(false, $result); } @@ -72,18 +77,14 @@ class CleanUpTest extends \Test\TestCase { * returning unexpected results */ public function test_runNotAllowedByBrokenHelper() { - $args = $this->getMocks(); - $args['helper']->expects($this->once()) + $this->mocks['helper']->expects($this->once()) ->method('haveDisabledConfigurations') - ->will($this->throwException(new \Exception())); + ->will($this->throwException(new Exception())); - $args['ocConfig']->expects($this->never()) + $this->mocks['ocConfig']->expects($this->never()) ->method('getSystemValue'); - $bgJob = new \OCA\User_LDAP\Jobs\CleanUp(); - $bgJob->setArguments($args); - - $result = $bgJob->isCleanUpAllowed(); + $result = $this->bgJob->isCleanUpAllowed(); $this->assertSame(false, $result); } @@ -91,19 +92,15 @@ class CleanUpTest extends \Test\TestCase { * clean up job must not run when it is not enabled */ public function test_runNotAllowedBySysConfig() { - $args = $this->getMocks(); - $args['helper']->expects($this->once()) + $this->mocks['helper']->expects($this->once()) ->method('haveDisabledConfigurations') ->willReturn(false); - $args['ocConfig']->expects($this->once()) + $this->mocks['ocConfig']->expects($this->once()) ->method('getSystemValue') ->willReturn(false); - $bgJob = new \OCA\User_LDAP\Jobs\CleanUp(); - $bgJob->setArguments($args); - - $result = $bgJob->isCleanUpAllowed(); + $result = $this->bgJob->isCleanUpAllowed(); $this->assertSame(false, $result); } @@ -111,19 +108,15 @@ class CleanUpTest extends \Test\TestCase { * clean up job is allowed to run */ public function test_runIsAllowed() { - $args = $this->getMocks(); - $args['helper']->expects($this->once()) + $this->mocks['helper']->expects($this->once()) ->method('haveDisabledConfigurations') ->willReturn(false); - $args['ocConfig']->expects($this->once()) + $this->mocks['ocConfig']->expects($this->once()) ->method('getSystemValue') ->willReturn(true); - $bgJob = new \OCA\User_LDAP\Jobs\CleanUp(); - $bgJob->setArguments($args); - - $result = $bgJob->isCleanUpAllowed(); + $result = $this->bgJob->isCleanUpAllowed(); $this->assertSame(true, $result); } @@ -131,12 +124,7 @@ class CleanUpTest extends \Test\TestCase { * check whether offset will be reset when it needs to */ public function test_OffsetResetIsNecessary() { - $args = $this->getMocks(); - - $bgJob = new \OCA\User_LDAP\Jobs\CleanUp(); - $bgJob->setArguments($args); - - $result = $bgJob->isOffsetResetNecessary($bgJob->getChunkSize() - 1); + $result = $this->bgJob->isOffsetResetNecessary($this->bgJob->getChunkSize() - 1); $this->assertSame(true, $result); } @@ -144,12 +132,7 @@ class CleanUpTest extends \Test\TestCase { * make sure offset is not reset when it is not due */ public function test_OffsetResetIsNotNecessary() { - $args = $this->getMocks(); - - $bgJob = new \OCA\User_LDAP\Jobs\CleanUp(); - $bgJob->setArguments($args); - - $result = $bgJob->isOffsetResetNecessary($bgJob->getChunkSize()); + $result = $this->bgJob->isOffsetResetNecessary($this->bgJob->getChunkSize()); $this->assertSame(false, $result); } } diff --git a/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php b/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php index ec484dfe7eb..82483a54327 100644 --- a/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php +++ b/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php @@ -74,18 +74,13 @@ abstract class AbstractUUIDFixTest extends TestCase { ->willReturn(['s01', 's03']); } - protected function mockProxy($className) { - $this->proxy = $this->createMock($className); + protected function instantiateJob($className) { + $this->job = new $className($this->mapper, $this->proxy); $this->proxy->expects($this->any()) ->method('getLDAPAccess') ->willReturn($this->access); } - protected function instantiateJob($className) { - $this->job = new $className($this->mapper, $this->ldap, $this->config, $this->helper); - $this->job->overrideProxy($this->proxy); - } - public function testRunSingleRecord() { $args = [ 'records' => [ diff --git a/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php b/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php index a1f04d44670..fb9d2e2331c 100644 --- a/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php +++ b/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php @@ -40,11 +40,9 @@ class UUIDFixGroupTest extends AbstractUUIDFixTest { $this->isUser = false; parent::setUp(); - $this->isUser = false; - $this->mapper = $this->createMock(GroupMapping::class); + $this->proxy = $this->createMock(Group_Proxy::class); - $this->mockProxy(Group_Proxy::class); $this->instantiateJob(UUIDFixGroup::class); } } diff --git a/apps/user_ldap/tests/Migration/UUIDFixUserTest.php b/apps/user_ldap/tests/Migration/UUIDFixUserTest.php index 188c7b0f91d..cf80bf36230 100644 --- a/apps/user_ldap/tests/Migration/UUIDFixUserTest.php +++ b/apps/user_ldap/tests/Migration/UUIDFixUserTest.php @@ -40,8 +40,8 @@ class UUIDFixUserTest extends AbstractUUIDFixTest { parent::setUp(); $this->mapper = $this->createMock(UserMapping::class); + $this->proxy = $this->createMock(User_Proxy::class); - $this->mockProxy(User_Proxy::class); $this->instantiateJob(UUIDFixUser::class); } } diff --git a/apps/user_ldap/tests/User_ProxyTest.php b/apps/user_ldap/tests/User_ProxyTest.php index 5753990a736..0bbea00ed44 100644 --- a/apps/user_ldap/tests/User_ProxyTest.php +++ b/apps/user_ldap/tests/User_ProxyTest.php @@ -29,6 +29,7 @@ namespace OCA\User_LDAP\Tests; +use OCA\User_LDAP\Helper; use OCA\User_LDAP\ILDAPWrapper; use OCA\User_LDAP\User_Proxy; use OCA\User_LDAP\UserPluginManager; @@ -38,6 +39,8 @@ use OCP\Notification\IManager as INotificationManager; use Test\TestCase; class User_ProxyTest extends TestCase { + /** @var Helper|\PHPUnit\Framework\MockObject\MockObject */ + protected $helper; /** @var ILDAPWrapper|\PHPUnit\Framework\MockObject\MockObject */ private $ldapWrapper; /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ @@ -54,6 +57,7 @@ class User_ProxyTest extends TestCase { protected function setUp(): void { parent::setUp(); + $this->helper = $this->createMock(Helper::class); $this->ldapWrapper = $this->createMock(ILDAPWrapper::class); $this->config = $this->createMock(IConfig::class); $this->notificationManager = $this->createMock(INotificationManager::class); @@ -61,7 +65,7 @@ class User_ProxyTest extends TestCase { $this->userPluginManager = $this->createMock(UserPluginManager::class); $this->proxy = $this->getMockBuilder(User_Proxy::class) ->setConstructorArgs([ - [], + $this->helper, $this->ldapWrapper, $this->config, $this->notificationManager, |