diff options
Diffstat (limited to 'lib')
50 files changed, 418 insertions, 75 deletions
diff --git a/lib/l10n/de.js b/lib/l10n/de.js index c8eebcfce04..99bcd6c33a3 100644 --- a/lib/l10n/de.js +++ b/lib/l10n/de.js @@ -56,9 +56,11 @@ OC.L10N.register( "Archives of type %s are not supported" : "Archive vom Typ %s werden nicht unterstützt", "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "Die Signatur konnte nicht überprüft werden. Bitte kontaktiere die App-Entwickler und überprüfe deinen Admin-Bildschirm.", "App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält", "App can't be installed because it is not compatible with this version of ownCloud" : "Die App kann nicht installiert werden, weil sie mit dieser Version von ownCloud nicht kompatibel ist", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die App kann nicht installiert werden, weil sie den <shipped>true</shipped>-Tag enthält, der bei Apps, die nicht zum Standardumfang von ownCloud gehören, nicht erlaubt ist", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Diese App kann nicht installiert werden, da die Version in info.xml nicht die gleiche Version wie die aus dem App Store ist.", "Application is not enabled" : "Die App ist nicht aktiviert", "Authentication error" : "Authentifizierungsfehler", "Token expired. Please reload page." : "Token abgelaufen. Bitte lade die Seite neu.", @@ -95,6 +97,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist", "You need to provide a password to create a public link, only protected links are allowed" : "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren", "Sharing %s failed, because sharing with links is not allowed" : "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist", + "Not allowed to create a federated share with the same user" : "Nicht erlaubt eine föderierte Freigabe mit dem gleichen Benutzer zu erstellen", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.", "Share type %s is not valid for %s" : "Freigabetyp %s ist nicht gültig für %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten", @@ -110,10 +113,14 @@ OC.L10N.register( "Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte", "Sharing %s failed, because the file could not be found in the file cache" : "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte", + "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen", + "Expiration date is in the past" : "Ablaufdatum ist in der Vergangenheit", + "Cannot set expiration date more than %s days in the future" : "Das Ablaufdatum kann nicht mehr als %s Tage in die Zukunft liegen", "Could not find category \"%s\"" : "Die Kategorie „%s“ konnte nicht gefunden werden", "Apps" : "Apps", "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", "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Dieser Benutzername existiert bereits", "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MySQL oder PostgreSQL) installiert.", @@ -146,6 +153,10 @@ OC.L10N.register( "Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) 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 not available" : "Speicher nicht verfügbar" + "Storage unauthorized. %s" : "Speichern nicht erlaubt. %s", + "Storage incomplete configuration. %s" : "Unvollständige Konfiguration des Storage. %s", + "Storage connection error. %s" : "Verbindungsfehler zum Storage. %s", + "Storage not available" : "Speicher nicht verfügbar", + "Storage connection timeout. %s" : "Zeitüberschreitung der Verbindung zum Storage. %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/de.json b/lib/l10n/de.json index b38a8d052fb..b768e39d026 100644 --- a/lib/l10n/de.json +++ b/lib/l10n/de.json @@ -54,9 +54,11 @@ "Archives of type %s are not supported" : "Archive vom Typ %s werden nicht unterstützt", "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "Die Signatur konnte nicht überprüft werden. Bitte kontaktiere die App-Entwickler und überprüfe deinen Admin-Bildschirm.", "App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält", "App can't be installed because it is not compatible with this version of ownCloud" : "Die App kann nicht installiert werden, weil sie mit dieser Version von ownCloud nicht kompatibel ist", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die App kann nicht installiert werden, weil sie den <shipped>true</shipped>-Tag enthält, der bei Apps, die nicht zum Standardumfang von ownCloud gehören, nicht erlaubt ist", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Diese App kann nicht installiert werden, da die Version in info.xml nicht die gleiche Version wie die aus dem App Store ist.", "Application is not enabled" : "Die App ist nicht aktiviert", "Authentication error" : "Authentifizierungsfehler", "Token expired. Please reload page." : "Token abgelaufen. Bitte lade die Seite neu.", @@ -93,6 +95,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist", "You need to provide a password to create a public link, only protected links are allowed" : "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren", "Sharing %s failed, because sharing with links is not allowed" : "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist", + "Not allowed to create a federated share with the same user" : "Nicht erlaubt eine föderierte Freigabe mit dem gleichen Benutzer zu erstellen", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.", "Share type %s is not valid for %s" : "Freigabetyp %s ist nicht gültig für %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten", @@ -108,10 +111,14 @@ "Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte", "Sharing %s failed, because the file could not be found in the file cache" : "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte", + "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen", + "Expiration date is in the past" : "Ablaufdatum ist in der Vergangenheit", + "Cannot set expiration date more than %s days in the future" : "Das Ablaufdatum kann nicht mehr als %s Tage in die Zukunft liegen", "Could not find category \"%s\"" : "Die Kategorie „%s“ konnte nicht gefunden werden", "Apps" : "Apps", "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", "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Dieser Benutzername existiert bereits", "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MySQL oder PostgreSQL) installiert.", @@ -144,6 +151,10 @@ "Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) 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 not available" : "Speicher nicht verfügbar" + "Storage unauthorized. %s" : "Speichern nicht erlaubt. %s", + "Storage incomplete configuration. %s" : "Unvollständige Konfiguration des Storage. %s", + "Storage connection error. %s" : "Verbindungsfehler zum Storage. %s", + "Storage not available" : "Speicher nicht verfügbar", + "Storage connection timeout. %s" : "Zeitüberschreitung der Verbindung zum Storage. %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js index 2c4719a68ee..c35da1944bf 100644 --- a/lib/l10n/de_DE.js +++ b/lib/l10n/de_DE.js @@ -92,6 +92,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist", "You need to provide a password to create a public link, only protected links are allowed" : "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren", "Sharing %s failed, because sharing with links is not allowed" : "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist", + "Not allowed to create a federated share with the same user" : "Das Erstellen einer föderierten Freigabe mit dem gleichen Benutzer ist nicht erlaubt", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.", "Share type %s is not valid for %s" : "Freigabetyp %s ist nicht gültig für %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten", diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json index a0033aab485..dd975c2089d 100644 --- a/lib/l10n/de_DE.json +++ b/lib/l10n/de_DE.json @@ -90,6 +90,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist", "You need to provide a password to create a public link, only protected links are allowed" : "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren", "Sharing %s failed, because sharing with links is not allowed" : "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist", + "Not allowed to create a federated share with the same user" : "Das Erstellen einer föderierten Freigabe mit dem gleichen Benutzer ist nicht erlaubt", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.", "Share type %s is not valid for %s" : "Freigabetyp %s ist nicht gültig für %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten", diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js index b75551708be..a83ae8e9f1a 100644 --- a/lib/l10n/en_GB.js +++ b/lib/l10n/en_GB.js @@ -16,6 +16,7 @@ OC.L10N.register( "Library %s with a version lower than %s is required - available version %s." : "Library %s with a version lower than %s is required - available version %s.", "Following platforms are supported: %s" : "Following platforms are supported: %s", "ownCloud %s or higher is required." : "ownCloud %s or higher is required.", + "ownCloud %s or lower is required." : "ownCloud %s or lower is required.", "Help" : "Help", "Personal" : "Personal", "Users" : "Users", @@ -37,24 +38,29 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["%n minute ago","%n minutes ago"], "seconds ago" : "seconds ago", "web services under your control" : "web services under your control", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator.", "Empty filename is not allowed" : "Empty filename is not allowed", "Dot files are not allowed" : "Dot files are not allowed", "4-byte characters are not supported in file names" : "4-byte characters are not supported in file names", "File name is a reserved word" : "File name is a reserved word", "File name contains at least one invalid character" : "File name contains at least one invalid character", "File name is too long" : "File name is too long", + "File is currently busy, please try again later" : "File is currently busy, please try again later", "Can't read file" : "Can't read file", "App directory already exists" : "App directory already exists", "Can't create app folder. Please fix permissions. %s" : "Can't create app folder. Please fix permissions. %s", + "Archive does not contain a directory named %s" : "Archive does not contain a directory named %s", "No source specified when installing app" : "No source specified when installing app", "No href specified when installing app from http" : "No href specified when installing app from http", "No path specified when installing app from local file" : "No path specified when installing app from local file", "Archives of type %s are not supported" : "Archives of type %s are not supported", "Failed to open archive when installing app" : "Failed to open archive when installing app", "App does not provide an info.xml file" : "App does not provide an info.xml file", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signature could not get checked. Please contact the app developer and check your admin screen.", "App can't be installed because of not allowed code in the App" : "App can't be installed because of unallowed code in the App", "App can't be installed because it is not compatible with this version of ownCloud" : "App can't be installed because it is not compatible with this version of ownCloud", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "App can't be installed because the version in info.xml is not the same as the version reported from the app store", "Application is not enabled" : "Application is not enabled", "Authentication error" : "Authentication error", "Token expired. Please reload page." : "Token expired. Please reload page.", @@ -76,18 +82,22 @@ OC.L10N.register( "Set an admin username." : "Set an admin username.", "Set an admin password." : "Set an admin password.", "Can't create or write into the data directory %s" : "Can't create or write into the data directory %s", + "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID", "%s shared »%s« with you" : "%s shared \"%s\" with you", "%s via %s" : "%s via %s", "Sharing %s failed, because the backend does not allow shares from type %i" : "Sharing %s failed, because the backend does not allow shares from type %i", "Sharing %s failed, because the file does not exist" : "Sharing %s failed, because the file does not exist", "You are not allowed to share %s" : "You are not allowed to share %s", + "Sharing %s failed, because you can not share with yourself" : "Sharing %s failed, because you can not share with yourself", "Sharing %s failed, because the user %s does not exist" : "Sharing %s failed, because the user %s does not exist", "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of", "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s", + "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s", "Sharing %s failed, because the group %s does not exist" : "Sharing %s failed, because the group %s does not exist", "Sharing %s failed, because %s is not a member of the group %s" : "Sharing %s failed, because %s is not a member of the group %s", "You need to provide a password to create a public link, only protected links are allowed" : "You need to provide a password to create a public link, only protected links are allowed", "Sharing %s failed, because sharing with links is not allowed" : "Sharing %s failed, because sharing with links is not allowed", + "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable.", "Share type %s is not valid for %s" : "Share type %s is not valid for %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting permissions for %s failed, because the permissions exceed permissions granted to %s", @@ -98,13 +108,19 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend", "Sharing backend %s not found" : "Sharing backend %s not found", "Sharing backend for %s not found" : "Sharing backend for %s not found", + "Sharing failed, because the user %s is the original sharer" : "Sharing failed, because the user %s is the original sharer", "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Sharing %s failed, because the permissions exceed permissions granted to %s", "Sharing %s failed, because resharing is not allowed" : "Sharing %s failed, because resharing is not allowed", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sharing %s failed, because the sharing backend for %s could not find its source", "Sharing %s failed, because the file could not be found in the file cache" : "Sharing %s failed, because the file could not be found in the file cache", + "Cannot increase permissions of %s" : "Cannot increase permissions of %s", + "Expiration date is in the past" : "Expiration date is in the past", + "Cannot set expiration date more than %s days in the future" : "Cannot set expiration date more than %s days in the future", "Could not find category \"%s\"" : "Could not find category \"%s\"", "Apps" : "Apps", + "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"", "A valid username must be provided" : "A valid username must be provided", + "Username contains whitespace at the beginning or at the end" : "Username contains whitespace at the beginning or at the end", "A valid password must be provided" : "A valid password must be provided", "The username is already being used" : "The username is already being used", "No database drivers (sqlite, mysql, or postgresql) installed." : "No database drivers (sqlite, mysql, or postgresql) installed.", @@ -137,6 +153,10 @@ OC.L10N.register( "Data directory (%s) is invalid" : "Data directory (%s) is invalid", "Please check that the data directory contains a file \".ocdata\" in its root." : "Please check that the data directory contains a file \".ocdata\" in its root.", "Could not obtain lock type %d on \"%s\"." : "Could not obtain lock type %d on \"%s\".", - "Storage not available" : "Storage not available" + "Storage unauthorized. %s" : "Storage unauthorised. %s", + "Storage incomplete configuration. %s" : "Storage incomplete configuration. %s", + "Storage connection error. %s" : "Storage connection error. %s", + "Storage not available" : "Storage not available", + "Storage connection timeout. %s" : "Storage connection timeout. %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json index c44cafd39e9..00ed1000ecd 100644 --- a/lib/l10n/en_GB.json +++ b/lib/l10n/en_GB.json @@ -14,6 +14,7 @@ "Library %s with a version lower than %s is required - available version %s." : "Library %s with a version lower than %s is required - available version %s.", "Following platforms are supported: %s" : "Following platforms are supported: %s", "ownCloud %s or higher is required." : "ownCloud %s or higher is required.", + "ownCloud %s or lower is required." : "ownCloud %s or lower is required.", "Help" : "Help", "Personal" : "Personal", "Users" : "Users", @@ -35,24 +36,29 @@ "_%n minute ago_::_%n minutes ago_" : ["%n minute ago","%n minutes ago"], "seconds ago" : "seconds ago", "web services under your control" : "web services under your control", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator.", "Empty filename is not allowed" : "Empty filename is not allowed", "Dot files are not allowed" : "Dot files are not allowed", "4-byte characters are not supported in file names" : "4-byte characters are not supported in file names", "File name is a reserved word" : "File name is a reserved word", "File name contains at least one invalid character" : "File name contains at least one invalid character", "File name is too long" : "File name is too long", + "File is currently busy, please try again later" : "File is currently busy, please try again later", "Can't read file" : "Can't read file", "App directory already exists" : "App directory already exists", "Can't create app folder. Please fix permissions. %s" : "Can't create app folder. Please fix permissions. %s", + "Archive does not contain a directory named %s" : "Archive does not contain a directory named %s", "No source specified when installing app" : "No source specified when installing app", "No href specified when installing app from http" : "No href specified when installing app from http", "No path specified when installing app from local file" : "No path specified when installing app from local file", "Archives of type %s are not supported" : "Archives of type %s are not supported", "Failed to open archive when installing app" : "Failed to open archive when installing app", "App does not provide an info.xml file" : "App does not provide an info.xml file", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signature could not get checked. Please contact the app developer and check your admin screen.", "App can't be installed because of not allowed code in the App" : "App can't be installed because of unallowed code in the App", "App can't be installed because it is not compatible with this version of ownCloud" : "App can't be installed because it is not compatible with this version of ownCloud", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "App can't be installed because the version in info.xml is not the same as the version reported from the app store", "Application is not enabled" : "Application is not enabled", "Authentication error" : "Authentication error", "Token expired. Please reload page." : "Token expired. Please reload page.", @@ -74,18 +80,22 @@ "Set an admin username." : "Set an admin username.", "Set an admin password." : "Set an admin password.", "Can't create or write into the data directory %s" : "Can't create or write into the data directory %s", + "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID", "%s shared »%s« with you" : "%s shared \"%s\" with you", "%s via %s" : "%s via %s", "Sharing %s failed, because the backend does not allow shares from type %i" : "Sharing %s failed, because the backend does not allow shares from type %i", "Sharing %s failed, because the file does not exist" : "Sharing %s failed, because the file does not exist", "You are not allowed to share %s" : "You are not allowed to share %s", + "Sharing %s failed, because you can not share with yourself" : "Sharing %s failed, because you can not share with yourself", "Sharing %s failed, because the user %s does not exist" : "Sharing %s failed, because the user %s does not exist", "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of", "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s", + "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s", "Sharing %s failed, because the group %s does not exist" : "Sharing %s failed, because the group %s does not exist", "Sharing %s failed, because %s is not a member of the group %s" : "Sharing %s failed, because %s is not a member of the group %s", "You need to provide a password to create a public link, only protected links are allowed" : "You need to provide a password to create a public link, only protected links are allowed", "Sharing %s failed, because sharing with links is not allowed" : "Sharing %s failed, because sharing with links is not allowed", + "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable.", "Share type %s is not valid for %s" : "Share type %s is not valid for %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting permissions for %s failed, because the permissions exceed permissions granted to %s", @@ -96,13 +106,19 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend", "Sharing backend %s not found" : "Sharing backend %s not found", "Sharing backend for %s not found" : "Sharing backend for %s not found", + "Sharing failed, because the user %s is the original sharer" : "Sharing failed, because the user %s is the original sharer", "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Sharing %s failed, because the permissions exceed permissions granted to %s", "Sharing %s failed, because resharing is not allowed" : "Sharing %s failed, because resharing is not allowed", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sharing %s failed, because the sharing backend for %s could not find its source", "Sharing %s failed, because the file could not be found in the file cache" : "Sharing %s failed, because the file could not be found in the file cache", + "Cannot increase permissions of %s" : "Cannot increase permissions of %s", + "Expiration date is in the past" : "Expiration date is in the past", + "Cannot set expiration date more than %s days in the future" : "Cannot set expiration date more than %s days in the future", "Could not find category \"%s\"" : "Could not find category \"%s\"", "Apps" : "Apps", + "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"", "A valid username must be provided" : "A valid username must be provided", + "Username contains whitespace at the beginning or at the end" : "Username contains whitespace at the beginning or at the end", "A valid password must be provided" : "A valid password must be provided", "The username is already being used" : "The username is already being used", "No database drivers (sqlite, mysql, or postgresql) installed." : "No database drivers (sqlite, mysql, or postgresql) installed.", @@ -135,6 +151,10 @@ "Data directory (%s) is invalid" : "Data directory (%s) is invalid", "Please check that the data directory contains a file \".ocdata\" in its root." : "Please check that the data directory contains a file \".ocdata\" in its root.", "Could not obtain lock type %d on \"%s\"." : "Could not obtain lock type %d on \"%s\".", - "Storage not available" : "Storage not available" + "Storage unauthorized. %s" : "Storage unauthorised. %s", + "Storage incomplete configuration. %s" : "Storage incomplete configuration. %s", + "Storage connection error. %s" : "Storage connection error. %s", + "Storage not available" : "Storage not available", + "Storage connection timeout. %s" : "Storage connection timeout. %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/lib/l10n/eo.js b/lib/l10n/eo.js index a19f1d51d14..356444b910e 100644 --- a/lib/l10n/eo.js +++ b/lib/l10n/eo.js @@ -25,6 +25,7 @@ OC.L10N.register( "seconds ago" : "sekundoj antaŭe", "web services under your control" : "TTT-servoj regataj de vi", "Empty filename is not allowed" : "Malplena dosiernomo ne permesatas", + "File name contains at least one invalid character" : "Dosiernomo enhavas almenaŭ unu nevalidan signon", "File name is too long" : "La dosiernomo tro longas", "Can't read file" : "Ne legeblas dosiero", "App directory already exists" : "La dosierujo de la aplikaĵo jam ekzistas", @@ -46,6 +47,7 @@ OC.L10N.register( "Can't create or write into the data directory %s" : "Ne kreeblas aŭ ne skribeblas la dosierujo de datumoj %s", "%s shared »%s« with you" : "%s kunhavigis “%s” kun vi", "%s via %s" : "%s per %s", + "Sharing %s failed, because the backend does not allow shares from type %i" : "Kunhavigo de %s malsukcesis, ĉar la motoro ne permesas kunhavojn el tipo %i", "Sharing %s failed, because the file does not exist" : "Kunhavigo de %s malsukcesis, ĉar la dosiero ne ekzistas", "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s", "Sharing %s failed, because the user %s does not exist" : "Kunhavigo de %s malsukcesis, ĉar la uzanto %s ne ekzistas", @@ -54,10 +56,18 @@ OC.L10N.register( "Sharing %s failed, because the group %s does not exist" : "Kunhavigo de %s malsukcesis, ĉar la grupo %s ne ekzistas", "Sharing %s failed, because %s is not a member of the group %s" : "Kunhavigo de %s malsukcesis, ĉar %s ne estas ano de la grupo %s", "Sharing %s failed, because sharing with links is not allowed" : "Kunhavo de %s malsukcesis, ĉar kunhavo per ligiloj ne permesatas", + "Not allowed to create a federated share with the same user" : "Vi ne permesas krei federan kunhavon kun la sama uzanto", + "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Kunhavmotoro %s devas realigi la interfacon “OCP\\Share_Backend”", + "Sharing backend %s not found" : "Kunhavmotoro %s ne troviĝas", + "Sharing backend for %s not found" : "Kunhavmotoro por %s ne troviĝas", "Sharing %s failed, because resharing is not allowed" : "Kunhavigo de %s malsukcesis, ĉar rekunhavigo ne permesatas", + "Sharing %s failed, because the sharing backend for %s could not find its source" : "Kunhavigo de %s malsukcesis, ĉar la kunhavmotoro por %s ne povis trovi ĝian fonton", + "Cannot increase permissions of %s" : "Ne eblas pliigi permesojn de %s", + "Expiration date is in the past" : "Senvalidiĝa dato estintas", "Could not find category \"%s\"" : "Ne troviĝis kategorio “%s”", "Apps" : "Aplikaĵoj", "A valid username must be provided" : "Valida uzantonomo devas proviziĝi", + "Username contains whitespace at the beginning or at the end" : "Uzantonomo enhavas blankospacon eke aŭ maleke", "A valid password must be provided" : "Valida pasvorto devas proviziĝi", "The username is already being used" : "La uzantonomo jam uzatas", "Microsoft Windows Platform is not supported" : "La platformo Microsoft Vindozo ne kongruas", @@ -71,6 +81,8 @@ OC.L10N.register( "Please upgrade your database version" : "Bonvolu ĝisdatigi la eldonon de via datumbazo", "Data directory (%s) is readable by other users" : "Dosierujo de datumoj (%s) legeblas de aliaj uzantoj", "Data directory (%s) must be an absolute path" : "Dosierujo de datumoj (%s) devas specifiĝi per absoluta vojo", - "Data directory (%s) is invalid" : "Dosierujo de datumoj (%s) ne validas" + "Data directory (%s) is invalid" : "Dosierujo de datumoj (%s) ne validas", + "Storage connection error. %s" : "Memorokonekta eraro. %s", + "Storage not available" : "Memoro ne disponeblas" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/eo.json b/lib/l10n/eo.json index 439b4f83f54..2c190884806 100644 --- a/lib/l10n/eo.json +++ b/lib/l10n/eo.json @@ -23,6 +23,7 @@ "seconds ago" : "sekundoj antaŭe", "web services under your control" : "TTT-servoj regataj de vi", "Empty filename is not allowed" : "Malplena dosiernomo ne permesatas", + "File name contains at least one invalid character" : "Dosiernomo enhavas almenaŭ unu nevalidan signon", "File name is too long" : "La dosiernomo tro longas", "Can't read file" : "Ne legeblas dosiero", "App directory already exists" : "La dosierujo de la aplikaĵo jam ekzistas", @@ -44,6 +45,7 @@ "Can't create or write into the data directory %s" : "Ne kreeblas aŭ ne skribeblas la dosierujo de datumoj %s", "%s shared »%s« with you" : "%s kunhavigis “%s” kun vi", "%s via %s" : "%s per %s", + "Sharing %s failed, because the backend does not allow shares from type %i" : "Kunhavigo de %s malsukcesis, ĉar la motoro ne permesas kunhavojn el tipo %i", "Sharing %s failed, because the file does not exist" : "Kunhavigo de %s malsukcesis, ĉar la dosiero ne ekzistas", "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s", "Sharing %s failed, because the user %s does not exist" : "Kunhavigo de %s malsukcesis, ĉar la uzanto %s ne ekzistas", @@ -52,10 +54,18 @@ "Sharing %s failed, because the group %s does not exist" : "Kunhavigo de %s malsukcesis, ĉar la grupo %s ne ekzistas", "Sharing %s failed, because %s is not a member of the group %s" : "Kunhavigo de %s malsukcesis, ĉar %s ne estas ano de la grupo %s", "Sharing %s failed, because sharing with links is not allowed" : "Kunhavo de %s malsukcesis, ĉar kunhavo per ligiloj ne permesatas", + "Not allowed to create a federated share with the same user" : "Vi ne permesas krei federan kunhavon kun la sama uzanto", + "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Kunhavmotoro %s devas realigi la interfacon “OCP\\Share_Backend”", + "Sharing backend %s not found" : "Kunhavmotoro %s ne troviĝas", + "Sharing backend for %s not found" : "Kunhavmotoro por %s ne troviĝas", "Sharing %s failed, because resharing is not allowed" : "Kunhavigo de %s malsukcesis, ĉar rekunhavigo ne permesatas", + "Sharing %s failed, because the sharing backend for %s could not find its source" : "Kunhavigo de %s malsukcesis, ĉar la kunhavmotoro por %s ne povis trovi ĝian fonton", + "Cannot increase permissions of %s" : "Ne eblas pliigi permesojn de %s", + "Expiration date is in the past" : "Senvalidiĝa dato estintas", "Could not find category \"%s\"" : "Ne troviĝis kategorio “%s”", "Apps" : "Aplikaĵoj", "A valid username must be provided" : "Valida uzantonomo devas proviziĝi", + "Username contains whitespace at the beginning or at the end" : "Uzantonomo enhavas blankospacon eke aŭ maleke", "A valid password must be provided" : "Valida pasvorto devas proviziĝi", "The username is already being used" : "La uzantonomo jam uzatas", "Microsoft Windows Platform is not supported" : "La platformo Microsoft Vindozo ne kongruas", @@ -69,6 +79,8 @@ "Please upgrade your database version" : "Bonvolu ĝisdatigi la eldonon de via datumbazo", "Data directory (%s) is readable by other users" : "Dosierujo de datumoj (%s) legeblas de aliaj uzantoj", "Data directory (%s) must be an absolute path" : "Dosierujo de datumoj (%s) devas specifiĝi per absoluta vojo", - "Data directory (%s) is invalid" : "Dosierujo de datumoj (%s) ne validas" + "Data directory (%s) is invalid" : "Dosierujo de datumoj (%s) ne validas", + "Storage connection error. %s" : "Memorokonekta eraro. %s", + "Storage not available" : "Memoro ne disponeblas" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js index adae17c841c..0b63542e61b 100644 --- a/lib/l10n/et_EE.js +++ b/lib/l10n/et_EE.js @@ -91,6 +91,7 @@ OC.L10N.register( "Sharing %s failed, because resharing is not allowed" : "%s jagamine ebaõnnestus, kuna edasijagamine pole lubatud", "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s jagamine ebaõnnestus, kuna jagamise tagarakend ei suutnud leida %s jaoks lähteallikat", "Sharing %s failed, because the file could not be found in the file cache" : "%s jagamine ebaõnnestus, kuna faili ei suudetud leida failide puhvrist", + "Expiration date is in the past" : "Aegumise kuupäev on minevikus", "Could not find category \"%s\"" : "Ei leia kategooriat \"%s\"", "Apps" : "Rakendused", "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus", diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json index 68340a6b965..b30fe6cd210 100644 --- a/lib/l10n/et_EE.json +++ b/lib/l10n/et_EE.json @@ -89,6 +89,7 @@ "Sharing %s failed, because resharing is not allowed" : "%s jagamine ebaõnnestus, kuna edasijagamine pole lubatud", "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s jagamine ebaõnnestus, kuna jagamise tagarakend ei suutnud leida %s jaoks lähteallikat", "Sharing %s failed, because the file could not be found in the file cache" : "%s jagamine ebaõnnestus, kuna faili ei suudetud leida failide puhvrist", + "Expiration date is in the past" : "Aegumise kuupäev on minevikus", "Could not find category \"%s\"" : "Ei leia kategooriat \"%s\"", "Apps" : "Rakendused", "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus", diff --git a/lib/l10n/he.js b/lib/l10n/he.js index 1c9060ccc62..b3ac1eb5d46 100644 --- a/lib/l10n/he.js +++ b/lib/l10n/he.js @@ -59,15 +59,42 @@ OC.L10N.register( "Unknown user" : "משתמש לא ידוע", "%s enter the database username." : "%s נכנס למסד נתוני שמות המשתמשים.", "%s enter the database name." : "%s נכנס למסד נתוני השמות.", + "%s you may not use dots in the database name" : "%s לא ניתן להשתמש בנקודות בשם מסד הנתונים", + "Oracle connection could not be established" : "לא ניתן היה ליצור חיבור Oracle", + "Oracle username and/or password not valid" : "שם משתמש ו/או סיסמת Oracle אינם תקפים", "DB Error: \"%s\"" : "שגיאת מסד נתונים: \"%s\"", + "You need to enter either an existing account or the administrator." : "יש להכניס חשבון קיים או מנהל.", + "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 לא יעבוד כשורה בפלטפורמה זו. ניתן לקחת סיכון ולהשתמש באחריותך! ", + "For the best results, please consider using a GNU/Linux server instead." : "לתוצאות הכי טובות, יש לשקול שימוש בשרת GNU/Linux במקום.", + "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "נראה ש- %s עובד על בסיס סביבת 32-bit PHP ושה- open_basedir הוגדר בקובץ php.ini. מצב זה יוביל לבעיות עם קבצים הגדולים מ- 4 GB ואינו מומלץ לחלוטין.", + "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "יש להסיר את הגדרת open_basedir מתוך קובץ php.ini או להחליף לסביבת 64-bit PHP.", "Set an admin username." : "קביעת שם משתמש מנהל", "Set an admin password." : "קביעת סיסמת מנהל", + "Can't create or write into the data directory %s" : "לא ניתן ליצור או לכתוב לתוך תיקיית הנתונים %s", "Invalid Federated Cloud ID" : "זיהוי ענן מאוגד לא חוקי", "%s shared »%s« with you" : "%s שיתף/שיתפה איתך את »%s«", "%s via %s" : "%s על בסיס %s", + "Sharing %s failed, because the backend does not allow shares from type %i" : "השיתוף %s נכשל, כיוון שהצד האחורי אינו מאפשר שיתופים מסוג %i", + "Sharing %s failed, because the file does not exist" : "השיתוף %s נכשל, כיוון שהקובץ אינו קיים", + "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s", + "Sharing %s failed, because you can not share with yourself" : "השיתוף %s נכשל, כיוון שלא ניתן לשתף עם עצמך", + "Sharing %s failed, because the user %s does not exist" : "השיתוף %s נכשל, כיוון שהמשתמש %s אינו קיים", + "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "השיתוף %s נכשל, כיוון שהמשתמש %s אינו חבר בקבוצות ש- %s חבר ב-", "Sharing %s failed, because this item is already shared with %s" : "שיתוף %s נכשל, כיוון שפריט זה כבר משותף עם %s", + "Sharing %s failed, because this item is already shared with user %s" : "השיתוף %s נכשל, כיוון שהפריט כבר משותף עם משתמש %s", + "Sharing %s failed, because the group %s does not exist" : "השיתוף %s נכשל, כיוון שהקבוצה %s אינה קיימת", + "Sharing %s failed, because %s is not a member of the group %s" : "השיתוף %s נכשל, כיוון ש- %s אינו חבר בקבוצה %s", + "You need to provide a password to create a public link, only protected links are allowed" : "יש לספק סיסמא ליצירת קישור ציבורי, רק קישורים מוגנים מותרים", + "Sharing %s failed, because sharing with links is not allowed" : "השיתוף %s נכשל, כיוון ששיתוף עם קישור אינו מותר", "Not allowed to create a federated share with the same user" : "אסור ליצור שיתוף מאוגד עם אותו משתמש", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "שיתוף %s נכשל, לא ניתן לאתר %s, ייתכן שהשרת לא ניתן להשגה כרגע.", + "Share type %s is not valid for %s" : "שיתוף מסוג %s אינו תקף ל- %s", + "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "הגדרת הרשאות ל- %s נכשלה, כיוון שההרשאות עולים על האישורים שניתנו ל- %s", + "Setting permissions for %s failed, because the item was not found" : "הגדרת הרשאות ל- %s נכשלה, כיוון שהפריט לא נמצא", + "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "לא ניתן לקבוע תאריך תפוגה. שיתופים אינם יכולים לפוג תוקף מאוחר יותר מ- %s לאחר ששותפו", + "Cannot set expiration date. Expiration date is in the past" : "לא ניתן לקבוע תאריך תפוגה. תאריך התפוגה הנו בעבר", + "Cannot clear expiration date. Shares are required to have an expiration date." : "לא ניתן לבטל תאריך תפוגה. שיתופים חייבים להכיל תאריך תפוגה.", "Expiration date is in the past" : "תאריך תפוגה הנו בעבר", "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Apps" : "יישומים", diff --git a/lib/l10n/he.json b/lib/l10n/he.json index 189040d796d..4eca14df850 100644 --- a/lib/l10n/he.json +++ b/lib/l10n/he.json @@ -57,15 +57,42 @@ "Unknown user" : "משתמש לא ידוע", "%s enter the database username." : "%s נכנס למסד נתוני שמות המשתמשים.", "%s enter the database name." : "%s נכנס למסד נתוני השמות.", + "%s you may not use dots in the database name" : "%s לא ניתן להשתמש בנקודות בשם מסד הנתונים", + "Oracle connection could not be established" : "לא ניתן היה ליצור חיבור Oracle", + "Oracle username and/or password not valid" : "שם משתמש ו/או סיסמת Oracle אינם תקפים", "DB Error: \"%s\"" : "שגיאת מסד נתונים: \"%s\"", + "You need to enter either an existing account or the administrator." : "יש להכניס חשבון קיים או מנהל.", + "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 לא יעבוד כשורה בפלטפורמה זו. ניתן לקחת סיכון ולהשתמש באחריותך! ", + "For the best results, please consider using a GNU/Linux server instead." : "לתוצאות הכי טובות, יש לשקול שימוש בשרת GNU/Linux במקום.", + "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "נראה ש- %s עובד על בסיס סביבת 32-bit PHP ושה- open_basedir הוגדר בקובץ php.ini. מצב זה יוביל לבעיות עם קבצים הגדולים מ- 4 GB ואינו מומלץ לחלוטין.", + "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "יש להסיר את הגדרת open_basedir מתוך קובץ php.ini או להחליף לסביבת 64-bit PHP.", "Set an admin username." : "קביעת שם משתמש מנהל", "Set an admin password." : "קביעת סיסמת מנהל", + "Can't create or write into the data directory %s" : "לא ניתן ליצור או לכתוב לתוך תיקיית הנתונים %s", "Invalid Federated Cloud ID" : "זיהוי ענן מאוגד לא חוקי", "%s shared »%s« with you" : "%s שיתף/שיתפה איתך את »%s«", "%s via %s" : "%s על בסיס %s", + "Sharing %s failed, because the backend does not allow shares from type %i" : "השיתוף %s נכשל, כיוון שהצד האחורי אינו מאפשר שיתופים מסוג %i", + "Sharing %s failed, because the file does not exist" : "השיתוף %s נכשל, כיוון שהקובץ אינו קיים", + "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s", + "Sharing %s failed, because you can not share with yourself" : "השיתוף %s נכשל, כיוון שלא ניתן לשתף עם עצמך", + "Sharing %s failed, because the user %s does not exist" : "השיתוף %s נכשל, כיוון שהמשתמש %s אינו קיים", + "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "השיתוף %s נכשל, כיוון שהמשתמש %s אינו חבר בקבוצות ש- %s חבר ב-", "Sharing %s failed, because this item is already shared with %s" : "שיתוף %s נכשל, כיוון שפריט זה כבר משותף עם %s", + "Sharing %s failed, because this item is already shared with user %s" : "השיתוף %s נכשל, כיוון שהפריט כבר משותף עם משתמש %s", + "Sharing %s failed, because the group %s does not exist" : "השיתוף %s נכשל, כיוון שהקבוצה %s אינה קיימת", + "Sharing %s failed, because %s is not a member of the group %s" : "השיתוף %s נכשל, כיוון ש- %s אינו חבר בקבוצה %s", + "You need to provide a password to create a public link, only protected links are allowed" : "יש לספק סיסמא ליצירת קישור ציבורי, רק קישורים מוגנים מותרים", + "Sharing %s failed, because sharing with links is not allowed" : "השיתוף %s נכשל, כיוון ששיתוף עם קישור אינו מותר", "Not allowed to create a federated share with the same user" : "אסור ליצור שיתוף מאוגד עם אותו משתמש", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "שיתוף %s נכשל, לא ניתן לאתר %s, ייתכן שהשרת לא ניתן להשגה כרגע.", + "Share type %s is not valid for %s" : "שיתוף מסוג %s אינו תקף ל- %s", + "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "הגדרת הרשאות ל- %s נכשלה, כיוון שההרשאות עולים על האישורים שניתנו ל- %s", + "Setting permissions for %s failed, because the item was not found" : "הגדרת הרשאות ל- %s נכשלה, כיוון שהפריט לא נמצא", + "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "לא ניתן לקבוע תאריך תפוגה. שיתופים אינם יכולים לפוג תוקף מאוחר יותר מ- %s לאחר ששותפו", + "Cannot set expiration date. Expiration date is in the past" : "לא ניתן לקבוע תאריך תפוגה. תאריך התפוגה הנו בעבר", + "Cannot clear expiration date. Shares are required to have an expiration date." : "לא ניתן לבטל תאריך תפוגה. שיתופים חייבים להכיל תאריך תפוגה.", "Expiration date is in the past" : "תאריך תפוגה הנו בעבר", "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Apps" : "יישומים", diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index 5a22e147df3..041b743549d 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -60,6 +60,7 @@ OC.L10N.register( "App can't be installed because of not allowed code in the App" : "De app kan niet worden geïnstalleerd wegens onjuiste code in de app", "App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd omdat de versie in info.xml niet dezelfde is als de versie zoals die in de app store staat vermeld", "Application is not enabled" : "De applicatie is niet actief", "Authentication error" : "Authenticatie fout", "Token expired. Please reload page." : "Token verlopen. Herlaad de pagina.", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index 2af4fad7e88..21a29c1757e 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -58,6 +58,7 @@ "App can't be installed because of not allowed code in the App" : "De app kan niet worden geïnstalleerd wegens onjuiste code in de app", "App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd omdat de versie in info.xml niet dezelfde is als de versie zoals die in de app store staat vermeld", "Application is not enabled" : "De applicatie is niet actief", "Authentication error" : "Authenticatie fout", "Token expired. Please reload page." : "Token verlopen. Herlaad de pagina.", diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js index 486d00c0391..010cfe13ccf 100644 --- a/lib/l10n/ru.js +++ b/lib/l10n/ru.js @@ -60,6 +60,7 @@ OC.L10N.register( "App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.", "App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложение невозможно установить. Оно содержит параметр <shipped>true</shipped> который не допустим для приложений, не входящих в поставку.", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Приложение невозможно установить. Версия в файле info.xml не совпадает с версией заявленной в магазине приложений", "Application is not enabled" : "Приложение не разрешено", "Authentication error" : "Ошибка аутентификации", "Token expired. Please reload page." : "Токен просрочен. Перезагрузите страницу.", diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json index 52766f67dd3..c08476fb79b 100644 --- a/lib/l10n/ru.json +++ b/lib/l10n/ru.json @@ -58,6 +58,7 @@ "App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.", "App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложение невозможно установить. Оно содержит параметр <shipped>true</shipped> который не допустим для приложений, не входящих в поставку.", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Приложение невозможно установить. Версия в файле info.xml не совпадает с версией заявленной в магазине приложений", "Application is not enabled" : "Приложение не разрешено", "Authentication error" : "Ошибка аутентификации", "Token expired. Please reload page." : "Токен просрочен. Перезагрузите страницу.", diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js index 872273a6d13..cde356b03ee 100644 --- a/lib/l10n/sl.js +++ b/lib/l10n/sl.js @@ -72,6 +72,7 @@ OC.L10N.register( "Set an admin username." : "Nastavi uporabniško ime skrbnika.", "Set an admin password." : "Nastavi geslo skrbnika.", "Can't create or write into the data directory %s" : "Ni mogoče zapisati podatkov v podatkovno mapo %s", + "Invalid Federated Cloud ID" : "Neveljaven ID za prenos dovoljenj ownCloud", "%s shared »%s« with you" : "%s je omogočil souporabo »%s«", "%s via %s" : "%s prek %s", "Sharing %s failed, because the backend does not allow shares from type %i" : "Omogočanje souporabe %s je spodletelo, ker ozadnji program ne dopušča souporabe vrste %i.", @@ -84,6 +85,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član skupine %s.", "You need to provide a password to create a public link, only protected links are allowed" : "Navesti je treba geslo za ustvarjanje javne povezave, saj so dovoljene le zaščitene.", "Sharing %s failed, because sharing with links is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena.", + "Not allowed to create a federated share with the same user" : "Ni dovoljeno ustvariti souporabe s prenosom dovoljenj z istim uporabnikom", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Omogočanje souporabe %s je spodletelo, ker ni mogoče najti %s. Najverjetneje je strežnik nedosegljiv.", "Share type %s is not valid for %s" : "Vrsta souporabe %s za %s ni veljavna.", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavljanje dovoljenj za %s je spodletelo, saj ta presegajo dovoljenja dodeljena uporabniku %s.", @@ -97,9 +99,11 @@ OC.L10N.register( "Sharing %s failed, because resharing is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker nadaljnje omogočanje souporabe ni dovoljeno.", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Nastavljanje souporabe %s je spodletelo, ker ozadnji program %s ne upravlja z viri.", "Sharing %s failed, because the file could not be found in the file cache" : "Nastavljanje souporabe %s je spodletelo, ker v predpomnilniku zahtevana datoteka ne obstaja.", + "Expiration date is in the past" : "Datum preteka je že mimo!", "Could not find category \"%s\"" : "Kategorije \"%s\" ni mogoče najti.", "Apps" : "Programi", "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime", + "Username contains whitespace at the beginning or at the end" : "Uporabniško ime vsebuje presledni znak na začetku ali na koncu imena.", "A valid password must be provided" : "Navedeno mora biti veljavno geslo", "The username is already being used" : "Vpisano uporabniško ime je že v uporabi", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).", diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json index e7fad43e6e6..8bd781a7371 100644 --- a/lib/l10n/sl.json +++ b/lib/l10n/sl.json @@ -70,6 +70,7 @@ "Set an admin username." : "Nastavi uporabniško ime skrbnika.", "Set an admin password." : "Nastavi geslo skrbnika.", "Can't create or write into the data directory %s" : "Ni mogoče zapisati podatkov v podatkovno mapo %s", + "Invalid Federated Cloud ID" : "Neveljaven ID za prenos dovoljenj ownCloud", "%s shared »%s« with you" : "%s je omogočil souporabo »%s«", "%s via %s" : "%s prek %s", "Sharing %s failed, because the backend does not allow shares from type %i" : "Omogočanje souporabe %s je spodletelo, ker ozadnji program ne dopušča souporabe vrste %i.", @@ -82,6 +83,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član skupine %s.", "You need to provide a password to create a public link, only protected links are allowed" : "Navesti je treba geslo za ustvarjanje javne povezave, saj so dovoljene le zaščitene.", "Sharing %s failed, because sharing with links is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena.", + "Not allowed to create a federated share with the same user" : "Ni dovoljeno ustvariti souporabe s prenosom dovoljenj z istim uporabnikom", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Omogočanje souporabe %s je spodletelo, ker ni mogoče najti %s. Najverjetneje je strežnik nedosegljiv.", "Share type %s is not valid for %s" : "Vrsta souporabe %s za %s ni veljavna.", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavljanje dovoljenj za %s je spodletelo, saj ta presegajo dovoljenja dodeljena uporabniku %s.", @@ -95,9 +97,11 @@ "Sharing %s failed, because resharing is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker nadaljnje omogočanje souporabe ni dovoljeno.", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Nastavljanje souporabe %s je spodletelo, ker ozadnji program %s ne upravlja z viri.", "Sharing %s failed, because the file could not be found in the file cache" : "Nastavljanje souporabe %s je spodletelo, ker v predpomnilniku zahtevana datoteka ne obstaja.", + "Expiration date is in the past" : "Datum preteka je že mimo!", "Could not find category \"%s\"" : "Kategorije \"%s\" ni mogoče najti.", "Apps" : "Programi", "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime", + "Username contains whitespace at the beginning or at the end" : "Uporabniško ime vsebuje presledni znak na začetku ali na koncu imena.", "A valid password must be provided" : "Navedeno mora biti veljavno geslo", "The username is already being used" : "Vpisano uporabniško ime je že v uporabi", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).", diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js index 2d5ce30ab87..67ee7427f3d 100644 --- a/lib/l10n/sv.js +++ b/lib/l10n/sv.js @@ -66,6 +66,7 @@ OC.L10N.register( "Set an admin username." : "Ange ett användarnamn för administratören.", "Set an admin password." : "Ange ett administratörslösenord.", "Can't create or write into the data directory %s" : "Kan inte skapa eller skriva till data-katalogen %s", + "Invalid Federated Cloud ID" : "Ogiltigt \"Federated Cloud\"-ID", "%s shared »%s« with you" : "%s delade »%s« med dig", "Sharing %s failed, because the backend does not allow shares from type %i" : "Misslyckades dela ut %s då backend inte tillåter delningar från typ %i", "Sharing %s failed, because the file does not exist" : "Delning av %s misslyckades på grund av att filen inte existerar", @@ -77,6 +78,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "Delning %s misslyckades därför att %s inte ingår i gruppen %s", "You need to provide a password to create a public link, only protected links are allowed" : "Du måste ange ett lösenord för att skapa en offentlig länk, endast skyddade länkar är tillåtna", "Sharing %s failed, because sharing with links is not allowed" : "Delning %s misslyckades därför att delning utav länkar inte är tillåtet", + "Not allowed to create a federated share with the same user" : "Ej tillåtet att skapa en förbundsdelning med samma användare", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Misslyckades dela ut %s, kan inte hitta %s, kanske är servern inte åtkomlig för närvarande.", "Share type %s is not valid for %s" : "Delningstyp %s är inte giltig för %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s", diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json index 1e93a4a7d75..2331d906fd8 100644 --- a/lib/l10n/sv.json +++ b/lib/l10n/sv.json @@ -64,6 +64,7 @@ "Set an admin username." : "Ange ett användarnamn för administratören.", "Set an admin password." : "Ange ett administratörslösenord.", "Can't create or write into the data directory %s" : "Kan inte skapa eller skriva till data-katalogen %s", + "Invalid Federated Cloud ID" : "Ogiltigt \"Federated Cloud\"-ID", "%s shared »%s« with you" : "%s delade »%s« med dig", "Sharing %s failed, because the backend does not allow shares from type %i" : "Misslyckades dela ut %s då backend inte tillåter delningar från typ %i", "Sharing %s failed, because the file does not exist" : "Delning av %s misslyckades på grund av att filen inte existerar", @@ -75,6 +76,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "Delning %s misslyckades därför att %s inte ingår i gruppen %s", "You need to provide a password to create a public link, only protected links are allowed" : "Du måste ange ett lösenord för att skapa en offentlig länk, endast skyddade länkar är tillåtna", "Sharing %s failed, because sharing with links is not allowed" : "Delning %s misslyckades därför att delning utav länkar inte är tillåtet", + "Not allowed to create a federated share with the same user" : "Ej tillåtet att skapa en förbundsdelning med samma användare", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Misslyckades dela ut %s, kan inte hitta %s, kanske är servern inte åtkomlig för närvarande.", "Share type %s is not valid for %s" : "Delningstyp %s är inte giltig för %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s", diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js index 29f7c12141c..ffbd74837f3 100644 --- a/lib/l10n/uk.js +++ b/lib/l10n/uk.js @@ -16,6 +16,7 @@ OC.L10N.register( "Library %s with a version lower than %s is required - available version %s." : "Потрібна бібліотека %s версії менш ніж %s, встановлена версія %s.", "Following platforms are supported: %s" : "Підтримуються наступні платформи: %s", "ownCloud %s or higher is required." : "Потрібен ownCloud %s або вище.", + "ownCloud %s or lower is required." : "Потрібна версія %s ownCloud або нижча.", "Help" : "Допомога", "Personal" : "Особисте", "Users" : "Користувачі", diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json index 45b39e4aa14..eb8200a803c 100644 --- a/lib/l10n/uk.json +++ b/lib/l10n/uk.json @@ -14,6 +14,7 @@ "Library %s with a version lower than %s is required - available version %s." : "Потрібна бібліотека %s версії менш ніж %s, встановлена версія %s.", "Following platforms are supported: %s" : "Підтримуються наступні платформи: %s", "ownCloud %s or higher is required." : "Потрібен ownCloud %s або вище.", + "ownCloud %s or lower is required." : "Потрібна версія %s ownCloud або нижча.", "Help" : "Допомога", "Personal" : "Особисте", "Users" : "Користувачі", diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js index a11c0539635..02086fba36f 100644 --- a/lib/l10n/zh_CN.js +++ b/lib/l10n/zh_CN.js @@ -8,19 +8,26 @@ OC.L10N.register( "Personal" : "个人", "Users" : "用户", "Admin" : "管理", + "Recommended" : "推荐", "No app name specified" : "没有指定的 App 名称", "Unknown filetype" : "未知的文件类型", "Invalid image" : "无效的图像", "today" : "今天", "yesterday" : "昨天", + "_%n day ago_::_%n days ago_" : ["%n 天前"], "last month" : "上月", "_%n month ago_::_%n months ago_" : ["%n 月前"], "last year" : "去年", + "_%n year ago_::_%n years ago_" : ["%n 年前"], "_%n hour ago_::_%n hours ago_" : ["%n 小时前"], "_%n minute ago_::_%n minutes ago_" : ["%n 分钟前"], "seconds ago" : "秒前", "web services under your control" : "您控制的网络服务", + "Dot files are not allowed" : ".文件 不被允许", + "File name is a reserved word" : "文件名包含敏感字符", "File name contains at least one invalid character" : "文件名中存在至少一个非法字符", + "File name is too long" : "文件名过长", + "Can't read file" : "无法读取文件", "App directory already exists" : "应用程序目录已存在", "Can't create app folder. Please fix permissions. %s" : "无法创建应用程序文件夹。请修正权限。%s", "No source specified when installing app" : "安装 App 时未指定来源", @@ -50,7 +57,9 @@ OC.L10N.register( "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。", "Set an admin username." : "请设置一个管理员用户名。", "Set an admin password." : "请设置一个管理员密码。", + "Invalid Federated Cloud ID" : "无效的联合云ID", "%s shared »%s« with you" : "%s 向您分享了 »%s«", + "%s via %s" : "%s 通过 %s", "Sharing %s failed, because the file does not exist" : "共享 %s 失败，因为文件不存在。", "You are not allowed to share %s" : "您无权分享 %s", "Sharing %s failed, because the user %s does not exist" : "共享 %s 失败，因为用户 %s 不存在", @@ -59,6 +68,8 @@ OC.L10N.register( "Sharing %s failed, because the group %s does not exist" : "共享 %s 失败，因为 %s 组不存在", "Sharing %s failed, because %s is not a member of the group %s" : "共享 %s 失败，因为 %s 不是 %s 组的成员", "Sharing %s failed, because sharing with links is not allowed" : "共享 %s 失败，因为不允许用链接共享", + "Not allowed to create a federated share with the same user" : "不能给你自己分享文件", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "文件：%s 分享失败，联合云无法找到 %s，请检查设置或联系管理员。", "Share type %s is not valid for %s" : "%s 不是 %s 的合法共享类型", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "设置 %s 权限失败，因为权限超出了 %s 已有权限。", "Setting permissions for %s failed, because the item was not found" : "设置 %s 的权限失败，因为未找到到对应项", @@ -75,12 +86,14 @@ OC.L10N.register( "A valid password must be provided" : "必须提供合法的密码", "The username is already being used" : "用户名已被使用", "No database drivers (sqlite, mysql, or postgresql) installed." : "没有安装数据库驱动 (SQLite、MySQL 或 PostgreSQL)。", + "Microsoft Windows Platform is not supported" : "不支持 Microsoft Windows Platform！", "Cannot write into \"config\" directory" : "无法写入“config”目录", "Cannot write into \"apps\" directory" : "无法写入“apps”目录", "Cannot create \"data\" directory (%s)" : "无法创建“apps”目录 (%s)", "Setting locale to %s failed" : "设置语言为 %s 失败", "Please ask your server administrator to install the module." : "请联系服务器管理员安装模块。", "PHP module %s not installed." : "PHP %s 模块未安装。", + "PHP setting \"%s\" is not set to \"%s\"." : "PHP 设定 \"%s\" 未设置为 \"%s\"。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。", "PHP modules have been installed, but they are still listed as missing?" : "PHP 模块已经安装，但仍然显示未安装？", "Please ask your server administrator to restart the web server." : "请联系服务器管理员重启网页服务器。", diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json index 5872c0eb5a9..31930109685 100644 --- a/lib/l10n/zh_CN.json +++ b/lib/l10n/zh_CN.json @@ -6,19 +6,26 @@ "Personal" : "个人", "Users" : "用户", "Admin" : "管理", + "Recommended" : "推荐", "No app name specified" : "没有指定的 App 名称", "Unknown filetype" : "未知的文件类型", "Invalid image" : "无效的图像", "today" : "今天", "yesterday" : "昨天", + "_%n day ago_::_%n days ago_" : ["%n 天前"], "last month" : "上月", "_%n month ago_::_%n months ago_" : ["%n 月前"], "last year" : "去年", + "_%n year ago_::_%n years ago_" : ["%n 年前"], "_%n hour ago_::_%n hours ago_" : ["%n 小时前"], "_%n minute ago_::_%n minutes ago_" : ["%n 分钟前"], "seconds ago" : "秒前", "web services under your control" : "您控制的网络服务", + "Dot files are not allowed" : ".文件 不被允许", + "File name is a reserved word" : "文件名包含敏感字符", "File name contains at least one invalid character" : "文件名中存在至少一个非法字符", + "File name is too long" : "文件名过长", + "Can't read file" : "无法读取文件", "App directory already exists" : "应用程序目录已存在", "Can't create app folder. Please fix permissions. %s" : "无法创建应用程序文件夹。请修正权限。%s", "No source specified when installing app" : "安装 App 时未指定来源", @@ -48,7 +55,9 @@ "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。", "Set an admin username." : "请设置一个管理员用户名。", "Set an admin password." : "请设置一个管理员密码。", + "Invalid Federated Cloud ID" : "无效的联合云ID", "%s shared »%s« with you" : "%s 向您分享了 »%s«", + "%s via %s" : "%s 通过 %s", "Sharing %s failed, because the file does not exist" : "共享 %s 失败，因为文件不存在。", "You are not allowed to share %s" : "您无权分享 %s", "Sharing %s failed, because the user %s does not exist" : "共享 %s 失败，因为用户 %s 不存在", @@ -57,6 +66,8 @@ "Sharing %s failed, because the group %s does not exist" : "共享 %s 失败，因为 %s 组不存在", "Sharing %s failed, because %s is not a member of the group %s" : "共享 %s 失败，因为 %s 不是 %s 组的成员", "Sharing %s failed, because sharing with links is not allowed" : "共享 %s 失败，因为不允许用链接共享", + "Not allowed to create a federated share with the same user" : "不能给你自己分享文件", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "文件：%s 分享失败，联合云无法找到 %s，请检查设置或联系管理员。", "Share type %s is not valid for %s" : "%s 不是 %s 的合法共享类型", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "设置 %s 权限失败，因为权限超出了 %s 已有权限。", "Setting permissions for %s failed, because the item was not found" : "设置 %s 的权限失败，因为未找到到对应项", @@ -73,12 +84,14 @@ "A valid password must be provided" : "必须提供合法的密码", "The username is already being used" : "用户名已被使用", "No database drivers (sqlite, mysql, or postgresql) installed." : "没有安装数据库驱动 (SQLite、MySQL 或 PostgreSQL)。", + "Microsoft Windows Platform is not supported" : "不支持 Microsoft Windows Platform！", "Cannot write into \"config\" directory" : "无法写入“config”目录", "Cannot write into \"apps\" directory" : "无法写入“apps”目录", "Cannot create \"data\" directory (%s)" : "无法创建“apps”目录 (%s)", "Setting locale to %s failed" : "设置语言为 %s 失败", "Please ask your server administrator to install the module." : "请联系服务器管理员安装模块。", "PHP module %s not installed." : "PHP %s 模块未安装。", + "PHP setting \"%s\" is not set to \"%s\"." : "PHP 设定 \"%s\" 未设置为 \"%s\"。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。", "PHP modules have been installed, but they are still listed as missing?" : "PHP 模块已经安装，但仍然显示未安装？", "Please ask your server administrator to restart the web server." : "请联系服务器管理员重启网页服务器。", diff --git a/lib/private/api.php b/lib/private/api.php index 6c6be233c9d..87f2aa9b118 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -188,7 +188,7 @@ class OC_API { /** * merge the returned result objects into one response * @param array $responses - * @return array|\OC_OCS_Result + * @return OC_OCS_Result */ public static function mergeResponses($responses) { // Sort into shipped and third-party @@ -442,6 +442,7 @@ class OC_API { /** * Based on the requested format the response content type is set + * @param string $format */ public static function setContentType($format = null) { $format = is_null($format) ? self::requestedFormat() : $format; diff --git a/lib/private/avatarmanager.php b/lib/private/avatarmanager.php index b39f5495122..b2d3e6eb3dd 100644 --- a/lib/private/avatarmanager.php +++ b/lib/private/avatarmanager.php @@ -26,6 +26,8 @@ namespace OC; +use OCP\Files\Folder; +use OCP\Files\NotFoundException; use OCP\IAvatarManager; use OCP\IUserManager; use OCP\Files\IRootFolder; @@ -45,6 +47,13 @@ class AvatarManager implements IAvatarManager { /** @var IL10N */ private $l; + /** + * AvatarManager constructor. + * + * @param IUserManager $userManager + * @param IRootFolder $rootFolder + * @param IL10N $l + */ public function __construct( IUserManager $userManager, IRootFolder $rootFolder, @@ -57,15 +66,26 @@ class AvatarManager implements IAvatarManager { /** * return a user specific instance of \OCP\IAvatar * @see \OCP\IAvatar - * @param string $user the ownCloud user id + * @param string $userId the ownCloud user id * @return \OCP\IAvatar * @throws \Exception In case the username is potentially dangerous + * @throws NotFoundException In case there is no user folder yet */ public function getAvatar($userId) { $user = $this->userManager->get($userId); if (is_null($user)) { throw new \Exception('user does not exist'); } - return new Avatar($this->rootFolder->getUserFolder($userId)->getParent(), $this->l, $user); + + /* + * Fix for #22119 + * Basically we do not want to copy the skeleton folder + */ + \OC\Files\Filesystem::initMountPoints($userId); + $dir = '/' . $userId; + /** @var Folder $folder */ + $folder = $this->rootFolder->get($dir); + + return new Avatar($folder, $this->l, $user); } } diff --git a/lib/private/console/application.php b/lib/private/console/application.php index 10ff69b1c80..0895f1788af 100644 --- a/lib/private/console/application.php +++ b/lib/private/console/application.php @@ -31,6 +31,7 @@ use OCP\IRequest; use Symfony\Component\Console\Application as SymfonyApplication; use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -56,12 +57,31 @@ class Application { } /** + * @param InputInterface $input * @param OutputInterface $output * @throws \Exception */ - public function loadCommands(OutputInterface $output) { + public function loadCommands(InputInterface $input, OutputInterface $output) { // $application is required to be defined in the register_command scripts $application = $this->application; + $inputDefinition = $application->getDefinition(); + $inputDefinition->addOption( + new InputOption( + 'no-warnings', + null, + InputOption::VALUE_NONE, + 'Skip global warnings, show command output only', + null + ) + ); + try { + $input->bind($inputDefinition); + } catch (\RuntimeException $e) { + //expected if there are extra options + } + if ($input->getOption('no-warnings')) { + $output->setVerbosity(OutputInterface::VERBOSITY_QUIET); + } require_once __DIR__ . '/../../../core/register_command.php'; if ($this->config->getSystemValue('installed', false)) { if (\OCP\Util::needUpgrade()) { diff --git a/lib/private/db/adaptersqlsrv.php b/lib/private/db/adaptersqlsrv.php deleted file mode 100644 index f208b2ba787..00000000000 --- a/lib/private/db/adaptersqlsrv.php +++ /dev/null @@ -1,37 +0,0 @@ -<?php -/** - * @author Bart Visscher <bartv@thisnet.nl> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @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\DB; - -class AdapterSQLSrv extends Adapter { - public function fixupStatement($statement) { - $statement = str_replace(' ILIKE ', ' COLLATE Latin1_General_CI_AS LIKE ', $statement); - $statement = preg_replace( "/\`(.*?)`/", "[$1]", $statement ); - $statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement ); - $statement = str_replace( 'LENGTH(', 'LEN(', $statement ); - $statement = str_replace( 'SUBSTR(', 'SUBSTRING(', $statement ); - $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'DATEDIFF(second,{d \'1970-01-01\'},GETDATE())', $statement ); - return $statement; - } -} diff --git a/lib/private/db/querybuilder/expressionbuilder/expressionbuilder.php b/lib/private/db/querybuilder/expressionbuilder/expressionbuilder.php index 7ab4c03d97c..6fb58ac3c9d 100644 --- a/lib/private/db/querybuilder/expressionbuilder/expressionbuilder.php +++ b/lib/private/db/querybuilder/expressionbuilder/expressionbuilder.php @@ -277,6 +277,23 @@ class ExpressionBuilder implements IExpressionBuilder { } /** + * Creates a ILIKE() comparison expression with the given arguments. + * + * @param string $x Field in string format to be inspected by ILIKE() comparison. + * @param mixed $y Argument to be used in ILIKE() comparison. + * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants + * required when comparing text fields for oci compatibility + * + * @return string + * @since 9.0.0 + */ + public function iLike($x, $y, $type = null) { + $x = $this->helper->quoteColumnName($x); + $y = $this->helper->quoteColumnName($y); + return $this->expressionBuilder->comparison("LOWER($x)", 'LIKE', "LOWER($y)"); + } + + /** * Creates a NOT LIKE() comparison expression with the given arguments. * * @param string $x Field in string format to be inspected by NOT LIKE() comparison. diff --git a/lib/private/db/querybuilder/expressionbuilder/mysqlexpressionbuilder.php b/lib/private/db/querybuilder/expressionbuilder/mysqlexpressionbuilder.php new file mode 100644 index 00000000000..8164d9623b8 --- /dev/null +++ b/lib/private/db/querybuilder/expressionbuilder/mysqlexpressionbuilder.php @@ -0,0 +1,39 @@ +<?php +/** + * @author Joas Schilling <nickvergessen@owncloud.com> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @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\DB\QueryBuilder\ExpressionBuilder; + + +use OC\DB\QueryBuilder\QueryFunction; +use OCP\DB\QueryBuilder\IQueryBuilder; + +class MySqlExpressionBuilder extends ExpressionBuilder { + + /** + * @inheritdoc + */ + public function iLike($x, $y, $type = null) { + $x = $this->helper->quoteColumnName($x); + $y = $this->helper->quoteColumnName($y); + return $this->expressionBuilder->comparison($x, ' COLLATE utf8_general_ci LIKE', $y); + } + +} diff --git a/lib/private/db/querybuilder/expressionbuilder/ociexpressionbuilder.php b/lib/private/db/querybuilder/expressionbuilder/ociexpressionbuilder.php index 6a6d0f455f6..bd7daa23911 100644 --- a/lib/private/db/querybuilder/expressionbuilder/ociexpressionbuilder.php +++ b/lib/private/db/querybuilder/expressionbuilder/ociexpressionbuilder.php @@ -149,4 +149,13 @@ class OCIExpressionBuilder extends ExpressionBuilder { return parent::castColumn($column, $type); } + + /** + * @inheritdoc + */ + public function iLike($x, $y, $type = null) { + $x = $this->helper->quoteColumnName($x); + $y = $this->helper->quoteColumnName($y); + return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE('.$y.', \'%\', \'.*\') || \'$\', \'i\')'); + } } diff --git a/lib/private/db/querybuilder/expressionbuilder/pgsqlexpressionbuilder.php b/lib/private/db/querybuilder/expressionbuilder/pgsqlexpressionbuilder.php index 8a0b68db998..ac2d7bf2421 100644 --- a/lib/private/db/querybuilder/expressionbuilder/pgsqlexpressionbuilder.php +++ b/lib/private/db/querybuilder/expressionbuilder/pgsqlexpressionbuilder.php @@ -42,4 +42,14 @@ class PgSqlExpressionBuilder extends ExpressionBuilder { return parent::castColumn($column, $type); } + + /** + * @inheritdoc + */ + public function iLike($x, $y, $type = null) { + $x = $this->helper->quoteColumnName($x); + $y = $this->helper->quoteColumnName($y); + return $this->expressionBuilder->comparison($x, 'ILIKE', $y); + } + } diff --git a/lib/private/db/querybuilder/querybuilder.php b/lib/private/db/querybuilder/querybuilder.php index ff31ffbc043..de803116dc4 100644 --- a/lib/private/db/querybuilder/querybuilder.php +++ b/lib/private/db/querybuilder/querybuilder.php @@ -21,9 +21,11 @@ namespace OC\DB\QueryBuilder; +use Doctrine\DBAL\Platforms\MySqlPlatform; use Doctrine\DBAL\Platforms\PostgreSqlPlatform; use OC\DB\OracleConnection; use OC\DB\QueryBuilder\ExpressionBuilder\ExpressionBuilder; +use OC\DB\QueryBuilder\ExpressionBuilder\MySqlExpressionBuilder; use OC\DB\QueryBuilder\ExpressionBuilder\OCIExpressionBuilder; use OC\DB\QueryBuilder\ExpressionBuilder\PgSqlExpressionBuilder; use OCP\DB\QueryBuilder\IQueryBuilder; @@ -91,6 +93,8 @@ class QueryBuilder implements IQueryBuilder { return new OCIExpressionBuilder($this->connection); } else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) { return new PgSqlExpressionBuilder($this->connection); + } else if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) { + return new MySqlExpressionBuilder($this->connection); } else { return new ExpressionBuilder($this->connection); } diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index edc570c967d..1d4801e5b97 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -613,6 +613,10 @@ abstract class Common implements Storage, ILockingStorage { return $this->rename($sourceInternalPath, $targetInternalPath); } + if (!$sourceStorage->isDeletable($sourceInternalPath)) { + return false; + } + $result = $this->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, true); if ($result) { if ($sourceStorage->is_dir($sourceInternalPath)) { diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 068a688cb74..1b0f39428a4 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -585,6 +585,10 @@ class Encryption extends Wrapper { // - copy the copyKeys() call from $this->copyBetweenStorage to this method // - remove $this->copyBetweenStorage + if (!$sourceStorage->isDeletable($sourceInternalPath)) { + return false; + } + $result = $this->copyBetweenStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime, true); if ($result) { if ($sourceStorage->is_dir($sourceInternalPath)) { diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php index 63949035b5a..37a1d75519d 100644 --- a/lib/private/files/stream/encryption.php +++ b/lib/private/files/stream/encryption.php @@ -183,7 +183,7 @@ class Encryption extends Wrapper { * * @param resource $source * @param string $mode - * @param array $context + * @param resource $context * @param string $protocol * @param string $class * @return resource diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php index 59673a306cb..bc815f5f6da 100644 --- a/lib/private/files/utils/scanner.php +++ b/lib/private/files/utils/scanner.php @@ -119,6 +119,10 @@ class Scanner extends PublicEmitter { if (is_null($mount->getStorage())) { continue; } + // don't scan the root storage + if ($mount->getStorage()->instanceOfStorage('\OC\Files\Storage\Local') && $mount->getMountPoint() === '/') { + continue; + } $scanner = $mount->getStorage()->getScanner(); $this->attachListener($mount); $scanner->backgroundScan(); diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php index c0d206a34e1..97f00385954 100644 --- a/lib/private/group/dummy.php +++ b/lib/private/group/dummy.php @@ -114,6 +114,7 @@ class OC_Group_Dummy extends OC_Group_Backend { if(isset($this->groups[$gid])) { if(($index=array_search($uid, $this->groups[$gid]))!==false) { unset($this->groups[$gid][$index]); + return true; }else{ return false; } diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 98e5551bcc5..7eca249c701 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -150,6 +150,10 @@ class Manager extends PublicEmitter implements IGroupManager { return $this->getGroupObject($gid); } + /** + * @param string $gid + * @return \OCP\IGroup + */ protected function getGroupObject($gid) { $backends = array(); foreach ($this->backends as $backend) { diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php index 21149d8b6bf..204ded7d5ab 100644 --- a/lib/private/memcache/factory.php +++ b/lib/private/memcache/factory.php @@ -172,7 +172,7 @@ class Factory implements ICacheFactory { /** * @see \OC\Memcache\Factory::createLocal() * @param string $prefix - * @return \OC\Memcache\Cache|null + * @return Cache */ public function createLowLatency($prefix = '') { return $this->createLocal($prefix); diff --git a/lib/private/preview.php b/lib/private/preview.php index df6eeceddcb..4fca56dd984 100644 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -202,7 +202,7 @@ class Preview { /** * returns the max width set in ownCloud's config * - * @return string + * @return integer */ public function getConfigMaxX() { return $this->configMaxWidth; @@ -211,7 +211,7 @@ class Preview { /** * returns the max height set in ownCloud's config * - * @return string + * @return integer */ public function getConfigMaxY() { return $this->configMaxHeight; @@ -546,7 +546,7 @@ class Preview { /** * Determines the size of the preview we should be looking for in the cache * - * @return int[] + * @return integer[] */ private function simulatePreviewDimensions() { $askedWidth = $this->getMaxX(); @@ -570,7 +570,7 @@ class Preview { * * @param int $originalWidth * @param int $originalHeight - * @return \int[] + * @return integer[] */ private function applyAspectRatio($askedWidth, $askedHeight, $originalWidth = 0, $originalHeight = 0) { if(!$originalWidth){ @@ -602,7 +602,7 @@ class Preview { * @param int $askedHeight * @param int $previewWidth * @param int $previewHeight - * @return \int[] + * @return integer[] */ private function applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight) { $originalRatio = $previewWidth / $previewHeight; @@ -628,7 +628,7 @@ class Preview { * @param int $askedWidth * @param int $askedHeight * - * @return \int[] + * @return integer[] */ private function fixSize($askedWidth, $askedHeight) { if ($this->scalingUp) { @@ -921,7 +921,7 @@ class Preview { * @param int $askedWidth * @param int $askedHeight * @param int $previewWidth - * @param null $previewHeight + * @param int $previewHeight * * @return int[] */ @@ -971,7 +971,7 @@ class Preview { * @param int $askedWidth * @param int $askedHeight * @param int $previewWidth - * @param null $previewHeight + * @param int $previewHeight */ private function crop($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight = null) { $cropX = floor(abs($askedWidth - $previewWidth) * 0.5); @@ -990,7 +990,7 @@ class Preview { * @param int $askedWidth * @param int $askedHeight * @param int $previewWidth - * @param null $previewHeight + * @param int $previewHeight */ private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { if ($previewWidth > $askedWidth) { @@ -1218,7 +1218,7 @@ class Preview { * @param int $maxDim * @param string $dimName * - * @return mixed + * @return integer */ private function limitMaxDim($dim, $maxDim, $dimName) { if (!is_null($maxDim)) { diff --git a/lib/private/preview/movie.php b/lib/private/preview/movie.php index ee56f017229..43a8d674fc9 100644 --- a/lib/private/preview/movie.php +++ b/lib/private/preview/movie.php @@ -83,9 +83,9 @@ class Movie extends Provider { $tmpPath = \OC::$server->getTempManager()->getTemporaryFile(); if (self::$avconvBinary) { - $cmd = self::$avconvBinary . ' -an -y -ss ' . escapeshellarg($second) . + $cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) . ' -i ' . escapeshellarg($absPath) . - ' -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) . + ' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) . ' > /dev/null 2>&1'; } else { $cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) . diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php index 4cff3dc818b..9b33e947557 100644 --- a/lib/private/share20/manager.php +++ b/lib/private/share20/manager.php @@ -517,8 +517,20 @@ class Manager implements IManager { // Verify if there are any issues with the path $this->pathCreateChecks($share->getNode()); - // On creation of a share the owner is always the owner of the path - $share->setShareOwner($share->getNode()->getOwner()->getUID()); + /* + * On creation of a share the owner is always the owner of the path + * Except for mounted federated shares. + */ + $storage = $share->getNode()->getStorage(); + if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) { + $parent = $share->getNode()->getParent(); + while($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) { + $parent = $parent->getParent(); + } + $share->setShareOwner($parent->getOwner()->getUID()); + } else { + $share->setShareOwner($share->getNode()->getOwner()->getUID()); + } // Cannot share with the owner if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER && diff --git a/lib/private/systemtag/systemtagobjectmapper.php b/lib/private/systemtag/systemtagobjectmapper.php index 1efb4f0f6e0..586351cf8c1 100644 --- a/lib/private/systemtag/systemtagobjectmapper.php +++ b/lib/private/systemtag/systemtagobjectmapper.php @@ -95,7 +95,7 @@ class SystemTagObjectMapper implements ISystemTagObjectMapper { /** * {@inheritdoc} */ - public function getObjectIdsForTags($tagIds, $objectType) { + public function getObjectIdsForTags($tagIds, $objectType, $limit = 0, $offset = '') { if (!is_array($tagIds)) { $tagIds = [$tagIds]; } @@ -103,12 +103,23 @@ class SystemTagObjectMapper implements ISystemTagObjectMapper { $this->assertTagsExist($tagIds); $query = $this->connection->getQueryBuilder(); - $query->select($query->createFunction('DISTINCT(`objectid`)')) + $query->selectDistinct('objectid') ->from(self::RELATION_TABLE) - ->where($query->expr()->in('systemtagid', $query->createParameter('tagids'))) - ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype'))) - ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY) - ->setParameter('objecttype', $objectType); + ->where($query->expr()->in('systemtagid', $query->createNamedParameter($tagIds, IQueryBuilder::PARAM_INT_ARRAY))) + ->andWhere($query->expr()->eq('objecttype', $query->createNamedParameter($objectType))); + + if ($limit) { + if (sizeof($tagIds) !== 1) { + throw new \InvalidArgumentException('Limit is only allowed with a single tag'); + } + + $query->setMaxResults($limit) + ->orderBy('objectid', 'ASC'); + + if ($offset !== '') { + $query->andWhere($query->expr()->gt('objectid', $query->createNamedParameter($offset))); + } + } $objectIds = []; @@ -208,7 +219,7 @@ class SystemTagObjectMapper implements ISystemTagObjectMapper { ->where($query->expr()->in('objectid', $query->createParameter('objectids'))) ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype'))) ->andWhere($query->expr()->eq('systemtagid', $query->createParameter('tagid'))) - ->setParameter('objectids', $objIds, IQueryBuilder::PARAM_INT_ARRAY) + ->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY) ->setParameter('tagid', $tagId) ->setParameter('objecttype', $objectType); diff --git a/lib/public/appframework/utility/icontrollermethodreflector.php b/lib/public/appframework/utility/icontrollermethodreflector.php index b2f91fdb170..7bf422aa567 100644 --- a/lib/public/appframework/utility/icontrollermethodreflector.php +++ b/lib/public/appframework/utility/icontrollermethodreflector.php @@ -35,6 +35,7 @@ interface IControllerMethodReflector { /** * @param object $object an object or classname * @param string $method the method which we want to inspect + * @return void * @since 8.0.0 */ public function reflect($object, $method); diff --git a/lib/public/db/querybuilder/iexpressionbuilder.php b/lib/public/db/querybuilder/iexpressionbuilder.php index 4b53a0e0b8b..0ed15bf4398 100644 --- a/lib/public/db/querybuilder/iexpressionbuilder.php +++ b/lib/public/db/querybuilder/iexpressionbuilder.php @@ -264,6 +264,19 @@ interface IExpressionBuilder { public function notLike($x, $y, $type = null); /** + * Creates a ILIKE() comparison expression with the given arguments. + * + * @param string $x Field in string format to be inspected by ILIKE() comparison. + * @param mixed $y Argument to be used in ILIKE() comparison. + * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants + * required when comparing text fields for oci compatibility + * + * @return string + * @since 9.0.0 + */ + public function iLike($x, $y, $type = null); + + /** * Creates a IN () comparison expression with the given arguments. * * @param string $x The field in string format to be inspected by IN() comparison. diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php index 45e0b79c2a9..df30dd57cee 100644 --- a/lib/public/encryption/iencryptionmodule.php +++ b/lib/public/encryption/iencryptionmodule.php @@ -71,29 +71,41 @@ interface IEncryptionModule { * buffer. * * @param string $path to the file + * @param string $position id of the last block (looks like "<Number>end") + * * @return string remained data which should be written to the file in case * of a write operation + * * @since 8.1.0 + * @since 9.0.0 parameter $position added */ - public function end($path); + public function end($path, $position); /** * encrypt data * * @param string $data you want to encrypt + * @param string $position position of the block we want to encrypt (starts with '0') + * * @return mixed encrypted data + * * @since 8.1.0 + * @since 9.0.0 parameter $position added */ - public function encrypt($data); + public function encrypt($data, $position); /** * decrypt data * * @param string $data you want to decrypt + * @param string $position position of the block we want to decrypt + * * @return mixed decrypted data + * * @since 8.1.0 + * @since 9.0.0 parameter $position added */ - public function decrypt($data); + public function decrypt($data, $position); /** * update encrypted file, e.g. give additional users access to the file diff --git a/lib/public/iavatarmanager.php b/lib/public/iavatarmanager.php index 264c4fcf051..cb63ccaf6fd 100644 --- a/lib/public/iavatarmanager.php +++ b/lib/public/iavatarmanager.php @@ -36,6 +36,8 @@ interface IAvatarManager { * @see \OCP\IAvatar * @param string $user the ownCloud user id * @return \OCP\IAvatar + * @throws \Exception In case the username is potentially dangerous + * @throws \OCP\Files\NotFoundException In case there is no user folder yet * @since 6.0.0 */ public function getAvatar($user); diff --git a/lib/public/search/pagedprovider.php b/lib/public/search/pagedprovider.php index 93289a1bde4..c8530626e59 100644 --- a/lib/public/search/pagedprovider.php +++ b/lib/public/search/pagedprovider.php @@ -58,7 +58,7 @@ abstract class PagedProvider extends Provider { * Search for $query * @param string $query * @param int $page pages start at page 1 - * @param int $size, 0 = SIZE_ALL + * @param int $size 0 = SIZE_ALL * @return array An array of OCP\Search\Result's * @since 8.0.0 */ diff --git a/lib/public/systemtag/isystemtagobjectmapper.php b/lib/public/systemtag/isystemtagobjectmapper.php index 8db5cdd31aa..59b988a3656 100644 --- a/lib/public/systemtag/isystemtagobjectmapper.php +++ b/lib/public/systemtag/isystemtagobjectmapper.php @@ -57,15 +57,19 @@ interface ISystemTagObjectMapper { * * @param string|array $tagIds Tag id or array of tag ids. * @param string $objectType object type + * @param int $limit Count of object ids you want to get + * @param string $offset The last object id you already received * * @return string[] array of object ids or empty array if none found * * @throws \OCP\SystemTag\TagNotFoundException if at least one of the * given tags does not exist + * @throws \InvalidArgumentException When a limit is specified together with + * multiple tag ids * * @since 9.0.0 */ - public function getObjectIdsForTags($tagIds, $objectType); + public function getObjectIdsForTags($tagIds, $objectType, $limit = 0, $offset = ''); /** * Assign the given tags to the given object. |