diff options
Diffstat (limited to 'lib')
31 files changed, 133 insertions, 114 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 823a876e04b..0d5f067779d 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -808,7 +808,6 @@ return array( 'OC\\Share20\\ShareHelper' => $baseDir . '/lib/private/Share20/ShareHelper.php', 'OC\\Share\\Constants' => $baseDir . '/lib/private/Share/Constants.php', 'OC\\Share\\Helper' => $baseDir . '/lib/private/Share/Helper.php', - 'OC\\Share\\MailNotifications' => $baseDir . '/lib/private/Share/MailNotifications.php', 'OC\\Share\\SearchResultSorter' => $baseDir . '/lib/private/Share/SearchResultSorter.php', 'OC\\Share\\Share' => $baseDir . '/lib/private/Share/Share.php', 'OC\\Streamer' => $baseDir . '/lib/private/Streamer.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 979679c4198..82c31c24a21 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -838,7 +838,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Share20\\ShareHelper' => __DIR__ . '/../../..' . '/lib/private/Share20/ShareHelper.php', 'OC\\Share\\Constants' => __DIR__ . '/../../..' . '/lib/private/Share/Constants.php', 'OC\\Share\\Helper' => __DIR__ . '/../../..' . '/lib/private/Share/Helper.php', - 'OC\\Share\\MailNotifications' => __DIR__ . '/../../..' . '/lib/private/Share/MailNotifications.php', 'OC\\Share\\SearchResultSorter' => __DIR__ . '/../../..' . '/lib/private/Share/SearchResultSorter.php', 'OC\\Share\\Share' => __DIR__ . '/../../..' . '/lib/private/Share/Share.php', 'OC\\Streamer' => __DIR__ . '/../../..' . '/lib/private/Streamer.php', diff --git a/lib/l10n/de.js b/lib/l10n/de.js index cae14af7cfc..a4c9547373a 100644 --- a/lib/l10n/de.js +++ b/lib/l10n/de.js @@ -36,11 +36,13 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["Vor %n Stunde","Vor %n Stunden"], "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"], "seconds ago" : "Gerade eben", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID: %s existiert nicht. Bitte die App in den App-Einstellungen aktivieren oder den Administrator kontaktieren.", "File name is a reserved word" : "Der Dateiname ist ein reserviertes Wort", "File name contains at least one invalid character" : "Der Dateiname enthält mindestens ein ungültiges Zeichen", "File name is too long" : "Dateiname ist zu lang", "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", + "This is an automatically sent email, please do not reply." : "Dies ist eine automatisch versandte E-Mail, bitte nicht antworten.", "Help" : "Hilfe", "Apps" : "Apps", "Personal" : "Persönlich", @@ -63,6 +65,7 @@ OC.L10N.register( "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig", "DB Error: \"%s\"" : "DB-Fehler: „%s“", "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: „%s“", + "You need to enter details of an existing account." : "Du mußt Daten eines existierenden Kontos angeben.", "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: „%s“, Name: %s, Passwort: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X wird nicht unterstützt und %s wird auf dieser Plattform nicht richtig funktionieren. Die Benutzung erfolgt auf eigene Gefahr!", @@ -155,6 +158,7 @@ OC.L10N.register( "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“ und „_.@-'“", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Username contains whitespace at the beginning or at the end" : "Der Benutzername enthält Leerzeichen am Anfang oder am Ende", + "Username must not consist of dots only" : "Benutzername darf nicht nur aus Punkten bestehen", "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Dieser Benutzername existiert bereits", "User disabled" : "Nutzer deaktiviert", @@ -198,6 +202,7 @@ OC.L10N.register( "Your data directory is readable by other users" : "Dein Datenverzeichnis kann von anderen Benutzern gelesen werden", "Your data directory must be an absolute path" : "Dein Datenverzeichnis muss einen eindeutigen Pfad haben", "Check the value of \"datadirectory\" in your configuration" : "Überprüfe bitte die Angabe unter „datadirectory“ in Deiner Konfiguration", + "Your data directory is invalid" : "Dein Datenverzeichnis ist ungültig", "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stelle sicher, dass das Datenverzeichnis auf seiner ersten Ebene eine Datei namens „.ocdata“ enthält.", "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf „%s“ konnte nicht ermittelt werden.", "Storage unauthorized. %s" : "Speichern nicht erlaubt. %s", diff --git a/lib/l10n/de.json b/lib/l10n/de.json index 39ee5435aaa..7b2051ab3bf 100644 --- a/lib/l10n/de.json +++ b/lib/l10n/de.json @@ -34,11 +34,13 @@ "_%n hour ago_::_%n hours ago_" : ["Vor %n Stunde","Vor %n Stunden"], "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"], "seconds ago" : "Gerade eben", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID: %s existiert nicht. Bitte die App in den App-Einstellungen aktivieren oder den Administrator kontaktieren.", "File name is a reserved word" : "Der Dateiname ist ein reserviertes Wort", "File name contains at least one invalid character" : "Der Dateiname enthält mindestens ein ungültiges Zeichen", "File name is too long" : "Dateiname ist zu lang", "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", + "This is an automatically sent email, please do not reply." : "Dies ist eine automatisch versandte E-Mail, bitte nicht antworten.", "Help" : "Hilfe", "Apps" : "Apps", "Personal" : "Persönlich", @@ -61,6 +63,7 @@ "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig", "DB Error: \"%s\"" : "DB-Fehler: „%s“", "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: „%s“", + "You need to enter details of an existing account." : "Du mußt Daten eines existierenden Kontos angeben.", "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: „%s“, Name: %s, Passwort: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X wird nicht unterstützt und %s wird auf dieser Plattform nicht richtig funktionieren. Die Benutzung erfolgt auf eigene Gefahr!", @@ -153,6 +156,7 @@ "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“ und „_.@-'“", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Username contains whitespace at the beginning or at the end" : "Der Benutzername enthält Leerzeichen am Anfang oder am Ende", + "Username must not consist of dots only" : "Benutzername darf nicht nur aus Punkten bestehen", "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Dieser Benutzername existiert bereits", "User disabled" : "Nutzer deaktiviert", @@ -196,6 +200,7 @@ "Your data directory is readable by other users" : "Dein Datenverzeichnis kann von anderen Benutzern gelesen werden", "Your data directory must be an absolute path" : "Dein Datenverzeichnis muss einen eindeutigen Pfad haben", "Check the value of \"datadirectory\" in your configuration" : "Überprüfe bitte die Angabe unter „datadirectory“ in Deiner Konfiguration", + "Your data directory is invalid" : "Dein Datenverzeichnis ist ungültig", "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stelle sicher, dass das Datenverzeichnis auf seiner ersten Ebene eine Datei namens „.ocdata“ enthält.", "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf „%s“ konnte nicht ermittelt werden.", "Storage unauthorized. %s" : "Speichern nicht erlaubt. %s", diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js index b4ba5739bed..c8c8bcf1086 100644 --- a/lib/l10n/de_DE.js +++ b/lib/l10n/de_DE.js @@ -36,11 +36,13 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["Vor %n Stunde","Vor %n Stunden"], "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"], "seconds ago" : "Gerade eben", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul mit ID: 1 %s existiert nicht. Bitte aktiviere es in deinen Einstellungen oder kontaktiere deinen Administrator.", "File name is a reserved word" : "Der Dateiname ist ein reserviertes Wort", "File name contains at least one invalid character" : "Der Dateiname enthält mindestens ein ungültiges Zeichen", "File name is too long" : "Dateiname ist zu lang", "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", + "This is an automatically sent email, please do not reply." : "Dies ist eine automatisch versendete EMail, bitte nicht antworten.", "Help" : "Hilfe", "Apps" : "Apps", "Personal" : "Persönlich", @@ -63,6 +65,7 @@ OC.L10N.register( "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig", "DB Error: \"%s\"" : "DB-Fehler: „%s“", "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: „%s“", + "You need to enter details of an existing account." : "Du musst Details von einem existierenden Benutzer einfügen.", "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: „%s“, Name: %s, Passwort: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X wird nicht unterstützt und %s wird auf dieser Plattform nicht richtig funktionieren. Die Benutzung erfolgt auf eigene Gefahr!", @@ -155,6 +158,7 @@ OC.L10N.register( "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Nur die folgenden Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“, and „_.@-'“", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Username contains whitespace at the beginning or at the end" : "Benutzername enthält Leerzeichen am Anfang oder Ende", + "Username must not consist of dots only" : "Benutzername darf nicht nur aus Punkten bestehen", "A valid password must be provided" : "Es muss ein gültiges Passwort eingegeben werden", "The username is already being used" : "Der Benutzername existiert bereits", "User disabled" : "Nutzer deaktiviert", @@ -198,6 +202,7 @@ OC.L10N.register( "Your data directory is readable by other users" : "Dein Datenverzeichnis kann von anderen Benutzern gelesen werden", "Your data directory must be an absolute path" : "Dein Datenverzeichnis muss einen eindeutigen Pfad haben", "Check the value of \"datadirectory\" in your configuration" : "Überprüfen Sie bitte die Angabe unter „datadirectory“ in Ihrer Konfiguration", + "Your data directory is invalid" : "Dein Datenverzeichnis ist ungültig.", "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stellen Sie sicher, dass das Datenverzeichnis auf seiner ersten Ebene eine Datei namens „.ocdata“ enthält.", "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf „%s“ konnte nicht ermittelt werden.", "Storage unauthorized. %s" : "Speicher ungültig. %s", diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json index 7040662f0be..1e3a96b7808 100644 --- a/lib/l10n/de_DE.json +++ b/lib/l10n/de_DE.json @@ -34,11 +34,13 @@ "_%n hour ago_::_%n hours ago_" : ["Vor %n Stunde","Vor %n Stunden"], "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"], "seconds ago" : "Gerade eben", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul mit ID: 1 %s existiert nicht. Bitte aktiviere es in deinen Einstellungen oder kontaktiere deinen Administrator.", "File name is a reserved word" : "Der Dateiname ist ein reserviertes Wort", "File name contains at least one invalid character" : "Der Dateiname enthält mindestens ein ungültiges Zeichen", "File name is too long" : "Dateiname ist zu lang", "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", + "This is an automatically sent email, please do not reply." : "Dies ist eine automatisch versendete EMail, bitte nicht antworten.", "Help" : "Hilfe", "Apps" : "Apps", "Personal" : "Persönlich", @@ -61,6 +63,7 @@ "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig", "DB Error: \"%s\"" : "DB-Fehler: „%s“", "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: „%s“", + "You need to enter details of an existing account." : "Du musst Details von einem existierenden Benutzer einfügen.", "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: „%s“, Name: %s, Passwort: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X wird nicht unterstützt und %s wird auf dieser Plattform nicht richtig funktionieren. Die Benutzung erfolgt auf eigene Gefahr!", @@ -153,6 +156,7 @@ "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Nur die folgenden Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“, and „_.@-'“", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Username contains whitespace at the beginning or at the end" : "Benutzername enthält Leerzeichen am Anfang oder Ende", + "Username must not consist of dots only" : "Benutzername darf nicht nur aus Punkten bestehen", "A valid password must be provided" : "Es muss ein gültiges Passwort eingegeben werden", "The username is already being used" : "Der Benutzername existiert bereits", "User disabled" : "Nutzer deaktiviert", @@ -196,6 +200,7 @@ "Your data directory is readable by other users" : "Dein Datenverzeichnis kann von anderen Benutzern gelesen werden", "Your data directory must be an absolute path" : "Dein Datenverzeichnis muss einen eindeutigen Pfad haben", "Check the value of \"datadirectory\" in your configuration" : "Überprüfen Sie bitte die Angabe unter „datadirectory“ in Ihrer Konfiguration", + "Your data directory is invalid" : "Dein Datenverzeichnis ist ungültig.", "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stellen Sie sicher, dass das Datenverzeichnis auf seiner ersten Ebene eine Datei namens „.ocdata“ enthält.", "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf „%s“ konnte nicht ermittelt werden.", "Storage unauthorized. %s" : "Speicher ungültig. %s", diff --git a/lib/l10n/es.js b/lib/l10n/es.js index e6bcf0827ad..52132180ca8 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -41,6 +41,7 @@ OC.L10N.register( "File name is too long" : "El nombre del archivo es demasiado largo", "Dot files are not allowed" : "Los archivos Dot no están permitidos", "Empty filename is not allowed" : "No se puede dejar el nombre en blanco.", + "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no responda.", "Help" : "Ayuda", "Apps" : "Aplicaciones", "Personal" : "Personal", @@ -63,6 +64,7 @@ OC.L10N.register( "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle no válidos", "DB Error: \"%s\"" : "Error BD: \"%s\"", "Offending command was: \"%s\"" : "Comando infractor: \"%s\"", + "You need to enter details of an existing account." : "Necesita ingresar detalles de una cuenta existente.", "Offending command was: \"%s\", name: %s, password: %s" : "Comando infractor: \"%s\", nombre: %s, contraseña: %s", "PostgreSQL username and/or password not valid" : "Usuario y/o contraseña de PostgreSQL no válidos", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela bajo su propio riesgo! ", @@ -198,6 +200,7 @@ OC.L10N.register( "Your data directory is readable by other users" : "Su directorio data es leible por otros usuarios", "Your data directory must be an absolute path" : "Su directorio data debe ser una ruta absoluta", "Check the value of \"datadirectory\" in your configuration" : "Compruebe el valor de \"datadirectory\" en su configuración.", + "Your data directory is invalid" : "Su directorio de datos es inválido", "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifique que el directorio de datos contiene un archivo \".ocdata\" en su directorio raíz.", "Could not obtain lock type %d on \"%s\"." : "No se pudo realizar el bloqueo %d en \"%s\".", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index 312a6674847..61827ee6aa6 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -39,6 +39,7 @@ "File name is too long" : "El nombre del archivo es demasiado largo", "Dot files are not allowed" : "Los archivos Dot no están permitidos", "Empty filename is not allowed" : "No se puede dejar el nombre en blanco.", + "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no responda.", "Help" : "Ayuda", "Apps" : "Aplicaciones", "Personal" : "Personal", @@ -61,6 +62,7 @@ "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle no válidos", "DB Error: \"%s\"" : "Error BD: \"%s\"", "Offending command was: \"%s\"" : "Comando infractor: \"%s\"", + "You need to enter details of an existing account." : "Necesita ingresar detalles de una cuenta existente.", "Offending command was: \"%s\", name: %s, password: %s" : "Comando infractor: \"%s\", nombre: %s, contraseña: %s", "PostgreSQL username and/or password not valid" : "Usuario y/o contraseña de PostgreSQL no válidos", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela bajo su propio riesgo! ", @@ -196,6 +198,7 @@ "Your data directory is readable by other users" : "Su directorio data es leible por otros usuarios", "Your data directory must be an absolute path" : "Su directorio data debe ser una ruta absoluta", "Check the value of \"datadirectory\" in your configuration" : "Compruebe el valor de \"datadirectory\" en su configuración.", + "Your data directory is invalid" : "Su directorio de datos es inválido", "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifique que el directorio de datos contiene un archivo \".ocdata\" en su directorio raíz.", "Could not obtain lock type %d on \"%s\"." : "No se pudo realizar el bloqueo %d en \"%s\".", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js index 440b213f33b..86a8fb3f84a 100644 --- a/lib/l10n/fr.js +++ b/lib/l10n/fr.js @@ -36,11 +36,13 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["Il y a %n heure","Il y a %n heures"], "_%n minute ago_::_%n minutes ago_" : ["il y a %n minute","il y a %n minutes"], "seconds ago" : "il y a quelques secondes", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Le module avec l'ID: %s n'existe pas. Merci de l'activer dans les paramètres d'applications ou de contacter votre administrateur.", "File name is a reserved word" : "Ce nom de fichier est un mot réservé", "File name contains at least one invalid character" : "Le nom de fichier contient un (des) caractère(s) non valide(s)", "File name is too long" : "Nom de fichier trop long", "Dot files are not allowed" : "Le nom de fichier ne peut pas commencer par un point", "Empty filename is not allowed" : "Le nom de fichier ne peut pas être vide", + "This is an automatically sent email, please do not reply." : "Ceci est un e-mail envoyé automatiquement, veuillez ne pas y répondre.", "Help" : "Aide", "Apps" : "Applications", "Personal" : "Personnel", @@ -63,6 +65,7 @@ OC.L10N.register( "Oracle username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base Oracle non valide(s)", "DB Error: \"%s\"" : "Erreur de la base de données : \"%s\"", "Offending command was: \"%s\"" : "La requête en cause est : \"%s\"", + "You need to enter details of an existing account." : "Vous devez indiquer les détails d'un compte existant.", "Offending command was: \"%s\", name: %s, password: %s" : "La requête en cause est : \"%s\", nom : %s, mot de passe : %s", "PostgreSQL username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL non valide(s)", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !", @@ -155,6 +158,7 @@ OC.L10N.register( "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", \"_@-\" et \".\" (le point)", "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi", "Username contains whitespace at the beginning or at the end" : "Le nom d'utilisateur contient des espaces au début ou à la fin", + "Username must not consist of dots only" : "Le nom d'utilisateur ne doit pas être composé uniquement de points", "A valid password must be provided" : "Un mot de passe valide doit être saisi", "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé", "User disabled" : "Utilisateur désactivé", @@ -198,6 +202,7 @@ OC.L10N.register( "Your data directory is readable by other users" : "Votre répertoire est lisible par les autres utilisateurs", "Your data directory must be an absolute path" : "Le chemin de votre répertoire doit être un lien absolu", "Check the value of \"datadirectory\" in your configuration" : "Verifiez la valeur de \"datadirectory\" dans votre configuration", + "Your data directory is invalid" : "Votre répertoire n'est pas valide", "Please check that the data directory contains a file \".ocdata\" in its root." : "Veuillez vérifier que le répertoire de données contient un fichier \".ocdata\" à sa racine.", "Could not obtain lock type %d on \"%s\"." : "Impossible d'obtenir le verrouillage de type %d sur \"%s\".", "Storage unauthorized. %s" : "Espace de stockage non autorisé. %s", diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json index 8ae0e212c92..8a3037cfd24 100644 --- a/lib/l10n/fr.json +++ b/lib/l10n/fr.json @@ -34,11 +34,13 @@ "_%n hour ago_::_%n hours ago_" : ["Il y a %n heure","Il y a %n heures"], "_%n minute ago_::_%n minutes ago_" : ["il y a %n minute","il y a %n minutes"], "seconds ago" : "il y a quelques secondes", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Le module avec l'ID: %s n'existe pas. Merci de l'activer dans les paramètres d'applications ou de contacter votre administrateur.", "File name is a reserved word" : "Ce nom de fichier est un mot réservé", "File name contains at least one invalid character" : "Le nom de fichier contient un (des) caractère(s) non valide(s)", "File name is too long" : "Nom de fichier trop long", "Dot files are not allowed" : "Le nom de fichier ne peut pas commencer par un point", "Empty filename is not allowed" : "Le nom de fichier ne peut pas être vide", + "This is an automatically sent email, please do not reply." : "Ceci est un e-mail envoyé automatiquement, veuillez ne pas y répondre.", "Help" : "Aide", "Apps" : "Applications", "Personal" : "Personnel", @@ -61,6 +63,7 @@ "Oracle username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base Oracle non valide(s)", "DB Error: \"%s\"" : "Erreur de la base de données : \"%s\"", "Offending command was: \"%s\"" : "La requête en cause est : \"%s\"", + "You need to enter details of an existing account." : "Vous devez indiquer les détails d'un compte existant.", "Offending command was: \"%s\", name: %s, password: %s" : "La requête en cause est : \"%s\", nom : %s, mot de passe : %s", "PostgreSQL username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL non valide(s)", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !", @@ -153,6 +156,7 @@ "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", \"_@-\" et \".\" (le point)", "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi", "Username contains whitespace at the beginning or at the end" : "Le nom d'utilisateur contient des espaces au début ou à la fin", + "Username must not consist of dots only" : "Le nom d'utilisateur ne doit pas être composé uniquement de points", "A valid password must be provided" : "Un mot de passe valide doit être saisi", "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé", "User disabled" : "Utilisateur désactivé", @@ -196,6 +200,7 @@ "Your data directory is readable by other users" : "Votre répertoire est lisible par les autres utilisateurs", "Your data directory must be an absolute path" : "Le chemin de votre répertoire doit être un lien absolu", "Check the value of \"datadirectory\" in your configuration" : "Verifiez la valeur de \"datadirectory\" dans votre configuration", + "Your data directory is invalid" : "Votre répertoire n'est pas valide", "Please check that the data directory contains a file \".ocdata\" in its root." : "Veuillez vérifier que le répertoire de données contient un fichier \".ocdata\" à sa racine.", "Could not obtain lock type %d on \"%s\"." : "Impossible d'obtenir le verrouillage de type %d sur \"%s\".", "Storage unauthorized. %s" : "Espace de stockage non autorisé. %s", diff --git a/lib/l10n/nb.js b/lib/l10n/nb.js index 2de0a7f5c5e..3e824b6376e 100644 --- a/lib/l10n/nb.js +++ b/lib/l10n/nb.js @@ -36,11 +36,13 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["for %n time siden","for %n timer siden"], "_%n minute ago_::_%n minutes ago_" : ["for %n minutt siden","for %n minutter siden"], "seconds ago" : "for få sekunder siden", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul med ID: %s finnes ikke. Skru den på i programinnstillingene eller kontakt en administrator.", "File name is a reserved word" : "Filnavnet er et reservert ord", "File name contains at least one invalid character" : "Filnavnet inneholder minst ett ulovlig tegn", "File name is too long" : "Filnavnet er for langt", "Dot files are not allowed" : "Punktum-filer er ikke tillatt", "Empty filename is not allowed" : "Tomt filnavn er ikke tillatt", + "This is an automatically sent email, please do not reply." : "Dette er en automatisk sendt e-post, ikke svar.", "Help" : "Hjelp", "Apps" : "Programmer", "Personal" : "Personlig", @@ -63,6 +65,7 @@ OC.L10N.register( "Oracle username and/or password not valid" : "Oracle-brukernavn og/eller passord er ikke gyldig", "DB Error: \"%s\"" : "Databasefeil: \"%s\"", "Offending command was: \"%s\"" : "Kommandoen som feilet: \"%s\"", + "You need to enter details of an existing account." : "Du må legge in detaljene til en eksisterende konto.", "Offending command was: \"%s\", name: %s, password: %s" : "Kommando som feilet: \"%s\", navn: %s, passord: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL-brukernavn og/eller passord er ikke gyldig", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!", @@ -195,7 +198,10 @@ OC.L10N.register( "PostgreSQL >= 9 required" : "PostgreSQL >= 9 kreves", "Please upgrade your database version" : "Oppgrader databaseversjonen din", "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Endre tillatelsene til 0770 slik at mappen ikke kan listes av andre brukere.", + "Your data directory is readable by other users" : "Din datamappe kan leses av andre brukere", + "Your data directory must be an absolute path" : "Din datamappe må være en absolutt sti", "Check the value of \"datadirectory\" in your configuration" : "Sjekk verdien for \"datadirectory\" i oppsettet ditt", + "Your data directory is invalid" : "Din datamappe er ugyldig", "Please check that the data directory contains a file \".ocdata\" in its root." : "Sjekk at det ligger en fil \".ocdata\" i roten av data-mappen.", "Could not obtain lock type %d on \"%s\"." : "Klarte ikke å låse med type %d på \"%s\".", "Storage unauthorized. %s" : "Lager uautorisert: %s", diff --git a/lib/l10n/nb.json b/lib/l10n/nb.json index 9602e1ebe0c..246bea1e256 100644 --- a/lib/l10n/nb.json +++ b/lib/l10n/nb.json @@ -34,11 +34,13 @@ "_%n hour ago_::_%n hours ago_" : ["for %n time siden","for %n timer siden"], "_%n minute ago_::_%n minutes ago_" : ["for %n minutt siden","for %n minutter siden"], "seconds ago" : "for få sekunder siden", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul med ID: %s finnes ikke. Skru den på i programinnstillingene eller kontakt en administrator.", "File name is a reserved word" : "Filnavnet er et reservert ord", "File name contains at least one invalid character" : "Filnavnet inneholder minst ett ulovlig tegn", "File name is too long" : "Filnavnet er for langt", "Dot files are not allowed" : "Punktum-filer er ikke tillatt", "Empty filename is not allowed" : "Tomt filnavn er ikke tillatt", + "This is an automatically sent email, please do not reply." : "Dette er en automatisk sendt e-post, ikke svar.", "Help" : "Hjelp", "Apps" : "Programmer", "Personal" : "Personlig", @@ -61,6 +63,7 @@ "Oracle username and/or password not valid" : "Oracle-brukernavn og/eller passord er ikke gyldig", "DB Error: \"%s\"" : "Databasefeil: \"%s\"", "Offending command was: \"%s\"" : "Kommandoen som feilet: \"%s\"", + "You need to enter details of an existing account." : "Du må legge in detaljene til en eksisterende konto.", "Offending command was: \"%s\", name: %s, password: %s" : "Kommando som feilet: \"%s\", navn: %s, passord: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL-brukernavn og/eller passord er ikke gyldig", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!", @@ -193,7 +196,10 @@ "PostgreSQL >= 9 required" : "PostgreSQL >= 9 kreves", "Please upgrade your database version" : "Oppgrader databaseversjonen din", "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Endre tillatelsene til 0770 slik at mappen ikke kan listes av andre brukere.", + "Your data directory is readable by other users" : "Din datamappe kan leses av andre brukere", + "Your data directory must be an absolute path" : "Din datamappe må være en absolutt sti", "Check the value of \"datadirectory\" in your configuration" : "Sjekk verdien for \"datadirectory\" i oppsettet ditt", + "Your data directory is invalid" : "Din datamappe er ugyldig", "Please check that the data directory contains a file \".ocdata\" in its root." : "Sjekk at det ligger en fil \".ocdata\" i roten av data-mappen.", "Could not obtain lock type %d on \"%s\"." : "Klarte ikke å låse med type %d på \"%s\".", "Storage unauthorized. %s" : "Lager uautorisert: %s", diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js index ade962bca47..d690d655d60 100644 --- a/lib/l10n/pl.js +++ b/lib/l10n/pl.js @@ -36,11 +36,13 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["%n godzinę temu","%n godzin temu","%n godzin temu","%n godzin temu"], "_%n minute ago_::_%n minutes ago_" : ["%n minute temu","%n minut temu","%n minut temu","%n minut temu"], "seconds ago" : "sekund temu", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Moduł o ID: %s nie istnieje. Proszę włącz go w ustawieniach aplikacji lub skontaktuj się z administratorem.", "File name is a reserved word" : "Nazwa pliku jest zarezerwowana", "File name contains at least one invalid character" : "Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak", "File name is too long" : "Nazwa pliku zbyt długa", "Dot files are not allowed" : "Pliki z kropką są nie dozwolone", "Empty filename is not allowed" : "Pusta nazwa nie jest dozwolona.", + "This is an automatically sent email, please do not reply." : "To jest automatycznie wysłany e-mail, proszę nie odpowiadać na niego.", "Help" : "Pomoc", "Apps" : "Aplikacje", "Personal" : "Osobiste", @@ -63,6 +65,7 @@ OC.L10N.register( "Oracle username and/or password not valid" : "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne", "DB Error: \"%s\"" : "Błąd DB: \"%s\"", "Offending command was: \"%s\"" : "Niepoprawna komenda: \"%s\"", + "You need to enter details of an existing account." : "Musisz wprowadzić szczegóły istniejącego konta.", "Offending command was: \"%s\", name: %s, password: %s" : "Niepoprawne polecania: \"%s\", nazwa: %s, hasło: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!", @@ -155,6 +158,7 @@ OC.L10N.register( "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "W nazwie użytkownika dozwolone są tylko następujące znaki : \"a-z\", \"A-Z\", \"0-9\" i \"_.@-'\"", "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika", "Username contains whitespace at the beginning or at the end" : "Nazwa użytkownika zawiera spację na początku albo na końcu", + "Username must not consist of dots only" : "Nazwa użytkownika nie może się składać tylko z kropek", "A valid password must be provided" : "Należy podać prawidłowe hasło", "The username is already being used" : "Ta nazwa użytkownika jest już używana", "User disabled" : "Użytkownik zablokowany", @@ -198,6 +202,7 @@ OC.L10N.register( "Your data directory is readable by other users" : "Twój katalog z danymi mogą czytać inni użytkownicy", "Your data directory must be an absolute path" : "Twój katalog z danymi musi być ścieżką absolutną", "Check the value of \"datadirectory\" in your configuration" : "Sprawdź wartość \"datadirectory\" w swojej konfiguracji", + "Your data directory is invalid" : "Twój katalog z danymi jest nieprawidłowy", "Please check that the data directory contains a file \".ocdata\" in its root." : "Sprawdź, czy katalog danych zawiera plik \".ocdata\".", "Could not obtain lock type %d on \"%s\"." : "Nie można uzyskać blokady typu %d na \"%s\".", "Storage unauthorized. %s" : "Magazyn nieautoryzowany. %s", diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json index 8dc4fa0bf76..a46ec2da2cf 100644 --- a/lib/l10n/pl.json +++ b/lib/l10n/pl.json @@ -34,11 +34,13 @@ "_%n hour ago_::_%n hours ago_" : ["%n godzinę temu","%n godzin temu","%n godzin temu","%n godzin temu"], "_%n minute ago_::_%n minutes ago_" : ["%n minute temu","%n minut temu","%n minut temu","%n minut temu"], "seconds ago" : "sekund temu", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Moduł o ID: %s nie istnieje. Proszę włącz go w ustawieniach aplikacji lub skontaktuj się z administratorem.", "File name is a reserved word" : "Nazwa pliku jest zarezerwowana", "File name contains at least one invalid character" : "Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak", "File name is too long" : "Nazwa pliku zbyt długa", "Dot files are not allowed" : "Pliki z kropką są nie dozwolone", "Empty filename is not allowed" : "Pusta nazwa nie jest dozwolona.", + "This is an automatically sent email, please do not reply." : "To jest automatycznie wysłany e-mail, proszę nie odpowiadać na niego.", "Help" : "Pomoc", "Apps" : "Aplikacje", "Personal" : "Osobiste", @@ -61,6 +63,7 @@ "Oracle username and/or password not valid" : "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne", "DB Error: \"%s\"" : "Błąd DB: \"%s\"", "Offending command was: \"%s\"" : "Niepoprawna komenda: \"%s\"", + "You need to enter details of an existing account." : "Musisz wprowadzić szczegóły istniejącego konta.", "Offending command was: \"%s\", name: %s, password: %s" : "Niepoprawne polecania: \"%s\", nazwa: %s, hasło: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!", @@ -153,6 +156,7 @@ "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "W nazwie użytkownika dozwolone są tylko następujące znaki : \"a-z\", \"A-Z\", \"0-9\" i \"_.@-'\"", "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika", "Username contains whitespace at the beginning or at the end" : "Nazwa użytkownika zawiera spację na początku albo na końcu", + "Username must not consist of dots only" : "Nazwa użytkownika nie może się składać tylko z kropek", "A valid password must be provided" : "Należy podać prawidłowe hasło", "The username is already being used" : "Ta nazwa użytkownika jest już używana", "User disabled" : "Użytkownik zablokowany", @@ -196,6 +200,7 @@ "Your data directory is readable by other users" : "Twój katalog z danymi mogą czytać inni użytkownicy", "Your data directory must be an absolute path" : "Twój katalog z danymi musi być ścieżką absolutną", "Check the value of \"datadirectory\" in your configuration" : "Sprawdź wartość \"datadirectory\" w swojej konfiguracji", + "Your data directory is invalid" : "Twój katalog z danymi jest nieprawidłowy", "Please check that the data directory contains a file \".ocdata\" in its root." : "Sprawdź, czy katalog danych zawiera plik \".ocdata\".", "Could not obtain lock type %d on \"%s\"." : "Nie można uzyskać blokady typu %d na \"%s\".", "Storage unauthorized. %s" : "Magazyn nieautoryzowany. %s", diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js index 1b3079579f3..4b58876ddbc 100644 --- a/lib/l10n/pt_BR.js +++ b/lib/l10n/pt_BR.js @@ -36,11 +36,13 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["há %n hora atrás","há %n horas atrás"], "_%n minute ago_::_%n minutes ago_" : ["há %n minuto atrás","há %n minutos atrás"], "seconds ago" : "segundos atrás", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "O módulo com a ID: %s não existe. Por favor, habilite-o nas configurações de seu aplicativo ou contacte o administrador.", "File name is a reserved word" : "O nome do arquivo é uma palavra reservada", "File name contains at least one invalid character" : "O nome do arquivo contém pelo menos um caracter inválido", "File name is too long" : "O nome do arquivo é muito longo", "Dot files are not allowed" : "Arquivos Dot não são permitidos", "Empty filename is not allowed" : "Nome vazio para arquivo não é permitido.", + "This is an automatically sent email, please do not reply." : "Este é um email enviado automaticamente. Por favor, não responda.", "Help" : "Ajuda", "Apps" : "Aplicativos", "Personal" : "Pessoal", @@ -63,6 +65,7 @@ OC.L10N.register( "Oracle username and/or password not valid" : "Nome de usuário e/ou senha Oracle inválidos", "DB Error: \"%s\"" : "Erro no BD: \"%s\"", "Offending command was: \"%s\"" : "Comando ofensivo era: \"%s\"", + "You need to enter details of an existing account." : "Você necessita entrar detalhes de uma conta existente.", "Offending command was: \"%s\", name: %s, password: %s" : "Comando ofensivo era: \"%s\", nome: %s, senha: %s", "PostgreSQL username and/or password not valid" : "Nome de usuário e/ou senha PostgreSQL inválidos", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!", @@ -155,8 +158,9 @@ OC.L10N.register( "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Somente os seguintes caracteres são permitidos em um nome de usuário: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-'\"", "A valid username must be provided" : "Um nome de usuário válido deve ser fornecido", "Username contains whitespace at the beginning or at the end" : "O nome de usuário contém espaço em branco no início ou no fim", + "Username must not consist of dots only" : "Nome do usuário não pode consistir de pontos somente", "A valid password must be provided" : "Uma senha válida deve ser fornecida", - "The username is already being used" : "Este nome de usuário já está em usado", + "The username is already being used" : "Este nome de usuário já está em uso", "User disabled" : "Usuário desativado", "Login canceled by app" : "Login cancelado pelo aplicativo", "App \"%s\" cannot be installed because appinfo file cannot be read." : "O aplicativo \"%s\" não pode ser instalado pois o arquivo appinfo não pode ser lido.", @@ -198,6 +202,7 @@ OC.L10N.register( "Your data directory is readable by other users" : "O diretório de dados está legível para outros usuários", "Your data directory must be an absolute path" : "O diretório de dados deve ser um caminho absoluto", "Check the value of \"datadirectory\" in your configuration" : "Verifique o valor do \"datadirectory\" na sua configuração", + "Your data directory is invalid" : "Seu diretório de dados é inválido", "Please check that the data directory contains a file \".ocdata\" in its root." : "Por favor, verifique se o diretório de dados contém um arquivo \".ocdata\" em sua raiz.", "Could not obtain lock type %d on \"%s\"." : "Não foi possível obter tipo de bloqueio %d em \"%s\".", "Storage unauthorized. %s" : "Armazenamento não autorizado. %s", diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json index a034d64a415..580af8db048 100644 --- a/lib/l10n/pt_BR.json +++ b/lib/l10n/pt_BR.json @@ -34,11 +34,13 @@ "_%n hour ago_::_%n hours ago_" : ["há %n hora atrás","há %n horas atrás"], "_%n minute ago_::_%n minutes ago_" : ["há %n minuto atrás","há %n minutos atrás"], "seconds ago" : "segundos atrás", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "O módulo com a ID: %s não existe. Por favor, habilite-o nas configurações de seu aplicativo ou contacte o administrador.", "File name is a reserved word" : "O nome do arquivo é uma palavra reservada", "File name contains at least one invalid character" : "O nome do arquivo contém pelo menos um caracter inválido", "File name is too long" : "O nome do arquivo é muito longo", "Dot files are not allowed" : "Arquivos Dot não são permitidos", "Empty filename is not allowed" : "Nome vazio para arquivo não é permitido.", + "This is an automatically sent email, please do not reply." : "Este é um email enviado automaticamente. Por favor, não responda.", "Help" : "Ajuda", "Apps" : "Aplicativos", "Personal" : "Pessoal", @@ -61,6 +63,7 @@ "Oracle username and/or password not valid" : "Nome de usuário e/ou senha Oracle inválidos", "DB Error: \"%s\"" : "Erro no BD: \"%s\"", "Offending command was: \"%s\"" : "Comando ofensivo era: \"%s\"", + "You need to enter details of an existing account." : "Você necessita entrar detalhes de uma conta existente.", "Offending command was: \"%s\", name: %s, password: %s" : "Comando ofensivo era: \"%s\", nome: %s, senha: %s", "PostgreSQL username and/or password not valid" : "Nome de usuário e/ou senha PostgreSQL inválidos", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!", @@ -153,8 +156,9 @@ "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Somente os seguintes caracteres são permitidos em um nome de usuário: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-'\"", "A valid username must be provided" : "Um nome de usuário válido deve ser fornecido", "Username contains whitespace at the beginning or at the end" : "O nome de usuário contém espaço em branco no início ou no fim", + "Username must not consist of dots only" : "Nome do usuário não pode consistir de pontos somente", "A valid password must be provided" : "Uma senha válida deve ser fornecida", - "The username is already being used" : "Este nome de usuário já está em usado", + "The username is already being used" : "Este nome de usuário já está em uso", "User disabled" : "Usuário desativado", "Login canceled by app" : "Login cancelado pelo aplicativo", "App \"%s\" cannot be installed because appinfo file cannot be read." : "O aplicativo \"%s\" não pode ser instalado pois o arquivo appinfo não pode ser lido.", @@ -196,6 +200,7 @@ "Your data directory is readable by other users" : "O diretório de dados está legível para outros usuários", "Your data directory must be an absolute path" : "O diretório de dados deve ser um caminho absoluto", "Check the value of \"datadirectory\" in your configuration" : "Verifique o valor do \"datadirectory\" na sua configuração", + "Your data directory is invalid" : "Seu diretório de dados é inválido", "Please check that the data directory contains a file \".ocdata\" in its root." : "Por favor, verifique se o diretório de dados contém um arquivo \".ocdata\" em sua raiz.", "Could not obtain lock type %d on \"%s\"." : "Não foi possível obter tipo de bloqueio %d em \"%s\".", "Storage unauthorized. %s" : "Armazenamento não autorizado. %s", diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js index bd4d53a5752..27864e2ec10 100644 --- a/lib/l10n/ru.js +++ b/lib/l10n/ru.js @@ -36,11 +36,13 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["%n час назад","%n часа назад","%n часов назад","%n часов назад"], "_%n minute ago_::_%n minutes ago_" : ["%n минута назад","%n минуты назад","%n минут назад","%n минут назад"], "seconds ago" : "менее минуты", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Модуль с ID «%s» не существует. Включите его в настройках приложений или обратитесь к администратору.", "File name is a reserved word" : "Имя файла является зарезервированным словом", "File name contains at least one invalid character" : "Имя файла содержит по крайней мере один некорректный символ", "File name is too long" : "Имя файла слишком длинное.", "Dot files are not allowed" : "Файлы начинающиеся с точки не допускаются", "Empty filename is not allowed" : "Пустое имя файла не допускается", + "This is an automatically sent email, please do not reply." : "Это соощение отправлено автоматически, пожалуйста, не отвечайте на него.", "Help" : "Помощь", "Apps" : "Приложения", "Personal" : "Личное", @@ -63,6 +65,7 @@ OC.L10N.register( "Oracle username and/or password not valid" : "Неверное имя пользователя и/или пароль Oracle", "DB Error: \"%s\"" : "Ошибка БД: \"%s\"", "Offending command was: \"%s\"" : "Вызываемая команда была: \"%s\"", + "You need to enter details of an existing account." : "Необходимо уточнить данные существующего акаунта.", "Offending command was: \"%s\", name: %s, password: %s" : "Вызываемая команда была: \"%s\", имя: %s, пароль: %s", "PostgreSQL username and/or password not valid" : "Неверное имя пользователя и/или пароль PostgreSQL", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s может работать некорректно на данной платформе. Используйте на свой страх и риск!", @@ -155,6 +158,7 @@ OC.L10N.register( "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "В составе имени пользователя допускаются следующие символы: \"a-z\", \"A-Z\", \"0-9\" и \"_.@-'\"", "A valid username must be provided" : "Укажите допустимое имя пользователя", "Username contains whitespace at the beginning or at the end" : "Имя пользователя содержит пробел в начале или в конце", + "Username must not consist of dots only" : "Имя пользователя должно состоять не только из точек", "A valid password must be provided" : "Укажите допустимый пароль", "The username is already being used" : "Имя пользователя уже используется", "User disabled" : "Пользователь отключен", @@ -198,6 +202,7 @@ OC.L10N.register( "Your data directory is readable by other users" : "Каталог данных доступен для чтения другим пользователям", "Your data directory must be an absolute path" : "Каталог данных должен быть указан в виде абсолютного пути", "Check the value of \"datadirectory\" in your configuration" : "Проверьте значение \"datadirectory\" в настройках.", + "Your data directory is invalid" : "Каталог данных не верен", "Please check that the data directory contains a file \".ocdata\" in its root." : "Убедитесь, что файл \".ocdata\" присутствует в корне каталога данных.", "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d для \"%s\"", "Storage unauthorized. %s" : "Хранилище неавторизовано. %s", diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json index 099790d8a40..cdd827031ee 100644 --- a/lib/l10n/ru.json +++ b/lib/l10n/ru.json @@ -34,11 +34,13 @@ "_%n hour ago_::_%n hours ago_" : ["%n час назад","%n часа назад","%n часов назад","%n часов назад"], "_%n minute ago_::_%n minutes ago_" : ["%n минута назад","%n минуты назад","%n минут назад","%n минут назад"], "seconds ago" : "менее минуты", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Модуль с ID «%s» не существует. Включите его в настройках приложений или обратитесь к администратору.", "File name is a reserved word" : "Имя файла является зарезервированным словом", "File name contains at least one invalid character" : "Имя файла содержит по крайней мере один некорректный символ", "File name is too long" : "Имя файла слишком длинное.", "Dot files are not allowed" : "Файлы начинающиеся с точки не допускаются", "Empty filename is not allowed" : "Пустое имя файла не допускается", + "This is an automatically sent email, please do not reply." : "Это соощение отправлено автоматически, пожалуйста, не отвечайте на него.", "Help" : "Помощь", "Apps" : "Приложения", "Personal" : "Личное", @@ -61,6 +63,7 @@ "Oracle username and/or password not valid" : "Неверное имя пользователя и/или пароль Oracle", "DB Error: \"%s\"" : "Ошибка БД: \"%s\"", "Offending command was: \"%s\"" : "Вызываемая команда была: \"%s\"", + "You need to enter details of an existing account." : "Необходимо уточнить данные существующего акаунта.", "Offending command was: \"%s\", name: %s, password: %s" : "Вызываемая команда была: \"%s\", имя: %s, пароль: %s", "PostgreSQL username and/or password not valid" : "Неверное имя пользователя и/или пароль PostgreSQL", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s может работать некорректно на данной платформе. Используйте на свой страх и риск!", @@ -153,6 +156,7 @@ "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "В составе имени пользователя допускаются следующие символы: \"a-z\", \"A-Z\", \"0-9\" и \"_.@-'\"", "A valid username must be provided" : "Укажите допустимое имя пользователя", "Username contains whitespace at the beginning or at the end" : "Имя пользователя содержит пробел в начале или в конце", + "Username must not consist of dots only" : "Имя пользователя должно состоять не только из точек", "A valid password must be provided" : "Укажите допустимый пароль", "The username is already being used" : "Имя пользователя уже используется", "User disabled" : "Пользователь отключен", @@ -196,6 +200,7 @@ "Your data directory is readable by other users" : "Каталог данных доступен для чтения другим пользователям", "Your data directory must be an absolute path" : "Каталог данных должен быть указан в виде абсолютного пути", "Check the value of \"datadirectory\" in your configuration" : "Проверьте значение \"datadirectory\" в настройках.", + "Your data directory is invalid" : "Каталог данных не верен", "Please check that the data directory contains a file \".ocdata\" in its root." : "Убедитесь, что файл \".ocdata\" присутствует в корне каталога данных.", "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d для \"%s\"", "Storage unauthorized. %s" : "Хранилище неавторизовано. %s", diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js index b8b83b2feea..676e62f3cab 100644 --- a/lib/l10n/tr.js +++ b/lib/l10n/tr.js @@ -36,11 +36,13 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["%n saat önce","%n saat önce"], "_%n minute ago_::_%n minutes ago_" : ["%n dakika önce","%n dakika önce"], "seconds ago" : "saniye önce", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "%s kodlu modül bulunamadı. Lütfen uygulamalarınız içinden modülü etkinleştirin ya da sistem yöneticinizle görüşün.", "File name is a reserved word" : "Bu dosya adı sistem kullanıma ayrılmıştır", "File name contains at least one invalid character" : "Dosya adında en az bir geçersiz karakter var", "File name is too long" : "Dosya adı çok uzun", "Dot files are not allowed" : "Nokta dosyalarına izin verilmiyor", "Empty filename is not allowed" : "Boş dosya adına izin verilmiyor", + "This is an automatically sent email, please do not reply." : "Bu ileti otomatik olarak gönderildiğinden lütfen yanıtlamayın.", "Help" : "Yardım", "Apps" : "Uygulamalar", "Personal" : "Kişisel", @@ -63,6 +65,7 @@ OC.L10N.register( "Oracle username and/or password not valid" : "Oracle kullanıcı adı ya da parolası geçersiz", "DB Error: \"%s\"" : "Veritabanı Hatası: \"%s\"", "Offending command was: \"%s\"" : "Saldırgan komut: \"%s\"", + "You need to enter details of an existing account." : "Varolan bir hesabın bilgilerini yazmalısınız.", "Offending command was: \"%s\", name: %s, password: %s" : "Saldırgan komut: \"%s\", kullanıcı adı: %s, parola: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL kullanıcı adı ya da parolası geçersiz", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kullanmaktan doğacak riskler size aittir!", @@ -155,6 +158,7 @@ OC.L10N.register( "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Kullanıcı adında yalnız şu karakterler kullanılabilir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-'\"", "A valid username must be provided" : "Geçerli bir kullanıcı adı yazmalısınız", "Username contains whitespace at the beginning or at the end" : "Kullanıcı adının başı ya da sonunda boşluk var", + "Username must not consist of dots only" : "Kullanıcı adı yalnız noktalardan oluşamaz", "A valid password must be provided" : "Geçerli bir parola yazmalısınız", "The username is already being used" : "Bu kullanıcı adı zaten var", "User disabled" : "Kullanıcı devre dışı", @@ -198,6 +202,7 @@ OC.L10N.register( "Your data directory is readable by other users" : "Veri klasörünüz diğer kullanıcılar tarafından okunabilir", "Your data directory must be an absolute path" : "Veri klasörünüz mutlak bir yol olmalıdır", "Check the value of \"datadirectory\" in your configuration" : "Yapılandırmanızdaki \"datadirectory\" seçeneğini denetleyin", + "Your data directory is invalid" : "Veri klasörünüz geçersiz", "Please check that the data directory contains a file \".ocdata\" in its root." : "Lütfen veri klasörünün kökünde \".ocdata\" dosyasının bulunduğunu denetleyin.", "Could not obtain lock type %d on \"%s\"." : "\"%s\" için %d kilit türü alınamadı.", "Storage unauthorized. %s" : "Depolamaya erişim izni yok. %s", diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json index 0cf02899523..02b2d17cc50 100644 --- a/lib/l10n/tr.json +++ b/lib/l10n/tr.json @@ -34,11 +34,13 @@ "_%n hour ago_::_%n hours ago_" : ["%n saat önce","%n saat önce"], "_%n minute ago_::_%n minutes ago_" : ["%n dakika önce","%n dakika önce"], "seconds ago" : "saniye önce", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "%s kodlu modül bulunamadı. Lütfen uygulamalarınız içinden modülü etkinleştirin ya da sistem yöneticinizle görüşün.", "File name is a reserved word" : "Bu dosya adı sistem kullanıma ayrılmıştır", "File name contains at least one invalid character" : "Dosya adında en az bir geçersiz karakter var", "File name is too long" : "Dosya adı çok uzun", "Dot files are not allowed" : "Nokta dosyalarına izin verilmiyor", "Empty filename is not allowed" : "Boş dosya adına izin verilmiyor", + "This is an automatically sent email, please do not reply." : "Bu ileti otomatik olarak gönderildiğinden lütfen yanıtlamayın.", "Help" : "Yardım", "Apps" : "Uygulamalar", "Personal" : "Kişisel", @@ -61,6 +63,7 @@ "Oracle username and/or password not valid" : "Oracle kullanıcı adı ya da parolası geçersiz", "DB Error: \"%s\"" : "Veritabanı Hatası: \"%s\"", "Offending command was: \"%s\"" : "Saldırgan komut: \"%s\"", + "You need to enter details of an existing account." : "Varolan bir hesabın bilgilerini yazmalısınız.", "Offending command was: \"%s\", name: %s, password: %s" : "Saldırgan komut: \"%s\", kullanıcı adı: %s, parola: %s", "PostgreSQL username and/or password not valid" : "PostgreSQL kullanıcı adı ya da parolası geçersiz", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kullanmaktan doğacak riskler size aittir!", @@ -153,6 +156,7 @@ "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Kullanıcı adında yalnız şu karakterler kullanılabilir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-'\"", "A valid username must be provided" : "Geçerli bir kullanıcı adı yazmalısınız", "Username contains whitespace at the beginning or at the end" : "Kullanıcı adının başı ya da sonunda boşluk var", + "Username must not consist of dots only" : "Kullanıcı adı yalnız noktalardan oluşamaz", "A valid password must be provided" : "Geçerli bir parola yazmalısınız", "The username is already being used" : "Bu kullanıcı adı zaten var", "User disabled" : "Kullanıcı devre dışı", @@ -196,6 +200,7 @@ "Your data directory is readable by other users" : "Veri klasörünüz diğer kullanıcılar tarafından okunabilir", "Your data directory must be an absolute path" : "Veri klasörünüz mutlak bir yol olmalıdır", "Check the value of \"datadirectory\" in your configuration" : "Yapılandırmanızdaki \"datadirectory\" seçeneğini denetleyin", + "Your data directory is invalid" : "Veri klasörünüz geçersiz", "Please check that the data directory contains a file \".ocdata\" in its root." : "Lütfen veri klasörünün kökünde \".ocdata\" dosyasının bulunduğunu denetleyin.", "Could not obtain lock type %d on \"%s\"." : "\"%s\" için %d kilit türü alınamadı.", "Storage unauthorized. %s" : "Depolamaya erişim izni yok. %s", diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index e2675a3c847..70208725f46 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -231,15 +231,9 @@ class RouteConfig { $routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method); - $route = $this->router->create($routeName, $url)->method($verb)->action( + $this->router->create($routeName, $url)->method($verb)->action( new RouteActionHandler($this->container, $controllerName, $actionName) ); - - if (!$collectionAction) { - $route->requirements([ - 'id' => '[^?]*' - ]); - } } } } diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php index 423eb5c423d..5cbdfaa9d82 100644 --- a/lib/private/Files/Config/UserMountCache.php +++ b/lib/private/Files/Config/UserMountCache.php @@ -220,15 +220,20 @@ class UserMountCache implements IUserMountCache { /** * @param int $numericStorageId + * @param string|null $user limit the results to a single user * @return CachedMountInfo[] */ - public function getMountsForStorageId($numericStorageId) { + public function getMountsForStorageId($numericStorageId, $user = null) { $builder = $this->connection->getQueryBuilder(); $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path') ->from('mounts', 'm') ->innerJoin('m', 'filecache', 'f' , $builder->expr()->eq('m.root_id', 'f.fileid')) ->where($builder->expr()->eq('storage_id', $builder->createPositionalParameter($numericStorageId, IQueryBuilder::PARAM_INT))); + if ($user) { + $query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user))); + } + $rows = $query->execute()->fetchAll(); return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows)); @@ -278,16 +283,17 @@ class UserMountCache implements IUserMountCache { /** * @param int $fileId + * @param string|null $user optionally restrict the results to a single user * @return ICachedMountInfo[] * @since 9.0.0 */ - public function getMountsForFileId($fileId) { + public function getMountsForFileId($fileId, $user = null) { try { list($storageId, $internalPath) = $this->getCacheInfoFromFileId($fileId); } catch (NotFoundException $e) { return []; } - $mountsForStorage = $this->getMountsForStorageId($storageId); + $mountsForStorage = $this->getMountsForStorageId($storageId, $user); // filter mounts that are from the same storage but a different directory return array_filter($mountsForStorage, function (ICachedMountInfo $mount) use ($internalPath, $fileId) { diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index 9809c6b7d11..fcadbe27393 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -280,7 +280,12 @@ class Folder extends Node implements \OCP\Files\Folder { */ public function getById($id) { $mountCache = $this->root->getUserMountCache(); - $mountsContainingFile = $mountCache->getMountsForFileId((int)$id); + if (strpos($this->getPath(), '/', 1) > 0) { + list(, $user) = explode('/', $this->getPath()); + } else { + $user = null; + } + $mountsContainingFile = $mountCache->getMountsForFileId((int)$id, $user); $mounts = $this->root->getMountsIn($this->path); $mounts[] = $this->root->getMount($this->path); /** @var IMountPoint[] $folderMounts */ diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php index e76f3225c3c..02f355fd4d9 100644 --- a/lib/private/Files/Utils/Scanner.php +++ b/lib/private/Files/Utils/Scanner.php @@ -32,6 +32,7 @@ use OC\ForbiddenException; use OC\Hooks\PublicEmitter; use OC\Lock\DBLockingProvider; use OCA\Files_Sharing\SharedStorage; +use OCP\Files\NotFoundException; use OCP\Files\Storage\IStorage; use OCP\Files\StorageNotAvailableException; use OCP\ILogger; @@ -161,6 +162,7 @@ class Scanner extends PublicEmitter { /** * @param string $dir * @throws \OC\ForbiddenException + * @throws \OCP\Files\NotFoundException */ public function scan($dir = '') { if (!Filesystem::isValidPath($dir)) { @@ -210,6 +212,9 @@ class Scanner extends PublicEmitter { $this->triggerPropagator($storage, $path); }); + if (!$storage->file_exists($relativePath)) { + throw new NotFoundException($dir); + } if (!$isDbLocking) { $this->db->beginTransaction(); } diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index 7384069f430..4e00eb153a3 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -34,7 +34,7 @@ use OCP\Mail\IEMailTemplate; * Class EMailTemplate * * addBodyText and addBodyButtonGroup automatically opens the body - * addFooter, renderHTML, renderText automatically closes the body and the HTML if opened + * addFooter, renderHtml, renderText automatically closes the body and the HTML if opened * * @package OC\Mail */ @@ -484,7 +484,7 @@ EOF; * * @return string */ - public function renderHTML() { + public function renderHtml() { if (!$this->footerAdded) { $this->footerAdded = true; if ($this->bodyOpened) { diff --git a/lib/private/Share/MailNotifications.php b/lib/private/Share/MailNotifications.php deleted file mode 100644 index e10389e77b9..00000000000 --- a/lib/private/Share/MailNotifications.php +++ /dev/null @@ -1,89 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Björn Schießle <bjoern@schiessle.org> - * @author Joas Schilling <coding@schilljs.com> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin McCorkell <robin@mccorkell.me.uk> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author scolebrook <scolebrook@mac.com> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Vincent Petry <pvince81@owncloud.com> - * - * @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/> - * - */ - -namespace OC\Share; - -use OCP\IL10N; -use OCP\IURLGenerator; -use OCP\IUser; -use OCP\Mail\IMailer; -use OCP\ILogger; -use OCP\Defaults; -use OCP\Util; - -/** - * Class MailNotifications - * - * @package OC\Share - */ -class MailNotifications { - - /** @var IUser sender userId */ - private $user; - /** @var string sender email address */ - private $replyTo; - /** @var string */ - private $senderDisplayName; - /** @var IL10N */ - private $l; - /** @var IMailer */ - private $mailer; - /** @var Defaults */ - private $defaults; - /** @var ILogger */ - private $logger; - /** @var IURLGenerator */ - private $urlGenerator; - - /** - * @param IUser $user - * @param IL10N $l10n - * @param IMailer $mailer - * @param ILogger $logger - * @param Defaults $defaults - * @param IURLGenerator $urlGenerator - */ - public function __construct(IUser $user, - IL10N $l10n, - IMailer $mailer, - ILogger $logger, - Defaults $defaults, - IURLGenerator $urlGenerator) { - $this->l = $l10n; - $this->user = $user; - $this->mailer = $mailer; - $this->logger = $logger; - $this->defaults = $defaults; - $this->urlGenerator = $urlGenerator; - - $this->replyTo = $this->user->getEMailAddress(); - $this->senderDisplayName = $this->user->getDisplayName(); - } -} diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 6e59629153e..3afd38c579f 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1233,7 +1233,7 @@ class Manager implements IManager { //Get node for the owner $userFolder = $this->rootFolder->getUserFolder($owner); - if (!$userFolder->isSubNode($path)) { + if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) { $path = $userFolder->getById($path->getId())[0]; } @@ -1245,7 +1245,12 @@ class Manager implements IManager { if ($currentAccess) { $ownerPath = $path->getPath(); - list(, , , $ownerPath) = explode('/', $ownerPath, 4); + $ownerPath = explode('/', $ownerPath, 4); + if (count($ownerPath) < 4) { + $ownerPath = ''; + } else { + $ownerPath = $ownerPath[3]; + } $al['users'][$owner] = [ 'node_id' => $path->getId(), 'node_path' => '/' . $ownerPath, diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index ba6699ae7ad..c79f58f6ba6 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -23,6 +23,7 @@ */ namespace OC\Share20; +use OC\CapabilitiesManager; use OCA\FederatedFileSharing\AddressHandler; use OCA\FederatedFileSharing\DiscoveryManager; use OCA\FederatedFileSharing\FederatedShareProvider; @@ -30,6 +31,7 @@ use OCA\FederatedFileSharing\Notifications; use OCA\FederatedFileSharing\TokenHandler; use OCA\ShareByMail\Settings\SettingsManager; use OCA\ShareByMail\ShareByMailProvider; +use OCP\Defaults; use OCP\Share\IProviderFactory; use OC\Share20\Exception\ProviderException; use OCP\IServerContainer; @@ -158,7 +160,10 @@ class ProviderFactory implements IProviderFactory { $this->serverContainer->getMailer(), $this->serverContainer->getURLGenerator(), $this->serverContainer->getActivityManager(), - $settingsManager + $settingsManager, + $this->serverContainer->query(Defaults::class), + $this->serverContainer->getHasher(), + $this->serverContainer->query(CapabilitiesManager::class) ); } diff --git a/lib/public/Defaults.php b/lib/public/Defaults.php index 591da18c7ee..dbde78bce68 100644 --- a/lib/public/Defaults.php +++ b/lib/public/Defaults.php @@ -51,7 +51,7 @@ class Defaults { * actual defaults * @since 6.0.0 */ - function __construct(\OC_Defaults $defaults = null) { + public function __construct(\OC_Defaults $defaults = null) { if ($defaults === null) { $defaults = \OC::$server->getThemingDefaults(); } diff --git a/lib/public/Files/Config/IUserMountCache.php b/lib/public/Files/Config/IUserMountCache.php index c141d019c2f..cf30d8fb431 100644 --- a/lib/public/Files/Config/IUserMountCache.php +++ b/lib/public/Files/Config/IUserMountCache.php @@ -53,10 +53,11 @@ interface IUserMountCache { * Get all cached mounts by storage * * @param int $numericStorageId + * @param string|null $user limit the results to a single user @since 12.0.0 * @return ICachedMountInfo[] * @since 9.0.0 */ - public function getMountsForStorageId($numericStorageId); + public function getMountsForStorageId($numericStorageId, $user = null); /** * Get all cached mounts by root @@ -71,10 +72,11 @@ interface IUserMountCache { * Get all cached mounts that contain a file * * @param int $fileId + * @param string|null $user optionally restrict the results to a single user @since 12.0.0 * @return ICachedMountInfo[] * @since 9.0.0 */ - public function getMountsForFileId($fileId); + public function getMountsForFileId($fileId, $user = null); /** * Remove all cached mounts for a user diff --git a/lib/public/Mail/IEMailTemplate.php b/lib/public/Mail/IEMailTemplate.php index ab7713e8e2c..05e2fe92beb 100644 --- a/lib/public/Mail/IEMailTemplate.php +++ b/lib/public/Mail/IEMailTemplate.php @@ -45,7 +45,7 @@ namespace OCP\Mail; * * $emailTemplate->addFooter('Optional footer text'); * - * $htmlContent = $emailTemplate->renderHTML(); + * $htmlContent = $emailTemplate->renderHtml(); * $plainContent = $emailTemplate->renderText(); * * @since 12.0.0 @@ -122,7 +122,7 @@ interface IEMailTemplate { * * @since 12.0.0 */ - public function renderHTML(); + public function renderHtml(); /** * Returns the rendered plain text email as string |