diff options
Diffstat (limited to 'apps')
868 files changed, 3679 insertions, 2028 deletions
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 415ec2a9be5..9475dc53fc0 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -172,7 +172,7 @@ this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 28); } this.delegateEvents(); - this.$el.find('textarea').on('keyup input change', this._onTypeComment); + this.$el.find('textarea').on('keydown input change', this._onTypeComment); }, _formatItem: function(commentModel) { @@ -273,7 +273,7 @@ // spawn form $comment.after($formRow); $formRow.data('commentEl', $comment); - $formRow.find('textarea').on('keyup input change', this._onTypeComment); + $formRow.find('textarea').on('keydown input change', this._onTypeComment); // copy avatar element from original to avoid flickering $formRow.find('.avatar').replaceWith($comment.find('.avatar').clone()); @@ -301,6 +301,11 @@ var limitExceeded = (len > this._commentMaxLength); $field.toggleClass('error', limitExceeded); $submitButton.prop('disabled', limitExceeded); + + //submits form on ctrl+Enter or cmd+Enter + if (ev.keyCode === 13 && (ev.ctrlKey || ev.metaKey)) { + $submitButton.click(); + } }, _onClickComment: function(ev) { diff --git a/apps/comments/l10n/cs_CZ.js b/apps/comments/l10n/cs_CZ.js index a87dac3fde9..d41b0f99f42 100644 --- a/apps/comments/l10n/cs_CZ.js +++ b/apps/comments/l10n/cs_CZ.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentáře</strong> pro soubory <em>(vždy uvedeny v proudu)</em>", - "You commented" : "Okomentoval(a) jsi", - "%1$s commented" : "%1$s okomentován", - "You commented on %2$s" : "Okomentoval(a) jsi %2$s", - "%1$s commented on %2$s" : "%1$s okomentoval %2$s", - "Comments" : "Komentáře", "Type in a new comment..." : "Zadat nový komentář...", "Delete comment" : "Smazat komentář", "Post" : "Zveřejnit", "Cancel" : "Zrušit", "Edit comment" : "Upravit komentář", "[Deleted user]" : "[Smazaný uživatel]", + "Comments" : "Komentáře", "No other comments available" : "Nejsou dostupné žádné další komentáře", "More comments..." : "Více komentářů...", "Save" : "Uložit", "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}", "{count} unread comments" : "{count} nepřečtených komentářů", - "Comment" : "Komentář" + "Comment" : "Komentář", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentáře</strong> pro soubory <em>(vždy uvedeny v proudu)</em>", + "You commented" : "Okomentoval(a) jsi", + "%1$s commented" : "%1$s okomentován", + "You commented on %2$s" : "Okomentoval(a) jsi %2$s", + "%1$s commented on %2$s" : "%1$s okomentoval %2$s" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/comments/l10n/cs_CZ.json b/apps/comments/l10n/cs_CZ.json index e646b72a49d..c695e50c646 100644 --- a/apps/comments/l10n/cs_CZ.json +++ b/apps/comments/l10n/cs_CZ.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentáře</strong> pro soubory <em>(vždy uvedeny v proudu)</em>", - "You commented" : "Okomentoval(a) jsi", - "%1$s commented" : "%1$s okomentován", - "You commented on %2$s" : "Okomentoval(a) jsi %2$s", - "%1$s commented on %2$s" : "%1$s okomentoval %2$s", - "Comments" : "Komentáře", "Type in a new comment..." : "Zadat nový komentář...", "Delete comment" : "Smazat komentář", "Post" : "Zveřejnit", "Cancel" : "Zrušit", "Edit comment" : "Upravit komentář", "[Deleted user]" : "[Smazaný uživatel]", + "Comments" : "Komentáře", "No other comments available" : "Nejsou dostupné žádné další komentáře", "More comments..." : "Více komentářů...", "Save" : "Uložit", "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}", "{count} unread comments" : "{count} nepřečtených komentářů", - "Comment" : "Komentář" + "Comment" : "Komentář", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentáře</strong> pro soubory <em>(vždy uvedeny v proudu)</em>", + "You commented" : "Okomentoval(a) jsi", + "%1$s commented" : "%1$s okomentován", + "You commented on %2$s" : "Okomentoval(a) jsi %2$s", + "%1$s commented on %2$s" : "%1$s okomentoval %2$s" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/comments/l10n/da.js b/apps/comments/l10n/da.js index 196a298a61a..1b827fe59b5 100644 --- a/apps/comments/l10n/da.js +++ b/apps/comments/l10n/da.js @@ -1,22 +1,22 @@ OC.L10N.register( "comments", { - "You commented" : "Du kommenterede", - "%1$s commented" : "%1$s kommenterede", - "You commented on %2$s" : "Du kommenterede %2$s", - "%1$s commented on %2$s" : "%1$s kommenterede %2$s", - "Comments" : "Kommentarer", "Type in a new comment..." : "Indtast en ny kommentar...", "Delete comment" : "Slet kommentar", "Post" : "Indlæg", "Cancel" : "Annullér", "Edit comment" : "Rediger kommentar", "[Deleted user]" : "[Deleted user]", + "Comments" : "Kommentarer", "No other comments available" : "Ingen andre kommentarer tilgængelige", "More comments..." : "Flere kommentarer...", "Save" : "Gem", "Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}", "{count} unread comments" : "{count} ulæste kommentarer", - "Comment" : "Kommentér" + "Comment" : "Kommentér", + "You commented" : "Du kommenterede", + "%1$s commented" : "%1$s kommenterede", + "You commented on %2$s" : "Du kommenterede %2$s", + "%1$s commented on %2$s" : "%1$s kommenterede %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/da.json b/apps/comments/l10n/da.json index f9ce94f7d70..051e9ddeadd 100644 --- a/apps/comments/l10n/da.json +++ b/apps/comments/l10n/da.json @@ -1,20 +1,20 @@ { "translations": { - "You commented" : "Du kommenterede", - "%1$s commented" : "%1$s kommenterede", - "You commented on %2$s" : "Du kommenterede %2$s", - "%1$s commented on %2$s" : "%1$s kommenterede %2$s", - "Comments" : "Kommentarer", "Type in a new comment..." : "Indtast en ny kommentar...", "Delete comment" : "Slet kommentar", "Post" : "Indlæg", "Cancel" : "Annullér", "Edit comment" : "Rediger kommentar", "[Deleted user]" : "[Deleted user]", + "Comments" : "Kommentarer", "No other comments available" : "Ingen andre kommentarer tilgængelige", "More comments..." : "Flere kommentarer...", "Save" : "Gem", "Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}", "{count} unread comments" : "{count} ulæste kommentarer", - "Comment" : "Kommentér" + "Comment" : "Kommentér", + "You commented" : "Du kommenterede", + "%1$s commented" : "%1$s kommenterede", + "You commented on %2$s" : "Du kommenterede %2$s", + "%1$s commented on %2$s" : "%1$s kommenterede %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/de.js b/apps/comments/l10n/de.js index e9873ed9ad6..ebf473c6b9c 100644 --- a/apps/comments/l10n/de.js +++ b/apps/comments/l10n/de.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", - "You commented" : "Du hast kommentiert", - "%1$s commented" : "%1$s kommentierte", - "You commented on %2$s" : "Du hast %2$s kommentiert", - "%1$s commented on %2$s" : "%1$s kommentierte %2$s", - "Comments" : "Kommentare", "Type in a new comment..." : "Bitte gib einen neuen Kommentar ein...", "Delete comment" : "Kommentar löschen", "Post" : "Speichern", "Cancel" : "Abbrechen", "Edit comment" : "Kommentar bearbeiten", "[Deleted user]" : "[Gelöschter Benutzer]", + "Comments" : "Kommentare", "No other comments available" : "Keine anderen Kommentare vorhanden", "More comments..." : "Weitere Kommentare...", "Save" : "Speichern", "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}", "{count} unread comments" : "{count} ungelesene Kommentare", - "Comment" : "Kommentar" + "Comment" : "Kommentar", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", + "You commented" : "Du hast kommentiert", + "%1$s commented" : "%1$s kommentierte", + "You commented on %2$s" : "Du hast %2$s kommentiert", + "%1$s commented on %2$s" : "%1$s kommentierte %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/de.json b/apps/comments/l10n/de.json index 1109a095af0..0e4bc1b53bd 100644 --- a/apps/comments/l10n/de.json +++ b/apps/comments/l10n/de.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", - "You commented" : "Du hast kommentiert", - "%1$s commented" : "%1$s kommentierte", - "You commented on %2$s" : "Du hast %2$s kommentiert", - "%1$s commented on %2$s" : "%1$s kommentierte %2$s", - "Comments" : "Kommentare", "Type in a new comment..." : "Bitte gib einen neuen Kommentar ein...", "Delete comment" : "Kommentar löschen", "Post" : "Speichern", "Cancel" : "Abbrechen", "Edit comment" : "Kommentar bearbeiten", "[Deleted user]" : "[Gelöschter Benutzer]", + "Comments" : "Kommentare", "No other comments available" : "Keine anderen Kommentare vorhanden", "More comments..." : "Weitere Kommentare...", "Save" : "Speichern", "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}", "{count} unread comments" : "{count} ungelesene Kommentare", - "Comment" : "Kommentar" + "Comment" : "Kommentar", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", + "You commented" : "Du hast kommentiert", + "%1$s commented" : "%1$s kommentierte", + "You commented on %2$s" : "Du hast %2$s kommentiert", + "%1$s commented on %2$s" : "%1$s kommentierte %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/de_DE.js b/apps/comments/l10n/de_DE.js index bdd0d8516ce..74e129e0a29 100644 --- a/apps/comments/l10n/de_DE.js +++ b/apps/comments/l10n/de_DE.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", - "You commented" : "Durch dich kommentiert", - "%1$s commented" : "%1$s kommentiert", - "You commented on %2$s" : "Sie haben %2$s kommentiert", - "%1$s commented on %2$s" : "%1$s kommentierte %2$s", - "Comments" : "Kommentare", "Type in a new comment..." : "Neuer Kommentar...", "Delete comment" : "Kommentar löschen", "Post" : "Speichern", "Cancel" : "Abbrechen", "Edit comment" : "Kommentar bearbeiten", "[Deleted user]" : "[gelöschter Benutzer]", + "Comments" : "Kommentare", "No other comments available" : "Keine anderen Kommentare verfügbar", "More comments..." : "Weitere Kommentare...", "Save" : "Speichern", "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt", "{count} unread comments" : "[count] ungelesene Kommentare", - "Comment" : "Kommentar" + "Comment" : "Kommentar", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", + "You commented" : "Durch dich kommentiert", + "%1$s commented" : "%1$s kommentiert", + "You commented on %2$s" : "Sie haben %2$s kommentiert", + "%1$s commented on %2$s" : "%1$s kommentierte %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/de_DE.json b/apps/comments/l10n/de_DE.json index 509cd837d54..6c18cf15fc1 100644 --- a/apps/comments/l10n/de_DE.json +++ b/apps/comments/l10n/de_DE.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", - "You commented" : "Durch dich kommentiert", - "%1$s commented" : "%1$s kommentiert", - "You commented on %2$s" : "Sie haben %2$s kommentiert", - "%1$s commented on %2$s" : "%1$s kommentierte %2$s", - "Comments" : "Kommentare", "Type in a new comment..." : "Neuer Kommentar...", "Delete comment" : "Kommentar löschen", "Post" : "Speichern", "Cancel" : "Abbrechen", "Edit comment" : "Kommentar bearbeiten", "[Deleted user]" : "[gelöschter Benutzer]", + "Comments" : "Kommentare", "No other comments available" : "Keine anderen Kommentare verfügbar", "More comments..." : "Weitere Kommentare...", "Save" : "Speichern", "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt", "{count} unread comments" : "[count] ungelesene Kommentare", - "Comment" : "Kommentar" + "Comment" : "Kommentar", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", + "You commented" : "Durch dich kommentiert", + "%1$s commented" : "%1$s kommentiert", + "You commented on %2$s" : "Sie haben %2$s kommentiert", + "%1$s commented on %2$s" : "%1$s kommentierte %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/el.js b/apps/comments/l10n/el.js index c88bf2c2ecc..297028adf74 100644 --- a/apps/comments/l10n/el.js +++ b/apps/comments/l10n/el.js @@ -1,22 +1,22 @@ OC.L10N.register( "comments", { - "You commented" : "Σχολιάσατε", - "%1$s commented" : "%1$s σχολίασε", - "You commented on %2$s" : "Σχολιάσατε στο %2$s", - "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s", - "Comments" : "Σχόλια", "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...", "Delete comment" : "Διαγραφή σχολίου", "Post" : "Δημοσίευση", "Cancel" : "Άκυρο", "Edit comment" : "Επεξεργασία σχολίου", "[Deleted user]" : "[Διαγραφή χρήστη]", + "Comments" : "Σχόλια", "No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια", "More comments..." : "Περισσότερα σχόλια...", "Save" : "Αποθήκευση", "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}", "{count} unread comments" : "{count} μη αναγνωσμένα σχόλια", - "Comment" : "Σχόλιο" + "Comment" : "Σχόλιο", + "You commented" : "Σχολιάσατε", + "%1$s commented" : "%1$s σχολίασε", + "You commented on %2$s" : "Σχολιάσατε στο %2$s", + "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/el.json b/apps/comments/l10n/el.json index 30c1fb9de34..df9977426aa 100644 --- a/apps/comments/l10n/el.json +++ b/apps/comments/l10n/el.json @@ -1,20 +1,20 @@ { "translations": { - "You commented" : "Σχολιάσατε", - "%1$s commented" : "%1$s σχολίασε", - "You commented on %2$s" : "Σχολιάσατε στο %2$s", - "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s", - "Comments" : "Σχόλια", "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...", "Delete comment" : "Διαγραφή σχολίου", "Post" : "Δημοσίευση", "Cancel" : "Άκυρο", "Edit comment" : "Επεξεργασία σχολίου", "[Deleted user]" : "[Διαγραφή χρήστη]", + "Comments" : "Σχόλια", "No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια", "More comments..." : "Περισσότερα σχόλια...", "Save" : "Αποθήκευση", "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}", "{count} unread comments" : "{count} μη αναγνωσμένα σχόλια", - "Comment" : "Σχόλιο" + "Comment" : "Σχόλιο", + "You commented" : "Σχολιάσατε", + "%1$s commented" : "%1$s σχολίασε", + "You commented on %2$s" : "Σχολιάσατε στο %2$s", + "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/en_GB.js b/apps/comments/l10n/en_GB.js index cabce50d16d..d8e5c5d8240 100644 --- a/apps/comments/l10n/en_GB.js +++ b/apps/comments/l10n/en_GB.js @@ -1,22 +1,23 @@ OC.L10N.register( "comments", { - "You commented" : "You commented", - "%1$s commented" : "%1$s commented", - "You commented on %2$s" : "You commented on %2$s", - "%1$s commented on %2$s" : "%1$s commented on %2$s", - "Comments" : "Comments", "Type in a new comment..." : "Type in a new comment...", "Delete comment" : "Delete comment", "Post" : "Post", "Cancel" : "Cancel", "Edit comment" : "Edit comment", "[Deleted user]" : "[Deleted user]", + "Comments" : "Comments", "No other comments available" : "No other comments available", "More comments..." : "More comments...", "Save" : "Save", "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}", "{count} unread comments" : "{count} unread comments", - "Comment" : "Comment" + "Comment" : "Comment", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comments</strong> for files <em>(always listed in stream)</em>", + "You commented" : "You commented", + "%1$s commented" : "%1$s commented", + "You commented on %2$s" : "You commented on %2$s", + "%1$s commented on %2$s" : "%1$s commented on %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/en_GB.json b/apps/comments/l10n/en_GB.json index 2b4e51ccd80..ccf4a1338d1 100644 --- a/apps/comments/l10n/en_GB.json +++ b/apps/comments/l10n/en_GB.json @@ -1,20 +1,21 @@ { "translations": { - "You commented" : "You commented", - "%1$s commented" : "%1$s commented", - "You commented on %2$s" : "You commented on %2$s", - "%1$s commented on %2$s" : "%1$s commented on %2$s", - "Comments" : "Comments", "Type in a new comment..." : "Type in a new comment...", "Delete comment" : "Delete comment", "Post" : "Post", "Cancel" : "Cancel", "Edit comment" : "Edit comment", "[Deleted user]" : "[Deleted user]", + "Comments" : "Comments", "No other comments available" : "No other comments available", "More comments..." : "More comments...", "Save" : "Save", "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}", "{count} unread comments" : "{count} unread comments", - "Comment" : "Comment" + "Comment" : "Comment", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comments</strong> for files <em>(always listed in stream)</em>", + "You commented" : "You commented", + "%1$s commented" : "%1$s commented", + "You commented on %2$s" : "You commented on %2$s", + "%1$s commented on %2$s" : "%1$s commented on %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/eo.js b/apps/comments/l10n/eo.js index 2843625bc5b..c9416bf59a9 100644 --- a/apps/comments/l10n/eo.js +++ b/apps/comments/l10n/eo.js @@ -1,20 +1,20 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s komentis", - "%1$s commented on %2$s" : "%1$s komentis %2$s", - "Comments" : "Komentoj", "Type in a new comment..." : "Tajpu novan komenton...", "Delete comment" : "Forigi komenton", "Post" : "Afiŝi", "Cancel" : "Nuligi", "Edit comment" : "Redakti komenton", "[Deleted user]" : "[Forigita uzanto]", + "Comments" : "Komentoj", "No other comments available" : "Neniu alia komento disponeblas", "More comments..." : "Pli da komentoj...", "Save" : "Konservi", "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}", "{count} unread comments" : "{count} nelegitaj komentoj", - "Comment" : "Komento" + "Comment" : "Komento", + "%1$s commented" : "%1$s komentis", + "%1$s commented on %2$s" : "%1$s komentis %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/eo.json b/apps/comments/l10n/eo.json index 3fcecdd4e34..b14d92caefa 100644 --- a/apps/comments/l10n/eo.json +++ b/apps/comments/l10n/eo.json @@ -1,18 +1,18 @@ { "translations": { - "%1$s commented" : "%1$s komentis", - "%1$s commented on %2$s" : "%1$s komentis %2$s", - "Comments" : "Komentoj", "Type in a new comment..." : "Tajpu novan komenton...", "Delete comment" : "Forigi komenton", "Post" : "Afiŝi", "Cancel" : "Nuligi", "Edit comment" : "Redakti komenton", "[Deleted user]" : "[Forigita uzanto]", + "Comments" : "Komentoj", "No other comments available" : "Neniu alia komento disponeblas", "More comments..." : "Pli da komentoj...", "Save" : "Konservi", "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}", "{count} unread comments" : "{count} nelegitaj komentoj", - "Comment" : "Komento" + "Comment" : "Komento", + "%1$s commented" : "%1$s komentis", + "%1$s commented on %2$s" : "%1$s komentis %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/es.js b/apps/comments/l10n/es.js index 906b5643f04..98d9d422365 100644 --- a/apps/comments/l10n/es.js +++ b/apps/comments/l10n/es.js @@ -1,22 +1,23 @@ OC.L10N.register( "comments", { - "You commented" : "Has comentado", - "%1$s commented" : "%1$s comentados", - "You commented on %2$s" : "Has comentado en %2$s", - "%1$s commented on %2$s" : "%1$s comentados en %2$s", - "Comments" : "Comentarios", - "Type in a new comment..." : "Ingrese un nuevo comentario...", + "Type in a new comment..." : "Escribe un nuevo comentario...", "Delete comment" : "Borrar comentario", "Post" : "Publicar", "Cancel" : "Cancelar", "Edit comment" : "Editar comentario", "[Deleted user]" : "[Usuario eliminado]", + "Comments" : "Comentarios", "No other comments available" : "No hay otros comentarios disponibles", "More comments..." : "Más comentarios...", "Save" : "Guardar", "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}", "{count} unread comments" : "{count} comentarios no leídos", - "Comment" : "Comentario" + "Comment" : "Comentario", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentarios</strong> de archivos <em>(siempre se listarán en stream)</em>", + "You commented" : "Has comentado", + "%1$s commented" : "%1$s comentados", + "You commented on %2$s" : "Has comentado en %2$s", + "%1$s commented on %2$s" : "%1$s comentados en %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/es.json b/apps/comments/l10n/es.json index 7eeade965d2..636342911c2 100644 --- a/apps/comments/l10n/es.json +++ b/apps/comments/l10n/es.json @@ -1,20 +1,21 @@ { "translations": { - "You commented" : "Has comentado", - "%1$s commented" : "%1$s comentados", - "You commented on %2$s" : "Has comentado en %2$s", - "%1$s commented on %2$s" : "%1$s comentados en %2$s", - "Comments" : "Comentarios", - "Type in a new comment..." : "Ingrese un nuevo comentario...", + "Type in a new comment..." : "Escribe un nuevo comentario...", "Delete comment" : "Borrar comentario", "Post" : "Publicar", "Cancel" : "Cancelar", "Edit comment" : "Editar comentario", "[Deleted user]" : "[Usuario eliminado]", + "Comments" : "Comentarios", "No other comments available" : "No hay otros comentarios disponibles", "More comments..." : "Más comentarios...", "Save" : "Guardar", "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}", "{count} unread comments" : "{count} comentarios no leídos", - "Comment" : "Comentario" + "Comment" : "Comentario", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentarios</strong> de archivos <em>(siempre se listarán en stream)</em>", + "You commented" : "Has comentado", + "%1$s commented" : "%1$s comentados", + "You commented on %2$s" : "Has comentado en %2$s", + "%1$s commented on %2$s" : "%1$s comentados en %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/et_EE.js b/apps/comments/l10n/et_EE.js index cba33642bfa..0979ed0c04b 100644 --- a/apps/comments/l10n/et_EE.js +++ b/apps/comments/l10n/et_EE.js @@ -1,22 +1,22 @@ OC.L10N.register( "comments", { - "You commented" : "Sa kommenteerisid", - "%1$s commented" : "%1$s kommenteeris", - "You commented on %2$s" : "Sa kommenteerisid %2$s", - "%1$s commented on %2$s" : "%1$s kommenteeris %2$s", - "Comments" : "Kommentaarid", "Type in a new comment..." : "Kirjuta uus komentaar...", "Delete comment" : "Kustuta kommentaar", "Post" : "Postita", "Cancel" : "Loobu", "Edit comment" : "Muuda kommentaari", "[Deleted user]" : "[Kustutatud kasutaja]", + "Comments" : "Kommentaarid", "No other comments available" : "Ühtegi teist kommentaari pole saadaval", "More comments..." : "Veel kommentaare...", "Save" : "Salvesta", "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}", "{count} unread comments" : "{count} lugemata kommentaari", - "Comment" : "Kommentaar" + "Comment" : "Kommentaar", + "You commented" : "Sa kommenteerisid", + "%1$s commented" : "%1$s kommenteeris", + "You commented on %2$s" : "Sa kommenteerisid %2$s", + "%1$s commented on %2$s" : "%1$s kommenteeris %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/et_EE.json b/apps/comments/l10n/et_EE.json index be23a869c28..93051ab6ddd 100644 --- a/apps/comments/l10n/et_EE.json +++ b/apps/comments/l10n/et_EE.json @@ -1,20 +1,20 @@ { "translations": { - "You commented" : "Sa kommenteerisid", - "%1$s commented" : "%1$s kommenteeris", - "You commented on %2$s" : "Sa kommenteerisid %2$s", - "%1$s commented on %2$s" : "%1$s kommenteeris %2$s", - "Comments" : "Kommentaarid", "Type in a new comment..." : "Kirjuta uus komentaar...", "Delete comment" : "Kustuta kommentaar", "Post" : "Postita", "Cancel" : "Loobu", "Edit comment" : "Muuda kommentaari", "[Deleted user]" : "[Kustutatud kasutaja]", + "Comments" : "Kommentaarid", "No other comments available" : "Ühtegi teist kommentaari pole saadaval", "More comments..." : "Veel kommentaare...", "Save" : "Salvesta", "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}", "{count} unread comments" : "{count} lugemata kommentaari", - "Comment" : "Kommentaar" + "Comment" : "Kommentaar", + "You commented" : "Sa kommenteerisid", + "%1$s commented" : "%1$s kommenteeris", + "You commented on %2$s" : "Sa kommenteerisid %2$s", + "%1$s commented on %2$s" : "%1$s kommenteeris %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/fi_FI.js b/apps/comments/l10n/fi_FI.js index 0c503a77586..7b4de946763 100644 --- a/apps/comments/l10n/fi_FI.js +++ b/apps/comments/l10n/fi_FI.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentit</strong> tiedostoille <em>(aina listattu luettelossa)</em>", - "You commented" : "Kommentoit", - "%1$s commented" : "%1$s kommentoi", - "You commented on %2$s" : "Kommentoit %2$s", - "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s", - "Comments" : "Kommentit", "Type in a new comment..." : "Kirjoita uusi kommentti...", "Delete comment" : "Poista kommentti", "Post" : "Lähetä", "Cancel" : "Peruuta", "Edit comment" : "Muokkaa kommenttia", "[Deleted user]" : "[Poistettu käyttäjä]", + "Comments" : "Kommentit", "No other comments available" : "Ei muita kommentteja saatavilla", "More comments..." : "Lisää kommentteja...", "Save" : "Tallenna", "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}", "{count} unread comments" : "{count} lukematonta kommenttia", - "Comment" : "Kommentti" + "Comment" : "Kommentti", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentit</strong> tiedostoille <em>(aina listattu luettelossa)</em>", + "You commented" : "Kommentoit", + "%1$s commented" : "%1$s kommentoi", + "You commented on %2$s" : "Kommentoit %2$s", + "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/fi_FI.json b/apps/comments/l10n/fi_FI.json index 2821281b0cc..5e9bcc74402 100644 --- a/apps/comments/l10n/fi_FI.json +++ b/apps/comments/l10n/fi_FI.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentit</strong> tiedostoille <em>(aina listattu luettelossa)</em>", - "You commented" : "Kommentoit", - "%1$s commented" : "%1$s kommentoi", - "You commented on %2$s" : "Kommentoit %2$s", - "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s", - "Comments" : "Kommentit", "Type in a new comment..." : "Kirjoita uusi kommentti...", "Delete comment" : "Poista kommentti", "Post" : "Lähetä", "Cancel" : "Peruuta", "Edit comment" : "Muokkaa kommenttia", "[Deleted user]" : "[Poistettu käyttäjä]", + "Comments" : "Kommentit", "No other comments available" : "Ei muita kommentteja saatavilla", "More comments..." : "Lisää kommentteja...", "Save" : "Tallenna", "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}", "{count} unread comments" : "{count} lukematonta kommenttia", - "Comment" : "Kommentti" + "Comment" : "Kommentti", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentit</strong> tiedostoille <em>(aina listattu luettelossa)</em>", + "You commented" : "Kommentoit", + "%1$s commented" : "%1$s kommentoi", + "You commented on %2$s" : "Kommentoit %2$s", + "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/fr.js b/apps/comments/l10n/fr.js index 64f95662029..720c9518b2e 100644 --- a/apps/comments/l10n/fr.js +++ b/apps/comments/l10n/fr.js @@ -1,22 +1,23 @@ OC.L10N.register( "comments", { - "You commented" : "Vous avez commenté", - "%1$s commented" : "%1$s a commenté", - "You commented on %2$s" : "Vous avez commenté %2$s", - "%1$s commented on %2$s" : "%1$s a commenté %2$s", - "Comments" : "Commentaires", "Type in a new comment..." : "Écrire un nouveau commentaire...", "Delete comment" : "Supprimer le commentaire", "Post" : "Poster", "Cancel" : "Annuler", "Edit comment" : "Modifier le commentaire", "[Deleted user]" : "[Utilisateur supprimé]", + "Comments" : "Commentaires", "No other comments available" : "Aucun autre commentaire", "More comments..." : "Plus de commentaires...", "Save" : "Enregistrer", "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés", "{count} unread comments" : "{count} commentaires non lus", - "Comment" : "Commenter" + "Comment" : "Commenter", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commentaires</strong> pour les fichiers <em>(toujours listés dans le flux)</em>", + "You commented" : "Vous avez commenté", + "%1$s commented" : "%1$s a commenté", + "You commented on %2$s" : "Vous avez commenté %2$s", + "%1$s commented on %2$s" : "%1$s a commenté %2$s" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/comments/l10n/fr.json b/apps/comments/l10n/fr.json index 5d1c1895447..25cbfa4daa2 100644 --- a/apps/comments/l10n/fr.json +++ b/apps/comments/l10n/fr.json @@ -1,20 +1,21 @@ { "translations": { - "You commented" : "Vous avez commenté", - "%1$s commented" : "%1$s a commenté", - "You commented on %2$s" : "Vous avez commenté %2$s", - "%1$s commented on %2$s" : "%1$s a commenté %2$s", - "Comments" : "Commentaires", "Type in a new comment..." : "Écrire un nouveau commentaire...", "Delete comment" : "Supprimer le commentaire", "Post" : "Poster", "Cancel" : "Annuler", "Edit comment" : "Modifier le commentaire", "[Deleted user]" : "[Utilisateur supprimé]", + "Comments" : "Commentaires", "No other comments available" : "Aucun autre commentaire", "More comments..." : "Plus de commentaires...", "Save" : "Enregistrer", "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés", "{count} unread comments" : "{count} commentaires non lus", - "Comment" : "Commenter" + "Comment" : "Commenter", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commentaires</strong> pour les fichiers <em>(toujours listés dans le flux)</em>", + "You commented" : "Vous avez commenté", + "%1$s commented" : "%1$s a commenté", + "You commented on %2$s" : "Vous avez commenté %2$s", + "%1$s commented on %2$s" : "%1$s a commenté %2$s" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/he.js b/apps/comments/l10n/he.js index e8b5e22222f..860bd6f8054 100644 --- a/apps/comments/l10n/he.js +++ b/apps/comments/l10n/he.js @@ -1,22 +1,22 @@ OC.L10N.register( "comments", { - "You commented" : "הערות שלך", - "%1$s commented" : "התקבלו תגובות %1$s", - "You commented on %2$s" : "הערות שלך ב- %2$s", - "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ", - "Comments" : "תגובות", "Type in a new comment..." : "יש להכניס תגובה חדשה...", "Delete comment" : "מחיקת תגובה", "Post" : "פרסום", "Cancel" : "ביטול", "Edit comment" : "עריכת תגובה", "[Deleted user]" : "[משתמשים מוסרים]", + "Comments" : "תגובות", "No other comments available" : "אין תגובות אחרות זמינות", "More comments..." : "תגובות נוספות...", "Save" : "שמירה", "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}", "{count} unread comments" : "{count} תגובות שלא נקראו", - "Comment" : "תגובה" + "Comment" : "תגובה", + "You commented" : "הערות שלך", + "%1$s commented" : "התקבלו תגובות %1$s", + "You commented on %2$s" : "הערות שלך ב- %2$s", + "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s " }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/he.json b/apps/comments/l10n/he.json index 8e38f34839e..32751d474d7 100644 --- a/apps/comments/l10n/he.json +++ b/apps/comments/l10n/he.json @@ -1,20 +1,20 @@ { "translations": { - "You commented" : "הערות שלך", - "%1$s commented" : "התקבלו תגובות %1$s", - "You commented on %2$s" : "הערות שלך ב- %2$s", - "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ", - "Comments" : "תגובות", "Type in a new comment..." : "יש להכניס תגובה חדשה...", "Delete comment" : "מחיקת תגובה", "Post" : "פרסום", "Cancel" : "ביטול", "Edit comment" : "עריכת תגובה", "[Deleted user]" : "[משתמשים מוסרים]", + "Comments" : "תגובות", "No other comments available" : "אין תגובות אחרות זמינות", "More comments..." : "תגובות נוספות...", "Save" : "שמירה", "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}", "{count} unread comments" : "{count} תגובות שלא נקראו", - "Comment" : "תגובה" + "Comment" : "תגובה", + "You commented" : "הערות שלך", + "%1$s commented" : "התקבלו תגובות %1$s", + "You commented on %2$s" : "הערות שלך ב- %2$s", + "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s " },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/hu_HU.js b/apps/comments/l10n/hu_HU.js index 8f789e19328..512a758932b 100644 --- a/apps/comments/l10n/hu_HU.js +++ b/apps/comments/l10n/hu_HU.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Hozzászólás</strong> a fájlokhoz <em>(mindig listázásra kerül a hírfolyamon)</em>", - "You commented" : "Hozzászólt", - "%1$s commented" : "%1$s hozzászólt", - "You commented on %2$s" : "Hozzászólt ehhez: %2$s", - "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s", - "Comments" : "Hozzászólások", "Type in a new comment..." : "Új hozzászólás írása...", "Delete comment" : "Hozzászólás törlése", "Post" : "Küldés", "Cancel" : "Mégsem", "Edit comment" : "Hozzászólás szerkesztése", "[Deleted user]" : "[Törölt felhasználó]", + "Comments" : "Hozzászólások", "No other comments available" : "Nincs több hozzászólás.", "More comments..." : "Több hozzászólás...", "Save" : "Mentés", "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}", "{count} unread comments" : "{count} olvasatlan hozzászólás", - "Comment" : "Hozzászólás" + "Comment" : "Hozzászólás", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Hozzászólás</strong> a fájlokhoz <em>(mindig listázásra kerül a hírfolyamon)</em>", + "You commented" : "Hozzászólt", + "%1$s commented" : "%1$s hozzászólt", + "You commented on %2$s" : "Hozzászólt ehhez: %2$s", + "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/hu_HU.json b/apps/comments/l10n/hu_HU.json index f10a740b510..59bd0363fb3 100644 --- a/apps/comments/l10n/hu_HU.json +++ b/apps/comments/l10n/hu_HU.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Hozzászólás</strong> a fájlokhoz <em>(mindig listázásra kerül a hírfolyamon)</em>", - "You commented" : "Hozzászólt", - "%1$s commented" : "%1$s hozzászólt", - "You commented on %2$s" : "Hozzászólt ehhez: %2$s", - "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s", - "Comments" : "Hozzászólások", "Type in a new comment..." : "Új hozzászólás írása...", "Delete comment" : "Hozzászólás törlése", "Post" : "Küldés", "Cancel" : "Mégsem", "Edit comment" : "Hozzászólás szerkesztése", "[Deleted user]" : "[Törölt felhasználó]", + "Comments" : "Hozzászólások", "No other comments available" : "Nincs több hozzászólás.", "More comments..." : "Több hozzászólás...", "Save" : "Mentés", "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}", "{count} unread comments" : "{count} olvasatlan hozzászólás", - "Comment" : "Hozzászólás" + "Comment" : "Hozzászólás", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Hozzászólás</strong> a fájlokhoz <em>(mindig listázásra kerül a hírfolyamon)</em>", + "You commented" : "Hozzászólt", + "%1$s commented" : "%1$s hozzászólt", + "You commented on %2$s" : "Hozzászólt ehhez: %2$s", + "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/id.js b/apps/comments/l10n/id.js index 87a17367b11..cecae13fb6f 100644 --- a/apps/comments/l10n/id.js +++ b/apps/comments/l10n/id.js @@ -1,20 +1,20 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s dikomentari", - "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s", - "Comments" : "Komentar", "Type in a new comment..." : "Ketik di komentar baru...", "Delete comment" : "Hapus komentar", "Post" : "Posting", "Cancel" : "Batal", "Edit comment" : "Sunting komentar", "[Deleted user]" : "[Hapus pengguna]", + "Comments" : "Komentar", "No other comments available" : "Tidak ada komentar lainnya", "More comments..." : "Komentar lainya...", "Save" : "Simpan", "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}", "{count} unread comments" : "{count} komentar belum dibaca", - "Comment" : "Komentar" + "Comment" : "Komentar", + "%1$s commented" : "%1$s dikomentari", + "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s" }, "nplurals=1; plural=0;"); diff --git a/apps/comments/l10n/id.json b/apps/comments/l10n/id.json index 601e88987a8..7836eeb40b5 100644 --- a/apps/comments/l10n/id.json +++ b/apps/comments/l10n/id.json @@ -1,18 +1,18 @@ { "translations": { - "%1$s commented" : "%1$s dikomentari", - "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s", - "Comments" : "Komentar", "Type in a new comment..." : "Ketik di komentar baru...", "Delete comment" : "Hapus komentar", "Post" : "Posting", "Cancel" : "Batal", "Edit comment" : "Sunting komentar", "[Deleted user]" : "[Hapus pengguna]", + "Comments" : "Komentar", "No other comments available" : "Tidak ada komentar lainnya", "More comments..." : "Komentar lainya...", "Save" : "Simpan", "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}", "{count} unread comments" : "{count} komentar belum dibaca", - "Comment" : "Komentar" + "Comment" : "Komentar", + "%1$s commented" : "%1$s dikomentari", + "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/comments/l10n/is.js b/apps/comments/l10n/is.js index 2330e6fe10b..6e1faa9b251 100644 --- a/apps/comments/l10n/is.js +++ b/apps/comments/l10n/is.js @@ -1,22 +1,22 @@ OC.L10N.register( "comments", { - "You commented" : "Þú settir inn athugasemd", - "%1$s commented" : "%1$s setti inn athugasemd", - "You commented on %2$s" : "Þú settir inn athugasemd við %2$s", - "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s", - "Comments" : "Athugasemdir", "Type in a new comment..." : "Skrifaðu inn nýja athugasemd...", "Delete comment" : "Eyða athugasemd", "Post" : "Senda", "Cancel" : "Hætta við", "Edit comment" : "Breyta athugasemd", "[Deleted user]" : "[Eyddur notandi]", + "Comments" : "Athugasemdir", "No other comments available" : "Engar aðrar athugasemdir eru tiltækar", "More comments..." : "Fleiri athugasemdir...", "Save" : "Vista", "Allowed characters {count} of {max}" : "Leyfður stafafjöldi {count} af {max}", "{count} unread comments" : "{count} ólesnar athugasemdir", - "Comment" : "Athugasemd" + "Comment" : "Athugasemd", + "You commented" : "Þú settir inn athugasemd", + "%1$s commented" : "%1$s setti inn athugasemd", + "You commented on %2$s" : "Þú settir inn athugasemd við %2$s", + "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/comments/l10n/is.json b/apps/comments/l10n/is.json index 1fbd21f55dd..e36776a32f1 100644 --- a/apps/comments/l10n/is.json +++ b/apps/comments/l10n/is.json @@ -1,20 +1,20 @@ { "translations": { - "You commented" : "Þú settir inn athugasemd", - "%1$s commented" : "%1$s setti inn athugasemd", - "You commented on %2$s" : "Þú settir inn athugasemd við %2$s", - "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s", - "Comments" : "Athugasemdir", "Type in a new comment..." : "Skrifaðu inn nýja athugasemd...", "Delete comment" : "Eyða athugasemd", "Post" : "Senda", "Cancel" : "Hætta við", "Edit comment" : "Breyta athugasemd", "[Deleted user]" : "[Eyddur notandi]", + "Comments" : "Athugasemdir", "No other comments available" : "Engar aðrar athugasemdir eru tiltækar", "More comments..." : "Fleiri athugasemdir...", "Save" : "Vista", "Allowed characters {count} of {max}" : "Leyfður stafafjöldi {count} af {max}", "{count} unread comments" : "{count} ólesnar athugasemdir", - "Comment" : "Athugasemd" + "Comment" : "Athugasemd", + "You commented" : "Þú settir inn athugasemd", + "%1$s commented" : "%1$s setti inn athugasemd", + "You commented on %2$s" : "Þú settir inn athugasemd við %2$s", + "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/comments/l10n/it.js b/apps/comments/l10n/it.js index c7ad15cf17f..112af1bedf5 100644 --- a/apps/comments/l10n/it.js +++ b/apps/comments/l10n/it.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commenti</strong> sui file <em>(elencati sempre nel flusso)</em>", - "You commented" : "Hai commentato", - "%1$s commented" : "%1$s ha commentato", - "You commented on %2$s" : "Hai commentato su %2$s", - "%1$s commented on %2$s" : "%1$s ha commentato %2$s", - "Comments" : "Commenti", "Type in a new comment..." : "Digita un nuovo commento...", "Delete comment" : "Elimina commento", "Post" : "Commento", "Cancel" : "Annulla", "Edit comment" : "Modifica commento", "[Deleted user]" : "[Utente eliminato]", + "Comments" : "Commenti", "No other comments available" : "Non sono disponibili altri commenti", "More comments..." : "Altri commenti...", "Save" : "Salva", "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}", "{count} unread comments" : "{count} commenti non letti", - "Comment" : "Commento" + "Comment" : "Commento", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commenti</strong> sui file <em>(elencati sempre nel flusso)</em>", + "You commented" : "Hai commentato", + "%1$s commented" : "%1$s ha commentato", + "You commented on %2$s" : "Hai commentato su %2$s", + "%1$s commented on %2$s" : "%1$s ha commentato %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/it.json b/apps/comments/l10n/it.json index deb0b5aea80..e46f1b8b40a 100644 --- a/apps/comments/l10n/it.json +++ b/apps/comments/l10n/it.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commenti</strong> sui file <em>(elencati sempre nel flusso)</em>", - "You commented" : "Hai commentato", - "%1$s commented" : "%1$s ha commentato", - "You commented on %2$s" : "Hai commentato su %2$s", - "%1$s commented on %2$s" : "%1$s ha commentato %2$s", - "Comments" : "Commenti", "Type in a new comment..." : "Digita un nuovo commento...", "Delete comment" : "Elimina commento", "Post" : "Commento", "Cancel" : "Annulla", "Edit comment" : "Modifica commento", "[Deleted user]" : "[Utente eliminato]", + "Comments" : "Commenti", "No other comments available" : "Non sono disponibili altri commenti", "More comments..." : "Altri commenti...", "Save" : "Salva", "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}", "{count} unread comments" : "{count} commenti non letti", - "Comment" : "Commento" + "Comment" : "Commento", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commenti</strong> sui file <em>(elencati sempre nel flusso)</em>", + "You commented" : "Hai commentato", + "%1$s commented" : "%1$s ha commentato", + "You commented on %2$s" : "Hai commentato su %2$s", + "%1$s commented on %2$s" : "%1$s ha commentato %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/ja.js b/apps/comments/l10n/ja.js index 2a8cc5fb352..d52b580d78d 100644 --- a/apps/comments/l10n/ja.js +++ b/apps/comments/l10n/ja.js @@ -1,20 +1,23 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s がコメントを追加", - "%1$s commented on %2$s" : "%2$s について、%1$s がコメントしました", - "Comments" : "コメント", "Type in a new comment..." : "新しいコメントを入力...", "Delete comment" : "コメントを削除", "Post" : "追加", "Cancel" : "キャンセル", "Edit comment" : "コメントを編集", "[Deleted user]" : "[削除済みユーザー]", + "Comments" : "コメント", "No other comments available" : "コメントはありません", "More comments..." : "コメントをさらに表示...", "Save" : "保存", "Allowed characters {count} of {max}" : "入力文字数 {count} / {max}", "{count} unread comments" : "未読コメント数 {count}", - "Comment" : "コメント" + "Comment" : "コメント", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "ファイルに対する<strong>コメント</strong><em>(常時ストリームに表示)</em>", + "You commented" : "コメント済", + "%1$s commented" : "%1$s がコメントを追加", + "You commented on %2$s" : "%2$s にコメント済", + "%1$s commented on %2$s" : "%2$s について、%1$s がコメントしました" }, "nplurals=1; plural=0;"); diff --git a/apps/comments/l10n/ja.json b/apps/comments/l10n/ja.json index d27a4b66160..277bffd9b33 100644 --- a/apps/comments/l10n/ja.json +++ b/apps/comments/l10n/ja.json @@ -1,18 +1,21 @@ { "translations": { - "%1$s commented" : "%1$s がコメントを追加", - "%1$s commented on %2$s" : "%2$s について、%1$s がコメントしました", - "Comments" : "コメント", "Type in a new comment..." : "新しいコメントを入力...", "Delete comment" : "コメントを削除", "Post" : "追加", "Cancel" : "キャンセル", "Edit comment" : "コメントを編集", "[Deleted user]" : "[削除済みユーザー]", + "Comments" : "コメント", "No other comments available" : "コメントはありません", "More comments..." : "コメントをさらに表示...", "Save" : "保存", "Allowed characters {count} of {max}" : "入力文字数 {count} / {max}", "{count} unread comments" : "未読コメント数 {count}", - "Comment" : "コメント" + "Comment" : "コメント", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "ファイルに対する<strong>コメント</strong><em>(常時ストリームに表示)</em>", + "You commented" : "コメント済", + "%1$s commented" : "%1$s がコメントを追加", + "You commented on %2$s" : "%2$s にコメント済", + "%1$s commented on %2$s" : "%2$s について、%1$s がコメントしました" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/comments/l10n/ko.js b/apps/comments/l10n/ko.js index ac1ed9310cb..fa579b85973 100644 --- a/apps/comments/l10n/ko.js +++ b/apps/comments/l10n/ko.js @@ -1,20 +1,20 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s 님의 댓글", - "%1$s commented on %2$s" : "%2$s에 %1$s 님이 댓글 남김", - "Comments" : "댓글", "Type in a new comment..." : "새 댓글을 입력하십시오...", "Delete comment" : "댓글 삭제", "Post" : "게시", "Cancel" : "취소", "Edit comment" : "댓글 편집", "[Deleted user]" : "[삭제된 사용자]", + "Comments" : "댓글", "No other comments available" : "더 이상 댓글 없음", "More comments..." : "더 많은 댓글...", "Save" : "저장", "Allowed characters {count} of {max}" : "{count}/{max} 글자 사용 가능", "{count} unread comments" : "읽지 않은 댓글 {count}개", - "Comment" : "설명" + "Comment" : "설명", + "%1$s commented" : "%1$s 님의 댓글", + "%1$s commented on %2$s" : "%2$s에 %1$s 님이 댓글 남김" }, "nplurals=1; plural=0;"); diff --git a/apps/comments/l10n/ko.json b/apps/comments/l10n/ko.json index 08356aaf9fa..50e813e926f 100644 --- a/apps/comments/l10n/ko.json +++ b/apps/comments/l10n/ko.json @@ -1,18 +1,18 @@ { "translations": { - "%1$s commented" : "%1$s 님의 댓글", - "%1$s commented on %2$s" : "%2$s에 %1$s 님이 댓글 남김", - "Comments" : "댓글", "Type in a new comment..." : "새 댓글을 입력하십시오...", "Delete comment" : "댓글 삭제", "Post" : "게시", "Cancel" : "취소", "Edit comment" : "댓글 편집", "[Deleted user]" : "[삭제된 사용자]", + "Comments" : "댓글", "No other comments available" : "더 이상 댓글 없음", "More comments..." : "더 많은 댓글...", "Save" : "저장", "Allowed characters {count} of {max}" : "{count}/{max} 글자 사용 가능", "{count} unread comments" : "읽지 않은 댓글 {count}개", - "Comment" : "설명" + "Comment" : "설명", + "%1$s commented" : "%1$s 님의 댓글", + "%1$s commented on %2$s" : "%2$s에 %1$s 님이 댓글 남김" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/comments/l10n/mk.js b/apps/comments/l10n/mk.js index 52277cc9222..eadb14aba45 100644 --- a/apps/comments/l10n/mk.js +++ b/apps/comments/l10n/mk.js @@ -1,9 +1,9 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s коментиран", "Cancel" : "Откажи", "Save" : "Сними", - "Comment" : "Коментар" + "Comment" : "Коментар", + "%1$s commented" : "%1$s коментиран" }, "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"); diff --git a/apps/comments/l10n/mk.json b/apps/comments/l10n/mk.json index 9a3b69b499a..106972fb5ec 100644 --- a/apps/comments/l10n/mk.json +++ b/apps/comments/l10n/mk.json @@ -1,7 +1,7 @@ { "translations": { - "%1$s commented" : "%1$s коментиран", "Cancel" : "Откажи", "Save" : "Сними", - "Comment" : "Коментар" + "Comment" : "Коментар", + "%1$s commented" : "%1$s коментиран" },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;" }
\ No newline at end of file diff --git a/apps/comments/l10n/nb_NO.js b/apps/comments/l10n/nb_NO.js index fd1dc3c6508..6fe515fa35d 100644 --- a/apps/comments/l10n/nb_NO.js +++ b/apps/comments/l10n/nb_NO.js @@ -1,20 +1,20 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s kommentert", - "%1$s commented on %2$s" : "%1$s kommenterte %2$s", - "Comments" : "Kommentarer", "Type in a new comment..." : "Skriv inn en ny kommentar...", "Delete comment" : "Slett kommentar", "Post" : "Send", "Cancel" : "Avbryt", "Edit comment" : "Rediger kommentar", "[Deleted user]" : "[Slettet bruker]", + "Comments" : "Kommentarer", "No other comments available" : "Ingen andre kommentarer tilgjengelig", "More comments..." : "Flere kommentarer..", "Save" : "Lagre", "Allowed characters {count} of {max}" : "Antall tegn tillatt {count} av {max}", "{count} unread comments" : "{count} uleste kommentarer", - "Comment" : "Kommentar" + "Comment" : "Kommentar", + "%1$s commented" : "%1$s kommentert", + "%1$s commented on %2$s" : "%1$s kommenterte %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/nb_NO.json b/apps/comments/l10n/nb_NO.json index 151bac73e15..5b5885b2d2e 100644 --- a/apps/comments/l10n/nb_NO.json +++ b/apps/comments/l10n/nb_NO.json @@ -1,18 +1,18 @@ { "translations": { - "%1$s commented" : "%1$s kommentert", - "%1$s commented on %2$s" : "%1$s kommenterte %2$s", - "Comments" : "Kommentarer", "Type in a new comment..." : "Skriv inn en ny kommentar...", "Delete comment" : "Slett kommentar", "Post" : "Send", "Cancel" : "Avbryt", "Edit comment" : "Rediger kommentar", "[Deleted user]" : "[Slettet bruker]", + "Comments" : "Kommentarer", "No other comments available" : "Ingen andre kommentarer tilgjengelig", "More comments..." : "Flere kommentarer..", "Save" : "Lagre", "Allowed characters {count} of {max}" : "Antall tegn tillatt {count} av {max}", "{count} unread comments" : "{count} uleste kommentarer", - "Comment" : "Kommentar" + "Comment" : "Kommentar", + "%1$s commented" : "%1$s kommentert", + "%1$s commented on %2$s" : "%1$s kommenterte %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/nl.js b/apps/comments/l10n/nl.js index 6accdedddc4..01cfc704536 100644 --- a/apps/comments/l10n/nl.js +++ b/apps/comments/l10n/nl.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Reacties</strong> voor bestanden <em>(altijd getoond in de stroom)</em>", - "You commented" : "U heeft gereageerd", - "%1$s commented" : "%1$s heeft gereageerd", - "You commented on %2$s" : "U heeft gereageerd op %2$s", - "%1$s commented on %2$s" : "%1$s heeft gereageerd op %2$s", - "Comments" : "Reacties", "Type in a new comment..." : "Type een nieuwe reactie...", "Delete comment" : "Verwijder reactie", "Post" : "Reageer", "Cancel" : "Annuleren", "Edit comment" : "Bewerk reactie", "[Deleted user]" : "[Verwijderde gebruiker]", + "Comments" : "Reacties", "No other comments available" : "Geen andere reacties beschikbaar", "More comments..." : "Meer reacties...", "Save" : "Opslaan", "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens", "{count} unread comments" : "{count} ongelezen reacties", - "Comment" : "Reactie" + "Comment" : "Reactie", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Reacties</strong> voor bestanden <em>(altijd getoond in de stroom)</em>", + "You commented" : "U heeft gereageerd", + "%1$s commented" : "%1$s heeft gereageerd", + "You commented on %2$s" : "U heeft gereageerd op %2$s", + "%1$s commented on %2$s" : "%1$s heeft gereageerd op %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/nl.json b/apps/comments/l10n/nl.json index d4005c329e4..1bdb76aabd5 100644 --- a/apps/comments/l10n/nl.json +++ b/apps/comments/l10n/nl.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Reacties</strong> voor bestanden <em>(altijd getoond in de stroom)</em>", - "You commented" : "U heeft gereageerd", - "%1$s commented" : "%1$s heeft gereageerd", - "You commented on %2$s" : "U heeft gereageerd op %2$s", - "%1$s commented on %2$s" : "%1$s heeft gereageerd op %2$s", - "Comments" : "Reacties", "Type in a new comment..." : "Type een nieuwe reactie...", "Delete comment" : "Verwijder reactie", "Post" : "Reageer", "Cancel" : "Annuleren", "Edit comment" : "Bewerk reactie", "[Deleted user]" : "[Verwijderde gebruiker]", + "Comments" : "Reacties", "No other comments available" : "Geen andere reacties beschikbaar", "More comments..." : "Meer reacties...", "Save" : "Opslaan", "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens", "{count} unread comments" : "{count} ongelezen reacties", - "Comment" : "Reactie" + "Comment" : "Reactie", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Reacties</strong> voor bestanden <em>(altijd getoond in de stroom)</em>", + "You commented" : "U heeft gereageerd", + "%1$s commented" : "%1$s heeft gereageerd", + "You commented on %2$s" : "U heeft gereageerd op %2$s", + "%1$s commented on %2$s" : "%1$s heeft gereageerd op %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/pl.js b/apps/comments/l10n/pl.js index c0183e817d5..d5e3f4b3320 100644 --- a/apps/comments/l10n/pl.js +++ b/apps/comments/l10n/pl.js @@ -1,20 +1,20 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s skomentował", - "%1$s commented on %2$s" : "%1$s skomentował %2$s", - "Comments" : "Komentarze", "Type in a new comment..." : "Wprowadź nowy komentarz...", "Delete comment" : "Skasuj komentarz", "Post" : "Zapisz", "Cancel" : "Anuluj", "Edit comment" : "Edytuj komentarz", "[Deleted user]" : "[Usunięty użytkownik]", + "Comments" : "Komentarze", "No other comments available" : "Nie ma więcej komentarzy", "More comments..." : "Więcej komentarzy...", "Save" : "Zapisz", "Allowed characters {count} of {max}" : "Dozwolone znaki {count} z {max}", "{count} unread comments" : "{count} nieprzeczytanych komentarzy", - "Comment" : "Komentarz" + "Comment" : "Komentarz", + "%1$s commented" : "%1$s skomentował", + "%1$s commented on %2$s" : "%1$s skomentował %2$s" }, "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/comments/l10n/pl.json b/apps/comments/l10n/pl.json index e2f70b11d90..28bbf20817f 100644 --- a/apps/comments/l10n/pl.json +++ b/apps/comments/l10n/pl.json @@ -1,18 +1,18 @@ { "translations": { - "%1$s commented" : "%1$s skomentował", - "%1$s commented on %2$s" : "%1$s skomentował %2$s", - "Comments" : "Komentarze", "Type in a new comment..." : "Wprowadź nowy komentarz...", "Delete comment" : "Skasuj komentarz", "Post" : "Zapisz", "Cancel" : "Anuluj", "Edit comment" : "Edytuj komentarz", "[Deleted user]" : "[Usunięty użytkownik]", + "Comments" : "Komentarze", "No other comments available" : "Nie ma więcej komentarzy", "More comments..." : "Więcej komentarzy...", "Save" : "Zapisz", "Allowed characters {count} of {max}" : "Dozwolone znaki {count} z {max}", "{count} unread comments" : "{count} nieprzeczytanych komentarzy", - "Comment" : "Komentarz" + "Comment" : "Komentarz", + "%1$s commented" : "%1$s skomentował", + "%1$s commented on %2$s" : "%1$s skomentował %2$s" },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/comments/l10n/pt_BR.js b/apps/comments/l10n/pt_BR.js index 8130f5127bb..173fc5395fb 100644 --- a/apps/comments/l10n/pt_BR.js +++ b/apps/comments/l10n/pt_BR.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comemtários</strong> para arquivos <em>(sempre listados no fluxo)</em>", - "You commented" : "Você comentou", - "%1$s commented" : "%1$s comentado", - "You commented on %2$s" : "Você comentou em %2$s", - "%1$s commented on %2$s" : "%1$s comentado em %2$s", - "Comments" : "Comentários", "Type in a new comment..." : "Digite um novo comentário...", "Delete comment" : "Apague o comentário", "Post" : "Postar", "Cancel" : "Cancelar", "Edit comment" : "Editar comentário", "[Deleted user]" : "[Usuário eliminado]", + "Comments" : "Comentários", "No other comments available" : "Nenhum outro comentário disponível", "More comments..." : "Mais comentários...", "Save" : "Salvar", "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}", "{count} unread comments" : "{count} comentários não lidos", - "Comment" : "Comentário" + "Comment" : "Comentário", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comemtários</strong> para arquivos <em>(sempre listados no fluxo)</em>", + "You commented" : "Você comentou", + "%1$s commented" : "%1$s comentado", + "You commented on %2$s" : "Você comentou em %2$s", + "%1$s commented on %2$s" : "%1$s comentado em %2$s" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/comments/l10n/pt_BR.json b/apps/comments/l10n/pt_BR.json index 5a48a4d69d2..b20ea2620b1 100644 --- a/apps/comments/l10n/pt_BR.json +++ b/apps/comments/l10n/pt_BR.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comemtários</strong> para arquivos <em>(sempre listados no fluxo)</em>", - "You commented" : "Você comentou", - "%1$s commented" : "%1$s comentado", - "You commented on %2$s" : "Você comentou em %2$s", - "%1$s commented on %2$s" : "%1$s comentado em %2$s", - "Comments" : "Comentários", "Type in a new comment..." : "Digite um novo comentário...", "Delete comment" : "Apague o comentário", "Post" : "Postar", "Cancel" : "Cancelar", "Edit comment" : "Editar comentário", "[Deleted user]" : "[Usuário eliminado]", + "Comments" : "Comentários", "No other comments available" : "Nenhum outro comentário disponível", "More comments..." : "Mais comentários...", "Save" : "Salvar", "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}", "{count} unread comments" : "{count} comentários não lidos", - "Comment" : "Comentário" + "Comment" : "Comentário", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comemtários</strong> para arquivos <em>(sempre listados no fluxo)</em>", + "You commented" : "Você comentou", + "%1$s commented" : "%1$s comentado", + "You commented on %2$s" : "Você comentou em %2$s", + "%1$s commented on %2$s" : "%1$s comentado em %2$s" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/pt_PT.js b/apps/comments/l10n/pt_PT.js index 458d0864735..6503e55bf70 100644 --- a/apps/comments/l10n/pt_PT.js +++ b/apps/comments/l10n/pt_PT.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentários</strong> para ficheiros <em>(listados sempre na transmissão)</em>", - "You commented" : "Comentou", - "%1$s commented" : "%1$s comentou", - "You commented on %2$s" : "Comentou %2$s", - "%1$s commented on %2$s" : "%1$s comentou %2$s", - "Comments" : "Comentários", "Type in a new comment..." : "Escreva um novo comentário...", "Delete comment" : "Apagar comentário", "Post" : "Enviar", "Cancel" : "Cancelar", "Edit comment" : "Editar comentário", "[Deleted user]" : "[utilizador apagado]", + "Comments" : "Comentários", "No other comments available" : "Nenhum outro comentário disponível", "More comments..." : "Mais comentários...", "Save" : "Guardar", "Allowed characters {count} of {max}" : "{count} de {max} caracteres restantes", "{count} unread comments" : "{count} comentários não lidos", - "Comment" : "Comentário" + "Comment" : "Comentário", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentários</strong> para ficheiros <em>(listados sempre na transmissão)</em>", + "You commented" : "Comentou", + "%1$s commented" : "%1$s comentou", + "You commented on %2$s" : "Comentou %2$s", + "%1$s commented on %2$s" : "%1$s comentou %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/pt_PT.json b/apps/comments/l10n/pt_PT.json index b46cbf864d6..0e68152390b 100644 --- a/apps/comments/l10n/pt_PT.json +++ b/apps/comments/l10n/pt_PT.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentários</strong> para ficheiros <em>(listados sempre na transmissão)</em>", - "You commented" : "Comentou", - "%1$s commented" : "%1$s comentou", - "You commented on %2$s" : "Comentou %2$s", - "%1$s commented on %2$s" : "%1$s comentou %2$s", - "Comments" : "Comentários", "Type in a new comment..." : "Escreva um novo comentário...", "Delete comment" : "Apagar comentário", "Post" : "Enviar", "Cancel" : "Cancelar", "Edit comment" : "Editar comentário", "[Deleted user]" : "[utilizador apagado]", + "Comments" : "Comentários", "No other comments available" : "Nenhum outro comentário disponível", "More comments..." : "Mais comentários...", "Save" : "Guardar", "Allowed characters {count} of {max}" : "{count} de {max} caracteres restantes", "{count} unread comments" : "{count} comentários não lidos", - "Comment" : "Comentário" + "Comment" : "Comentário", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentários</strong> para ficheiros <em>(listados sempre na transmissão)</em>", + "You commented" : "Comentou", + "%1$s commented" : "%1$s comentou", + "You commented on %2$s" : "Comentou %2$s", + "%1$s commented on %2$s" : "%1$s comentou %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/ro.js b/apps/comments/l10n/ro.js index 71a0fa68531..dcdbf9b8f98 100644 --- a/apps/comments/l10n/ro.js +++ b/apps/comments/l10n/ro.js @@ -1,7 +1,23 @@ OC.L10N.register( "comments", { + "Type in a new comment..." : "Scrie un comentariu nou...", + "Delete comment" : "Șterge comentariul", + "Post" : "Postează", "Cancel" : "Anulează", - "Save" : "Salvează" + "Edit comment" : "Editează comentariul", + "[Deleted user]" : "[Utilizator șters]", + "Comments" : "Comentarii", + "No other comments available" : "Nu sunt disponibile alte comentarii", + "More comments..." : "Mai multe comentarii...", + "Save" : "Salvează", + "Allowed characters {count} of {max}" : "Caractere admise {count} din {max}", + "{count} unread comments" : "{count} comentarii necitite", + "Comment" : "Comentariu", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentarii</strong> pentru fișiere <em>(afișate întotdeauna în flux)</em>", + "You commented" : "Ai comentat", + "%1$s commented" : "%1$s a comentat", + "You commented on %2$s" : "Ai comentat la %2$s", + "%1$s commented on %2$s" : "%1$s a comentat la %2$s" }, "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/comments/l10n/ro.json b/apps/comments/l10n/ro.json index dfd0b01cfff..b826e58971b 100644 --- a/apps/comments/l10n/ro.json +++ b/apps/comments/l10n/ro.json @@ -1,5 +1,21 @@ { "translations": { + "Type in a new comment..." : "Scrie un comentariu nou...", + "Delete comment" : "Șterge comentariul", + "Post" : "Postează", "Cancel" : "Anulează", - "Save" : "Salvează" + "Edit comment" : "Editează comentariul", + "[Deleted user]" : "[Utilizator șters]", + "Comments" : "Comentarii", + "No other comments available" : "Nu sunt disponibile alte comentarii", + "More comments..." : "Mai multe comentarii...", + "Save" : "Salvează", + "Allowed characters {count} of {max}" : "Caractere admise {count} din {max}", + "{count} unread comments" : "{count} comentarii necitite", + "Comment" : "Comentariu", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentarii</strong> pentru fișiere <em>(afișate întotdeauna în flux)</em>", + "You commented" : "Ai comentat", + "%1$s commented" : "%1$s a comentat", + "You commented on %2$s" : "Ai comentat la %2$s", + "%1$s commented on %2$s" : "%1$s a comentat la %2$s" },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" }
\ No newline at end of file diff --git a/apps/comments/l10n/ru.js b/apps/comments/l10n/ru.js index a7c2fbc1411..3ee5e1fb4d4 100644 --- a/apps/comments/l10n/ru.js +++ b/apps/comments/l10n/ru.js @@ -1,22 +1,23 @@ OC.L10N.register( "comments", { - "You commented" : "Вы откомментировали", - "%1$s commented" : "%1$s откомментировано", - "You commented on %2$s" : "Вы откомментировали в %2$s", - "%1$s commented on %2$s" : "%1$s откомментировано на %2$s", - "Comments" : "Коментарии", "Type in a new comment..." : "Запишите новый комментарий...", "Delete comment" : "Удалить комментарий", "Post" : "Запись", "Cancel" : "Отмена", "Edit comment" : "Редактировать комментарий", "[Deleted user]" : "[Удалённый пользователь]", + "Comments" : "Коментарии", "No other comments available" : "Нет других комментариев", "More comments..." : "Ещё комментарии...", "Save" : "Сохранить", "Allowed characters {count} of {max}" : "Допустимых символов {count} из {max}", "{count} unread comments" : "{count} непрочитанных комментариев", - "Comment" : "Коментарий" + "Comment" : "Коментарий", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Комментарии</strong> к файлам <em>(всегда перечислены в потоке)</em>", + "You commented" : "Вы откомментировали", + "%1$s commented" : "%1$s откомментировано", + "You commented on %2$s" : "Вы откомментировали в %2$s", + "%1$s commented on %2$s" : "%1$s откомментировано на %2$s" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/comments/l10n/ru.json b/apps/comments/l10n/ru.json index eea01451765..fcafda4c9cb 100644 --- a/apps/comments/l10n/ru.json +++ b/apps/comments/l10n/ru.json @@ -1,20 +1,21 @@ { "translations": { - "You commented" : "Вы откомментировали", - "%1$s commented" : "%1$s откомментировано", - "You commented on %2$s" : "Вы откомментировали в %2$s", - "%1$s commented on %2$s" : "%1$s откомментировано на %2$s", - "Comments" : "Коментарии", "Type in a new comment..." : "Запишите новый комментарий...", "Delete comment" : "Удалить комментарий", "Post" : "Запись", "Cancel" : "Отмена", "Edit comment" : "Редактировать комментарий", "[Deleted user]" : "[Удалённый пользователь]", + "Comments" : "Коментарии", "No other comments available" : "Нет других комментариев", "More comments..." : "Ещё комментарии...", "Save" : "Сохранить", "Allowed characters {count} of {max}" : "Допустимых символов {count} из {max}", "{count} unread comments" : "{count} непрочитанных комментариев", - "Comment" : "Коментарий" + "Comment" : "Коментарий", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Комментарии</strong> к файлам <em>(всегда перечислены в потоке)</em>", + "You commented" : "Вы откомментировали", + "%1$s commented" : "%1$s откомментировано", + "You commented on %2$s" : "Вы откомментировали в %2$s", + "%1$s commented on %2$s" : "%1$s откомментировано на %2$s" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/comments/l10n/sl.js b/apps/comments/l10n/sl.js index b4b78e55571..263522cf3e5 100644 --- a/apps/comments/l10n/sl.js +++ b/apps/comments/l10n/sl.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Opombe</strong> k datotekam <em>(vedno pokaži)</em>", - "You commented" : "Vaša opomba", - "%1$s commented" : "%1$s opomb", - "You commented on %2$s" : "Napisali ste opombo na %2$s", - "%1$s commented on %2$s" : "%1$s opomb ob %2$s", - "Comments" : "Opombe", "Type in a new comment..." : "Vpis nove opombe ...", "Delete comment" : "Izbriši opombo", "Post" : "Objavi", "Cancel" : "Prekliči", "Edit comment" : "Uredi opombo", "[Deleted user]" : "[Izbrisan uporabnik]", + "Comments" : "Opombe", "No other comments available" : "Ni drugih opomb", "More comments..." : "Več opomb ...", "Save" : "Shrani", "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}", "{count} unread comments" : "{count} neprebranih opomb", - "Comment" : "Opomba" + "Comment" : "Opomba", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Opombe</strong> k datotekam <em>(vedno pokaži)</em>", + "You commented" : "Vaša opomba", + "%1$s commented" : "%1$s opomb", + "You commented on %2$s" : "Napisali ste opombo na %2$s", + "%1$s commented on %2$s" : "%1$s opomb ob %2$s" }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/comments/l10n/sl.json b/apps/comments/l10n/sl.json index 0a1af42d80c..8a52d03c8c3 100644 --- a/apps/comments/l10n/sl.json +++ b/apps/comments/l10n/sl.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Opombe</strong> k datotekam <em>(vedno pokaži)</em>", - "You commented" : "Vaša opomba", - "%1$s commented" : "%1$s opomb", - "You commented on %2$s" : "Napisali ste opombo na %2$s", - "%1$s commented on %2$s" : "%1$s opomb ob %2$s", - "Comments" : "Opombe", "Type in a new comment..." : "Vpis nove opombe ...", "Delete comment" : "Izbriši opombo", "Post" : "Objavi", "Cancel" : "Prekliči", "Edit comment" : "Uredi opombo", "[Deleted user]" : "[Izbrisan uporabnik]", + "Comments" : "Opombe", "No other comments available" : "Ni drugih opomb", "More comments..." : "Več opomb ...", "Save" : "Shrani", "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}", "{count} unread comments" : "{count} neprebranih opomb", - "Comment" : "Opomba" + "Comment" : "Opomba", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Opombe</strong> k datotekam <em>(vedno pokaži)</em>", + "You commented" : "Vaša opomba", + "%1$s commented" : "%1$s opomb", + "You commented on %2$s" : "Napisali ste opombo na %2$s", + "%1$s commented on %2$s" : "%1$s opomb ob %2$s" },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/comments/l10n/sq.js b/apps/comments/l10n/sq.js index da7185bfc13..0f0366d87f6 100644 --- a/apps/comments/l10n/sq.js +++ b/apps/comments/l10n/sq.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komente</strong> për kartela <em>(përherë të pranishme në rrjedhë)</em>", - "You commented" : "Komentuat", - "%1$s commented" : "%1$s komentoi", - "You commented on %2$s" : "Komentuat te %2$s", - "%1$s commented on %2$s" : "%1$s komentoi te %2$s", - "Comments" : "Komente", "Type in a new comment..." : "Shtypni një koment të ri…", "Delete comment" : "Fshije komentin", "Post" : "Postoje", "Cancel" : "Anuloje", "Edit comment" : "Përpunoni komentin", "[Deleted user]" : "[Përdorues i fshirë]", + "Comments" : "Komente", "No other comments available" : "S’ka komente të tjera", "More comments..." : "Më tepër komente…", "Save" : "Ruaje", "Allowed characters {count} of {max}" : "Shenja të lejuara {count} nga {max}", "{count} unread comments" : "{count} komente të palexuar", - "Comment" : "Koment" + "Comment" : "Koment", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komente</strong> për kartela <em>(përherë të pranishme në rrjedhë)</em>", + "You commented" : "Komentuat", + "%1$s commented" : "%1$s komentoi", + "You commented on %2$s" : "Komentuat te %2$s", + "%1$s commented on %2$s" : "%1$s komentoi te %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/sq.json b/apps/comments/l10n/sq.json index ca3079d07ec..e4fdcbaeb52 100644 --- a/apps/comments/l10n/sq.json +++ b/apps/comments/l10n/sq.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komente</strong> për kartela <em>(përherë të pranishme në rrjedhë)</em>", - "You commented" : "Komentuat", - "%1$s commented" : "%1$s komentoi", - "You commented on %2$s" : "Komentuat te %2$s", - "%1$s commented on %2$s" : "%1$s komentoi te %2$s", - "Comments" : "Komente", "Type in a new comment..." : "Shtypni një koment të ri…", "Delete comment" : "Fshije komentin", "Post" : "Postoje", "Cancel" : "Anuloje", "Edit comment" : "Përpunoni komentin", "[Deleted user]" : "[Përdorues i fshirë]", + "Comments" : "Komente", "No other comments available" : "S’ka komente të tjera", "More comments..." : "Më tepër komente…", "Save" : "Ruaje", "Allowed characters {count} of {max}" : "Shenja të lejuara {count} nga {max}", "{count} unread comments" : "{count} komente të palexuar", - "Comment" : "Koment" + "Comment" : "Koment", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komente</strong> për kartela <em>(përherë të pranishme në rrjedhë)</em>", + "You commented" : "Komentuat", + "%1$s commented" : "%1$s komentoi", + "You commented on %2$s" : "Komentuat te %2$s", + "%1$s commented on %2$s" : "%1$s komentoi te %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/sr.js b/apps/comments/l10n/sr.js index 230f79c9214..39b1595fc0f 100644 --- a/apps/comments/l10n/sr.js +++ b/apps/comments/l10n/sr.js @@ -1,20 +1,20 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s коментариса", - "%1$s commented on %2$s" : "%1$s коментариса на %2$s", - "Comments" : "Коментари", "Type in a new comment..." : "Укуцајте нови коментар...", "Delete comment" : "Обриши коментар", "Post" : "Објави", "Cancel" : "Откажи", "Edit comment" : "Уреди коментар", "[Deleted user]" : "[Обрисан корисник]", + "Comments" : "Коментари", "No other comments available" : "Нема других коментара", "More comments..." : "Још коментара...", "Save" : "Сачувај", "Allowed characters {count} of {max}" : "Дозвољених {count} знакова од {max}", "{count} unread comments" : "{count} непрочитаних коментара", - "Comment" : "Коментар" + "Comment" : "Коментар", + "%1$s commented" : "%1$s коментариса", + "%1$s commented on %2$s" : "%1$s коментариса на %2$s" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/comments/l10n/sr.json b/apps/comments/l10n/sr.json index a9940b644e1..6b3fe95ea9e 100644 --- a/apps/comments/l10n/sr.json +++ b/apps/comments/l10n/sr.json @@ -1,18 +1,18 @@ { "translations": { - "%1$s commented" : "%1$s коментариса", - "%1$s commented on %2$s" : "%1$s коментариса на %2$s", - "Comments" : "Коментари", "Type in a new comment..." : "Укуцајте нови коментар...", "Delete comment" : "Обриши коментар", "Post" : "Објави", "Cancel" : "Откажи", "Edit comment" : "Уреди коментар", "[Deleted user]" : "[Обрисан корисник]", + "Comments" : "Коментари", "No other comments available" : "Нема других коментара", "More comments..." : "Још коментара...", "Save" : "Сачувај", "Allowed characters {count} of {max}" : "Дозвољених {count} знакова од {max}", "{count} unread comments" : "{count} непрочитаних коментара", - "Comment" : "Коментар" + "Comment" : "Коментар", + "%1$s commented" : "%1$s коментариса", + "%1$s commented on %2$s" : "%1$s коментариса на %2$s" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/comments/l10n/sv.js b/apps/comments/l10n/sv.js index b64ad9e8173..e22528090c0 100644 --- a/apps/comments/l10n/sv.js +++ b/apps/comments/l10n/sv.js @@ -1,22 +1,22 @@ OC.L10N.register( "comments", { - "You commented" : "Du kommenterade", - "%1$s commented" : "%1$s har kommenterat", - "You commented on %2$s" : "Du kommenterade %2$s", - "%1$s commented on %2$s" : "%1$s kommenterade på %2$s", - "Comments" : "Kommentarer", "Type in a new comment..." : "Skriv en ny kommentar", "Delete comment" : "Radera kommentar", "Post" : "Skicka", "Cancel" : "Avbryt", "Edit comment" : "Redigera kommentar", "[Deleted user]" : "[Raderad användare]", + "Comments" : "Kommentarer", "No other comments available" : "Inga andra kommentarer tillgängliga", "More comments..." : "Fler kommentarter,,,", "Save" : "Spara", "Allowed characters {count} of {max}" : "Tillåtet antal tecken {count} av {max}", "{count} unread comments" : "{count} olästa kommentarer", - "Comment" : "Kommentar" + "Comment" : "Kommentar", + "You commented" : "Du kommenterade", + "%1$s commented" : "%1$s har kommenterat", + "You commented on %2$s" : "Du kommenterade %2$s", + "%1$s commented on %2$s" : "%1$s kommenterade på %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/sv.json b/apps/comments/l10n/sv.json index f7c9db11cf6..28e16a0d8f6 100644 --- a/apps/comments/l10n/sv.json +++ b/apps/comments/l10n/sv.json @@ -1,20 +1,20 @@ { "translations": { - "You commented" : "Du kommenterade", - "%1$s commented" : "%1$s har kommenterat", - "You commented on %2$s" : "Du kommenterade %2$s", - "%1$s commented on %2$s" : "%1$s kommenterade på %2$s", - "Comments" : "Kommentarer", "Type in a new comment..." : "Skriv en ny kommentar", "Delete comment" : "Radera kommentar", "Post" : "Skicka", "Cancel" : "Avbryt", "Edit comment" : "Redigera kommentar", "[Deleted user]" : "[Raderad användare]", + "Comments" : "Kommentarer", "No other comments available" : "Inga andra kommentarer tillgängliga", "More comments..." : "Fler kommentarter,,,", "Save" : "Spara", "Allowed characters {count} of {max}" : "Tillåtet antal tecken {count} av {max}", "{count} unread comments" : "{count} olästa kommentarer", - "Comment" : "Kommentar" + "Comment" : "Kommentar", + "You commented" : "Du kommenterade", + "%1$s commented" : "%1$s har kommenterat", + "You commented on %2$s" : "Du kommenterade %2$s", + "%1$s commented on %2$s" : "%1$s kommenterade på %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/th_TH.js b/apps/comments/l10n/th_TH.js index 241a37a12c6..f8b2d4e2648 100644 --- a/apps/comments/l10n/th_TH.js +++ b/apps/comments/l10n/th_TH.js @@ -1,23 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>ความคิดเห็น</strong> สำหรับไฟล์ <em>(ระบุไว้เสมอในสตรีม)</em>", - "You commented" : "คุณได้แสดงความคิดเห็นแล้ว", - "%1$s commented" : "%1$s ได้ถูกแสดงความคิดเห็น", - "You commented on %2$s" : "คุณได้แสดงความคิดเห็นบน %2$s", - "%1$s commented on %2$s" : "%1$s ได้ถูกแสดงความคิดเห็นบน %2$s", - "Comments" : "ความคิดเห็น", "Type in a new comment..." : "เพิ่มความคิดเห็นใหม่ ...", "Delete comment" : "ลบความคิดเห็น", "Post" : "โพสต์", "Cancel" : "ยกเลิก", "Edit comment" : "แก้ไขความคิดเห็น", "[Deleted user]" : "[ผู้ใช้ถูกลบไปแล้ว]", + "Comments" : "ความคิดเห็น", "No other comments available" : "ยังไม่มีความคิดเห็นอื่นๆ", "More comments..." : "ความคิดเห็นอื่นๆ ...", "Save" : "บันทึก", "Allowed characters {count} of {max}" : "อนุญาตให้ใช้ {count} จากทั้งหมด {max} ตัวอักษร", "{count} unread comments" : "{count} ความคิดเห็นที่ยังไม่ได้อ่าน", - "Comment" : "แสดงความคิดเห็น" + "Comment" : "แสดงความคิดเห็น", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>ความคิดเห็น</strong> สำหรับไฟล์ <em>(ระบุไว้เสมอในสตรีม)</em>", + "You commented" : "คุณได้แสดงความคิดเห็นแล้ว", + "%1$s commented" : "%1$s ได้ถูกแสดงความคิดเห็น", + "You commented on %2$s" : "คุณได้แสดงความคิดเห็นบน %2$s", + "%1$s commented on %2$s" : "%1$s ได้ถูกแสดงความคิดเห็นบน %2$s" }, "nplurals=1; plural=0;"); diff --git a/apps/comments/l10n/th_TH.json b/apps/comments/l10n/th_TH.json index b4ae0e8f7a7..88740585e3c 100644 --- a/apps/comments/l10n/th_TH.json +++ b/apps/comments/l10n/th_TH.json @@ -1,21 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>ความคิดเห็น</strong> สำหรับไฟล์ <em>(ระบุไว้เสมอในสตรีม)</em>", - "You commented" : "คุณได้แสดงความคิดเห็นแล้ว", - "%1$s commented" : "%1$s ได้ถูกแสดงความคิดเห็น", - "You commented on %2$s" : "คุณได้แสดงความคิดเห็นบน %2$s", - "%1$s commented on %2$s" : "%1$s ได้ถูกแสดงความคิดเห็นบน %2$s", - "Comments" : "ความคิดเห็น", "Type in a new comment..." : "เพิ่มความคิดเห็นใหม่ ...", "Delete comment" : "ลบความคิดเห็น", "Post" : "โพสต์", "Cancel" : "ยกเลิก", "Edit comment" : "แก้ไขความคิดเห็น", "[Deleted user]" : "[ผู้ใช้ถูกลบไปแล้ว]", + "Comments" : "ความคิดเห็น", "No other comments available" : "ยังไม่มีความคิดเห็นอื่นๆ", "More comments..." : "ความคิดเห็นอื่นๆ ...", "Save" : "บันทึก", "Allowed characters {count} of {max}" : "อนุญาตให้ใช้ {count} จากทั้งหมด {max} ตัวอักษร", "{count} unread comments" : "{count} ความคิดเห็นที่ยังไม่ได้อ่าน", - "Comment" : "แสดงความคิดเห็น" + "Comment" : "แสดงความคิดเห็น", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>ความคิดเห็น</strong> สำหรับไฟล์ <em>(ระบุไว้เสมอในสตรีม)</em>", + "You commented" : "คุณได้แสดงความคิดเห็นแล้ว", + "%1$s commented" : "%1$s ได้ถูกแสดงความคิดเห็น", + "You commented on %2$s" : "คุณได้แสดงความคิดเห็นบน %2$s", + "%1$s commented on %2$s" : "%1$s ได้ถูกแสดงความคิดเห็นบน %2$s" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/comments/l10n/tr.js b/apps/comments/l10n/tr.js index 558684161cf..dbbf03908b9 100644 --- a/apps/comments/l10n/tr.js +++ b/apps/comments/l10n/tr.js @@ -1,22 +1,22 @@ OC.L10N.register( "comments", { - "You commented" : "Yorum yaptınız", - "%1$s commented" : "%1$s yorumlanmış", - "You commented on %2$s" : "%2$s için yorum yaptınız", - "%1$s commented on %2$s" : "%1$s, %2$s için yorum yaptı", - "Comments" : "Yorumlar", "Type in a new comment..." : "Yeni bir yorum yazın...", "Delete comment" : "Yorumu sil", "Post" : "Gönder", "Cancel" : "İptal", "Edit comment" : "Yorumu düzenle", "[Deleted user]" : "[Silinmiş kullanıcı]", + "Comments" : "Yorumlar", "No other comments available" : "Mevcut başka yorum yok", "More comments..." : "Daha fazla yorum...", "Save" : "Kaydet", "Allowed characters {count} of {max}" : "İzin verilen karakterler {count}/{max}", "{count} unread comments" : "{count} okunmamış yorum", - "Comment" : "Yorum" + "Comment" : "Yorum", + "You commented" : "Yorum yaptınız", + "%1$s commented" : "%1$s yorumlanmış", + "You commented on %2$s" : "%2$s için yorum yaptınız", + "%1$s commented on %2$s" : "%1$s, %2$s için yorum yaptı" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/comments/l10n/tr.json b/apps/comments/l10n/tr.json index 25d539e57e3..b26e51a02a8 100644 --- a/apps/comments/l10n/tr.json +++ b/apps/comments/l10n/tr.json @@ -1,20 +1,20 @@ { "translations": { - "You commented" : "Yorum yaptınız", - "%1$s commented" : "%1$s yorumlanmış", - "You commented on %2$s" : "%2$s için yorum yaptınız", - "%1$s commented on %2$s" : "%1$s, %2$s için yorum yaptı", - "Comments" : "Yorumlar", "Type in a new comment..." : "Yeni bir yorum yazın...", "Delete comment" : "Yorumu sil", "Post" : "Gönder", "Cancel" : "İptal", "Edit comment" : "Yorumu düzenle", "[Deleted user]" : "[Silinmiş kullanıcı]", + "Comments" : "Yorumlar", "No other comments available" : "Mevcut başka yorum yok", "More comments..." : "Daha fazla yorum...", "Save" : "Kaydet", "Allowed characters {count} of {max}" : "İzin verilen karakterler {count}/{max}", "{count} unread comments" : "{count} okunmamış yorum", - "Comment" : "Yorum" + "Comment" : "Yorum", + "You commented" : "Yorum yaptınız", + "%1$s commented" : "%1$s yorumlanmış", + "You commented on %2$s" : "%2$s için yorum yaptınız", + "%1$s commented on %2$s" : "%1$s, %2$s için yorum yaptı" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/uk.js b/apps/comments/l10n/uk.js index e958597b40e..547fa22b7a5 100644 --- a/apps/comments/l10n/uk.js +++ b/apps/comments/l10n/uk.js @@ -1,20 +1,20 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s прокоментовано", - "%1$s commented on %2$s" : "%1$s прокоментовано у %2$s", - "Comments" : "Коментарі", "Type in a new comment..." : "Введіть новий коментар...", "Delete comment" : "Видалити коментар", "Post" : "Відправити", "Cancel" : "Скасувати", "Edit comment" : "Редагувати коментар", "[Deleted user]" : "[Видалений користувач]", + "Comments" : "Коментарі", "No other comments available" : "Інші коментарі не доступні", "More comments..." : "Більше коментарів...", "Save" : "Зберегти", "Allowed characters {count} of {max}" : "Доступно символів {count} з {max}", "{count} unread comments" : "{count} непрочитаних коментарів", - "Comment" : "Коментар" + "Comment" : "Коментар", + "%1$s commented" : "%1$s прокоментовано", + "%1$s commented on %2$s" : "%1$s прокоментовано у %2$s" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/comments/l10n/uk.json b/apps/comments/l10n/uk.json index 59fb9f7eb76..5fbbe2a6217 100644 --- a/apps/comments/l10n/uk.json +++ b/apps/comments/l10n/uk.json @@ -1,18 +1,18 @@ { "translations": { - "%1$s commented" : "%1$s прокоментовано", - "%1$s commented on %2$s" : "%1$s прокоментовано у %2$s", - "Comments" : "Коментарі", "Type in a new comment..." : "Введіть новий коментар...", "Delete comment" : "Видалити коментар", "Post" : "Відправити", "Cancel" : "Скасувати", "Edit comment" : "Редагувати коментар", "[Deleted user]" : "[Видалений користувач]", + "Comments" : "Коментарі", "No other comments available" : "Інші коментарі не доступні", "More comments..." : "Більше коментарів...", "Save" : "Зберегти", "Allowed characters {count} of {max}" : "Доступно символів {count} з {max}", "{count} unread comments" : "{count} непрочитаних коментарів", - "Comment" : "Коментар" + "Comment" : "Коментар", + "%1$s commented" : "%1$s прокоментовано", + "%1$s commented on %2$s" : "%1$s прокоментовано у %2$s" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/comments/l10n/zh_CN.js b/apps/comments/l10n/zh_CN.js index 79d12423208..6ae1c231ae0 100644 --- a/apps/comments/l10n/zh_CN.js +++ b/apps/comments/l10n/zh_CN.js @@ -1,20 +1,20 @@ OC.L10N.register( "comments", { - "%1$s commented" : "%1$s 已评论", - "%1$s commented on %2$s" : "%1$s 评论了 %2$s", - "Comments" : "评论", "Type in a new comment..." : "添加新评论...", "Delete comment" : "删除评论", "Post" : "发布", "Cancel" : "取消", "Edit comment" : "编辑评论", "[Deleted user]" : "[Deleted user]", + "Comments" : "评论", "No other comments available" : "没有其他评论", "More comments..." : "更多评论...", "Save" : "保存", "Allowed characters {count} of {max}" : "当前字数： {count}，最大允许：{max}", "{count} unread comments" : "{count} 条未读评论", - "Comment" : "评论" + "Comment" : "评论", + "%1$s commented" : "%1$s 已评论", + "%1$s commented on %2$s" : "%1$s 评论了 %2$s" }, "nplurals=1; plural=0;"); diff --git a/apps/comments/l10n/zh_CN.json b/apps/comments/l10n/zh_CN.json index b27364e4638..f5dab6f5ab1 100644 --- a/apps/comments/l10n/zh_CN.json +++ b/apps/comments/l10n/zh_CN.json @@ -1,18 +1,18 @@ { "translations": { - "%1$s commented" : "%1$s 已评论", - "%1$s commented on %2$s" : "%1$s 评论了 %2$s", - "Comments" : "评论", "Type in a new comment..." : "添加新评论...", "Delete comment" : "删除评论", "Post" : "发布", "Cancel" : "取消", "Edit comment" : "编辑评论", "[Deleted user]" : "[Deleted user]", + "Comments" : "评论", "No other comments available" : "没有其他评论", "More comments..." : "更多评论...", "Save" : "保存", "Allowed characters {count} of {max}" : "当前字数： {count}，最大允许：{max}", "{count} unread comments" : "{count} 条未读评论", - "Comment" : "评论" + "Comment" : "评论", + "%1$s commented" : "%1$s 已评论", + "%1$s commented on %2$s" : "%1$s 评论了 %2$s" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/comments/l10n/zh_TW.js b/apps/comments/l10n/zh_TW.js index 251752fedb8..14bb4ad7af4 100644 --- a/apps/comments/l10n/zh_TW.js +++ b/apps/comments/l10n/zh_TW.js @@ -1,22 +1,22 @@ OC.L10N.register( "comments", { - "You commented" : "您留言", - "%1$s commented" : "%1$s 留言", - "You commented on %2$s" : "您對 %2$s 留言", - "%1$s commented on %2$s" : "%1$s 對 %2$s 留言", - "Comments" : "留言", "Type in a new comment..." : "輸入新留言…", "Delete comment" : "刪除留言", "Post" : "送出", "Cancel" : "取消", "Edit comment" : "編輯留言", "[Deleted user]" : "[已刪除的使用者]", + "Comments" : "留言", "No other comments available" : "沒有其他留言", "More comments..." : "更多留言…", "Save" : "儲存", "Allowed characters {count} of {max}" : "已輸入 {count} / 長度限制 {max}", "{count} unread comments" : "{count} 則未讀留言", - "Comment" : "留言" + "Comment" : "留言", + "You commented" : "您留言", + "%1$s commented" : "%1$s 留言", + "You commented on %2$s" : "您對 %2$s 留言", + "%1$s commented on %2$s" : "%1$s 對 %2$s 留言" }, "nplurals=1; plural=0;"); diff --git a/apps/comments/l10n/zh_TW.json b/apps/comments/l10n/zh_TW.json index d75f11523b9..e8dce02fc7b 100644 --- a/apps/comments/l10n/zh_TW.json +++ b/apps/comments/l10n/zh_TW.json @@ -1,20 +1,20 @@ { "translations": { - "You commented" : "您留言", - "%1$s commented" : "%1$s 留言", - "You commented on %2$s" : "您對 %2$s 留言", - "%1$s commented on %2$s" : "%1$s 對 %2$s 留言", - "Comments" : "留言", "Type in a new comment..." : "輸入新留言…", "Delete comment" : "刪除留言", "Post" : "送出", "Cancel" : "取消", "Edit comment" : "編輯留言", "[Deleted user]" : "[已刪除的使用者]", + "Comments" : "留言", "No other comments available" : "沒有其他留言", "More comments..." : "更多留言…", "Save" : "儲存", "Allowed characters {count} of {max}" : "已輸入 {count} / 長度限制 {max}", "{count} unread comments" : "{count} 則未讀留言", - "Comment" : "留言" + "Comment" : "留言", + "You commented" : "您留言", + "%1$s commented" : "%1$s 留言", + "You commented on %2$s" : "您對 %2$s 留言", + "%1$s commented on %2$s" : "%1$s 對 %2$s 留言" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/comments/activity/extension.php b/apps/comments/lib/Activity/Extension.php index ef800e88abc..ef800e88abc 100644 --- a/apps/comments/activity/extension.php +++ b/apps/comments/lib/Activity/Extension.php diff --git a/apps/comments/activity/listener.php b/apps/comments/lib/Activity/Listener.php index 7c6970df837..7c6970df837 100644 --- a/apps/comments/activity/listener.php +++ b/apps/comments/lib/Activity/Listener.php diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php index d85a3583bf1..66b62f35346 100644 --- a/apps/dav/appinfo/app.php +++ b/apps/dav/appinfo/app.php @@ -20,7 +20,7 @@ * */ -use OCA\Dav\AppInfo\Application; +use OCA\DAV\AppInfo\Application; use Symfony\Component\EventDispatcher\GenericEvent; $app = new Application(); diff --git a/apps/dav/appinfo/database.xml b/apps/dav/appinfo/database.xml index 71dec639064..f79ea07ae76 100644 --- a/apps/dav/appinfo/database.xml +++ b/apps/dav/appinfo/database.xml @@ -259,11 +259,13 @@ CREATE TABLE calendarobjects ( <name>firstoccurence</name> <type>integer</type> <unsigned>true</unsigned> + <length>11</length> </field> <field> <name>lastoccurence</name> <type>integer</type> <unsigned>true</unsigned> + <length>11</length> </field> <field> <name>uid</name> diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index a8e7df6e8e2..ca456b03089 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -5,15 +5,19 @@ <description>ownCloud WebDAV endpoint</description> <licence>AGPL</licence> <author>owncloud.org</author> - <version>0.2.3</version> + <version>0.2.4</version> <default_enable/> <types> <filesystem/> </types> + <namespace>DAV</namespace> <public> <webdav>appinfo/v1/publicwebdav.php</webdav> </public> <dependencies> <owncloud min-version="9.1" max-version="9.1" /> </dependencies> + <background-jobs> + <job>OCA\DAV\CardDAV\Sync\SyncJob</job> + </background-jobs> </info> diff --git a/apps/dav/appinfo/install.php b/apps/dav/appinfo/install.php index fbd41d25f49..8ee55dbbd11 100644 --- a/apps/dav/appinfo/install.php +++ b/apps/dav/appinfo/install.php @@ -19,8 +19,7 @@ * */ -use OCA\Dav\AppInfo\Application; +use OCA\DAV\AppInfo\Application; $app = new Application(); -$app->setupCron(); $app->generateBirthdays(); diff --git a/apps/dav/appinfo/register_command.php b/apps/dav/appinfo/register_command.php index b3ab25a99e3..6010f594e9b 100644 --- a/apps/dav/appinfo/register_command.php +++ b/apps/dav/appinfo/register_command.php @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -use OCA\Dav\AppInfo\Application; +use OCA\DAV\AppInfo\Application; use OCA\DAV\Command\CreateAddressBook; use OCA\DAV\Command\CreateCalendar; use OCA\DAV\Command\SyncBirthdayCalendar; diff --git a/apps/dav/appinfo/update.php b/apps/dav/appinfo/update.php index fbd41d25f49..8ee55dbbd11 100644 --- a/apps/dav/appinfo/update.php +++ b/apps/dav/appinfo/update.php @@ -19,8 +19,7 @@ * */ -use OCA\Dav\AppInfo\Application; +use OCA\DAV\AppInfo\Application; $app = new Application(); -$app->setupCron(); $app->generateBirthdays(); diff --git a/apps/dav/appinfo/application.php b/apps/dav/lib/AppInfo/Application.php index c3811a40845..d44ea22e2f3 100644 --- a/apps/dav/appinfo/application.php +++ b/apps/dav/lib/AppInfo/Application.php @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -namespace OCA\Dav\AppInfo; +namespace OCA\DAV\AppInfo; use OCA\DAV\CalDAV\BirthdayService; use OCA\DAV\CalDAV\CalDavBackend; @@ -153,11 +153,6 @@ class Application extends App { return $this->getContainer()->query('SyncService'); } - public function setupCron() { - $jl = $this->getContainer()->getServer()->getJobList(); - $jl->add(new SyncJob()); - } - public function generateBirthdays() { try { /** @var BirthdayService $migration */ diff --git a/apps/dav/lib/caldav/birthdayservice.php b/apps/dav/lib/CalDAV/BirthdayService.php index b74116f4083..b74116f4083 100644 --- a/apps/dav/lib/caldav/birthdayservice.php +++ b/apps/dav/lib/CalDAV/BirthdayService.php diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index f0f236de3ff..f0f236de3ff 100644 --- a/apps/dav/lib/caldav/caldavbackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php diff --git a/apps/dav/lib/caldav/calendar.php b/apps/dav/lib/CalDAV/Calendar.php index f3637692e43..f3637692e43 100644 --- a/apps/dav/lib/caldav/calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php diff --git a/apps/dav/lib/caldav/calendarhome.php b/apps/dav/lib/CalDAV/CalendarHome.php index a4c485a8983..a4c485a8983 100644 --- a/apps/dav/lib/caldav/calendarhome.php +++ b/apps/dav/lib/CalDAV/CalendarHome.php diff --git a/apps/dav/lib/caldav/calendarroot.php b/apps/dav/lib/CalDAV/CalendarRoot.php index d302da3d861..d302da3d861 100644 --- a/apps/dav/lib/caldav/calendarroot.php +++ b/apps/dav/lib/CalDAV/CalendarRoot.php diff --git a/apps/dav/lib/caldav/schedule/imipplugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index d9f2ec674f0..d9f2ec674f0 100644 --- a/apps/dav/lib/caldav/schedule/imipplugin.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php diff --git a/apps/dav/lib/carddav/addressbook.php b/apps/dav/lib/CardDAV/AddressBook.php index 8b1b600ec3d..8b1b600ec3d 100644 --- a/apps/dav/lib/carddav/addressbook.php +++ b/apps/dav/lib/CardDAV/AddressBook.php diff --git a/apps/dav/lib/carddav/addressbookimpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php index 8b29d6d5c0c..8b29d6d5c0c 100644 --- a/apps/dav/lib/carddav/addressbookimpl.php +++ b/apps/dav/lib/CardDAV/AddressBookImpl.php diff --git a/apps/dav/lib/carddav/addressbookroot.php b/apps/dav/lib/CardDAV/AddressBookRoot.php index 99c36c2e767..99c36c2e767 100644 --- a/apps/dav/lib/carddav/addressbookroot.php +++ b/apps/dav/lib/CardDAV/AddressBookRoot.php diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 28d5ed1ae99..28d5ed1ae99 100644 --- a/apps/dav/lib/carddav/carddavbackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php diff --git a/apps/dav/lib/carddav/contactsmanager.php b/apps/dav/lib/CardDAV/ContactsManager.php index 7900c6ccae0..7900c6ccae0 100644 --- a/apps/dav/lib/carddav/contactsmanager.php +++ b/apps/dav/lib/CardDAV/ContactsManager.php diff --git a/apps/dav/lib/carddav/converter.php b/apps/dav/lib/CardDAV/Converter.php index c8d9b94c267..c8d9b94c267 100644 --- a/apps/dav/lib/carddav/converter.php +++ b/apps/dav/lib/CardDAV/Converter.php diff --git a/apps/dav/lib/carddav/plugin.php b/apps/dav/lib/CardDAV/Plugin.php index e02cc5686b8..e02cc5686b8 100644 --- a/apps/dav/lib/carddav/plugin.php +++ b/apps/dav/lib/CardDAV/Plugin.php diff --git a/apps/dav/lib/carddav/syncjob.php b/apps/dav/lib/CardDAV/SyncJob.php index 0554af6fbf1..b6748c05f5c 100644 --- a/apps/dav/lib/carddav/syncjob.php +++ b/apps/dav/lib/CardDAV/SyncJob.php @@ -22,7 +22,7 @@ namespace OCA\DAV\CardDAV; use OC\BackgroundJob\TimedJob; -use OCA\Dav\AppInfo\Application; +use OCA\DAV\AppInfo\Application; class SyncJob extends TimedJob { diff --git a/apps/dav/lib/carddav/syncservice.php b/apps/dav/lib/CardDAV/SyncService.php index c4741a01772..c4741a01772 100644 --- a/apps/dav/lib/carddav/syncservice.php +++ b/apps/dav/lib/CardDAV/SyncService.php diff --git a/apps/dav/lib/carddav/useraddressbooks.php b/apps/dav/lib/CardDAV/UserAddressBooks.php index 734e3829e69..734e3829e69 100644 --- a/apps/dav/lib/carddav/useraddressbooks.php +++ b/apps/dav/lib/CardDAV/UserAddressBooks.php diff --git a/apps/dav/lib/carddav/xml/groups.php b/apps/dav/lib/CardDAV/Xml/Groups.php index b39615db033..b39615db033 100644 --- a/apps/dav/lib/carddav/xml/groups.php +++ b/apps/dav/lib/CardDAV/Xml/Groups.php diff --git a/apps/dav/command/createaddressbook.php b/apps/dav/lib/Command/CreateAddressBook.php index 48302a2b439..48302a2b439 100644 --- a/apps/dav/command/createaddressbook.php +++ b/apps/dav/lib/Command/CreateAddressBook.php diff --git a/apps/dav/command/createcalendar.php b/apps/dav/lib/Command/CreateCalendar.php index d7f82dd0e52..d7f82dd0e52 100644 --- a/apps/dav/command/createcalendar.php +++ b/apps/dav/lib/Command/CreateCalendar.php diff --git a/apps/dav/command/syncbirthdaycalendar.php b/apps/dav/lib/Command/SyncBirthdayCalendar.php index 90a73a3eeb3..90a73a3eeb3 100644 --- a/apps/dav/command/syncbirthdaycalendar.php +++ b/apps/dav/lib/Command/SyncBirthdayCalendar.php diff --git a/apps/dav/command/syncsystemaddressbook.php b/apps/dav/lib/Command/SyncSystemAddressBook.php index b62a42d7b90..b62a42d7b90 100644 --- a/apps/dav/command/syncsystemaddressbook.php +++ b/apps/dav/lib/Command/SyncSystemAddressBook.php diff --git a/apps/dav/lib/comments/commentnode.php b/apps/dav/lib/Comments/CommentNode.php index 339abc6382d..339abc6382d 100644 --- a/apps/dav/lib/comments/commentnode.php +++ b/apps/dav/lib/Comments/CommentNode.php diff --git a/apps/dav/lib/comments/commentsplugin.php b/apps/dav/lib/Comments/CommentsPlugin.php index d4a065649ef..d4a065649ef 100644 --- a/apps/dav/lib/comments/commentsplugin.php +++ b/apps/dav/lib/Comments/CommentsPlugin.php diff --git a/apps/dav/lib/comments/entitycollection.php b/apps/dav/lib/Comments/EntityCollection.php index a55a18c00c0..a55a18c00c0 100644 --- a/apps/dav/lib/comments/entitycollection.php +++ b/apps/dav/lib/Comments/EntityCollection.php diff --git a/apps/dav/lib/comments/entitytypecollection.php b/apps/dav/lib/Comments/EntityTypeCollection.php index 6bc42484207..6bc42484207 100644 --- a/apps/dav/lib/comments/entitytypecollection.php +++ b/apps/dav/lib/Comments/EntityTypeCollection.php diff --git a/apps/dav/lib/comments/rootcollection.php b/apps/dav/lib/Comments/RootCollection.php index cda666f7162..cda666f7162 100644 --- a/apps/dav/lib/comments/rootcollection.php +++ b/apps/dav/lib/Comments/RootCollection.php diff --git a/apps/dav/lib/connector/legacydavacl.php b/apps/dav/lib/Connector/LegacyDAVACL.php index eb6ca1fd7d5..eb6ca1fd7d5 100644 --- a/apps/dav/lib/connector/legacydavacl.php +++ b/apps/dav/lib/Connector/LegacyDAVACL.php diff --git a/apps/dav/lib/connector/publicauth.php b/apps/dav/lib/Connector/PublicAuth.php index 3aa58cda244..3aa58cda244 100644 --- a/apps/dav/lib/connector/publicauth.php +++ b/apps/dav/lib/Connector/PublicAuth.php diff --git a/apps/dav/lib/connector/sabre/appenabledplugin.php b/apps/dav/lib/Connector/Sabre/AppEnabledPlugin.php index cb061d6a309..cb061d6a309 100644 --- a/apps/dav/lib/connector/sabre/appenabledplugin.php +++ b/apps/dav/lib/Connector/Sabre/AppEnabledPlugin.php diff --git a/apps/dav/lib/connector/sabre/auth.php b/apps/dav/lib/Connector/Sabre/Auth.php index b63efa3a1ba..b8047e779f5 100644 --- a/apps/dav/lib/connector/sabre/auth.php +++ b/apps/dav/lib/Connector/Sabre/Auth.php @@ -33,7 +33,7 @@ use Exception; use OC\AppFramework\Http\Request; use OCP\IRequest; use OCP\ISession; -use OCP\IUserSession; +use OC\User\Session; use Sabre\DAV\Auth\Backend\AbstractBasic; use Sabre\DAV\Exception\NotAuthenticated; use Sabre\DAV\Exception\ServiceUnavailable; @@ -45,7 +45,7 @@ class Auth extends AbstractBasic { /** @var ISession */ private $session; - /** @var IUserSession */ + /** @var Session */ private $userSession; /** @var IRequest */ private $request; @@ -54,12 +54,12 @@ class Auth extends AbstractBasic { /** * @param ISession $session - * @param IUserSession $userSession + * @param Session $userSession * @param IRequest $request * @param string $principalPrefix */ public function __construct(ISession $session, - IUserSession $userSession, + Session $userSession, IRequest $request, $principalPrefix = 'principals/users/') { $this->session = $session; @@ -104,6 +104,7 @@ class Auth extends AbstractBasic { } else { \OC_Util::setUpFS(); //login hooks may need early access to the filesystem if($this->userSession->login($username, $password)) { + $this->userSession->createSessionToken($this->request, $username, $password); \OC_Util::setUpFS($this->userSession->getUser()->getUID()); $this->session->set(self::DAV_AUTHENTICATED, $this->userSession->getUser()->getUID()); $this->session->close(); diff --git a/apps/dav/lib/connector/sabre/blocklegacyclientplugin.php b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php index 70d19cb7f2a..70d19cb7f2a 100644 --- a/apps/dav/lib/connector/sabre/blocklegacyclientplugin.php +++ b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php diff --git a/apps/dav/lib/connector/sabre/checksumlist.php b/apps/dav/lib/Connector/Sabre/ChecksumList.php index f137222acca..f137222acca 100644 --- a/apps/dav/lib/connector/sabre/checksumlist.php +++ b/apps/dav/lib/Connector/Sabre/ChecksumList.php diff --git a/apps/dav/lib/connector/sabre/commentpropertiesplugin.php b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php index a8d5f771122..a8d5f771122 100644 --- a/apps/dav/lib/connector/sabre/commentpropertiesplugin.php +++ b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php diff --git a/apps/dav/lib/connector/sabre/copyetagheaderplugin.php b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php index 49b6a7b2de7..49b6a7b2de7 100644 --- a/apps/dav/lib/connector/sabre/copyetagheaderplugin.php +++ b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php diff --git a/apps/dav/lib/connector/sabre/custompropertiesbackend.php b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php index 5946c9910d4..5946c9910d4 100644 --- a/apps/dav/lib/connector/sabre/custompropertiesbackend.php +++ b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php diff --git a/apps/dav/lib/connector/sabre/davaclplugin.php b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php index f5699b469c3..f5699b469c3 100644 --- a/apps/dav/lib/connector/sabre/davaclplugin.php +++ b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php diff --git a/apps/dav/lib/connector/sabre/directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index f31eff30b65..daa5f29ce79 100644 --- a/apps/dav/lib/connector/sabre/directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -64,9 +64,10 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node * @param \OC\Files\View $view * @param \OCP\Files\FileInfo $info * @param ObjectTree|null $tree + * @param \OCP\Share\IManager $shareManager */ - public function __construct($view, $info, $tree = null) { - parent::__construct($view, $info); + public function __construct($view, $info, $tree = null, $shareManager = null) { + parent::__construct($view, $info, $shareManager); $this->tree = $tree; } @@ -202,9 +203,9 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node } if ($info['mimetype'] == 'httpd/unix-directory') { - $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree); + $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager); } else { - $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info); + $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info, $this->shareManager); } if ($this->tree) { $this->tree->cacheNode($node); diff --git a/apps/dav/lib/connector/sabre/dummygetresponseplugin.php b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php index b10d5aaab36..b10d5aaab36 100644 --- a/apps/dav/lib/connector/sabre/dummygetresponseplugin.php +++ b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php diff --git a/apps/dav/lib/connector/sabre/exception/entitytoolarge.php b/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php index d16e93bb637..d16e93bb637 100644 --- a/apps/dav/lib/connector/sabre/exception/entitytoolarge.php +++ b/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php diff --git a/apps/dav/lib/connector/sabre/exception/filelocked.php b/apps/dav/lib/Connector/Sabre/Exception/FileLocked.php index 03ced0e81e2..03ced0e81e2 100644 --- a/apps/dav/lib/connector/sabre/exception/filelocked.php +++ b/apps/dav/lib/Connector/Sabre/Exception/FileLocked.php diff --git a/apps/dav/lib/connector/sabre/exception/forbidden.php b/apps/dav/lib/Connector/Sabre/Exception/Forbidden.php index f2467e6b298..f2467e6b298 100644 --- a/apps/dav/lib/connector/sabre/exception/forbidden.php +++ b/apps/dav/lib/Connector/Sabre/Exception/Forbidden.php diff --git a/apps/dav/lib/connector/sabre/exception/invalidpath.php b/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php index 7951a0a89b7..7951a0a89b7 100644 --- a/apps/dav/lib/connector/sabre/exception/invalidpath.php +++ b/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php diff --git a/apps/dav/lib/connector/sabre/exception/unsupportedmediatype.php b/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php index 99e3c222c75..99e3c222c75 100644 --- a/apps/dav/lib/connector/sabre/exception/unsupportedmediatype.php +++ b/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php diff --git a/apps/dav/lib/connector/sabre/exceptionloggerplugin.php b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php index 38bddef8769..38bddef8769 100644 --- a/apps/dav/lib/connector/sabre/exceptionloggerplugin.php +++ b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php diff --git a/apps/dav/lib/connector/sabre/fakelockerplugin.php b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php index 6db8740bc13..6db8740bc13 100644 --- a/apps/dav/lib/connector/sabre/fakelockerplugin.php +++ b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php diff --git a/apps/dav/lib/connector/sabre/file.php b/apps/dav/lib/Connector/Sabre/File.php index 943e9150e74..943e9150e74 100644 --- a/apps/dav/lib/connector/sabre/file.php +++ b/apps/dav/lib/Connector/Sabre/File.php diff --git a/apps/dav/lib/connector/sabre/filesplugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index 8822deb1661..8822deb1661 100644 --- a/apps/dav/lib/connector/sabre/filesplugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php diff --git a/apps/dav/lib/connector/sabre/filesreportplugin.php b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php index d4e1cbe3b20..d4e1cbe3b20 100644 --- a/apps/dav/lib/connector/sabre/filesreportplugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php diff --git a/apps/dav/lib/connector/sabre/lockplugin.php b/apps/dav/lib/Connector/Sabre/LockPlugin.php index 66da39a57c8..66da39a57c8 100644 --- a/apps/dav/lib/connector/sabre/lockplugin.php +++ b/apps/dav/lib/Connector/Sabre/LockPlugin.php diff --git a/apps/dav/lib/connector/sabre/maintenanceplugin.php b/apps/dav/lib/Connector/Sabre/MaintenancePlugin.php index 6e9a5930b78..6e9a5930b78 100644 --- a/apps/dav/lib/connector/sabre/maintenanceplugin.php +++ b/apps/dav/lib/Connector/Sabre/MaintenancePlugin.php diff --git a/apps/dav/lib/connector/sabre/node.php b/apps/dav/lib/Connector/Sabre/Node.php index ccc035063cd..ccc035063cd 100644 --- a/apps/dav/lib/connector/sabre/node.php +++ b/apps/dav/lib/Connector/Sabre/Node.php diff --git a/apps/dav/lib/connector/sabre/objecttree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php index f38dfe679c7..f38dfe679c7 100644 --- a/apps/dav/lib/connector/sabre/objecttree.php +++ b/apps/dav/lib/Connector/Sabre/ObjectTree.php diff --git a/apps/dav/lib/connector/sabre/principal.php b/apps/dav/lib/Connector/Sabre/Principal.php index 18f28a916f1..787bcdf469b 100644 --- a/apps/dav/lib/connector/sabre/principal.php +++ b/apps/dav/lib/Connector/Sabre/Principal.php @@ -196,6 +196,14 @@ class Principal implements BackendInterface { * @return string */ function findByUri($uri, $principalPrefix) { + if (substr($uri, 0, 7) === 'mailto:') { + $email = substr($uri, 7); + $users = $this->userManager->getByEmail($email); + if (count($users) === 1) { + return $this->principalPrefix . '/' . $users[0]->getUID(); + } + } + return ''; } diff --git a/apps/dav/lib/connector/sabre/quotaplugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php index a093c52851c..a093c52851c 100644 --- a/apps/dav/lib/connector/sabre/quotaplugin.php +++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php diff --git a/apps/dav/lib/connector/sabre/server.php b/apps/dav/lib/Connector/Sabre/Server.php index 421fc64422d..421fc64422d 100644 --- a/apps/dav/lib/connector/sabre/server.php +++ b/apps/dav/lib/Connector/Sabre/Server.php diff --git a/apps/dav/lib/connector/sabre/serverfactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php index 5853370778d..5853370778d 100644 --- a/apps/dav/lib/connector/sabre/serverfactory.php +++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php diff --git a/apps/dav/lib/connector/sabre/sharetypelist.php b/apps/dav/lib/Connector/Sabre/ShareTypeList.php index 763586412ad..763586412ad 100644 --- a/apps/dav/lib/connector/sabre/sharetypelist.php +++ b/apps/dav/lib/Connector/Sabre/ShareTypeList.php diff --git a/apps/dav/lib/connector/sabre/sharesplugin.php b/apps/dav/lib/Connector/Sabre/SharesPlugin.php index c76068969e9..c76068969e9 100644 --- a/apps/dav/lib/connector/sabre/sharesplugin.php +++ b/apps/dav/lib/Connector/Sabre/SharesPlugin.php diff --git a/apps/dav/lib/connector/sabre/taglist.php b/apps/dav/lib/Connector/Sabre/TagList.php index 5c1cd8b4f1d..5c1cd8b4f1d 100644 --- a/apps/dav/lib/connector/sabre/taglist.php +++ b/apps/dav/lib/Connector/Sabre/TagList.php diff --git a/apps/dav/lib/connector/sabre/tagsplugin.php b/apps/dav/lib/Connector/Sabre/TagsPlugin.php index dfc1a2dd95d..dfc1a2dd95d 100644 --- a/apps/dav/lib/connector/sabre/tagsplugin.php +++ b/apps/dav/lib/Connector/Sabre/TagsPlugin.php diff --git a/apps/dav/lib/dav/groupprincipalbackend.php b/apps/dav/lib/DAV/GroupPrincipalBackend.php index e0568639784..e0568639784 100644 --- a/apps/dav/lib/dav/groupprincipalbackend.php +++ b/apps/dav/lib/DAV/GroupPrincipalBackend.php diff --git a/apps/dav/lib/dav/sharing/backend.php b/apps/dav/lib/DAV/Sharing/Backend.php index 225b773713d..225b773713d 100644 --- a/apps/dav/lib/dav/sharing/backend.php +++ b/apps/dav/lib/DAV/Sharing/Backend.php diff --git a/apps/dav/lib/dav/sharing/ishareable.php b/apps/dav/lib/DAV/Sharing/IShareable.php index f6b6bfa8862..f6b6bfa8862 100644 --- a/apps/dav/lib/dav/sharing/ishareable.php +++ b/apps/dav/lib/DAV/Sharing/IShareable.php diff --git a/apps/dav/lib/dav/sharing/plugin.php b/apps/dav/lib/DAV/Sharing/Plugin.php index 3173d1397ba..3173d1397ba 100644 --- a/apps/dav/lib/dav/sharing/plugin.php +++ b/apps/dav/lib/DAV/Sharing/Plugin.php diff --git a/apps/dav/lib/dav/sharing/xml/invite.php b/apps/dav/lib/DAV/Sharing/Xml/Invite.php index ae40ff06701..ae40ff06701 100644 --- a/apps/dav/lib/dav/sharing/xml/invite.php +++ b/apps/dav/lib/DAV/Sharing/Xml/Invite.php diff --git a/apps/dav/lib/dav/sharing/xml/sharerequest.php b/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php index 776fb446b6c..776fb446b6c 100644 --- a/apps/dav/lib/dav/sharing/xml/sharerequest.php +++ b/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php diff --git a/apps/dav/lib/dav/systemprincipalbackend.php b/apps/dav/lib/DAV/SystemPrincipalBackend.php index 8001ec4e6c6..8001ec4e6c6 100644 --- a/apps/dav/lib/dav/systemprincipalbackend.php +++ b/apps/dav/lib/DAV/SystemPrincipalBackend.php diff --git a/apps/dav/lib/files/browsererrorpageplugin.php b/apps/dav/lib/Files/BrowserErrorPagePlugin.php index 37a4166efef..37a4166efef 100644 --- a/apps/dav/lib/files/browsererrorpageplugin.php +++ b/apps/dav/lib/Files/BrowserErrorPagePlugin.php diff --git a/apps/dav/lib/files/custompropertiesbackend.php b/apps/dav/lib/Files/CustomPropertiesBackend.php index aa541f88dad..aa541f88dad 100644 --- a/apps/dav/lib/files/custompropertiesbackend.php +++ b/apps/dav/lib/Files/CustomPropertiesBackend.php diff --git a/apps/dav/lib/files/fileshome.php b/apps/dav/lib/Files/FilesHome.php index ef572d6618b..ef572d6618b 100644 --- a/apps/dav/lib/files/fileshome.php +++ b/apps/dav/lib/Files/FilesHome.php diff --git a/apps/dav/lib/files/rootcollection.php b/apps/dav/lib/Files/RootCollection.php index 63328aac8e3..63328aac8e3 100644 --- a/apps/dav/lib/files/rootcollection.php +++ b/apps/dav/lib/Files/RootCollection.php diff --git a/apps/dav/lib/files/sharing/publiclinkcheckplugin.php b/apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php index 751f63d394e..751f63d394e 100644 --- a/apps/dav/lib/files/sharing/publiclinkcheckplugin.php +++ b/apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php diff --git a/apps/dav/lib/hookmanager.php b/apps/dav/lib/HookManager.php index aa3777088f8..aa3777088f8 100644 --- a/apps/dav/lib/hookmanager.php +++ b/apps/dav/lib/HookManager.php diff --git a/apps/dav/lib/rootcollection.php b/apps/dav/lib/RootCollection.php index b6e1747e990..b6e1747e990 100644 --- a/apps/dav/lib/rootcollection.php +++ b/apps/dav/lib/RootCollection.php diff --git a/apps/dav/lib/server.php b/apps/dav/lib/Server.php index 73e24c9a292..edaa7ac8552 100644 --- a/apps/dav/lib/server.php +++ b/apps/dav/lib/Server.php @@ -84,6 +84,9 @@ class Server { // acl $acl = new DavAclPlugin(); + $acl->principalCollectionSet = [ + 'principals/users', 'principals/groups' + ]; $acl->defaultUsernamePath = 'principals/users'; $this->server->addPlugin($acl); diff --git a/apps/dav/lib/systemtag/systemtagmappingnode.php b/apps/dav/lib/SystemTag/SystemTagMappingNode.php index bb2936c13dc..bb2936c13dc 100644 --- a/apps/dav/lib/systemtag/systemtagmappingnode.php +++ b/apps/dav/lib/SystemTag/SystemTagMappingNode.php diff --git a/apps/dav/lib/systemtag/systemtagnode.php b/apps/dav/lib/SystemTag/SystemTagNode.php index 500e1a3adea..500e1a3adea 100644 --- a/apps/dav/lib/systemtag/systemtagnode.php +++ b/apps/dav/lib/SystemTag/SystemTagNode.php diff --git a/apps/dav/lib/systemtag/systemtagplugin.php b/apps/dav/lib/SystemTag/SystemTagPlugin.php index a266b4a1214..a266b4a1214 100644 --- a/apps/dav/lib/systemtag/systemtagplugin.php +++ b/apps/dav/lib/SystemTag/SystemTagPlugin.php diff --git a/apps/dav/lib/systemtag/systemtagsbyidcollection.php b/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php index 298902501ab..298902501ab 100644 --- a/apps/dav/lib/systemtag/systemtagsbyidcollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php diff --git a/apps/dav/lib/systemtag/systemtagsobjectmappingcollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php index eb75ed06393..eb75ed06393 100644 --- a/apps/dav/lib/systemtag/systemtagsobjectmappingcollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php diff --git a/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php index bdbc73c4e32..bdbc73c4e32 100644 --- a/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php diff --git a/apps/dav/lib/systemtag/systemtagsrelationscollection.php b/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php index 19db39d3f3a..19db39d3f3a 100644 --- a/apps/dav/lib/systemtag/systemtagsrelationscollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php diff --git a/apps/dav/lib/upload/assemblystream.php b/apps/dav/lib/Upload/AssemblyStream.php index 4b80a591ce4..4b80a591ce4 100644 --- a/apps/dav/lib/upload/assemblystream.php +++ b/apps/dav/lib/Upload/AssemblyStream.php diff --git a/apps/dav/lib/upload/futurefile.php b/apps/dav/lib/Upload/FutureFile.php index aca81afc055..aca81afc055 100644 --- a/apps/dav/lib/upload/futurefile.php +++ b/apps/dav/lib/Upload/FutureFile.php diff --git a/apps/dav/lib/upload/rootcollection.php b/apps/dav/lib/Upload/RootCollection.php index 673a3734318..673a3734318 100644 --- a/apps/dav/lib/upload/rootcollection.php +++ b/apps/dav/lib/Upload/RootCollection.php diff --git a/apps/dav/lib/upload/uploadfolder.php b/apps/dav/lib/Upload/UploadFolder.php index 01fbf1f8dc9..01fbf1f8dc9 100644 --- a/apps/dav/lib/upload/uploadfolder.php +++ b/apps/dav/lib/Upload/UploadFolder.php diff --git a/apps/dav/lib/upload/uploadhome.php b/apps/dav/lib/Upload/UploadHome.php index ae4dcfa4931..ae4dcfa4931 100644 --- a/apps/dav/lib/upload/uploadhome.php +++ b/apps/dav/lib/Upload/UploadHome.php diff --git a/apps/dav/tests/unit/appinfo/applicationtest.php b/apps/dav/tests/unit/appinfo/applicationtest.php index 7f533a185df..05dd75b2c68 100644 --- a/apps/dav/tests/unit/appinfo/applicationtest.php +++ b/apps/dav/tests/unit/appinfo/applicationtest.php @@ -21,7 +21,7 @@ namespace OCA\DAV\Tests\Unit\AppInfo; -use OCA\Dav\AppInfo\Application; +use OCA\DAV\AppInfo\Application; use OCP\Contacts\IManager; use Test\TestCase; diff --git a/apps/dav/tests/unit/caldav/caldavbackendtest.php b/apps/dav/tests/unit/caldav/caldavbackendtest.php index 440db7636e1..89be5671ca8 100644 --- a/apps/dav/tests/unit/caldav/caldavbackendtest.php +++ b/apps/dav/tests/unit/caldav/caldavbackendtest.php @@ -328,6 +328,7 @@ EOD; $events[0] = $this->createEvent($calendarId, '20130912T130000Z', '20130912T140000Z'); $events[1] = $this->createEvent($calendarId, '20130912T150000Z', '20130912T170000Z'); $events[2] = $this->createEvent($calendarId, '20130912T173000Z', '20130912T220000Z'); + $events[3] = $this->createEvent($calendarId, '21130912T130000Z', '22130912T130000Z'); $result = $this->backend->calendarQuery($calendarId, [ 'name' => '', @@ -351,11 +352,12 @@ EOD; public function providesCalendarQueryParameters() { return [ - 'all' => [[0, 1, 2], [], []], + 'all' => [[0, 1, 2, 3], [], []], 'only-todos' => [[], ['name' => 'VTODO'], []], - 'only-events' => [[0, 1, 2], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => null], 'prop-filters' => []]],], - 'start' => [[1, 2], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],], + 'only-events' => [[0, 1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => null], 'prop-filters' => []]],], + 'start' => [[1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],], 'end' => [[0], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC'))], 'prop-filters' => []]],], + 'future' => [[3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2099-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],], ]; } diff --git a/apps/dav/tests/unit/connector/sabre/auth.php b/apps/dav/tests/unit/connector/sabre/auth.php index b81a5e003b5..a0168e435e2 100644 --- a/apps/dav/tests/unit/connector/sabre/auth.php +++ b/apps/dav/tests/unit/connector/sabre/auth.php @@ -28,7 +28,7 @@ use OCP\IRequest; use OCP\IUser; use Test\TestCase; use OCP\ISession; -use OCP\IUserSession; +use OC\User\Session; /** * Class Auth @@ -41,7 +41,7 @@ class Auth extends TestCase { private $session; /** @var \OCA\DAV\Connector\Sabre\Auth */ private $auth; - /** @var IUserSession */ + /** @var Session */ private $userSession; /** @var IRequest */ private $request; @@ -50,7 +50,7 @@ class Auth extends TestCase { parent::setUp(); $this->session = $this->getMockBuilder('\OCP\ISession') ->disableOriginalConstructor()->getMock(); - $this->userSession = $this->getMockBuilder('\OCP\IUserSession') + $this->userSession = $this->getMockBuilder('\OC\User\Session') ->disableOriginalConstructor()->getMock(); $this->request = $this->getMockBuilder('\OCP\IRequest') ->disableOriginalConstructor()->getMock(); @@ -170,6 +170,10 @@ class Auth extends TestCase { ->method('login') ->with('MyTestUser', 'MyTestPassword') ->will($this->returnValue(true)); + $this->userSession + ->expects($this->once()) + ->method('createSessionToken') + ->with($this->request, 'MyTestUser', 'MyTestPassword'); $this->session ->expects($this->once()) ->method('set') @@ -559,6 +563,9 @@ class Auth extends TestCase { ->method('login') ->with('username', 'password') ->will($this->returnValue(true)); + $this->userSession + ->expects($this->once()) + ->method('createSessionToken'); $user = $this->getMockBuilder('\OCP\IUser') ->disableOriginalConstructor() ->getMock(); diff --git a/apps/dav/tests/unit/connector/sabre/principal.php b/apps/dav/tests/unit/connector/sabre/principal.php index 1747885240a..75076e9618b 100644 --- a/apps/dav/tests/unit/connector/sabre/principal.php +++ b/apps/dav/tests/unit/connector/sabre/principal.php @@ -255,4 +255,19 @@ class Principal extends TestCase { public function testSearchPrincipals() { $this->assertSame([], $this->connector->searchPrincipals('principals/users', [])); } + + public function testFindByUri() { + $fooUser = $this->getMockBuilder('\OC\User\User') + ->disableOriginalConstructor()->getMock(); + $fooUser + ->expects($this->exactly(1)) + ->method('getUID') + ->will($this->returnValue('foo')); + + $this->userManager->expects($this->once())->method('getByEmail')->willReturn([ + $fooUser + ]); + $ret = $this->connector->findByUri('mailto:foo@bar.net', 'principals/users'); + $this->assertSame('principals/users/foo', $ret); + } } diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js index 6f8b9a28d49..e7f1ebed301 100644 --- a/apps/encryption/l10n/sl.js +++ b/apps/encryption/l10n/sl.js @@ -21,6 +21,7 @@ OC.L10N.register( "The old password was not correct, please try again." : "Staro geslo ni vpisano pravilno. Poskusite znova.", "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.", "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Preseliti je treba šifrirne ključe iz starega sistema (ownCloud <= 8.0) na novega. Zaženite ukaz 'occ encryption:migrate' ali pa stopite v stik s skrbnikom sistema.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.", "Encryption App is enabled and ready" : "Program za šifriranje ne omogočen in pripravljen za delo", @@ -30,10 +31,12 @@ OC.L10N.register( "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče brati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "The share will expire on %s." : "Povezava souporabe bo potekla %s.", - "Cheers!" : "Na zdravje!", + "Cheers!" : "Lep pozdrav!", "Encrypt the home storage" : "Šifriraj domačo shrambo", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Izbrana možnost omogoči šifriranje vseh datotek, shranjenih v glavni shrambi, sicer so šifrirane le datoteke v zunanjih shrambah.", "Enable recovery key" : "Omogoči obnovitev gesla", "Disable recovery key" : "Onemogoči obnovitev gesla", + "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Obnovitveni ključ je dodatni šifrirni ključ, ki se uporablja pri šifriranju datotek. Omogoča obnovitev uporabnikovih datotek, če uporabnih pozabi svoje geslo za dostop.", "Recovery key password" : "Ključ za obnovitev gesla", "Repeat recovery key password" : "Ponovi ključ za obnovitev gesla", "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:", diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json index f0bd37fca57..73e31950482 100644 --- a/apps/encryption/l10n/sl.json +++ b/apps/encryption/l10n/sl.json @@ -19,6 +19,7 @@ "The old password was not correct, please try again." : "Staro geslo ni vpisano pravilno. Poskusite znova.", "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.", "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Preseliti je treba šifrirne ključe iz starega sistema (ownCloud <= 8.0) na novega. Zaženite ukaz 'occ encryption:migrate' ali pa stopite v stik s skrbnikom sistema.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.", "Encryption App is enabled and ready" : "Program za šifriranje ne omogočen in pripravljen za delo", @@ -28,10 +29,12 @@ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče brati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", "The share will expire on %s." : "Povezava souporabe bo potekla %s.", - "Cheers!" : "Na zdravje!", + "Cheers!" : "Lep pozdrav!", "Encrypt the home storage" : "Šifriraj domačo shrambo", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Izbrana možnost omogoči šifriranje vseh datotek, shranjenih v glavni shrambi, sicer so šifrirane le datoteke v zunanjih shrambah.", "Enable recovery key" : "Omogoči obnovitev gesla", "Disable recovery key" : "Onemogoči obnovitev gesla", + "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Obnovitveni ključ je dodatni šifrirni ključ, ki se uporablja pri šifriranju datotek. Omogoča obnovitev uporabnikovih datotek, če uporabnih pozabi svoje geslo za dostop.", "Recovery key password" : "Ključ za obnovitev gesla", "Repeat recovery key password" : "Ponovi ključ za obnovitev gesla", "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:", diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/lib/AppInfo/Application.php index c7c8d2a3d31..c7c8d2a3d31 100644 --- a/apps/encryption/appinfo/application.php +++ b/apps/encryption/lib/AppInfo/Application.php diff --git a/apps/encryption/command/enablemasterkey.php b/apps/encryption/lib/Command/EnableMasterKey.php index fd86c221176..fd86c221176 100644 --- a/apps/encryption/command/enablemasterkey.php +++ b/apps/encryption/lib/Command/EnableMasterKey.php diff --git a/apps/encryption/command/migratekeys.php b/apps/encryption/lib/Command/MigrateKeys.php index 88d8d46973f..88d8d46973f 100644 --- a/apps/encryption/command/migratekeys.php +++ b/apps/encryption/lib/Command/MigrateKeys.php diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/lib/Controller/RecoveryController.php index e4b02e004dc..e4b02e004dc 100644 --- a/apps/encryption/controller/recoverycontroller.php +++ b/apps/encryption/lib/Controller/RecoveryController.php diff --git a/apps/encryption/controller/settingscontroller.php b/apps/encryption/lib/Controller/SettingsController.php index 5c171a23aec..5c171a23aec 100644 --- a/apps/encryption/controller/settingscontroller.php +++ b/apps/encryption/lib/Controller/SettingsController.php diff --git a/apps/encryption/controller/statuscontroller.php b/apps/encryption/lib/Controller/StatusController.php index 99fdc68c3d0..99fdc68c3d0 100644 --- a/apps/encryption/controller/statuscontroller.php +++ b/apps/encryption/lib/Controller/StatusController.php diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/Crypto/Crypt.php index ca70c88488f..ca70c88488f 100644 --- a/apps/encryption/lib/crypto/crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php diff --git a/apps/encryption/lib/crypto/decryptall.php b/apps/encryption/lib/Crypto/DecryptAll.php index 694aba2fb89..694aba2fb89 100644 --- a/apps/encryption/lib/crypto/decryptall.php +++ b/apps/encryption/lib/Crypto/DecryptAll.php diff --git a/apps/encryption/lib/crypto/encryptall.php b/apps/encryption/lib/Crypto/EncryptAll.php index 0037c213265..0037c213265 100644 --- a/apps/encryption/lib/crypto/encryptall.php +++ b/apps/encryption/lib/Crypto/EncryptAll.php diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/Crypto/Encryption.php index 6eff66e72be..6eff66e72be 100644 --- a/apps/encryption/lib/crypto/encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php diff --git a/apps/encryption/lib/exceptions/multikeydecryptexception.php b/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php index 59bea59344d..59bea59344d 100644 --- a/apps/encryption/lib/exceptions/multikeydecryptexception.php +++ b/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php diff --git a/apps/encryption/lib/exceptions/multikeyencryptexception.php b/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php index bc0872ffdd2..bc0872ffdd2 100644 --- a/apps/encryption/lib/exceptions/multikeyencryptexception.php +++ b/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php diff --git a/apps/encryption/lib/exceptions/privatekeymissingexception.php b/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php index fe162a8f5c4..fe162a8f5c4 100644 --- a/apps/encryption/lib/exceptions/privatekeymissingexception.php +++ b/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php diff --git a/apps/encryption/lib/exceptions/publickeymissingexception.php b/apps/encryption/lib/Exceptions/PublicKeyMissingException.php index 6fad4693dcc..6fad4693dcc 100644 --- a/apps/encryption/lib/exceptions/publickeymissingexception.php +++ b/apps/encryption/lib/Exceptions/PublicKeyMissingException.php diff --git a/apps/encryption/lib/hookmanager.php b/apps/encryption/lib/HookManager.php index a4269dca031..a4269dca031 100644 --- a/apps/encryption/lib/hookmanager.php +++ b/apps/encryption/lib/HookManager.php diff --git a/apps/encryption/hooks/contracts/ihook.php b/apps/encryption/lib/Hooks/Contracts/IHook.php index 4bf7ead8c15..4bf7ead8c15 100644 --- a/apps/encryption/hooks/contracts/ihook.php +++ b/apps/encryption/lib/Hooks/Contracts/IHook.php diff --git a/apps/encryption/hooks/userhooks.php b/apps/encryption/lib/Hooks/UserHooks.php index 136a1832101..136a1832101 100644 --- a/apps/encryption/hooks/userhooks.php +++ b/apps/encryption/lib/Hooks/UserHooks.php diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/KeyManager.php index 4f22c3def63..4f22c3def63 100644 --- a/apps/encryption/lib/keymanager.php +++ b/apps/encryption/lib/KeyManager.php diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/Migration.php index db9541d6f5a..db9541d6f5a 100644 --- a/apps/encryption/lib/migration.php +++ b/apps/encryption/lib/Migration.php diff --git a/apps/encryption/lib/recovery.php b/apps/encryption/lib/Recovery.php index f0ac7bb2383..f0ac7bb2383 100644 --- a/apps/encryption/lib/recovery.php +++ b/apps/encryption/lib/Recovery.php diff --git a/apps/encryption/lib/session.php b/apps/encryption/lib/Session.php index 62cc09b018d..62cc09b018d 100644 --- a/apps/encryption/lib/session.php +++ b/apps/encryption/lib/Session.php diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/Users/Setup.php index e59340c4ce2..e59340c4ce2 100644 --- a/apps/encryption/lib/users/setup.php +++ b/apps/encryption/lib/Users/Setup.php diff --git a/apps/encryption/lib/util.php b/apps/encryption/lib/Util.php index e87ed478a1a..e87ed478a1a 100644 --- a/apps/encryption/lib/util.php +++ b/apps/encryption/lib/Util.php diff --git a/apps/encryption/tests/command/testenablemasterkey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php index e408a7c2b14..da04e017a15 100644 --- a/apps/encryption/tests/command/testenablemasterkey.php +++ b/apps/encryption/tests/Command/TestEnableMasterKey.php @@ -24,6 +24,7 @@ namespace OCA\Encryption\Tests\Command; use OCA\Encryption\Command\EnableMasterKey; +use OCA\Encryption\Util; use Test\TestCase; class TestEnableMasterKey extends TestCase { diff --git a/apps/encryption/tests/controller/RecoveryControllerTest.php b/apps/encryption/tests/Controller/RecoveryControllerTest.php index a4349139896..63c99e1277d 100644 --- a/apps/encryption/tests/controller/RecoveryControllerTest.php +++ b/apps/encryption/tests/Controller/RecoveryControllerTest.php @@ -28,47 +28,36 @@ use OCP\AppFramework\Http; use Test\TestCase; class RecoveryControllerTest extends TestCase { - /** - * @var RecoveryController - */ + /** @var RecoveryController */ private $controller; - private $appName; - /** - * @var \PHPUnit_Framework_MockObject_MockObject - */ + /** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */ private $requestMock; - /** - * @var \PHPUnit_Framework_MockObject_MockObject - */ + /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $configMock; - /** - * @var \PHPUnit_Framework_MockObject_MockObject - */ + /** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ private $l10nMock; - /** - * @var \PHPUnit_Framework_MockObject_MockObject - */ + /** @var \OCA\Encryption\Recovery|\PHPUnit_Framework_MockObject_MockObject */ private $recoveryMock; public function adminRecoveryProvider() { return [ - ['test', 'test', '1', 'Recovery key successfully enabled', HTTP::STATUS_OK], - ['', 'test', '1', 'Missing recovery key password', HTTP::STATUS_BAD_REQUEST], - ['test', '', '1', 'Please repeat the recovery key password', HTTP::STATUS_BAD_REQUEST], - ['test', 'soimething that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_BAD_REQUEST], - ['test', 'test', '0', 'Recovery key successfully disabled', HTTP::STATUS_OK], + ['test', 'test', '1', 'Recovery key successfully enabled', Http::STATUS_OK], + ['', 'test', '1', 'Missing recovery key password', Http::STATUS_BAD_REQUEST], + ['test', '', '1', 'Please repeat the recovery key password', Http::STATUS_BAD_REQUEST], + ['test', 'soimething that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST], + ['test', 'test', '0', 'Recovery key successfully disabled', Http::STATUS_OK], ]; } /** * @dataProvider adminRecoveryProvider * @param $recoveryPassword - * @param $passconfirm + * @param $passConfirm * @param $enableRecovery * @param $expectedMessage * @param $expectedStatus */ - public function testAdminRecovery($recoveryPassword, $passconfirm, $enableRecovery, $expectedMessage, $expectedStatus) { + public function testAdminRecovery($recoveryPassword, $passConfirm, $enableRecovery, $expectedMessage, $expectedStatus) { $this->recoveryMock->expects($this->any()) @@ -80,7 +69,7 @@ class RecoveryControllerTest extends TestCase { ->willReturn(true); $response = $this->controller->adminRecovery($recoveryPassword, - $passconfirm, + $passConfirm, $enableRecovery); @@ -92,11 +81,11 @@ class RecoveryControllerTest extends TestCase { public function changeRecoveryPasswordProvider() { return [ - ['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', HTTP::STATUS_BAD_REQUEST], - ['test', 'test', 'oldtest', 'Password successfully changed.', HTTP::STATUS_OK], - ['test', 'notmatch', 'oldtest', 'Repeated recovery key password does not match the provided recovery key password', HTTP::STATUS_BAD_REQUEST], - ['', 'test', 'oldtest', 'Please provide a new recovery password', HTTP::STATUS_BAD_REQUEST], - ['test', 'test', '', 'Please provide the old recovery password', HTTP::STATUS_BAD_REQUEST] + ['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', Http::STATUS_BAD_REQUEST], + ['test', 'test', 'oldtest', 'Password successfully changed.', Http::STATUS_OK], + ['test', 'notmatch', 'oldtest', 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST], + ['', 'test', 'oldtest', 'Please provide a new recovery password', Http::STATUS_BAD_REQUEST], + ['test', 'test', '', 'Please provide the old recovery password', Http::STATUS_BAD_REQUEST] ]; } @@ -160,8 +149,7 @@ class RecoveryControllerTest extends TestCase { protected function setUp() { parent::setUp(); - $this->appName = 'encryption'; - $this->requestMock = $this->getMockBuilder('\OCP\IRequest') + $this->requestMock = $this->getMockBuilder('OCP\IRequest') ->disableOriginalConstructor() ->getMock(); @@ -182,7 +170,7 @@ class RecoveryControllerTest extends TestCase { ->disableOriginalConstructor() ->getMock(); - $this->controller = new RecoveryController($this->appName, + $this->controller = new RecoveryController('encryption', $this->requestMock, $this->configMock, $this->l10nMock, diff --git a/apps/encryption/tests/controller/SettingsControllerTest.php b/apps/encryption/tests/Controller/SettingsControllerTest.php index 61391a33002..8180cae113f 100644 --- a/apps/encryption/tests/controller/SettingsControllerTest.php +++ b/apps/encryption/tests/Controller/SettingsControllerTest.php @@ -32,31 +32,31 @@ class SettingsControllerTest extends TestCase { /** @var SettingsController */ private $controller; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */ private $requestMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ private $l10nMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */ private $userManagerMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */ private $userSessionMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject */ private $keyManagerMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject */ private $cryptMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Session|\PHPUnit_Framework_MockObject_MockObject */ private $sessionMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\ISession|\PHPUnit_Framework_MockObject_MockObject */ private $ocSessionMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Util|\PHPUnit_Framework_MockObject_MockObject */ private $utilMock; protected function setUp() { @@ -96,7 +96,7 @@ class SettingsControllerTest extends TestCase { ]) ->getMock(); - $this->ocSessionMock = $this->getMockBuilder('\OCP\ISession')->disableOriginalConstructor()->getMock(); + $this->ocSessionMock = $this->getMockBuilder('OCP\ISession')->disableOriginalConstructor()->getMock(); $this->userSessionMock->expects($this->any()) ->method('getUID') diff --git a/apps/encryption/tests/controller/StatusControllerTest.php b/apps/encryption/tests/Controller/StatusControllerTest.php index 3c937623b7a..0410b36cd2a 100644 --- a/apps/encryption/tests/controller/StatusControllerTest.php +++ b/apps/encryption/tests/Controller/StatusControllerTest.php @@ -29,11 +29,11 @@ use Test\TestCase; class StatusControllerTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ - protected $requestMock; + /** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */ + private $requestMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ - protected $l10nMock; + /** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ + private $l10nMock; /** @var \OCA\Encryption\Session | \PHPUnit_Framework_MockObject_MockObject */ protected $sessionMock; diff --git a/apps/encryption/tests/lib/crypto/cryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php index 2f290db21a1..4b8147ab214 100644 --- a/apps/encryption/tests/lib/crypto/cryptTest.php +++ b/apps/encryption/tests/Crypto/CryptTest.php @@ -22,29 +22,28 @@ */ -namespace OCA\Encryption\Tests\lib\Crypto; +namespace OCA\Encryption\Tests\Crypto; use OCA\Encryption\Crypto\Crypt; use Test\TestCase; -class cryptTest extends TestCase { +class CryptTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\ILogger|\PHPUnit_Framework_MockObject_MockObject */ private $logger; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */ private $userSession; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $config; - - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ private $l; - /** @var Crypt */ + /** @var Crypt */ private $crypt; public function setUp() { diff --git a/apps/encryption/tests/lib/crypto/decryptalltest.php b/apps/encryption/tests/Crypto/DecryptAllTest.php index 0945692e427..a094f3b3a2d 100644 --- a/apps/encryption/tests/lib/crypto/decryptalltest.php +++ b/apps/encryption/tests/Crypto/DecryptAllTest.php @@ -20,7 +20,7 @@ */ -namespace OCA\Encryption\Tests\lib\Crypto; +namespace OCA\Encryption\Tests\Crypto; use OCA\Encryption\Crypto\Crypt; diff --git a/apps/encryption/tests/lib/crypto/encryptalltest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php index d31f58377c4..baa80eaaf84 100644 --- a/apps/encryption/tests/lib/crypto/encryptalltest.php +++ b/apps/encryption/tests/Crypto/EncryptAllTest.php @@ -20,7 +20,7 @@ */ -namespace OCA\Encryption\Tests\lib\Crypto; +namespace OCA\Encryption\Tests\Crypto; use OCA\Encryption\Crypto\EncryptAll; diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php index ad20efb4451..723c6e31b90 100644 --- a/apps/encryption/tests/lib/crypto/encryptionTest.php +++ b/apps/encryption/tests/Crypto/EncryptionTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\Encryption\Tests\lib\Crypto; +namespace OCA\Encryption\Tests\Crypto; use OCA\Encryption\Exceptions\PublicKeyMissingException; use Test\TestCase; @@ -31,31 +31,31 @@ class EncryptionTest extends TestCase { /** @var Encryption */ private $instance; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject */ private $keyManagerMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Crypto\EncryptAll|\PHPUnit_Framework_MockObject_MockObject */ private $encryptAllMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Crypto\DecryptAll|\PHPUnit_Framework_MockObject_MockObject */ private $decryptAllMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Session|\PHPUnit_Framework_MockObject_MockObject */ private $sessionMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject */ private $cryptMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Util|\PHPUnit_Framework_MockObject_MockObject */ private $utilMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\ILogger|\PHPUnit_Framework_MockObject_MockObject */ private $loggerMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ private $l10nMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Files\Storage|\PHPUnit_Framework_MockObject_MockObject */ private $storageMock; public function setUp() { @@ -410,7 +410,9 @@ class EncryptionTest extends TestCase { } public function testPrepareDecryptAll() { + /** @var \Symfony\Component\Console\Input\InputInterface $input */ $input = $this->getMock('Symfony\Component\Console\Input\InputInterface'); + /** @var \Symfony\Component\Console\Output\OutputInterface $output */ $output = $this->getMock('Symfony\Component\Console\Output\OutputInterface'); $this->decryptAllMock->expects($this->once())->method('prepare') diff --git a/apps/encryption/tests/lib/HookManagerTest.php b/apps/encryption/tests/HookManagerTest.php index d69674faec0..4228db318a1 100644 --- a/apps/encryption/tests/lib/HookManagerTest.php +++ b/apps/encryption/tests/HookManagerTest.php @@ -65,6 +65,7 @@ class HookManagerTest extends TestCase { */ public function testRegisterHooksWithInstance() { $mock = $this->getMockBuilder('OCA\Encryption\Hooks\Contracts\IHook')->disableOriginalConstructor()->getMock(); + /** @var \OCA\Encryption\Hooks\Contracts\IHook $mock */ self::$instance->registerHook($mock); $hookInstances = self::invokePrivate(self::$instance, 'hookInstances'); diff --git a/apps/encryption/tests/hooks/UserHooksTest.php b/apps/encryption/tests/Hooks/UserHooksTest.php index df3d12b3401..a4767bfb743 100644 --- a/apps/encryption/tests/hooks/UserHooksTest.php +++ b/apps/encryption/tests/Hooks/UserHooksTest.php @@ -70,6 +70,10 @@ class UserHooksTest extends TestCase { */ private $cryptMock; /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $loggerMock; + /** * @var UserHooks */ private $instance; @@ -91,15 +95,16 @@ class UserHooksTest extends TestCase { public function testLogout() { $this->sessionMock->expects($this->once()) ->method('clear'); - - $this->assertNull($this->instance->logout()); + $this->instance->logout(); + $this->assertTrue(true); } public function testPostCreateUser() { $this->userSetupMock->expects($this->once()) ->method('setupUser'); - $this->assertNull($this->instance->postCreateUser($this->params)); + $this->instance->postCreateUser($this->params); + $this->assertTrue(true); } public function testPostDeleteUser() { @@ -107,7 +112,8 @@ class UserHooksTest extends TestCase { ->method('deletePublicKey') ->with('testUser'); - $this->assertNull($this->instance->postDeleteUser($this->params)); + $this->instance->postDeleteUser($this->params); + $this->assertTrue(true); } /** @@ -273,6 +279,7 @@ class UserHooksTest extends TestCase { ] )->setMethods(['initMountPoints'])->getMock(); + /** @var \OCA\Encryption\Hooks\UserHooks $userHooks */ $this->assertNull($userHooks->setPassphrase($this->params)); } @@ -285,7 +292,8 @@ class UserHooksTest extends TestCase { ->method('setupUser') ->with('testUser', 'password'); - $this->assertNull($this->instance->postPasswordReset($this->params)); + $this->instance->postPasswordReset($this->params); + $this->assertTrue(true); } protected function setUp() { diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php index 7ede6177deb..6f6fb3a02dd 100644 --- a/apps/encryption/tests/lib/KeyManagerTest.php +++ b/apps/encryption/tests/KeyManagerTest.php @@ -43,25 +43,25 @@ class KeyManagerTest extends TestCase { /** @var string */ private $systemKeyId; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Encryption\Keys\IStorage|\PHPUnit_Framework_MockObject_MockObject */ private $keyStorageMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject */ private $cryptMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */ private $userMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Session|\PHPUnit_Framework_MockObject_MockObject */ private $sessionMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\ILogger|\PHPUnit_Framework_MockObject_MockObject */ private $logMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Encryption\Util|\PHPUnit_Framework_MockObject_MockObject */ private $utilMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $configMock; public function setUp() { @@ -245,6 +245,7 @@ class KeyManagerTest extends TestCase { */ public function testInit($useMasterKey) { + /** @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject $instance */ $instance = $this->getMockBuilder('OCA\Encryption\KeyManager') ->setConstructorArgs( [ @@ -588,6 +589,7 @@ class KeyManagerTest extends TestCase { ->with('/admin/files/myfile.txt') ->willReturn(false); + /** @var \OC\Files\View $view */ $this->assertSame(0, $this->instance->getVersion('/admin/files/myfile.txt', $view)); } @@ -604,6 +606,7 @@ class KeyManagerTest extends TestCase { ->with('/admin/files/myfile.txt') ->willReturn($fileInfo); + /** @var \OC\Files\View $view */ $this->assertSame(1337, $this->instance->getVersion('/admin/files/myfile.txt', $view)); } @@ -633,6 +636,7 @@ class KeyManagerTest extends TestCase { ->with('/admin/files/myfile.txt') ->willReturn($fileInfo); + /** @var \OC\Files\View $view */ $this->instance->setVersion('/admin/files/myfile.txt', 5, $view); } @@ -644,6 +648,7 @@ class KeyManagerTest extends TestCase { ->with('/admin/files/myfile.txt') ->willReturn(false); + /** @var \OC\Files\View $view */ $this->instance->setVersion('/admin/files/myfile.txt', 5, $view); } diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/MigrationTest.php index 18f7c8b35d5..c77693d24a6 100644 --- a/apps/encryption/tests/lib/MigrationTest.php +++ b/apps/encryption/tests/MigrationTest.php @@ -39,7 +39,7 @@ class MigrationTest extends \Test\TestCase { private $recovery_key_id = 'recovery_key_id'; private $moduleId; - /** @var PHPUnit_Framework_MockObject_MockObject | ILogger */ + /** @var \PHPUnit_Framework_MockObject_MockObject | ILogger */ private $logger; public static function setUpBeforeClass() { diff --git a/apps/encryption/tests/lib/RecoveryTest.php b/apps/encryption/tests/RecoveryTest.php index 68c21c80b34..c8bd838242b 100644 --- a/apps/encryption/tests/lib/RecoveryTest.php +++ b/apps/encryption/tests/RecoveryTest.php @@ -32,27 +32,27 @@ use Test\TestCase; class RecoveryTest extends TestCase { private static $tempStorage = []; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \OCP\Encryption\IFile|\PHPUnit_Framework_MockObject_MockObject */ private $fileMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Files\View|\PHPUnit_Framework_MockObject_MockObject */ private $viewMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */ private $userSessionMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject */ private $keyManagerMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $configMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject */ private $cryptMock; /** @@ -201,7 +201,8 @@ class RecoveryTest extends TestCase { $this->cryptMock->expects($this->once()) ->method('decryptPrivateKey'); - $this->assertNull($this->instance->recoverUsersFiles('password', 'admin')); + $this->instance->recoverUsersFiles('password', 'admin'); + $this->assertTrue(true); } public function testRecoverFile() { @@ -265,9 +266,11 @@ class RecoveryTest extends TestCase { ->will($this->returnSelf()); $this->cryptMock = $this->getMockBuilder('OCA\Encryption\Crypto\Crypt')->disableOriginalConstructor()->getMock(); + /** @var \OCP\Security\ISecureRandom $randomMock */ $randomMock = $this->getMock('OCP\Security\ISecureRandom'); $this->keyManagerMock = $this->getMockBuilder('OCA\Encryption\KeyManager')->disableOriginalConstructor()->getMock(); $this->configMock = $this->getMock('OCP\IConfig'); + /** @var \OCP\Encryption\Keys\IStorage $keyStorageMock */ $keyStorageMock = $this->getMock('OCP\Encryption\Keys\IStorage'); $this->fileMock = $this->getMock('OCP\Encryption\IFile'); $this->viewMock = $this->getMock('OC\Files\View'); diff --git a/apps/encryption/tests/lib/SessionTest.php b/apps/encryption/tests/SessionTest.php index f7a8a0369bb..b2944d450a1 100644 --- a/apps/encryption/tests/lib/SessionTest.php +++ b/apps/encryption/tests/SessionTest.php @@ -34,6 +34,7 @@ class SessionTest extends TestCase { * @var Session */ private $instance; + /** @var \OCP\ISession|\PHPUnit_Framework_MockObject_MockObject */ private $sessionMock; /** diff --git a/apps/encryption/tests/lib/users/SetupTest.php b/apps/encryption/tests/Users/SetupTest.php index e7d8afbb102..9e7cbde0c17 100644 --- a/apps/encryption/tests/lib/users/SetupTest.php +++ b/apps/encryption/tests/Users/SetupTest.php @@ -29,11 +29,11 @@ use Test\TestCase; class SetupTest extends TestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject */ private $keyManagerMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject */ private $cryptMock; /** @@ -55,6 +55,8 @@ class SetupTest extends TestCase { ->disableOriginalConstructor() ->getMock(); + /** @var \OCP\ILogger $logMock */ + /** @var \OCP\IUserSession $userSessionMock */ $this->instance = new Setup($logMock, $userSessionMock, $this->cryptMock, diff --git a/apps/encryption/tests/lib/UtilTest.php b/apps/encryption/tests/UtilTest.php index fa90125d6e9..e052bff8633 100644 --- a/apps/encryption/tests/lib/UtilTest.php +++ b/apps/encryption/tests/UtilTest.php @@ -30,16 +30,16 @@ use Test\TestCase; class UtilTest extends TestCase { private static $tempStorage = []; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $configMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Files\View|\PHPUnit_Framework_MockObject_MockObject */ private $filesMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */ private $userManagerMock; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Files\Mount\IMountPoint|\PHPUnit_Framework_MockObject_MockObject */ private $mountMock; /** @var Util */ @@ -72,10 +72,13 @@ class UtilTest extends TestCase { $this->filesMock = $this->getMock('OC\Files\View'); $this->userManagerMock = $this->getMock('\OCP\IUserManager'); + /** @var \OCA\Encryption\Crypto\Crypt $cryptMock */ $cryptMock = $this->getMockBuilder('OCA\Encryption\Crypto\Crypt') ->disableOriginalConstructor() ->getMock(); + /** @var \OCP\ILogger $loggerMock */ $loggerMock = $this->getMock('OCP\ILogger'); + /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject $userSessionMock */ $userSessionMock = $this->getMockBuilder('OCP\IUserSession') ->disableOriginalConstructor() ->setMethods([ @@ -97,7 +100,7 @@ class UtilTest extends TestCase { ->will($this->returnSelf()); - $this->configMock = $configMock = $this->getMock('OCP\IConfig'); + $this->configMock = $this->getMock('OCP\IConfig'); $this->configMock->expects($this->any()) ->method('getUserValue') @@ -107,7 +110,7 @@ class UtilTest extends TestCase { ->method('setUserValue') ->will($this->returnCallback([$this, 'setValueTester'])); - $this->instance = new Util($this->filesMock, $cryptMock, $loggerMock, $userSessionMock, $configMock, $this->userManagerMock); + $this->instance = new Util($this->filesMock, $cryptMock, $loggerMock, $userSessionMock, $this->configMock, $this->userManagerMock); } /** @@ -157,8 +160,8 @@ class UtilTest extends TestCase { /** * @dataProvider dataTestShouldEncryptHomeStorage - * @param $returnValue return value from getAppValue() - * @param $expected + * @param string $returnValue return value from getAppValue() + * @param bool $expected */ public function testShouldEncryptHomeStorage($returnValue, $expected) { $this->configMock->expects($this->once())->method('getAppValue') @@ -195,12 +198,16 @@ class UtilTest extends TestCase { } public function testGetStorage() { + $return = $this->getMockBuilder('OC\Files\Storage\Storage') + ->disableOriginalConstructor() + ->getMock(); + $path = '/foo/bar.txt'; $this->filesMock->expects($this->once())->method('getMount')->with($path) ->willReturn($this->mountMock); - $this->mountMock->expects($this->once())->method('getStorage')->willReturn(true); + $this->mountMock->expects($this->once())->method('getStorage')->willReturn($return); - $this->assertTrue($this->instance->getStorage($path)); + $this->assertEquals($return, $this->instance->getStorage($path)); } } diff --git a/apps/federatedfilesharing/l10n/it.js b/apps/federatedfilesharing/l10n/it.js index 142a976f45f..f2e2461e888 100644 --- a/apps/federatedfilesharing/l10n/it.js +++ b/apps/federatedfilesharing/l10n/it.js @@ -14,7 +14,7 @@ OC.L10N.register( "Federated Cloud" : "Cloud federata", "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", "Share it:" : "Condividilo:", - "Add to your website" : "Aggiungilo al tuo sito web", + "Add to your website" : "Aggiungi al tuo sito web", "Share with me via ownCloud" : "Condividi con me tramite ownCloud", "HTML Code:" : "Codice HTML:" }, diff --git a/apps/federatedfilesharing/l10n/it.json b/apps/federatedfilesharing/l10n/it.json index 553e9504501..fdf76b20e54 100644 --- a/apps/federatedfilesharing/l10n/it.json +++ b/apps/federatedfilesharing/l10n/it.json @@ -12,7 +12,7 @@ "Federated Cloud" : "Cloud federata", "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", "Share it:" : "Condividilo:", - "Add to your website" : "Aggiungilo al tuo sito web", + "Add to your website" : "Aggiungi al tuo sito web", "Share with me via ownCloud" : "Condividi con me tramite ownCloud", "HTML Code:" : "Codice HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/federatedfilesharing/l10n/ro.js b/apps/federatedfilesharing/l10n/ro.js new file mode 100644 index 00000000000..e2ee3edfd2a --- /dev/null +++ b/apps/federatedfilesharing/l10n/ro.js @@ -0,0 +1,10 @@ +OC.L10N.register( + "federatedfilesharing", + { + "Sharing %s failed, because this item is already shared with %s" : "Partajarea %s a eșuat deoarece acest element este deja partajat cu %s", + "Open documentation" : "Deschide documentația", + "Add to your website" : "Adaugă la site-ul tău Web", + "Share with me via ownCloud" : "Partajează cu mine via ownCloud", + "HTML Code:" : "Cod HTML:" +}, +"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/federatedfilesharing/l10n/ro.json b/apps/federatedfilesharing/l10n/ro.json new file mode 100644 index 00000000000..db021d11ad9 --- /dev/null +++ b/apps/federatedfilesharing/l10n/ro.json @@ -0,0 +1,8 @@ +{ "translations": { + "Sharing %s failed, because this item is already shared with %s" : "Partajarea %s a eșuat deoarece acest element este deja partajat cu %s", + "Open documentation" : "Deschide documentația", + "Add to your website" : "Adaugă la site-ul tău Web", + "Share with me via ownCloud" : "Partajează cu mine via ownCloud", + "HTML Code:" : "Cod HTML:" +},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" +}
\ No newline at end of file diff --git a/apps/federation/appinfo/application.php b/apps/federation/appinfo/application.php index 621a5d3d099..74185345329 100644 --- a/apps/federation/appinfo/application.php +++ b/apps/federation/appinfo/application.php @@ -169,11 +169,6 @@ class Application extends \OCP\AppFramework\App { }); } - public function setupCron() { - $jl = $this->getContainer()->getServer()->getJobList(); - $jl->add(new SyncJob()); - } - /** * @return SyncFederationAddressBooks */ diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml index 3bd66e2954a..e51d3990cea 100644 --- a/apps/federation/appinfo/info.xml +++ b/apps/federation/appinfo/info.xml @@ -15,4 +15,8 @@ <types> <authentication/> </types> + + <background-jobs> + <job>OCA\Federation\SyncJob</job> + </background-jobs> </info> diff --git a/apps/federation/appinfo/install.php b/apps/federation/appinfo/install.php deleted file mode 100644 index f2a98d7f555..00000000000 --- a/apps/federation/appinfo/install.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -/** - * @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/> - * - */ - -$app = new \OCA\Federation\AppInfo\Application(); -$app->setupCron(); diff --git a/apps/federation/appinfo/update.php b/apps/federation/appinfo/update.php deleted file mode 100644 index f2a98d7f555..00000000000 --- a/apps/federation/appinfo/update.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -/** - * @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/> - * - */ - -$app = new \OCA\Federation\AppInfo\Application(); -$app->setupCron(); diff --git a/apps/federation/l10n/es.js b/apps/federation/l10n/es.js index c559a39c979..2eb6aab8bd8 100644 --- a/apps/federation/l10n/es.js +++ b/apps/federation/l10n/es.js @@ -1,15 +1,15 @@ OC.L10N.register( "federation", { - "Server added to the list of trusted ownClouds" : "Servidor agregado a la lista de ownClouds en los que se confía", + "Server added to the list of trusted ownClouds" : "Servidor añadido a la lista de ownClouds en los que se confía", "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.", "No ownCloud server found" : "No se ha encontrado el servidor ownCloud", - "Could not add server" : "No se pudo agregar el servidor", + "Could not add server" : "No se ha podido añadir el servidor", "Federation" : "Federación", "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Federación de ownCloud permite conectar con otros ownClouds en los que se confíe para intercambiar el directorio de usuario. Por ejemplo esto se puede usar para autocompletar usuarios externos en caso de compartición federada.", "Add server automatically once a federated share was created successfully" : "Añadir el servidor automáticamente una vez que un compartido federado se haya creado exitosamente", "Trusted ownCloud Servers" : "Servidores onwCloud en los que confío", - "+ Add ownCloud server" : "+ Añadir servidor onwCloud", + "+ Add ownCloud server" : "+ Añadir servidor ownCloud", "ownCloud Server" : "Servidor ownCloud" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es.json b/apps/federation/l10n/es.json index 17c11ebae3c..67d6dec6de1 100644 --- a/apps/federation/l10n/es.json +++ b/apps/federation/l10n/es.json @@ -1,13 +1,13 @@ { "translations": { - "Server added to the list of trusted ownClouds" : "Servidor agregado a la lista de ownClouds en los que se confía", + "Server added to the list of trusted ownClouds" : "Servidor añadido a la lista de ownClouds en los que se confía", "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.", "No ownCloud server found" : "No se ha encontrado el servidor ownCloud", - "Could not add server" : "No se pudo agregar el servidor", + "Could not add server" : "No se ha podido añadir el servidor", "Federation" : "Federación", "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Federación de ownCloud permite conectar con otros ownClouds en los que se confíe para intercambiar el directorio de usuario. Por ejemplo esto se puede usar para autocompletar usuarios externos en caso de compartición federada.", "Add server automatically once a federated share was created successfully" : "Añadir el servidor automáticamente una vez que un compartido federado se haya creado exitosamente", "Trusted ownCloud Servers" : "Servidores onwCloud en los que confío", - "+ Add ownCloud server" : "+ Añadir servidor onwCloud", + "+ Add ownCloud server" : "+ Añadir servidor ownCloud", "ownCloud Server" : "Servidor ownCloud" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/ro.js b/apps/federation/l10n/ro.js new file mode 100644 index 00000000000..e3035955143 --- /dev/null +++ b/apps/federation/l10n/ro.js @@ -0,0 +1,9 @@ +OC.L10N.register( + "federation", + { + "Server added to the list of trusted ownClouds" : "Server adăugat la lista serverelor ownCloud de încredere", + "Server is already in the list of trusted servers." : "Serverul este deja pe lista celor de încredere.", + "No ownCloud server found" : "Nu s-a găsit niciun server ownCloud", + "Could not add server" : "Nu s-a putut adăuga serverul" +}, +"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/federation/l10n/ro.json b/apps/federation/l10n/ro.json new file mode 100644 index 00000000000..75c514fd8c8 --- /dev/null +++ b/apps/federation/l10n/ro.json @@ -0,0 +1,7 @@ +{ "translations": { + "Server added to the list of trusted ownClouds" : "Server adăugat la lista serverelor ownCloud de încredere", + "Server is already in the list of trusted servers." : "Serverul este deja pe lista celor de încredere.", + "No ownCloud server found" : "Nu s-a găsit niciun server ownCloud", + "Could not add server" : "Nu s-a putut adăuga serverul" +},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" +}
\ No newline at end of file diff --git a/apps/federation/l10n/ru.js b/apps/federation/l10n/ru.js index 8e4b1372938..f8644e2b9d3 100644 --- a/apps/federation/l10n/ru.js +++ b/apps/federation/l10n/ru.js @@ -7,6 +7,7 @@ OC.L10N.register( "Could not add server" : "Не удалось добавить сервер", "Federation" : "Объединение", "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Объединение серверов ownCloud позволит Вам подключиться к другим доверенным серверам ownCloud для обмена директориями пользователей. Это будет использовано, например, для автоматического завершения внешних пользователей при объединенном общем доступе.", + "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически, как только федеративный общий доступ будет успешно создан", "Trusted ownCloud Servers" : "Доверенные серверы ownCloud", "+ Add ownCloud server" : "+ Добавить сервер ownCloud", "ownCloud Server" : "Сервер ownCloud" diff --git a/apps/federation/l10n/ru.json b/apps/federation/l10n/ru.json index 526005e3d38..132794d6580 100644 --- a/apps/federation/l10n/ru.json +++ b/apps/federation/l10n/ru.json @@ -5,6 +5,7 @@ "Could not add server" : "Не удалось добавить сервер", "Federation" : "Объединение", "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Объединение серверов ownCloud позволит Вам подключиться к другим доверенным серверам ownCloud для обмена директориями пользователей. Это будет использовано, например, для автоматического завершения внешних пользователей при объединенном общем доступе.", + "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически, как только федеративный общий доступ будет успешно создан", "Trusted ownCloud Servers" : "Доверенные серверы ownCloud", "+ Add ownCloud server" : "+ Добавить сервер ownCloud", "ownCloud Server" : "Сервер ownCloud" diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 79dc4b31346..573285f8b3b 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -16,4 +16,10 @@ <documentation> <user>user-files</user> </documentation> + + <background-jobs> + <job>OCA\Files\BackgroundJob\ScanFiles</job> + <job>OCA\Files\BackgroundJob\DeleteOrphanedItems</job> + <job>OCA\Files\BackgroundJob\CleanupFileLocks</job> + </background-jobs> </info> diff --git a/apps/files/appinfo/install.php b/apps/files/appinfo/install.php deleted file mode 100644 index 55514935cda..00000000000 --- a/apps/files/appinfo/install.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -/** - * @author Arthur Schiwon <blizzz@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> - * @author Vincent Petry <pvince81@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/> - * - */ - -// Cron job for scanning user storages -\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\ScanFiles'); -\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\DeleteOrphanedItems'); -\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\CleanupFileLocks'); diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index 621ef7d2987..8fe6bb7b882 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -98,8 +98,3 @@ if ($installedVersion === '1.1.9' && ( } } } - -// Add cron job for scanning user storages -\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\ScanFiles'); -\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\DeleteOrphanedItems'); -\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\CleanupFileLocks'); diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css index c77bb28c774..669a15c4e38 100644 --- a/apps/files/css/detailsView.css +++ b/apps/files/css/detailsView.css @@ -14,6 +14,19 @@ width: 100%; } +#app-sidebar .mainFileInfoView .icon { + display: inline-block; +} + +#app-sidebar .mainFileInfoView .permalink { + margin-left: 10px; + opacity: .5; +} +#app-sidebar .mainFileInfoView .permalink-field>input { + clear: both; + width: 90%; +} + #app-sidebar .file-details-container { display: inline-block; float: left; diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css index 0641304d211..bb20c8c3f77 100644 --- a/apps/files/css/mobile.css +++ b/apps/files/css/mobile.css @@ -67,7 +67,15 @@ table td.filename .nametext .innernametext { } /* shorten elements for mobile */ -#uploadprogressbar { +#uploadprogressbar, #uploadprogressbar .label.inner { width: 50px; } +/* hide desktop-only parts */ +#uploadprogressbar .desktop { + display: none !important; } +#uploadprogressbar .mobile { + display: block !important; +} + +}
\ No newline at end of file diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index 07b788b937f..f0ffb9ac99e 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -47,7 +47,39 @@ width: 200px; height: 36px; display:inline-block; + text-align: center; +} +#uploadprogressbar .ui-progressbar-value.ui-widget-header.ui-corner-left { + height: 100%; + top: 0px; + left: 0px; + position: absolute; + overflow: hidden; +} +#uploadprogressbar .label { + top: 6px; + opacity: 1; + overflow: hidden; + white-space: nowrap; + font-weight: normal; +} +#uploadprogressbar .label.inner { + color:white; + position: absolute; + display: block; + width: 200px; +} +#uploadprogressbar .label.outer { + position: relative; + color: black; +} +#uploadprogressbar .desktop { + display: block; +} +#uploadprogressbar .mobile { + display: none; } + #uploadprogressbar + stop { font-size: 13px; } diff --git a/apps/files/js/app.js b/apps/files/js/app.js index eac080a009d..7a3d78f9663 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -174,6 +174,7 @@ // detect when app changed their current directory $('#app-content').delegate('>div', 'changeDirectory', _.bind(this._onDirectoryChanged, this)); + $('#app-content').delegate('>div', 'afterChangeDirectory', _.bind(this._onAfterDirectoryChanged, this)); $('#app-content').delegate('>div', 'changeViewerMode', _.bind(this._onChangeViewerMode, this)); $('#app-navigation').on('itemChanged', _.bind(this._onNavigationChanged, this)); @@ -224,7 +225,16 @@ */ _onDirectoryChanged: function(e) { if (e.dir) { - this._changeUrl(this.navigation.getActiveItem(), e.dir); + this._changeUrl(this.navigation.getActiveItem(), e.dir, e.fileId); + } + }, + + /** + * Event handler for when an app notified that its directory changed + */ + _onAfterDirectoryChanged: function(e) { + if (e.dir && e.fileId) { + this._changeUrl(this.navigation.getActiveItem(), e.dir, e.fileId); } }, @@ -261,14 +271,35 @@ }, /** + * Encode URL params into a string, except for the "dir" attribute + * that gets encoded as path where "/" is not encoded + * + * @param {Object.<string>} params + * @return {string} encoded params + */ + _makeUrlParams: function(params) { + var dir = params.dir; + delete params.dir; + return 'dir=' + OC.encodePath(dir) + '&' + OC.buildQueryString(params); + }, + + /** * Change the URL to point to the given dir and view */ - _changeUrl: function(view, dir) { + _changeUrl: function(view, dir, fileId) { var params = {dir: dir}; if (view !== 'files') { params.view = view; + } else if (fileId) { + params.fileid = fileId; + } + var currentParams = OC.Util.History.parseUrlQuery(); + if (currentParams.dir === params.dir && currentParams.view === params.view && currentParams.fileid !== params.fileid) { + // if only fileid changed or was added, replace instead of push + OC.Util.History.replaceState(this._makeUrlParams(params)); + } else { + OC.Util.History.pushState(this._makeUrlParams(params)); } - OC.Util.History.pushState(params); } }; })(); diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js index 364475e4a4f..58ac9924ef7 100644 --- a/apps/files/js/breadcrumb.js +++ b/apps/files/js/breadcrumb.js @@ -39,6 +39,8 @@ } if (options.onDrop) { this.onDrop = options.onDrop; + this.onOver = options.onOver; + this.onOut = options.onOut; } if (options.getCrumbUrl) { this.getCrumbUrl = options.getCrumbUrl; @@ -60,6 +62,8 @@ breadcrumbs: [], onClick: null, onDrop: null, + onOver: null, + onOut: null, /** * Sets the directory to be displayed as breadcrumb. @@ -127,6 +131,8 @@ if (this.onDrop) { this.$el.find('.crumb:not(.last)').droppable({ drop: this.onDrop, + over: this.onOver, + out: this.onOut, tolerance: 'pointer' }); } diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index b88a7031dba..3257ded7b89 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -557,7 +557,16 @@ OC.Upload = { window.file_upload_param = fileupload; if (supportAjaxUploadWithProgress()) { - + //remaining time + var lastUpdate = new Date().getMilliseconds(); + var lastSize = 0; + var bufferSize = 20; + var buffer = []; + var bufferIndex = 0; + var bufferTotal = 0; + for(var i = 0; i < bufferSize;i++){ + buffer[i] = 0; + } // add progress handlers fileupload.on('fileuploadadd', function(e, data) { OC.Upload.log('progress handle fileuploadadd', e, data); @@ -570,7 +579,15 @@ OC.Upload = { fileupload.on('fileuploadstart', function(e, data) { OC.Upload.log('progress handle fileuploadstart', e, data); $('#uploadprogresswrapper .stop').show(); + $('#uploadprogresswrapper .label').show(); $('#uploadprogressbar').progressbar({value: 0}); + $('#uploadprogressbar .ui-progressbar-value'). + html('<em class="label inner"><span class="desktop">' + + t('files', 'Uploading...') + + '</span><span class="mobile">' + + t('files', '...') + + '</span></em>'); + $('#uploadprogressbar').tipsy({gravity:'n', fade:true, live:true}); OC.Upload._showProgressBar(); }); fileupload.on('fileuploadprogress', function(e, data) { @@ -580,11 +597,67 @@ OC.Upload = { fileupload.on('fileuploadprogressall', function(e, data) { OC.Upload.log('progress handle fileuploadprogressall', e, data); var progress = (data.loaded / data.total) * 100; + var thisUpdate = new Date().getMilliseconds(); + var diffUpdate = (thisUpdate - lastUpdate)/1000; // eg. 2s + lastUpdate = thisUpdate; + var diffSize = data.loaded - lastSize; + lastSize = data.loaded; + diffSize = diffSize / diffUpdate; // apply timing factor, eg. 1mb/2s = 0.5mb/s + var remainingSeconds = ((data.total - data.loaded) / diffSize); + if(remainingSeconds >= 0) { + bufferTotal = bufferTotal - (buffer[bufferIndex]) + remainingSeconds; + buffer[bufferIndex] = remainingSeconds; //buffer to make it smoother + bufferIndex = (bufferIndex + 1) % bufferSize; + } + var smoothRemainingSeconds = (bufferTotal / bufferSize); //seconds + var date = new Date(smoothRemainingSeconds * 1000); + var timeStringDesktop = ""; + var timeStringMobile = ""; + if(date.getUTCHours() > 0){ + timeStringDesktop = t('files', '{hours}:{minutes}:{seconds} hour{plural_s} left' , { + hours:date.getUTCHours(), + minutes: ('0' + date.getUTCMinutes()).slice(-2), + seconds: ('0' + date.getUTCSeconds()).slice(-2), + plural_s: ( smoothRemainingSeconds === 3600 ? "": "s") // 1 hour = 1*60m*60s = 3600s + }); + timeStringMobile = t('files', '{hours}:{minutes}h' , { + hours:date.getUTCHours(), + minutes: ('0' + date.getUTCMinutes()).slice(-2), + seconds: ('0' + date.getUTCSeconds()).slice(-2) + }); + } else if(date.getUTCMinutes() > 0){ + timeStringDesktop = t('files', '{minutes}:{seconds} minute{plural_s} left' , { + minutes: date.getUTCMinutes(), + seconds: ('0' + date.getUTCSeconds()).slice(-2), + plural_s: (smoothRemainingSeconds === 60 ? "": "s") // 1 minute = 1*60s = 60s + }); + timeStringMobile = t('files', '{minutes}:{seconds}m' , { + minutes: date.getUTCMinutes(), + seconds: ('0' + date.getUTCSeconds()).slice(-2) + }); + } else if(date.getUTCSeconds() > 0){ + timeStringDesktop = t('files', '{seconds} second{plural_s} left' , { + seconds: date.getUTCSeconds(), + plural_s: (smoothRemainingSeconds === 1 ? "": "s") // 1 second = 1s = 1s + }); + timeStringMobile = t('files', '{seconds}s' , {seconds: date.getUTCSeconds()}); + } else { + timeStringDesktop = t('files', 'Any moment now...'); + timeStringMobile = t('files', 'Soon...'); + } + $('#uploadprogressbar .label .mobile').text(timeStringMobile); + $('#uploadprogressbar .label .desktop').text(timeStringDesktop); + $('#uploadprogressbar').attr('original-title', + t('files', '{loadedSize} of {totalSize} ({bitrate})' , { + loadedSize: humanFileSize(data.loaded), + totalSize: humanFileSize(data.total), + bitrate: humanFileSize(data.bitrate) + '/s' + }) + ); $('#uploadprogressbar').progressbar('value', progress); }); fileupload.on('fileuploadstop', function(e, data) { OC.Upload.log('progress handle fileuploadstop', e, data); - OC.Upload._hideProgressBar(); }); fileupload.on('fileuploadfail', function(e, data) { diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 69e32d500c4..c3d4fba9ef5 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -619,7 +619,7 @@ this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) { var dir = context.$file.attr('data-path') || context.fileList.getCurrentDirectory(); - context.fileList.changeDirectory(OC.joinPaths(dir, filename)); + context.fileList.changeDirectory(OC.joinPaths(dir, filename), true, false, parseInt(context.$file.attr('data-id'), 10)); }); this.registerAction({ diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 16ca5e91ed2..ef29a4844bf 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -271,6 +271,12 @@ // if dropping on folders is allowed, then also allow on breadcrumbs if (this._folderDropOptions) { breadcrumbOptions.onDrop = _.bind(this._onDropOnBreadCrumb, this); + breadcrumbOptions.onOver = function() { + self.$el.find('td.filename.ui-droppable').droppable('disable'); + } + breadcrumbOptions.onOut = function() { + self.$el.find('td.filename.ui-droppable').droppable('enable'); + } } this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions); @@ -785,6 +791,13 @@ } this.move(_.pluck(files, 'name'), targetPath); + + // re-enable td elements to be droppable + // sometimes the filename drop handler is still called after re-enable, + // it seems that waiting for a short time before re-enabling solves the problem + setTimeout(function() { + self.$el.find('td.filename.ui-droppable').droppable('enable'); + }, 10); }, /** @@ -1362,19 +1375,20 @@ return parseInt(this.$el.find('#permissions').val(), 10); }, /** - * @brief Changes the current directory and reload the file list. - * @param targetDir target directory (non URL encoded) - * @param changeUrl false if the URL must not be changed (defaults to true) - * @param {boolean} force set to true to force changing directory + * Changes the current directory and reload the file list. + * @param {string} targetDir target directory (non URL encoded) + * @param {boolean} [changeUrl=true] if the URL must not be changed (defaults to true) + * @param {boolean} [force=false] set to true to force changing directory + * @param {string} [fileId] optional file id, if known, to be appended in the URL */ - changeDirectory: function(targetDir, changeUrl, force) { + changeDirectory: function(targetDir, changeUrl, force, fileId) { var self = this; var currentDir = this.getCurrentDirectory(); targetDir = targetDir || '/'; if (!force && currentDir === targetDir) { return; } - this._setCurrentDir(targetDir, changeUrl); + this._setCurrentDir(targetDir, changeUrl, fileId); this.reload().then(function(success){ if (!success) { self.changeDirectory(currentDir, true); @@ -1389,8 +1403,9 @@ * Sets the current directory name and updates the breadcrumb. * @param targetDir directory to display * @param changeUrl true to also update the URL, false otherwise (default) + * @param {string} [fileId] file id */ - _setCurrentDir: function(targetDir, changeUrl) { + _setCurrentDir: function(targetDir, changeUrl, fileId) { targetDir = targetDir.replace(/\\/g, '/'); var previousDir = this.getCurrentDirectory(), baseDir = OC.basename(targetDir); @@ -1408,10 +1423,14 @@ this.$el.find('#dir').val(targetDir); if (changeUrl !== false) { - this.$el.trigger(jQuery.Event('changeDirectory', { + var params = { dir: targetDir, previousDir: previousDir - })); + }; + if (fileId) { + params.fileId = fileId; + } + this.$el.trigger(jQuery.Event('changeDirectory', params)); } this.breadcrumb.setDirectory(this.getCurrentDirectory()); }, @@ -1557,6 +1576,18 @@ result.sort(this._sortComparator); this.setFiles(result); + + if (this.dirInfo) { + var newFileId = this.dirInfo.id; + // update fileid in URL + var params = { + dir: this.getCurrentDirectory() + }; + if (newFileId) { + params.fileId = newFileId; + } + this.$el.trigger(jQuery.Event('afterChangeDirectory', params)); + } return true; }, diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js index 1bcb4873c53..c586135b9c7 100644 --- a/apps/files/js/mainfileinfodetailview.js +++ b/apps/files/js/mainfileinfodetailview.js @@ -12,7 +12,13 @@ var TEMPLATE = '<div class="thumbnailContainer"><a href="#" class="thumbnail action-default"><div class="stretcher"/></a></div>' + '<div class="file-details-container">' + - '<div class="fileName"><h3 title="{{name}}" class="ellipsis">{{name}}</h3></div>' + + '<div class="fileName">' + + '<h3 title="{{name}}" class="ellipsis">{{name}}</h3>' + + '<a class="permalink" href="{{permalink}}" title="{{permalinkTitle}}">' + + '<span class="icon icon-public"></span>' + + '<span class="hidden-visually">{{permalinkTitle}}</span>' + + '</a>' + + '</div>' + ' <div class="file-details ellipsis">' + ' <a href="#" ' + ' class="action action-favorite favorite">' + @@ -20,6 +26,9 @@ ' </a>' + ' {{#if hasSize}}<span class="size" title="{{altSize}}">{{size}}</span>, {{/if}}<span class="date" title="{{altDate}}">{{date}}</span>' + ' </div>' + + '</div>' + + '<div class="hidden permalink-field">' + + '<input type="text" value="{{permalink}}" placeholder="{{permalinkTitle}}" readonly="readonly"/>' + '</div>'; /** @@ -50,7 +59,9 @@ events: { 'click a.action-favorite': '_onClickFavorite', - 'click a.action-default': '_onClickDefaultAction' + 'click a.action-default': '_onClickDefaultAction', + 'click a.permalink': '_onClickPermalink', + 'focus .permalink-field>input': '_onFocusPermalink' }, template: function(data) { @@ -72,6 +83,20 @@ } }, + _onClickPermalink: function() { + var $row = this.$('.permalink-field'); + $row.toggleClass('hidden'); + if (!$row.hasClass('hidden')) { + $row.find('>input').focus(); + } + // cancel click, user must right-click + copy or middle click + return false; + }, + + _onFocusPermalink: function() { + this.$('.permalink-field>input').select(); + }, + _onClickFavorite: function(event) { event.preventDefault(); this._fileActions.triggerAction('Favorite', this.model, this._fileList); @@ -87,6 +112,11 @@ this.render(); }, + _makePermalink: function(fileId) { + var baseUrl = OC.getProtocol() + '://' + OC.getHost(); + return baseUrl + OC.generateUrl('/f/{fileId}', {fileId: fileId}); + }, + setFileInfo: function(fileInfo) { if (this.model) { this.model.off('change', this._onModelChanged, this); @@ -118,7 +148,9 @@ altDate: OC.Util.formatDate(this.model.get('mtime')), date: OC.Util.relativeModifiedDate(this.model.get('mtime')), starAltText: isFavorite ? t('files', 'Favorited') : t('files', 'Favorite'), - starIcon: OC.imagePath('core', isFavorite ? 'actions/starred' : 'actions/star') + starIcon: OC.imagePath('core', isFavorite ? 'actions/starred' : 'actions/star'), + permalink: this._makePermalink(this.model.get('id')), + permalinkTitle: t('files', 'Local link') })); // TODO: we really need OC.Previews diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js index 7330264e4e0..a9093c45a96 100644 --- a/apps/files/l10n/ar.js +++ b/apps/files/l10n/ar.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "مسار غير صحيح.", "Files" : "الملفات", "All files" : "كل الملفات", - "Favorites" : "المفضلة ", "Home" : "البيت", "Close" : "إغلاق", + "Favorites" : "المفضلة ", "Upload cancelled." : "تم إلغاء عملية رفع الملفات .", "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت", "Total file size {size1} exceeds upload limit {size2}" : "حجم الملف الكلي {size1} تجاوز الحد المسموح للرفع {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.", "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم", + "Uploading..." : "ترفيع...", "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.", "Actions" : "* تطبيقات.\n* أنشطة.", "Download" : "تحميل", @@ -83,7 +84,6 @@ OC.L10N.register( "Save" : "حفظ", "Settings" : "إعدادات", "WebDAV" : "WebDAV", - "Cancel upload" : "إلغاء الرفع", "No files in here" : "لا يوجد ملفات هنا ", "Upload some content or sync with your devices!" : "ارفع بعض المحتوي او زامن مع اجهزتك !", "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ", diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json index 281d546c515..fe07f30c033 100644 --- a/apps/files/l10n/ar.json +++ b/apps/files/l10n/ar.json @@ -19,14 +19,15 @@ "Invalid directory." : "مسار غير صحيح.", "Files" : "الملفات", "All files" : "كل الملفات", - "Favorites" : "المفضلة ", "Home" : "البيت", "Close" : "إغلاق", + "Favorites" : "المفضلة ", "Upload cancelled." : "تم إلغاء عملية رفع الملفات .", "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت", "Total file size {size1} exceeds upload limit {size2}" : "حجم الملف الكلي {size1} تجاوز الحد المسموح للرفع {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.", "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم", + "Uploading..." : "ترفيع...", "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.", "Actions" : "* تطبيقات.\n* أنشطة.", "Download" : "تحميل", @@ -81,7 +82,6 @@ "Save" : "حفظ", "Settings" : "إعدادات", "WebDAV" : "WebDAV", - "Cancel upload" : "إلغاء الرفع", "No files in here" : "لا يوجد ملفات هنا ", "Upload some content or sync with your devices!" : "ارفع بعض المحتوي او زامن مع اجهزتك !", "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ", diff --git a/apps/files/l10n/ast.js b/apps/files/l10n/ast.js index 7e5aba5a63b..6fe07fed765 100644 --- a/apps/files/l10n/ast.js +++ b/apps/files/l10n/ast.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Direutoriu non válidu.", "Files" : "Ficheros", "All files" : "Tolos ficheros", - "Favorites" : "Favoritos", "Home" : "Casa", "Close" : "Zarrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Xuba encaboxada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}", "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.", + "Uploading..." : "Xubiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.", "Actions" : "Aiciones", "Download" : "Descargar", @@ -92,7 +93,6 @@ OC.L10N.register( "Save" : "Guardar", "Settings" : "Axustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Encaboxar xuba", "No files in here" : "Nun hai nengún ficheru equí", "Upload some content or sync with your devices!" : "¡Xuba algún conteníu o sincroniza colos sos preseos!", "No entries found in this folder" : "Nenguna entrada en esta carpeta", diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json index f62ec31e0d8..5b554ab8f93 100644 --- a/apps/files/l10n/ast.json +++ b/apps/files/l10n/ast.json @@ -19,14 +19,15 @@ "Invalid directory." : "Direutoriu non válidu.", "Files" : "Ficheros", "All files" : "Tolos ficheros", - "Favorites" : "Favoritos", "Home" : "Casa", "Close" : "Zarrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Xuba encaboxada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}", "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.", + "Uploading..." : "Xubiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.", "Actions" : "Aiciones", "Download" : "Descargar", @@ -90,7 +91,6 @@ "Save" : "Guardar", "Settings" : "Axustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Encaboxar xuba", "No files in here" : "Nun hai nengún ficheru equí", "Upload some content or sync with your devices!" : "¡Xuba algún conteníu o sincroniza colos sos preseos!", "No entries found in this folder" : "Nenguna entrada en esta carpeta", diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js index 0adeb3b7a7d..7cce658e6c9 100644 --- a/apps/files/l10n/az.js +++ b/apps/files/l10n/az.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Yalnış qovluq.", "Files" : "Fayllar", "All files" : "Bütün fayllar", - "Favorites" : "Sevimlilər", "Home" : "Ev", "Close" : "Bağla", + "Favorites" : "Sevimlilər", "Upload cancelled." : "Yüklənmə dayandırıldı.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Yükləmək olmur {filename} ona görə ki, ya qovluqdur yada ki, həcmi 0 baytdır ", "Total file size {size1} exceeds upload limit {size2}" : "Ümumi fayl həcmi {size1} yüklənmə limiti {size2} -ni aşır", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Kifayət qədər boş yer yoxdur, siz yükləyirsiniz {size1} ancaq {size2} var. ", "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.", + "Uploading..." : "Serverə yüklənir...", "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.", "Actions" : "İşlər", "Download" : "Yüklə", @@ -89,7 +90,6 @@ OC.L10N.register( "Save" : "Saxlamaq", "Settings" : "Quraşdırmalar", "WebDAV" : "WebDAV", - "Cancel upload" : "Yüklənməni dayandır", "No files in here" : "Burda fayl yoxdur", "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!", "No entries found in this folder" : "Bu qovluqda heç bir verilən tapılmadı", diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json index cc98d275ed0..48bb39bc650 100644 --- a/apps/files/l10n/az.json +++ b/apps/files/l10n/az.json @@ -19,14 +19,15 @@ "Invalid directory." : "Yalnış qovluq.", "Files" : "Fayllar", "All files" : "Bütün fayllar", - "Favorites" : "Sevimlilər", "Home" : "Ev", "Close" : "Bağla", + "Favorites" : "Sevimlilər", "Upload cancelled." : "Yüklənmə dayandırıldı.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Yükləmək olmur {filename} ona görə ki, ya qovluqdur yada ki, həcmi 0 baytdır ", "Total file size {size1} exceeds upload limit {size2}" : "Ümumi fayl həcmi {size1} yüklənmə limiti {size2} -ni aşır", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Kifayət qədər boş yer yoxdur, siz yükləyirsiniz {size1} ancaq {size2} var. ", "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.", + "Uploading..." : "Serverə yüklənir...", "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.", "Actions" : "İşlər", "Download" : "Yüklə", @@ -87,7 +88,6 @@ "Save" : "Saxlamaq", "Settings" : "Quraşdırmalar", "WebDAV" : "WebDAV", - "Cancel upload" : "Yüklənməni dayandır", "No files in here" : "Burda fayl yoxdur", "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!", "No entries found in this folder" : "Bu qovluqda heç bir verilən tapılmadı", diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js index 9e6abe1e554..3a00853fa18 100644 --- a/apps/files/l10n/bg_BG.js +++ b/apps/files/l10n/bg_BG.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Невалидна директория.", "Files" : "Файлове", "All files" : "Всички файлове", - "Favorites" : "Любими", "Home" : "Домашен", "Close" : "Затвори", + "Favorites" : "Любими", "Upload cancelled." : "Качването е прекъснато.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неуспешно качване на {filename}, защото е директория или е с размер от 0 байта.", "Total file size {size1} exceeds upload limit {size2}" : "Общия размер {size1} надминава лимита за качване {size2}.", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Няма достатъчно свободно място, ти се опитваш да качиш {size1}, но са останали само {size2}.", "Could not get result from server." : "Не се получи резултат от сървърът.", + "Uploading..." : "Качване...", "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.", "Actions" : "Действия", "Download" : "Изтегли", @@ -81,7 +82,6 @@ OC.L10N.register( "Save" : "Запис", "Settings" : "Настройки", "WebDAV" : "WebDAV", - "Cancel upload" : "Отказване на качването", "No files in here" : "Тук няма файлове", "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!", "No entries found in this folder" : "Няма намерени записи в тази папка", diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json index 20a146fdf24..4d60be20692 100644 --- a/apps/files/l10n/bg_BG.json +++ b/apps/files/l10n/bg_BG.json @@ -19,14 +19,15 @@ "Invalid directory." : "Невалидна директория.", "Files" : "Файлове", "All files" : "Всички файлове", - "Favorites" : "Любими", "Home" : "Домашен", "Close" : "Затвори", + "Favorites" : "Любими", "Upload cancelled." : "Качването е прекъснато.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неуспешно качване на {filename}, защото е директория или е с размер от 0 байта.", "Total file size {size1} exceeds upload limit {size2}" : "Общия размер {size1} надминава лимита за качване {size2}.", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Няма достатъчно свободно място, ти се опитваш да качиш {size1}, но са останали само {size2}.", "Could not get result from server." : "Не се получи резултат от сървърът.", + "Uploading..." : "Качване...", "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.", "Actions" : "Действия", "Download" : "Изтегли", @@ -79,7 +80,6 @@ "Save" : "Запис", "Settings" : "Настройки", "WebDAV" : "WebDAV", - "Cancel upload" : "Отказване на качването", "No files in here" : "Тук няма файлове", "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!", "No entries found in this folder" : "Няма намерени записи в тази папка", diff --git a/apps/files/l10n/bn_BD.js b/apps/files/l10n/bn_BD.js index e9020ade843..43a8fc62fa6 100644 --- a/apps/files/l10n/bn_BD.js +++ b/apps/files/l10n/bn_BD.js @@ -17,10 +17,11 @@ OC.L10N.register( "Invalid directory." : "ভুল ডিরেক্টরি", "Files" : "ফাইল", "All files" : "সব ফাইল", - "Favorites" : "প্রিয়জন", "Home" : "নিবাস", "Close" : "বন্ধ", + "Favorites" : "প্রিয়জন", "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।", + "Uploading..." : "আপলোড করা হচ্ছে..........", "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।", "Actions" : "পদক্ষেপসমূহ", "Download" : "ডাউনলোড", @@ -57,7 +58,6 @@ OC.L10N.register( "Save" : "সংরক্ষণ", "Settings" : "নিয়ামকসমূহ", "WebDAV" : "WebDAV", - "Cancel upload" : "আপলোড বাতিল কর", "Upload too large" : "আপলোডের আকারটি অনেক বড়", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ", "Text file" : "টেক্সট ফাইল" diff --git a/apps/files/l10n/bn_BD.json b/apps/files/l10n/bn_BD.json index 1cd65349314..dc114d13a17 100644 --- a/apps/files/l10n/bn_BD.json +++ b/apps/files/l10n/bn_BD.json @@ -15,10 +15,11 @@ "Invalid directory." : "ভুল ডিরেক্টরি", "Files" : "ফাইল", "All files" : "সব ফাইল", - "Favorites" : "প্রিয়জন", "Home" : "নিবাস", "Close" : "বন্ধ", + "Favorites" : "প্রিয়জন", "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।", + "Uploading..." : "আপলোড করা হচ্ছে..........", "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।", "Actions" : "পদক্ষেপসমূহ", "Download" : "ডাউনলোড", @@ -55,7 +56,6 @@ "Save" : "সংরক্ষণ", "Settings" : "নিয়ামকসমূহ", "WebDAV" : "WebDAV", - "Cancel upload" : "আপলোড বাতিল কর", "Upload too large" : "আপলোডের আকারটি অনেক বড়", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ", "Text file" : "টেক্সট ফাইল" diff --git a/apps/files/l10n/bn_IN.js b/apps/files/l10n/bn_IN.js index e69597d35ca..0ecfb2688e1 100644 --- a/apps/files/l10n/bn_IN.js +++ b/apps/files/l10n/bn_IN.js @@ -13,6 +13,7 @@ OC.L10N.register( "Invalid directory." : "অবৈধ ডিরেক্টরি।", "Files" : "ফাইলস", "Close" : "বন্ধ", + "Uploading..." : "আপলোডইং ...", "Download" : "ডাউনলোড করুন", "Rename" : "পুনঃনামকরণ", "Delete" : "মুছে ফেলা", diff --git a/apps/files/l10n/bn_IN.json b/apps/files/l10n/bn_IN.json index 20c8c2e795e..fd1036d9926 100644 --- a/apps/files/l10n/bn_IN.json +++ b/apps/files/l10n/bn_IN.json @@ -11,6 +11,7 @@ "Invalid directory." : "অবৈধ ডিরেক্টরি।", "Files" : "ফাইলস", "Close" : "বন্ধ", + "Uploading..." : "আপলোডইং ...", "Download" : "ডাউনলোড করুন", "Rename" : "পুনঃনামকরণ", "Delete" : "মুছে ফেলা", diff --git a/apps/files/l10n/bs.js b/apps/files/l10n/bs.js index 285808e77bc..30adf5d7b06 100644 --- a/apps/files/l10n/bs.js +++ b/apps/files/l10n/bs.js @@ -21,9 +21,9 @@ OC.L10N.register( "Invalid directory." : "Neispravan direktorij.", "Files" : "Datoteke", "All files" : "Sve datoteke", - "Favorites" : "Favoriti", "Home" : "Kuća", "Close" : "Zatvori", + "Favorites" : "Favoriti", "Upload cancelled." : "Učitavanje je prekinuto.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemoguće učitati {filename} jer je ili direktorij ili ima 0 bajta", "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} prelazi ograničenje unosa {size2}", @@ -64,7 +64,6 @@ OC.L10N.register( "Save" : "Spasi", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Prekini učitavanje", "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!", "Select all" : "Označi sve", "Upload too large" : "Učitavanje je preveliko", diff --git a/apps/files/l10n/bs.json b/apps/files/l10n/bs.json index dfe4b910b42..1d06dca2da8 100644 --- a/apps/files/l10n/bs.json +++ b/apps/files/l10n/bs.json @@ -19,9 +19,9 @@ "Invalid directory." : "Neispravan direktorij.", "Files" : "Datoteke", "All files" : "Sve datoteke", - "Favorites" : "Favoriti", "Home" : "Kuća", "Close" : "Zatvori", + "Favorites" : "Favoriti", "Upload cancelled." : "Učitavanje je prekinuto.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemoguće učitati {filename} jer je ili direktorij ili ima 0 bajta", "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} prelazi ograničenje unosa {size2}", @@ -62,7 +62,6 @@ "Save" : "Spasi", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Prekini učitavanje", "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!", "Select all" : "Označi sve", "Upload too large" : "Učitavanje je preveliko", diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js index c3c16103ada..3773498f6ca 100644 --- a/apps/files/l10n/ca.js +++ b/apps/files/l10n/ca.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Directori no vàlid.", "Files" : "Fitxers", "All files" : "Tots els fitxers", - "Favorites" : "Preferits", "Home" : "Casa", "Close" : "Tanca", + "Favorites" : "Preferits", "Upload cancelled." : "La pujada s'ha cancel·lat.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No es pot pujar {filename} perquè és una carpeta o té 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Mida total del fitxer {size1} excedeix el límit de pujada {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}", "Could not get result from server." : "No hi ha resposta del servidor.", + "Uploading..." : "Pujant...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.", "Actions" : "Accions", "Download" : "Baixa", @@ -84,7 +86,6 @@ OC.L10N.register( "Save" : "Desa", "Settings" : "Arranjament", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancel·la la pujada", "No files in here" : "No hi ha arxius", "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.", "No entries found in this folder" : "No hi ha entrades en aquesta carpeta", diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json index a2b5da56dfd..2444742b1bd 100644 --- a/apps/files/l10n/ca.json +++ b/apps/files/l10n/ca.json @@ -19,14 +19,16 @@ "Invalid directory." : "Directori no vàlid.", "Files" : "Fitxers", "All files" : "Tots els fitxers", - "Favorites" : "Preferits", "Home" : "Casa", "Close" : "Tanca", + "Favorites" : "Preferits", "Upload cancelled." : "La pujada s'ha cancel·lat.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No es pot pujar {filename} perquè és una carpeta o té 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Mida total del fitxer {size1} excedeix el límit de pujada {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}", "Could not get result from server." : "No hi ha resposta del servidor.", + "Uploading..." : "Pujant...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.", "Actions" : "Accions", "Download" : "Baixa", @@ -82,7 +84,6 @@ "Save" : "Desa", "Settings" : "Arranjament", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancel·la la pujada", "No files in here" : "No hi ha arxius", "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.", "No entries found in this folder" : "No hi ha entrades en aquesta carpeta", diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js index 7301549e63a..cf3190c6ca2 100644 --- a/apps/files/l10n/cs_CZ.js +++ b/apps/files/l10n/cs_CZ.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Neplatný adresář", "Files" : "Soubory", "All files" : "Všechny soubory", - "Favorites" : "Oblíbené", "Home" : "Domů", "Close" : "Zavřít", + "Favorites" : "Oblíbené", "Upload cancelled." : "Odesílání zrušeno.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů", "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}", "Error uploading file \"{fileName}\": {message}" : "Chyba nahrávání souboru \"{fileName}\": {message}", "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.", + "Uploading..." : "Odesílám...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", "Actions" : "Činnosti", "Download" : "Stáhnout", @@ -75,6 +77,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"], "Favorited" : "Přidáno k oblíbeným", "Favorite" : "Oblíbené", + "Local link" : "Místní odkaz", "Folder" : "Složka", "New folder" : "Nová složka", "{newname} already exists" : "{newname} již existuje", @@ -108,7 +111,6 @@ OC.L10N.register( "Show hidden files" : "Zobrazit skryté soubory", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">přístup ke svým Souborům přes WebDAV</a>", - "Cancel upload" : "Zrušit odesílání", "No files in here" : "Žádné soubory", "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!", "No entries found in this folder" : "V této složce nebylo nic nalezeno", diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json index 9423db1ca09..e8890dc8c12 100644 --- a/apps/files/l10n/cs_CZ.json +++ b/apps/files/l10n/cs_CZ.json @@ -19,15 +19,17 @@ "Invalid directory." : "Neplatný adresář", "Files" : "Soubory", "All files" : "Všechny soubory", - "Favorites" : "Oblíbené", "Home" : "Domů", "Close" : "Zavřít", + "Favorites" : "Oblíbené", "Upload cancelled." : "Odesílání zrušeno.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů", "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}", "Error uploading file \"{fileName}\": {message}" : "Chyba nahrávání souboru \"{fileName}\": {message}", "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.", + "Uploading..." : "Odesílám...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", "Actions" : "Činnosti", "Download" : "Stáhnout", @@ -73,6 +75,7 @@ "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"], "Favorited" : "Přidáno k oblíbeným", "Favorite" : "Oblíbené", + "Local link" : "Místní odkaz", "Folder" : "Složka", "New folder" : "Nová složka", "{newname} already exists" : "{newname} již existuje", @@ -106,7 +109,6 @@ "Show hidden files" : "Zobrazit skryté soubory", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">přístup ke svým Souborům přes WebDAV</a>", - "Cancel upload" : "Zrušit odesílání", "No files in here" : "Žádné soubory", "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!", "No entries found in this folder" : "V této složce nebylo nic nalezeno", diff --git a/apps/files/l10n/cy_GB.js b/apps/files/l10n/cy_GB.js index e3879890b86..075164ddee4 100644 --- a/apps/files/l10n/cy_GB.js +++ b/apps/files/l10n/cy_GB.js @@ -15,6 +15,7 @@ OC.L10N.register( "Home" : "Cartref", "Close" : "Cau", "Upload cancelled." : "Diddymwyd llwytho i fyny.", + "Uploading..." : "Yn llwytho i fyny...", "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.", "Actions" : "Gweithredoedd", "Download" : "Llwytho i lawr", @@ -37,7 +38,6 @@ OC.L10N.register( "max. possible: " : "mwyaf. posib:", "Save" : "Cadw", "Settings" : "Gosodiadau", - "Cancel upload" : "Diddymu llwytho i fyny", "Upload too large" : "Maint llwytho i fyny'n rhy fawr", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.", "Text file" : "Ffeil destun" diff --git a/apps/files/l10n/cy_GB.json b/apps/files/l10n/cy_GB.json index 7d217d631ae..698a79a2d9a 100644 --- a/apps/files/l10n/cy_GB.json +++ b/apps/files/l10n/cy_GB.json @@ -13,6 +13,7 @@ "Home" : "Cartref", "Close" : "Cau", "Upload cancelled." : "Diddymwyd llwytho i fyny.", + "Uploading..." : "Yn llwytho i fyny...", "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.", "Actions" : "Gweithredoedd", "Download" : "Llwytho i lawr", @@ -35,7 +36,6 @@ "max. possible: " : "mwyaf. posib:", "Save" : "Cadw", "Settings" : "Gosodiadau", - "Cancel upload" : "Diddymu llwytho i fyny", "Upload too large" : "Maint llwytho i fyny'n rhy fawr", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.", "Text file" : "Ffeil destun" diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js index 02e0610c24a..e1013bcafbb 100644 --- a/apps/files/l10n/da.js +++ b/apps/files/l10n/da.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Ugyldig mappe.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Foretrukne", "Home" : "Hjemme", "Close" : "Luk", + "Favorites" : "Foretrukne", "Upload cancelled." : "Upload afbrudt.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage", "Error uploading file \"{fileName}\": {message}" : "Fejl under upload af filen \"{fileName}\": {message}", "Could not get result from server." : "Kunne ikke hente resultat fra server.", + "Uploading..." : "Uploader...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.", "Actions" : "Handlinger", "Download" : "Download", @@ -96,7 +98,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted", "Settings" : "Indstillinger", "WebDAV" : "WebDAV", - "Cancel upload" : "Fortryd upload", "No files in here" : "Her er ingen filer", "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!", "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe", diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json index 5a9a14c414a..3162770cc40 100644 --- a/apps/files/l10n/da.json +++ b/apps/files/l10n/da.json @@ -19,15 +19,17 @@ "Invalid directory." : "Ugyldig mappe.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Foretrukne", "Home" : "Hjemme", "Close" : "Luk", + "Favorites" : "Foretrukne", "Upload cancelled." : "Upload afbrudt.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage", "Error uploading file \"{fileName}\": {message}" : "Fejl under upload af filen \"{fileName}\": {message}", "Could not get result from server." : "Kunne ikke hente resultat fra server.", + "Uploading..." : "Uploader...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.", "Actions" : "Handlinger", "Download" : "Download", @@ -94,7 +96,6 @@ "Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted", "Settings" : "Indstillinger", "WebDAV" : "WebDAV", - "Cancel upload" : "Fortryd upload", "No files in here" : "Her er ingen filer", "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!", "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe", diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index 1d3c8ed51e7..068cbe85376 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Ungültiges Verzeichnis.", "Files" : "Dateien", "All files" : "Alle Dateien", - "Favorites" : "Favoriten", "Home" : "Home", "Close" : "Schließen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen von \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", + "Uploading..." : "Hochladen…", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig", + "{seconds}s" : "{seconds}n", + "Any moment now..." : "Jeden Augenblick...", + "Soon..." : "Bald...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", "Actions" : "Aktionen", "Download" : "Herunterladen", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "{newname} already exists" : "{newname} existiert bereits", @@ -108,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Versteckte Dateien anzeigen", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Deine Dateien zuzugreifen</a>", - "Cancel upload" : "Upload abbrechen", "No files in here" : "Keine Dateien vorhanden", "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!", "No entries found in this folder" : "Keine Einträge in diesem Ordner", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 2b0ddc64950..2169d228295 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -19,15 +19,26 @@ "Invalid directory." : "Ungültiges Verzeichnis.", "Files" : "Dateien", "All files" : "Alle Dateien", - "Favorites" : "Favoriten", "Home" : "Home", "Close" : "Schließen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen von \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", + "Uploading..." : "Hochladen…", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig", + "{seconds}s" : "{seconds}n", + "Any moment now..." : "Jeden Augenblick...", + "Soon..." : "Bald...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", "Actions" : "Aktionen", "Download" : "Herunterladen", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "{newname} already exists" : "{newname} existiert bereits", @@ -106,7 +118,6 @@ "Show hidden files" : "Versteckte Dateien anzeigen", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Deine Dateien zuzugreifen</a>", - "Cancel upload" : "Upload abbrechen", "No files in here" : "Keine Dateien vorhanden", "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!", "No entries found in this folder" : "Keine Einträge in diesem Ordner", diff --git a/apps/files/l10n/de_AT.js b/apps/files/l10n/de_AT.js index 9100dc4d820..356747e1ae1 100644 --- a/apps/files/l10n/de_AT.js +++ b/apps/files/l10n/de_AT.js @@ -21,7 +21,6 @@ OC.L10N.register( "You deleted %1$s" : "Du hast %1$s gelöscht", "%2$s deleted %1$s" : "%2$s löschte %1$s", "Save" : "Speichern", - "Settings" : "Einstellungen", - "Cancel upload" : "Hochladen abbrechen" + "Settings" : "Einstellungen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/de_AT.json b/apps/files/l10n/de_AT.json index cfbffca2b31..abb023d815f 100644 --- a/apps/files/l10n/de_AT.json +++ b/apps/files/l10n/de_AT.json @@ -19,7 +19,6 @@ "You deleted %1$s" : "Du hast %1$s gelöscht", "%2$s deleted %1$s" : "%2$s löschte %1$s", "Save" : "Speichern", - "Settings" : "Einstellungen", - "Cancel upload" : "Hochladen abbrechen" + "Settings" : "Einstellungen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 3c3c732c885..9a349357a99 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Ungültiges Verzeichnis.", "Files" : "Dateien", "All files" : "Alle Dateien", - "Favorites" : "Favoriten", "Home" : "Zuhause", "Close" : "Schließen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", + "Uploading..." : "Hochladen…", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig", + "{seconds}s" : "{seconds}n", + "Any moment now..." : "Jeden Augenblick...", + "Soon..." : "Bald...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "Actions" : "Aktionen", "Download" : "Herunterladen", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "{newname} already exists" : "{newname} existiert bereits", @@ -108,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Versteckte Dateien anzeigen", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Ihre Dateien zuzugreifen</a>", - "Cancel upload" : "Upload abbrechen", "No files in here" : "Keine Dateien vorhanden", "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!", "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index f9ad749b41e..9df557e8fa4 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -19,15 +19,26 @@ "Invalid directory." : "Ungültiges Verzeichnis.", "Files" : "Dateien", "All files" : "Alle Dateien", - "Favorites" : "Favoriten", "Home" : "Zuhause", "Close" : "Schließen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", + "Uploading..." : "Hochladen…", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} Stunde{plural_s} übrig", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} Minute{plural_s} übrig", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} Sekund{plural_s} übrig", + "{seconds}s" : "{seconds}n", + "Any moment now..." : "Jeden Augenblick...", + "Soon..." : "Bald...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "Actions" : "Aktionen", "Download" : "Herunterladen", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorisiert", "Favorite" : "Favorit", + "Local link" : "Lokaler Link", "Folder" : "Ordner", "New folder" : "Neuer Ordner", "{newname} already exists" : "{newname} existiert bereits", @@ -106,7 +118,6 @@ "Show hidden files" : "Versteckte Dateien anzeigen", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Ihre Dateien zuzugreifen</a>", - "Cancel upload" : "Upload abbrechen", "No files in here" : "Keine Dateien vorhanden", "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!", "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js index 7b65dbc90a6..7889f274a6e 100644 --- a/apps/files/l10n/el.js +++ b/apps/files/l10n/el.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Μη έγκυρος φάκελος.", "Files" : "Αρχεία", "All files" : "Όλα τα αρχεία", - "Favorites" : "Αγαπημένα", "Home" : "Σπίτι", "Close" : "Κλείσιμο", + "Favorites" : "Αγαπημένα", "Upload cancelled." : "Η αποστολή ακυρώθηκε.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}", "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.", + "Uploading..." : "Μεταφόρτωση...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", "Actions" : "Ενέργειες", "Download" : "Λήψη", @@ -101,7 +103,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Δεν υπάρχουν τα απαραίτητα δικαιώματα για να γίνει τροποποιήση σε αυτό το σημείο.", "Settings" : "Ρυθμίσεις", "WebDAV" : "WebDAV", - "Cancel upload" : "Ακύρωση μεταφόρτωσης", "No files in here" : "Δεν υπάρχουν αρχεία", "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!", "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json index 982dc0c97c9..1bbec743a75 100644 --- a/apps/files/l10n/el.json +++ b/apps/files/l10n/el.json @@ -19,14 +19,16 @@ "Invalid directory." : "Μη έγκυρος φάκελος.", "Files" : "Αρχεία", "All files" : "Όλα τα αρχεία", - "Favorites" : "Αγαπημένα", "Home" : "Σπίτι", "Close" : "Κλείσιμο", + "Favorites" : "Αγαπημένα", "Upload cancelled." : "Η αποστολή ακυρώθηκε.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}", "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.", + "Uploading..." : "Μεταφόρτωση...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", "Actions" : "Ενέργειες", "Download" : "Λήψη", @@ -99,7 +101,6 @@ "Missing permissions to edit from here." : "Δεν υπάρχουν τα απαραίτητα δικαιώματα για να γίνει τροποποιήση σε αυτό το σημείο.", "Settings" : "Ρυθμίσεις", "WebDAV" : "WebDAV", - "Cancel upload" : "Ακύρωση μεταφόρτωσης", "No files in here" : "Δεν υπάρχουν αρχεία", "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!", "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", diff --git a/apps/files/l10n/en@pirate.js b/apps/files/l10n/en@pirate.js deleted file mode 100644 index 5c456a089fe..00000000000 --- a/apps/files/l10n/en@pirate.js +++ /dev/null @@ -1,6 +0,0 @@ -OC.L10N.register( - "files", - { - "Download" : "Download" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/en@pirate.json b/apps/files/l10n/en@pirate.json deleted file mode 100644 index a8fb4073298..00000000000 --- a/apps/files/l10n/en@pirate.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "translations": { - "Download" : "Download" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js index a15c67400b7..ec8b821c3e7 100644 --- a/apps/files/l10n/en_GB.js +++ b/apps/files/l10n/en_GB.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Invalid directory.", "Files" : "Files", "All files" : "All files", - "Favorites" : "Favourites", "Home" : "Home", "Close" : "Close", + "Favorites" : "Favourites", "Upload cancelled." : "Upload cancelled.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left", "Error uploading file \"{fileName}\": {message}" : "Error uploading file \"{fileName}\": {message}", "Could not get result from server." : "Could not get result from server.", + "Uploading..." : "Uploading...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} left", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} second{plural_s} left", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Any moment now...", + "Soon..." : "Soon...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.", "Actions" : "Actions", "Download" : "Download", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favourited", "Favorite" : "Favourite", + "Local link" : "Local link", "Folder" : "Folder", "New folder" : "New folder", "{newname} already exists" : "{newname} already exists", @@ -105,9 +117,9 @@ OC.L10N.register( "With PHP-FPM it might take 5 minutes for changes to be applied." : "With PHP-FPM it might take 5 minutes for changes to be applied.", "Missing permissions to edit from here." : "Missing permissions to edit from here.", "Settings" : "Settings", + "Show hidden files" : "Show hidden files", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>", - "Cancel upload" : "Cancel upload", "No files in here" : "No files in here", "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!", "No entries found in this folder" : "No entries found in this folder", diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json index 46a71fdf049..6dae8ba41b7 100644 --- a/apps/files/l10n/en_GB.json +++ b/apps/files/l10n/en_GB.json @@ -19,15 +19,26 @@ "Invalid directory." : "Invalid directory.", "Files" : "Files", "All files" : "All files", - "Favorites" : "Favourites", "Home" : "Home", "Close" : "Close", + "Favorites" : "Favourites", "Upload cancelled." : "Upload cancelled.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left", "Error uploading file \"{fileName}\": {message}" : "Error uploading file \"{fileName}\": {message}", "Could not get result from server." : "Could not get result from server.", + "Uploading..." : "Uploading...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} left", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} second{plural_s} left", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Any moment now...", + "Soon..." : "Soon...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.", "Actions" : "Actions", "Download" : "Download", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favourited", "Favorite" : "Favourite", + "Local link" : "Local link", "Folder" : "Folder", "New folder" : "New folder", "{newname} already exists" : "{newname} already exists", @@ -103,9 +115,9 @@ "With PHP-FPM it might take 5 minutes for changes to be applied." : "With PHP-FPM it might take 5 minutes for changes to be applied.", "Missing permissions to edit from here." : "Missing permissions to edit from here.", "Settings" : "Settings", + "Show hidden files" : "Show hidden files", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>", - "Cancel upload" : "Cancel upload", "No files in here" : "No files in here", "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!", "No entries found in this folder" : "No entries found in this folder", diff --git a/apps/files/l10n/eo.js b/apps/files/l10n/eo.js index d0463d0ac10..0a935b38f1b 100644 --- a/apps/files/l10n/eo.js +++ b/apps/files/l10n/eo.js @@ -20,14 +20,15 @@ OC.L10N.register( "Invalid directory." : "Nevalida dosierujo.", "Files" : "Dosieroj", "All files" : "Ĉiuj dosieroj", - "Favorites" : "Favoratoj", "Home" : "Hejmo", "Close" : "Fermi", + "Favorites" : "Favoratoj", "Upload cancelled." : "La alŝuto nuliĝis.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn", "Total file size {size1} exceeds upload limit {size2}" : "Tuta dosiergrando {size1} transpasas alŝutolimon {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ne sufiĉas libera spaco: vi alŝutas {size1} sed nur {size2} restas", "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.", + "Uploading..." : "Alŝutante...", "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.", "Actions" : "Agoj", "Download" : "Elŝuti", @@ -102,7 +103,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Mankas permesoj por redakti ekde ĉi tie.", "Settings" : "Agordo", "WebDAV" : "WebDAV", - "Cancel upload" : "Nuligi alŝuton", "No files in here" : "Neniu dosiero estas ĉi tie", "Upload some content or sync with your devices!" : "Alŝutu iom da enhavo aŭ sinkronigu kun viaj aparatoj!", "No entries found in this folder" : "Neniu enigo troviĝis en ĉi tiu dosierujo", diff --git a/apps/files/l10n/eo.json b/apps/files/l10n/eo.json index 743d146699e..4b7602e11a7 100644 --- a/apps/files/l10n/eo.json +++ b/apps/files/l10n/eo.json @@ -18,14 +18,15 @@ "Invalid directory." : "Nevalida dosierujo.", "Files" : "Dosieroj", "All files" : "Ĉiuj dosieroj", - "Favorites" : "Favoratoj", "Home" : "Hejmo", "Close" : "Fermi", + "Favorites" : "Favoratoj", "Upload cancelled." : "La alŝuto nuliĝis.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn", "Total file size {size1} exceeds upload limit {size2}" : "Tuta dosiergrando {size1} transpasas alŝutolimon {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ne sufiĉas libera spaco: vi alŝutas {size1} sed nur {size2} restas", "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.", + "Uploading..." : "Alŝutante...", "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.", "Actions" : "Agoj", "Download" : "Elŝuti", @@ -100,7 +101,6 @@ "Missing permissions to edit from here." : "Mankas permesoj por redakti ekde ĉi tie.", "Settings" : "Agordo", "WebDAV" : "WebDAV", - "Cancel upload" : "Nuligi alŝuton", "No files in here" : "Neniu dosiero estas ĉi tie", "Upload some content or sync with your devices!" : "Alŝutu iom da enhavo aŭ sinkronigu kun viaj aparatoj!", "No entries found in this folder" : "Neniu enigo troviĝis en ĉi tiu dosierujo", diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index 87f531a02e6..433945d7c60 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -21,15 +21,21 @@ OC.L10N.register( "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", "All files" : "Todos los archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Subida cancelada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", "Error uploading file \"{fileName}\": {message}" : "Error subiendo el archivo \"{fileName}\": {message}", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", + "Uploading..." : "Subiendo...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "En cualquier momento...", + "Soon..." : "Dentro de poco...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", "Download" : "Descargar", @@ -40,7 +46,7 @@ OC.L10N.register( "Details" : "Detalles", "Select" : "Seleccionar", "Pending" : "Pendiente", - "Unable to determine date" : "No se pudo determinar la fecha", + "Unable to determine date" : "No se ha podido determinar la fecha", "This operation is forbidden" : "Esta operación está prohibida", "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contáctese con el administrador", "Could not move \"{file}\", target exists" : "No se pudo mover \"{file}\", destino ya existe", @@ -75,6 +81,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Agregado a Favoritos", "Favorite" : "Favorito", + "Local link" : "Enlace local", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", "{newname} already exists" : "{newname} ya existe", @@ -102,13 +109,12 @@ OC.L10N.register( "Maximum upload size" : "Tamaño máximo de subida", "max. possible: " : "máx. posible:", "Save" : "Guardar", - "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tomar 5 minutos para que los cambios se apliquen.", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tardar 5 minutos para que se realicen los cambios.", "Missing permissions to edit from here." : "Faltan permisos para poder editar desde aquí.", "Settings" : "Ajustes", "Show hidden files" : "Mostrar archivos ocultos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Introduce esta dirección <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> en el cliente de ownCloud para acceder a tus archivos a través de él</a>", - "Cancel upload" : "Cancelar la subida", "No files in here" : "Aquí no hay archivos", "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.", "No entries found in this folder" : "No hay entradas en esta carpeta", diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index 73366ba821b..57a6905a497 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -19,15 +19,21 @@ "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", "All files" : "Todos los archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Subida cancelada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", "Error uploading file \"{fileName}\": {message}" : "Error subiendo el archivo \"{fileName}\": {message}", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", + "Uploading..." : "Subiendo...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "En cualquier momento...", + "Soon..." : "Dentro de poco...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", "Download" : "Descargar", @@ -38,7 +44,7 @@ "Details" : "Detalles", "Select" : "Seleccionar", "Pending" : "Pendiente", - "Unable to determine date" : "No se pudo determinar la fecha", + "Unable to determine date" : "No se ha podido determinar la fecha", "This operation is forbidden" : "Esta operación está prohibida", "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contáctese con el administrador", "Could not move \"{file}\", target exists" : "No se pudo mover \"{file}\", destino ya existe", @@ -73,6 +79,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Agregado a Favoritos", "Favorite" : "Favorito", + "Local link" : "Enlace local", "Folder" : "Carpeta", "New folder" : "Nueva carpeta", "{newname} already exists" : "{newname} ya existe", @@ -100,13 +107,12 @@ "Maximum upload size" : "Tamaño máximo de subida", "max. possible: " : "máx. posible:", "Save" : "Guardar", - "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tomar 5 minutos para que los cambios se apliquen.", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tardar 5 minutos para que se realicen los cambios.", "Missing permissions to edit from here." : "Faltan permisos para poder editar desde aquí.", "Settings" : "Ajustes", "Show hidden files" : "Mostrar archivos ocultos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Introduce esta dirección <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> en el cliente de ownCloud para acceder a tus archivos a través de él</a>", - "Cancel upload" : "Cancelar la subida", "No files in here" : "Aquí no hay archivos", "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.", "No entries found in this folder" : "No hay entradas en esta carpeta", diff --git a/apps/files/l10n/es_AR.js b/apps/files/l10n/es_AR.js index 7a5df7542e3..95226ead4d2 100644 --- a/apps/files/l10n/es_AR.js +++ b/apps/files/l10n/es_AR.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", "All files" : "Todos los archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "La subida fue cancelada", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", "Could not get result from server." : "No se pudo obtener resultados del servidor.", + "Uploading..." : "Subiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.", "Actions" : "Acciones", "Download" : "Descargar", @@ -70,7 +71,6 @@ OC.L10N.register( "Save" : "Guardar", "Settings" : "Configuración", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar subida", "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ", "Text file" : "Archivo de texto" diff --git a/apps/files/l10n/es_AR.json b/apps/files/l10n/es_AR.json index 03a0007c477..891fbc932ed 100644 --- a/apps/files/l10n/es_AR.json +++ b/apps/files/l10n/es_AR.json @@ -19,14 +19,15 @@ "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", "All files" : "Todos los archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "La subida fue cancelada", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}", "Could not get result from server." : "No se pudo obtener resultados del servidor.", + "Uploading..." : "Subiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.", "Actions" : "Acciones", "Download" : "Descargar", @@ -68,7 +69,6 @@ "Save" : "Guardar", "Settings" : "Configuración", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar subida", "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ", "Text file" : "Archivo de texto" diff --git a/apps/files/l10n/es_CL.js b/apps/files/l10n/es_CL.js index 7b67ca39ac5..d918e9f434b 100644 --- a/apps/files/l10n/es_CL.js +++ b/apps/files/l10n/es_CL.js @@ -17,7 +17,6 @@ OC.L10N.register( "%2$s changed %1$s" : "%2$s cambió %1$s", "You deleted %1$s" : "Ha borrado %1$s", "%2$s deleted %1$s" : "%2$s borró %1$s", - "Settings" : "Configuración", - "Cancel upload" : "cancelar subida" + "Settings" : "Configuración" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/es_CL.json b/apps/files/l10n/es_CL.json index 7c42b2a4097..0869209474f 100644 --- a/apps/files/l10n/es_CL.json +++ b/apps/files/l10n/es_CL.json @@ -15,7 +15,6 @@ "%2$s changed %1$s" : "%2$s cambió %1$s", "You deleted %1$s" : "Ha borrado %1$s", "%2$s deleted %1$s" : "%2$s borró %1$s", - "Settings" : "Configuración", - "Cancel upload" : "cancelar subida" + "Settings" : "Configuración" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js index 3eb1c68b888..45db24098e5 100644 --- a/apps/files/l10n/es_MX.js +++ b/apps/files/l10n/es_MX.js @@ -17,12 +17,13 @@ OC.L10N.register( "Upload failed. Could not get file info." : "Actualización fallida. No se pudo obtener información del archivo.", "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Subida cancelada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", + "Uploading..." : "Subiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", "Download" : "Descargar", @@ -56,7 +57,6 @@ OC.L10N.register( "Save" : "Guardar", "Settings" : "Ajustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar subida", "Upload too large" : "Subida demasido grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.", "Text file" : "Archivo de texto" diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json index 644ae02a3b5..76e66f1d612 100644 --- a/apps/files/l10n/es_MX.json +++ b/apps/files/l10n/es_MX.json @@ -15,12 +15,13 @@ "Upload failed. Could not get file info." : "Actualización fallida. No se pudo obtener información del archivo.", "Invalid directory." : "Directorio inválido.", "Files" : "Archivos", - "Favorites" : "Favoritos", "Home" : "Particular", "Close" : "Cerrar", + "Favorites" : "Favoritos", "Upload cancelled." : "Subida cancelada.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes", "Could not get result from server." : "No se pudo obtener respuesta del servidor.", + "Uploading..." : "Subiendo...", "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.", "Actions" : "Acciones", "Download" : "Descargar", @@ -54,7 +55,6 @@ "Save" : "Guardar", "Settings" : "Ajustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar subida", "Upload too large" : "Subida demasido grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.", "Text file" : "Archivo de texto" diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js index ab205b5ecf9..fc6629c9436 100644 --- a/apps/files/l10n/et_EE.js +++ b/apps/files/l10n/et_EE.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Vigane kaust.", "Files" : "Failid", "All files" : "Kõik failid", - "Favorites" : "Lemmikud", "Home" : "Kodu", "Close" : "Sulge", + "Favorites" : "Lemmikud", "Upload cancelled." : "Üleslaadimine tühistati.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti", "Total file size {size1} exceeds upload limit {size2}" : "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.", "Could not get result from server." : "Serverist ei saadud tulemusi", + "Uploading..." : "Üleslaadimine...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.", "Actions" : "Tegevused", "Download" : "Lae alla", @@ -92,7 +94,6 @@ OC.L10N.register( "Save" : "Salvesta", "Settings" : "Seaded", "WebDAV" : "WebDAV", - "Cancel upload" : "Tühista üleslaadimine", "No files in here" : "Siin ei ole faile", "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!", "No entries found in this folder" : "Selles kaustast ei leitud kirjeid", diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json index 15881c2a853..9dce37dc64d 100644 --- a/apps/files/l10n/et_EE.json +++ b/apps/files/l10n/et_EE.json @@ -19,14 +19,16 @@ "Invalid directory." : "Vigane kaust.", "Files" : "Failid", "All files" : "Kõik failid", - "Favorites" : "Lemmikud", "Home" : "Kodu", "Close" : "Sulge", + "Favorites" : "Lemmikud", "Upload cancelled." : "Üleslaadimine tühistati.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti", "Total file size {size1} exceeds upload limit {size2}" : "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.", "Could not get result from server." : "Serverist ei saadud tulemusi", + "Uploading..." : "Üleslaadimine...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.", "Actions" : "Tegevused", "Download" : "Lae alla", @@ -90,7 +92,6 @@ "Save" : "Salvesta", "Settings" : "Seaded", "WebDAV" : "WebDAV", - "Cancel upload" : "Tühista üleslaadimine", "No files in here" : "Siin ei ole faile", "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!", "No entries found in this folder" : "Selles kaustast ei leitud kirjeid", diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js index cb4f4486b15..5c1251d5c69 100644 --- a/apps/files/l10n/eu.js +++ b/apps/files/l10n/eu.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Baliogabeko karpeta.", "Files" : "Fitxategiak", "All files" : "Fitxategi guztiak", - "Favorites" : "Gogokoak", "Home" : "Etxekoa", "Close" : "Itxi", + "Favorites" : "Gogokoak", "Upload cancelled." : "Igoera ezeztatuta", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako", "Total file size {size1} exceeds upload limit {size2}" : "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago", "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu", + "Uploading..." : "Igotzen...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.", "Actions" : "Ekintzak", "Download" : "Deskargatu", @@ -79,7 +81,6 @@ OC.L10N.register( "Save" : "Gorde", "Settings" : "Ezarpenak", "WebDAV" : "WebDAV", - "Cancel upload" : "Ezeztatu igoera", "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!", "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", "Select all" : "Hautatu dena", diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json index 956e25a4a91..4872c60e457 100644 --- a/apps/files/l10n/eu.json +++ b/apps/files/l10n/eu.json @@ -19,14 +19,16 @@ "Invalid directory." : "Baliogabeko karpeta.", "Files" : "Fitxategiak", "All files" : "Fitxategi guztiak", - "Favorites" : "Gogokoak", "Home" : "Etxekoa", "Close" : "Itxi", + "Favorites" : "Gogokoak", "Upload cancelled." : "Igoera ezeztatuta", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako", "Total file size {size1} exceeds upload limit {size2}" : "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago", "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu", + "Uploading..." : "Igotzen...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.", "Actions" : "Ekintzak", "Download" : "Deskargatu", @@ -77,7 +79,6 @@ "Save" : "Gorde", "Settings" : "Ezarpenak", "WebDAV" : "WebDAV", - "Cancel upload" : "Ezeztatu igoera", "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!", "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan", "Select all" : "Hautatu dena", diff --git a/apps/files/l10n/fa.js b/apps/files/l10n/fa.js index 9d5e5d46c27..233c877b4b1 100644 --- a/apps/files/l10n/fa.js +++ b/apps/files/l10n/fa.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "فهرست راهنما نامعتبر می باشد.", "Files" : "پروندهها", "All files" : "تمامی فایلها", - "Favorites" : "موارد محبوب", "Home" : "خانه", "Close" : "بستن", + "Favorites" : "موارد محبوب", "Upload cancelled." : "بار گذاری لغو شد", "Unable to upload {filename} as it is a directory or has 0 bytes" : "امکان آپلود {filename} وجود ندارد، پوشهای با این نام یا فایلی با حجم 0 بایت با این نام وجود دارد", "Total file size {size1} exceeds upload limit {size2}" : "مجموع سایز {size1} بیشتر از محدودیت آپلود {size2} است", "Not enough free space, you are uploading {size1} but only {size2} is left" : "ظرفیت لازم وجود ندارد، شما آپلودی با حجم {size1} را انجام میدهید اما تنها {size2} فضا باقی مانده است", "Could not get result from server." : "امکان دریافت نتایج از سرور وجود ندارد.", + "Uploading..." : "درحال بارگذاری...", "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ", "Actions" : "فعالیت ها", "Download" : "دانلود", @@ -90,7 +91,6 @@ OC.L10N.register( "Save" : "ذخیره", "Settings" : "تنظیمات", "WebDAV" : "WebDAV", - "Cancel upload" : "متوقف کردن بار گذاری", "No files in here" : "هیچ فایلی اینجا وجود ندارد", "Upload some content or sync with your devices!" : "محتوایی را آپلود کنید یا با دستگاه خود همگامسازی کنید!", "No entries found in this folder" : "هیچ ورودیای در این پوشه وجود ندارد", diff --git a/apps/files/l10n/fa.json b/apps/files/l10n/fa.json index 53015919436..27145240997 100644 --- a/apps/files/l10n/fa.json +++ b/apps/files/l10n/fa.json @@ -19,14 +19,15 @@ "Invalid directory." : "فهرست راهنما نامعتبر می باشد.", "Files" : "پروندهها", "All files" : "تمامی فایلها", - "Favorites" : "موارد محبوب", "Home" : "خانه", "Close" : "بستن", + "Favorites" : "موارد محبوب", "Upload cancelled." : "بار گذاری لغو شد", "Unable to upload {filename} as it is a directory or has 0 bytes" : "امکان آپلود {filename} وجود ندارد، پوشهای با این نام یا فایلی با حجم 0 بایت با این نام وجود دارد", "Total file size {size1} exceeds upload limit {size2}" : "مجموع سایز {size1} بیشتر از محدودیت آپلود {size2} است", "Not enough free space, you are uploading {size1} but only {size2} is left" : "ظرفیت لازم وجود ندارد، شما آپلودی با حجم {size1} را انجام میدهید اما تنها {size2} فضا باقی مانده است", "Could not get result from server." : "امکان دریافت نتایج از سرور وجود ندارد.", + "Uploading..." : "درحال بارگذاری...", "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ", "Actions" : "فعالیت ها", "Download" : "دانلود", @@ -88,7 +89,6 @@ "Save" : "ذخیره", "Settings" : "تنظیمات", "WebDAV" : "WebDAV", - "Cancel upload" : "متوقف کردن بار گذاری", "No files in here" : "هیچ فایلی اینجا وجود ندارد", "Upload some content or sync with your devices!" : "محتوایی را آپلود کنید یا با دستگاه خود همگامسازی کنید!", "No entries found in this folder" : "هیچ ورودیای در این پوشه وجود ندارد", diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js index e5ad89cf0fc..325955a5492 100644 --- a/apps/files/l10n/fi_FI.js +++ b/apps/files/l10n/fi_FI.js @@ -21,15 +21,21 @@ OC.L10N.register( "Invalid directory." : "Virheellinen kansio.", "Files" : "Tiedostot", "All files" : "Kaikki tiedostot", - "Favorites" : "Suosikit", "Home" : "Koti", "Close" : "Sulje", + "Favorites" : "Suosikit", "Upload cancelled." : "Lähetys peruttu.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua", "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä", "Error uploading file \"{fileName}\": {message}" : "Virhe lähettäessä tiedostoa \"{fileName}\": {message}", "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.", + "Uploading..." : "Lähetetään...", + "..." : "...", + "{seconds}s" : "{seconds} s", + "Any moment now..." : "Minä tahansa hetkenä...", + "Soon..." : "Pian...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.", "Actions" : "Toiminnot", "Download" : "Lataa", @@ -75,6 +81,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"], "Favorited" : "Lisätty suosikkeihin", "Favorite" : "Suosikki", + "Local link" : "Paikallinen linkki", "Folder" : "Kansio", "New folder" : "Uusi kansio", "{newname} already exists" : "{newname} on jo olemassa", @@ -108,7 +115,6 @@ OC.L10N.register( "Show hidden files" : "Näytä piilotetut tiedostot", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">päästäksesi tiedostoihisi WebDAV-liittymän kautta</a>", - "Cancel upload" : "Peru lähetys", "No files in here" : "Täällä ei ole tiedostoja", "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!", "No entries found in this folder" : "Ei kohteita tässä kansiossa", diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json index 6f75e570c00..966ef7074e4 100644 --- a/apps/files/l10n/fi_FI.json +++ b/apps/files/l10n/fi_FI.json @@ -19,15 +19,21 @@ "Invalid directory." : "Virheellinen kansio.", "Files" : "Tiedostot", "All files" : "Kaikki tiedostot", - "Favorites" : "Suosikit", "Home" : "Koti", "Close" : "Sulje", + "Favorites" : "Suosikit", "Upload cancelled." : "Lähetys peruttu.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua", "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä", "Error uploading file \"{fileName}\": {message}" : "Virhe lähettäessä tiedostoa \"{fileName}\": {message}", "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.", + "Uploading..." : "Lähetetään...", + "..." : "...", + "{seconds}s" : "{seconds} s", + "Any moment now..." : "Minä tahansa hetkenä...", + "Soon..." : "Pian...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.", "Actions" : "Toiminnot", "Download" : "Lataa", @@ -73,6 +79,7 @@ "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"], "Favorited" : "Lisätty suosikkeihin", "Favorite" : "Suosikki", + "Local link" : "Paikallinen linkki", "Folder" : "Kansio", "New folder" : "Uusi kansio", "{newname} already exists" : "{newname} on jo olemassa", @@ -106,7 +113,6 @@ "Show hidden files" : "Näytä piilotetut tiedostot", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">päästäksesi tiedostoihisi WebDAV-liittymän kautta</a>", - "Cancel upload" : "Peru lähetys", "No files in here" : "Täällä ei ole tiedostoja", "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!", "No entries found in this folder" : "Ei kohteita tässä kansiossa", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 4edc931ca25..c0d1f22e74b 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -21,15 +21,18 @@ OC.L10N.register( "Invalid directory." : "Dossier non valide.", "Files" : "Fichiers", "All files" : "Tous les fichiers", - "Favorites" : "Favoris", "Home" : "Mes fichiers", "Close" : "Fermer", + "Favorites" : "Favoris", "Upload cancelled." : "Envoi annulé.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle", "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles", "Error uploading file \"{fileName}\": {message}" : "Erreur lors de l'envoi du fichier \"{fileName}\" : {message}", "Could not get result from server." : "Ne peut recevoir les résultats du serveur.", + "Uploading..." : "Téléversement en cours…", + "..." : "...", + "Soon..." : "Bientôt...", "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", "Actions" : "Actions", "Download" : "Télécharger", @@ -75,6 +78,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n octet","%n octets"], "Favorited" : "Marqué comme favori", "Favorite" : "Favoris", + "Local link" : "Dossier local", "Folder" : "Dossier", "New folder" : "Nouveau dossier", "{newname} already exists" : "{newname} existe déjà", @@ -108,7 +112,6 @@ OC.L10N.register( "Show hidden files" : "Afficher les fichiers cachés", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accéder à vos fichiers par WebDAV</a>", - "Cancel upload" : "Annuler l'envoi", "No files in here" : "Aucun fichier", "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index f80275841ac..7db4cf95312 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -19,15 +19,18 @@ "Invalid directory." : "Dossier non valide.", "Files" : "Fichiers", "All files" : "Tous les fichiers", - "Favorites" : "Favoris", "Home" : "Mes fichiers", "Close" : "Fermer", + "Favorites" : "Favoris", "Upload cancelled." : "Envoi annulé.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle", "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles", "Error uploading file \"{fileName}\": {message}" : "Erreur lors de l'envoi du fichier \"{fileName}\" : {message}", "Could not get result from server." : "Ne peut recevoir les résultats du serveur.", + "Uploading..." : "Téléversement en cours…", + "..." : "...", + "Soon..." : "Bientôt...", "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", "Actions" : "Actions", "Download" : "Télécharger", @@ -73,6 +76,7 @@ "_%n byte_::_%n bytes_" : ["%n octet","%n octets"], "Favorited" : "Marqué comme favori", "Favorite" : "Favoris", + "Local link" : "Dossier local", "Folder" : "Dossier", "New folder" : "Nouveau dossier", "{newname} already exists" : "{newname} existe déjà", @@ -106,7 +110,6 @@ "Show hidden files" : "Afficher les fichiers cachés", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accéder à vos fichiers par WebDAV</a>", - "Cancel upload" : "Annuler l'envoi", "No files in here" : "Aucun fichier", "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js index e02df778102..508eb5cf779 100644 --- a/apps/files/l10n/gl.js +++ b/apps/files/l10n/gl.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "O directorio é incorrecto.", "Files" : "Ficheiros", "All files" : "Todos os ficheiros", - "Favorites" : "Favoritos", "Home" : "Inicio", "Close" : "Pechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envío cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamaño total do ficheiro {size1} excede do límite de envío {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}", "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.", + "Uploading..." : "Enviando...", "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.", "Actions" : "Accións", "Download" : "Descargar", @@ -88,7 +89,6 @@ OC.L10N.register( "Save" : "Gardar", "Settings" : "Axustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar o envío", "No files in here" : "Aquí non hai ficheiros", "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!", "No entries found in this folder" : "Non se atoparon entradas neste cartafol", diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json index 2add4f99144..2749f170d33 100644 --- a/apps/files/l10n/gl.json +++ b/apps/files/l10n/gl.json @@ -19,14 +19,15 @@ "Invalid directory." : "O directorio é incorrecto.", "Files" : "Ficheiros", "All files" : "Todos os ficheiros", - "Favorites" : "Favoritos", "Home" : "Inicio", "Close" : "Pechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envío cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamaño total do ficheiro {size1} excede do límite de envío {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}", "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.", + "Uploading..." : "Enviando...", "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.", "Actions" : "Accións", "Download" : "Descargar", @@ -86,7 +87,6 @@ "Save" : "Gardar", "Settings" : "Axustes", "WebDAV" : "WebDAV", - "Cancel upload" : "Cancelar o envío", "No files in here" : "Aquí non hai ficheiros", "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!", "No entries found in this folder" : "Non se atoparon entradas neste cartafol", diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js index 138e474f307..6dbc250d55e 100644 --- a/apps/files/l10n/he.js +++ b/apps/files/l10n/he.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "תיקייה שגויה.", "Files" : "קבצים", "All files" : "כל הקבצים", - "Favorites" : "מועדפים", "Home" : "בית", "Close" : "סגירה", + "Favorites" : "מועדפים", "Upload cancelled." : "ההעלאה בוטלה.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "לא ניתן להעלות {filename} כיוון שמדובר בתיקייה או שגודלו 0 בייט", "Total file size {size1} exceeds upload limit {size2}" : "גודל הקובת {size1} עובר את מגבלת הגודל להעלאה {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "לא קיים מספיק מקום פנוי, הקובץ המיועד להעלאה {size1} אבל נשאר {size2} בלבד", "Error uploading file \"{fileName}\": {message}" : "שגיאה בזמן העלאת קובץ \"{fileName}\": {message}", "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.", + "Uploading..." : "העלאה...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.", "Actions" : "פעולות", "Download" : "הורדה", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "הגדרות", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "ניתן להשתמש בכתובת זו כדי <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">להכנס לקבצים שלך באמצעות WebDAV</a>", - "Cancel upload" : "ביטול ההעלאה", "No files in here" : "אין כאן קבצים", "Upload some content or sync with your devices!" : "יש להעלות קצת תוכן או לסנכרן עם ההתקנים שלך!", "No entries found in this folder" : "לא נמצאו כניסות לתיקייה זו", diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json index fbe71b5bf4a..c436ffaebc6 100644 --- a/apps/files/l10n/he.json +++ b/apps/files/l10n/he.json @@ -19,15 +19,17 @@ "Invalid directory." : "תיקייה שגויה.", "Files" : "קבצים", "All files" : "כל הקבצים", - "Favorites" : "מועדפים", "Home" : "בית", "Close" : "סגירה", + "Favorites" : "מועדפים", "Upload cancelled." : "ההעלאה בוטלה.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "לא ניתן להעלות {filename} כיוון שמדובר בתיקייה או שגודלו 0 בייט", "Total file size {size1} exceeds upload limit {size2}" : "גודל הקובת {size1} עובר את מגבלת הגודל להעלאה {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "לא קיים מספיק מקום פנוי, הקובץ המיועד להעלאה {size1} אבל נשאר {size2} בלבד", "Error uploading file \"{fileName}\": {message}" : "שגיאה בזמן העלאת קובץ \"{fileName}\": {message}", "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.", + "Uploading..." : "העלאה...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.", "Actions" : "פעולות", "Download" : "הורדה", @@ -105,7 +107,6 @@ "Settings" : "הגדרות", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "ניתן להשתמש בכתובת זו כדי <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">להכנס לקבצים שלך באמצעות WebDAV</a>", - "Cancel upload" : "ביטול ההעלאה", "No files in here" : "אין כאן קבצים", "Upload some content or sync with your devices!" : "יש להעלות קצת תוכן או לסנכרן עם ההתקנים שלך!", "No entries found in this folder" : "לא נמצאו כניסות לתיקייה זו", diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js index 906ed19d22f..0ef4a00f268 100644 --- a/apps/files/l10n/hr.js +++ b/apps/files/l10n/hr.js @@ -21,9 +21,9 @@ OC.L10N.register( "Invalid directory." : "Neispravan direktorij", "Files" : "Datoteke", "All files" : "Sve datoteke", - "Favorites" : "Favoriti", "Home" : "Kuća", "Close" : "Zatvorite", + "Favorites" : "Favoriti", "Upload cancelled." : "Učitavanje je prekinuto.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće učitati {filename} jer je ili direktorij ili ima 0 bajta", "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} premašuje ograničenje unosa {size2}", @@ -79,7 +79,6 @@ OC.L10N.register( "Save" : "Spremite", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Prekini upload", "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!", "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", "Select all" : "Selektiraj sve", diff --git a/apps/files/l10n/hr.json b/apps/files/l10n/hr.json index 950dcee3471..eb0bfca6d29 100644 --- a/apps/files/l10n/hr.json +++ b/apps/files/l10n/hr.json @@ -19,9 +19,9 @@ "Invalid directory." : "Neispravan direktorij", "Files" : "Datoteke", "All files" : "Sve datoteke", - "Favorites" : "Favoriti", "Home" : "Kuća", "Close" : "Zatvorite", + "Favorites" : "Favoriti", "Upload cancelled." : "Učitavanje je prekinuto.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće učitati {filename} jer je ili direktorij ili ima 0 bajta", "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} premašuje ograničenje unosa {size2}", @@ -77,7 +77,6 @@ "Save" : "Spremite", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Prekini upload", "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!", "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ", "Select all" : "Selektiraj sve", diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js index 181bac52a09..c2a667e04b8 100644 --- a/apps/files/l10n/hu_HU.js +++ b/apps/files/l10n/hu_HU.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Érvénytelen mappa.", "Files" : "Fájlkezelő", "All files" : "Az összes állomány", - "Favorites" : "Kedvencek", "Home" : "Otthoni", "Close" : "Bezárás", + "Favorites" : "Kedvencek", "Upload cancelled." : "A feltöltést megszakítottuk.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.", "Total file size {size1} exceeds upload limit {size2}" : "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.", "Error uploading file \"{fileName}\": {message}" : "Hiba történt a fájlfeltöltés közben: \"{fileName}\": {message}", "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.", + "Uploading..." : "Feltöltés...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.", "Actions" : "Műveletek", "Download" : "Letöltés", @@ -108,7 +110,6 @@ OC.L10N.register( "Show hidden files" : "Rejtett fájlok megjelenítése", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Használja ezt a címet <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">a Fájlok eléréséhez WebDAV-on keresztül</a>.", - "Cancel upload" : "A feltöltés megszakítása", "No files in here" : "Itt nincsenek fájlok", "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!", "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json index 35e4546923b..301445001b0 100644 --- a/apps/files/l10n/hu_HU.json +++ b/apps/files/l10n/hu_HU.json @@ -19,15 +19,17 @@ "Invalid directory." : "Érvénytelen mappa.", "Files" : "Fájlkezelő", "All files" : "Az összes állomány", - "Favorites" : "Kedvencek", "Home" : "Otthoni", "Close" : "Bezárás", + "Favorites" : "Kedvencek", "Upload cancelled." : "A feltöltést megszakítottuk.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.", "Total file size {size1} exceeds upload limit {size2}" : "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.", "Error uploading file \"{fileName}\": {message}" : "Hiba történt a fájlfeltöltés közben: \"{fileName}\": {message}", "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.", + "Uploading..." : "Feltöltés...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.", "Actions" : "Műveletek", "Download" : "Letöltés", @@ -106,7 +108,6 @@ "Show hidden files" : "Rejtett fájlok megjelenítése", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Használja ezt a címet <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">a Fájlok eléréséhez WebDAV-on keresztül</a>.", - "Cancel upload" : "A feltöltés megszakítása", "No files in here" : "Itt nincsenek fájlok", "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!", "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", diff --git a/apps/files/l10n/ia.js b/apps/files/l10n/ia.js index 8310334287f..1cb6178700d 100644 --- a/apps/files/l10n/ia.js +++ b/apps/files/l10n/ia.js @@ -8,6 +8,7 @@ OC.L10N.register( "Files" : "Files", "Home" : "Domo", "Close" : "Clauder", + "Uploading..." : "Incargante...", "Download" : "Discargar", "Delete" : "Deler", "Unshare" : "Leva compartir", diff --git a/apps/files/l10n/ia.json b/apps/files/l10n/ia.json index eee4980e34a..e113f998748 100644 --- a/apps/files/l10n/ia.json +++ b/apps/files/l10n/ia.json @@ -6,6 +6,7 @@ "Files" : "Files", "Home" : "Domo", "Close" : "Clauder", + "Uploading..." : "Incargante...", "Download" : "Discargar", "Delete" : "Deler", "Unshare" : "Leva compartir", diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js index fbf6df463d0..a036c546c07 100644 --- a/apps/files/l10n/id.js +++ b/apps/files/l10n/id.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Direktori tidak valid.", "Files" : "Berkas", "All files" : "Semua berkas", - "Favorites" : "Favorit", "Home" : "Rumah", "Close" : "Tutup", + "Favorites" : "Favorit", "Upload cancelled." : "Pengunggahan dibatalkan.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte", "Total file size {size1} exceeds upload limit {size2}" : "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa", "Could not get result from server." : "Tidak mendapatkan hasil dari server.", + "Uploading..." : "Mengunggah...", "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.", "Actions" : "Tindakan", "Download" : "Unduh", @@ -92,7 +93,6 @@ OC.L10N.register( "Save" : "Simpan", "Settings" : "Pengaturan", "WebDAV" : "WebDAV", - "Cancel upload" : "Batal unggah", "No files in here" : "Tidak ada berkas disini", "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!", "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json index 230c204fc67..8a0c3e825cb 100644 --- a/apps/files/l10n/id.json +++ b/apps/files/l10n/id.json @@ -19,14 +19,15 @@ "Invalid directory." : "Direktori tidak valid.", "Files" : "Berkas", "All files" : "Semua berkas", - "Favorites" : "Favorit", "Home" : "Rumah", "Close" : "Tutup", + "Favorites" : "Favorit", "Upload cancelled." : "Pengunggahan dibatalkan.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte", "Total file size {size1} exceeds upload limit {size2}" : "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa", "Could not get result from server." : "Tidak mendapatkan hasil dari server.", + "Uploading..." : "Mengunggah...", "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.", "Actions" : "Tindakan", "Download" : "Unduh", @@ -90,7 +91,6 @@ "Save" : "Simpan", "Settings" : "Pengaturan", "WebDAV" : "WebDAV", - "Cancel upload" : "Batal unggah", "No files in here" : "Tidak ada berkas disini", "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!", "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini", diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js index 1a2fe2dd914..811add007bf 100644 --- a/apps/files/l10n/is.js +++ b/apps/files/l10n/is.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Ógild mappa.", "Files" : "Skrár", "All files" : "Allar skrár", - "Favorites" : "Eftirlæti", "Home" : "Heim", "Close" : "Loka", + "Favorites" : "Eftirlæti", "Upload cancelled." : "Hætt við innsendingu.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tókst ekki að hlaða inn {filename} þar sem þetta er mappa eða er 0 bæti", "Total file size {size1} exceeds upload limit {size2}" : "Heildarskráastærð {size1} er meiri en leyfilegt innsendingahámark {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ekki nægilegt laust pláss, þú ert að senda inn {size1} en einungis {size2} eru eftir", "Error uploading file \"{fileName}\": {message}" : "Villa við að senda inn skrána \"{fileName}\": {message}", "Could not get result from server." : "Fékk ekki niðurstöður frá þjóni.", + "Uploading..." : "Sendi inn ...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending hætta.", "Actions" : "Aðgerðir", "Download" : "Niðurhal", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "Stillingar", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Notaðu þetta vistfang til að <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">nálgast skrárnar þínar með WebDAV</a>", - "Cancel upload" : "Hætta við innsendingu", "No files in here" : "Engar skrár hér", "Upload some content or sync with your devices!" : "Sendu inn eitthvað efni eða samstilltu við tækin þín!", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json index 4f7c3822c0f..13dc3717406 100644 --- a/apps/files/l10n/is.json +++ b/apps/files/l10n/is.json @@ -19,15 +19,17 @@ "Invalid directory." : "Ógild mappa.", "Files" : "Skrár", "All files" : "Allar skrár", - "Favorites" : "Eftirlæti", "Home" : "Heim", "Close" : "Loka", + "Favorites" : "Eftirlæti", "Upload cancelled." : "Hætt við innsendingu.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tókst ekki að hlaða inn {filename} þar sem þetta er mappa eða er 0 bæti", "Total file size {size1} exceeds upload limit {size2}" : "Heildarskráastærð {size1} er meiri en leyfilegt innsendingahámark {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ekki nægilegt laust pláss, þú ert að senda inn {size1} en einungis {size2} eru eftir", "Error uploading file \"{fileName}\": {message}" : "Villa við að senda inn skrána \"{fileName}\": {message}", "Could not get result from server." : "Fékk ekki niðurstöður frá þjóni.", + "Uploading..." : "Sendi inn ...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending hætta.", "Actions" : "Aðgerðir", "Download" : "Niðurhal", @@ -105,7 +107,6 @@ "Settings" : "Stillingar", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Notaðu þetta vistfang til að <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">nálgast skrárnar þínar með WebDAV</a>", - "Cancel upload" : "Hætta við innsendingu", "No files in here" : "Engar skrár hér", "Upload some content or sync with your devices!" : "Sendu inn eitthvað efni eða samstilltu við tækin þín!", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index b05e602e4ae..7d85f952ed4 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Cartella non valida.", "Files" : "File", "All files" : "Tutti i file", - "Favorites" : "Preferiti", "Home" : "Home", "Close" : "Chiudi", + "Favorites" : "Preferiti", "Upload cancelled." : "Caricamento annullato.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.", "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}", "Error uploading file \"{fileName}\": {message}" : "Errore durante il caricamento del file \"{fileName}\": {message}", "Could not get result from server." : "Impossibile ottenere il risultato dal server.", + "Uploading..." : "Caricamento in corso...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} ore rimanenti", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuti rimanenti", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} secondi rimanenti", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Da un momento all'altro...", + "Soon..." : "Presto...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} di {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", "Actions" : "Azioni", "Download" : "Scarica", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n byte"], "Favorited" : "Preferiti", "Favorite" : "Preferito", + "Local link" : "Collegamento locale", "Folder" : "Cartella", "New folder" : "Nuova cartella", "{newname} already exists" : "{newname} esiste già", @@ -108,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Mostra i file nascosti", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accedere ai tuoi file con WebDAV</a>", - "Cancel upload" : "Annulla caricamento", "No files in here" : "Qui non c'è alcun file", "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!", "No entries found in this folder" : "Nessuna voce trovata in questa cartella", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 24e0cc02db0..ec7003f7382 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -19,15 +19,26 @@ "Invalid directory." : "Cartella non valida.", "Files" : "File", "All files" : "Tutti i file", - "Favorites" : "Preferiti", "Home" : "Home", "Close" : "Chiudi", + "Favorites" : "Preferiti", "Upload cancelled." : "Caricamento annullato.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.", "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}", "Error uploading file \"{fileName}\": {message}" : "Errore durante il caricamento del file \"{fileName}\": {message}", "Could not get result from server." : "Impossibile ottenere il risultato dal server.", + "Uploading..." : "Caricamento in corso...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} ore rimanenti", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuti rimanenti", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} secondi rimanenti", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Da un momento all'altro...", + "Soon..." : "Presto...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} di {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", "Actions" : "Azioni", "Download" : "Scarica", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n byte"], "Favorited" : "Preferiti", "Favorite" : "Preferito", + "Local link" : "Collegamento locale", "Folder" : "Cartella", "New folder" : "Nuova cartella", "{newname} already exists" : "{newname} esiste già", @@ -106,7 +118,6 @@ "Show hidden files" : "Mostra i file nascosti", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accedere ai tuoi file con WebDAV</a>", - "Cancel upload" : "Annulla caricamento", "No files in here" : "Qui non c'è alcun file", "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!", "No entries found in this folder" : "Nessuna voce trovata in questa cartella", diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index 185a5d6d121..ff3b14dc2b4 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "無効なディレクトリです。", "Files" : "ファイル", "All files" : "すべてのファイル", - "Favorites" : "お気に入り", "Home" : "ホーム", "Close" : "閉じる", + "Favorites" : "お気に入り", "Upload cancelled." : "アップロードはキャンセルされました。", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません", "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。", "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。", "Error uploading file \"{fileName}\": {message}" : "ファイル\"{fileName}\"のアップロードエラー: {message}", "Could not get result from server." : "サーバーから結果を取得できませんでした。", + "Uploading..." : "アップロード中...", + "..." : "…", "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "Actions" : "アクション", "Download" : "ダウンロード", @@ -105,8 +107,9 @@ OC.L10N.register( "With PHP-FPM it might take 5 minutes for changes to be applied." : "PHP-FPM の場合は値を変更後、反映されるのに5分程度かかります。", "Missing permissions to edit from here." : "ここから編集するための権限がありません。", "Settings" : "設定", + "Show hidden files" : "隠しファイルを表示", "WebDAV" : "WebDAV", - "Cancel upload" : "アップロードをキャンセル", + "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください", "No files in here" : "ファイルがありません", "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。", "No entries found in this folder" : "このフォルダーにはエントリーがありません", diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index 129e417962b..2719e9d50a5 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -19,15 +19,17 @@ "Invalid directory." : "無効なディレクトリです。", "Files" : "ファイル", "All files" : "すべてのファイル", - "Favorites" : "お気に入り", "Home" : "ホーム", "Close" : "閉じる", + "Favorites" : "お気に入り", "Upload cancelled." : "アップロードはキャンセルされました。", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません", "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。", "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。", "Error uploading file \"{fileName}\": {message}" : "ファイル\"{fileName}\"のアップロードエラー: {message}", "Could not get result from server." : "サーバーから結果を取得できませんでした。", + "Uploading..." : "アップロード中...", + "..." : "…", "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "Actions" : "アクション", "Download" : "ダウンロード", @@ -103,8 +105,9 @@ "With PHP-FPM it might take 5 minutes for changes to be applied." : "PHP-FPM の場合は値を変更後、反映されるのに5分程度かかります。", "Missing permissions to edit from here." : "ここから編集するための権限がありません。", "Settings" : "設定", + "Show hidden files" : "隠しファイルを表示", "WebDAV" : "WebDAV", - "Cancel upload" : "アップロードをキャンセル", + "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください", "No files in here" : "ファイルがありません", "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。", "No entries found in this folder" : "このフォルダーにはエントリーがありません", diff --git a/apps/files/l10n/ka_GE.js b/apps/files/l10n/ka_GE.js index c54da5a206d..510b1db25eb 100644 --- a/apps/files/l10n/ka_GE.js +++ b/apps/files/l10n/ka_GE.js @@ -13,10 +13,11 @@ OC.L10N.register( "Not enough storage available" : "საცავში საკმარისი ადგილი არ არის", "Invalid directory." : "დაუშვებელი დირექტორია.", "Files" : "ფაილები", - "Favorites" : "ფავორიტები", "Home" : "სახლი", "Close" : "დახურვა", + "Favorites" : "ფავორიტები", "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.", + "Uploading..." : "მიმდინარეობს ატვირთვა...", "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას", "Actions" : "მოქმედებები", "Download" : "ჩამოტვირთვა", @@ -42,7 +43,6 @@ OC.L10N.register( "Save" : "შენახვა", "Settings" : "პარამეტრები", "WebDAV" : "WebDAV", - "Cancel upload" : "ატვირთვის გაუქმება", "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.", "Text file" : "ტექსტური ფაილი" diff --git a/apps/files/l10n/ka_GE.json b/apps/files/l10n/ka_GE.json index cdc9cd03126..55cc188305b 100644 --- a/apps/files/l10n/ka_GE.json +++ b/apps/files/l10n/ka_GE.json @@ -11,10 +11,11 @@ "Not enough storage available" : "საცავში საკმარისი ადგილი არ არის", "Invalid directory." : "დაუშვებელი დირექტორია.", "Files" : "ფაილები", - "Favorites" : "ფავორიტები", "Home" : "სახლი", "Close" : "დახურვა", + "Favorites" : "ფავორიტები", "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.", + "Uploading..." : "მიმდინარეობს ატვირთვა...", "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას", "Actions" : "მოქმედებები", "Download" : "ჩამოტვირთვა", @@ -40,7 +41,6 @@ "Save" : "შენახვა", "Settings" : "პარამეტრები", "WebDAV" : "WebDAV", - "Cancel upload" : "ატვირთვის გაუქმება", "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.", "Text file" : "ტექსტური ფაილი" diff --git a/apps/files/l10n/km.js b/apps/files/l10n/km.js index 55080926fc3..0202944bc42 100644 --- a/apps/files/l10n/km.js +++ b/apps/files/l10n/km.js @@ -7,6 +7,7 @@ OC.L10N.register( "Files" : "ឯកសារ", "Close" : "បិទ", "Upload cancelled." : "បានបោះបង់ការផ្ទុកឡើង។", + "Uploading..." : "កំពុងដាក់បញ្ចូល...", "Download" : "ទាញយក", "Rename" : "ប្ដូរឈ្មោះ", "Delete" : "លុប", @@ -31,7 +32,6 @@ OC.L10N.register( "Save" : "រក្សាទុក", "Settings" : "ការកំណត់", "WebDAV" : "WebDAV", - "Cancel upload" : "បោះបង់ការផ្ទុកឡើង", "Upload too large" : "ផ្ទុកឡើងធំពេក", "Text file" : "ឯកសារអក្សរ" }, diff --git a/apps/files/l10n/km.json b/apps/files/l10n/km.json index c1e9159ee88..8f4b54f10bc 100644 --- a/apps/files/l10n/km.json +++ b/apps/files/l10n/km.json @@ -5,6 +5,7 @@ "Files" : "ឯកសារ", "Close" : "បិទ", "Upload cancelled." : "បានបោះបង់ការផ្ទុកឡើង។", + "Uploading..." : "កំពុងដាក់បញ្ចូល...", "Download" : "ទាញយក", "Rename" : "ប្ដូរឈ្មោះ", "Delete" : "លុប", @@ -29,7 +30,6 @@ "Save" : "រក្សាទុក", "Settings" : "ការកំណត់", "WebDAV" : "WebDAV", - "Cancel upload" : "បោះបង់ការផ្ទុកឡើង", "Upload too large" : "ផ្ទុកឡើងធំពេក", "Text file" : "ឯកសារអក្សរ" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files/l10n/kn.js b/apps/files/l10n/kn.js index 1e97d7ffa79..6ad65bf9806 100644 --- a/apps/files/l10n/kn.js +++ b/apps/files/l10n/kn.js @@ -17,9 +17,9 @@ OC.L10N.register( "Invalid directory." : "ಅಮಾನ್ಯ ಕಡತಕೋಶ.", "Files" : "ಕಡತಗಳು", "All files" : "ಎಲ್ಲಾ ಕಡತಗಳು", - "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ", "Home" : "ಮುಖಪುಟ", "Close" : "ಮುಚ್ಚು", + "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ", "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.", "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.", "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ", @@ -51,7 +51,6 @@ OC.L10N.register( "Save" : "ಉಳಿಸಿ", "Settings" : "ಆಯ್ಕೆ", "WebDAV" : "WebDAV", - "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ", "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ", "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.", diff --git a/apps/files/l10n/kn.json b/apps/files/l10n/kn.json index 9ebd3cb619b..5fda4e75989 100644 --- a/apps/files/l10n/kn.json +++ b/apps/files/l10n/kn.json @@ -15,9 +15,9 @@ "Invalid directory." : "ಅಮಾನ್ಯ ಕಡತಕೋಶ.", "Files" : "ಕಡತಗಳು", "All files" : "ಎಲ್ಲಾ ಕಡತಗಳು", - "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ", "Home" : "ಮುಖಪುಟ", "Close" : "ಮುಚ್ಚು", + "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ", "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.", "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.", "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ", @@ -49,7 +49,6 @@ "Save" : "ಉಳಿಸಿ", "Settings" : "ಆಯ್ಕೆ", "WebDAV" : "WebDAV", - "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ", "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ", "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.", diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js index 38e16404c30..9b4afb356ba 100644 --- a/apps/files/l10n/ko.js +++ b/apps/files/l10n/ko.js @@ -21,15 +21,18 @@ OC.L10N.register( "Invalid directory." : "올바르지 않은 디렉터리입니다.", "Files" : "파일", "All files" : "모든 파일", - "Favorites" : "즐겨찾기", "Home" : "가정", "Close" : "닫기", + "Favorites" : "즐겨찾기", "Upload cancelled." : "업로드가 취소되었습니다.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.", "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함", "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다", "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\"을(를) 업로드할 수 없음: {message}", "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.", + "Uploading..." : "업로드 중...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} 시간 {plural_s} 남음", "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", "Actions" : "작업", "Download" : "다운로드", @@ -106,7 +109,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "여기에서 편집할 권한이 없습니다.", "Settings" : "설정", "WebDAV" : "WebDAV", - "Cancel upload" : "업로드 취소", "No files in here" : "여기에 파일 없음", "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!", "No entries found in this folder" : "이 폴더에 항목 없음", diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json index 1702efc58fa..e31db19186c 100644 --- a/apps/files/l10n/ko.json +++ b/apps/files/l10n/ko.json @@ -19,15 +19,18 @@ "Invalid directory." : "올바르지 않은 디렉터리입니다.", "Files" : "파일", "All files" : "모든 파일", - "Favorites" : "즐겨찾기", "Home" : "가정", "Close" : "닫기", + "Favorites" : "즐겨찾기", "Upload cancelled." : "업로드가 취소되었습니다.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.", "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함", "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다", "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\"을(를) 업로드할 수 없음: {message}", "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.", + "Uploading..." : "업로드 중...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} 시간 {plural_s} 남음", "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", "Actions" : "작업", "Download" : "다운로드", @@ -104,7 +107,6 @@ "Missing permissions to edit from here." : "여기에서 편집할 권한이 없습니다.", "Settings" : "설정", "WebDAV" : "WebDAV", - "Cancel upload" : "업로드 취소", "No files in here" : "여기에 파일 없음", "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!", "No entries found in this folder" : "이 폴더에 항목 없음", diff --git a/apps/files/l10n/ku_IQ.js b/apps/files/l10n/ku_IQ.js index 1ceca50b705..804dec891f0 100644 --- a/apps/files/l10n/ku_IQ.js +++ b/apps/files/l10n/ku_IQ.js @@ -2,8 +2,8 @@ OC.L10N.register( "files", { "Files" : "پهڕگەکان", - "Favorites" : "دڵخوازەکان", "Close" : "دابخه", + "Favorites" : "دڵخوازەکان", "Download" : "داگرتن", "Select" : "دیاریکردنی", "Name" : "ناو", diff --git a/apps/files/l10n/ku_IQ.json b/apps/files/l10n/ku_IQ.json index e934b5eb29b..b54d56a922f 100644 --- a/apps/files/l10n/ku_IQ.json +++ b/apps/files/l10n/ku_IQ.json @@ -1,7 +1,7 @@ { "translations": { "Files" : "پهڕگەکان", - "Favorites" : "دڵخوازەکان", "Close" : "دابخه", + "Favorites" : "دڵخوازەکان", "Download" : "داگرتن", "Select" : "دیاریکردنی", "Name" : "ناو", diff --git a/apps/files/l10n/lb.js b/apps/files/l10n/lb.js index c6ee76819ec..d0d40965dab 100644 --- a/apps/files/l10n/lb.js +++ b/apps/files/l10n/lb.js @@ -9,10 +9,11 @@ OC.L10N.register( "Missing a temporary folder" : "Et feelt en temporären Dossier", "Failed to write to disk" : "Konnt net op den Disk schreiwen", "Files" : "Dateien", - "Favorites" : "Favoriten", "Home" : "Doheem", "Close" : "Zoumaachen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload ofgebrach.", + "Uploading..." : "Lueden erop...", "File upload is in progress. Leaving the page now will cancel the upload." : "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.", "Download" : "Download", "Rename" : "Ëmbenennen", @@ -32,7 +33,6 @@ OC.L10N.register( "max. possible: " : "max. méiglech:", "Save" : "Späicheren", "Settings" : "Astellungen", - "Cancel upload" : "Upload ofbriechen", "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt", "Select all" : "All auswielen", "Upload too large" : "Upload ze grouss", diff --git a/apps/files/l10n/lb.json b/apps/files/l10n/lb.json index 59289599719..d4e81d1d0ba 100644 --- a/apps/files/l10n/lb.json +++ b/apps/files/l10n/lb.json @@ -7,10 +7,11 @@ "Missing a temporary folder" : "Et feelt en temporären Dossier", "Failed to write to disk" : "Konnt net op den Disk schreiwen", "Files" : "Dateien", - "Favorites" : "Favoriten", "Home" : "Doheem", "Close" : "Zoumaachen", + "Favorites" : "Favoriten", "Upload cancelled." : "Upload ofgebrach.", + "Uploading..." : "Lueden erop...", "File upload is in progress. Leaving the page now will cancel the upload." : "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.", "Download" : "Download", "Rename" : "Ëmbenennen", @@ -30,7 +31,6 @@ "max. possible: " : "max. méiglech:", "Save" : "Späicheren", "Settings" : "Astellungen", - "Cancel upload" : "Upload ofbriechen", "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt", "Select all" : "All auswielen", "Upload too large" : "Upload ze grouss", diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js index 958cc833b96..524877d6137 100644 --- a/apps/files/l10n/lt_LT.js +++ b/apps/files/l10n/lt_LT.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Neteisingas aplankas", "Files" : "Failai", "All files" : "Visi failai", - "Favorites" : "Mėgstamiausi", "Home" : "Namų", "Close" : "Užverti", + "Favorites" : "Mėgstamiausi", "Upload cancelled." : "Įkėlimas atšauktas.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio", "Total file size {size1} exceeds upload limit {size2}" : "Visas failo dydis {size1} viršyja įkėlimo limitą {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nepakanka laisvos vietos. Keliate {size1}, bet tik {size2} yra likę", "Could not get result from server." : "Nepavyko gauti rezultato iš serverio.", + "Uploading..." : "Įkeliama...", "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.", "Actions" : "Veiksmai", "Download" : "Atsisiųsti", @@ -105,7 +106,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Draudžiama iš čia redaguoti", "Settings" : "Nustatymai", "WebDAV" : "WebDAV", - "Cancel upload" : "Atšaukti siuntimą", "No files in here" : "Čia nėra failų", "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!", "No entries found in this folder" : "Nerasta įrašų šiame aplanke", diff --git a/apps/files/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json index 6613ea4e6ad..a75798167ae 100644 --- a/apps/files/l10n/lt_LT.json +++ b/apps/files/l10n/lt_LT.json @@ -19,14 +19,15 @@ "Invalid directory." : "Neteisingas aplankas", "Files" : "Failai", "All files" : "Visi failai", - "Favorites" : "Mėgstamiausi", "Home" : "Namų", "Close" : "Užverti", + "Favorites" : "Mėgstamiausi", "Upload cancelled." : "Įkėlimas atšauktas.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio", "Total file size {size1} exceeds upload limit {size2}" : "Visas failo dydis {size1} viršyja įkėlimo limitą {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nepakanka laisvos vietos. Keliate {size1}, bet tik {size2} yra likę", "Could not get result from server." : "Nepavyko gauti rezultato iš serverio.", + "Uploading..." : "Įkeliama...", "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.", "Actions" : "Veiksmai", "Download" : "Atsisiųsti", @@ -103,7 +104,6 @@ "Missing permissions to edit from here." : "Draudžiama iš čia redaguoti", "Settings" : "Nustatymai", "WebDAV" : "WebDAV", - "Cancel upload" : "Atšaukti siuntimą", "No files in here" : "Čia nėra failų", "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!", "No entries found in this folder" : "Nerasta įrašų šiame aplanke", diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js index 9efd5f087cd..5efe5d6f2bd 100644 --- a/apps/files/l10n/lv.js +++ b/apps/files/l10n/lv.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Nederīga direktorija.", "Files" : "Datnes", "All files" : "Visas datnes", - "Favorites" : "Iecienītie", "Home" : "Mājas", "Close" : "Aizvērt", + "Favorites" : "Iecienītie", "Upload cancelled." : "Augšupielāde ir atcelta.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Neizdodas augšupielādēt {filename}, jo tā ir vai nu mape vai 0 baitu saturošs fails.", "Total file size {size1} exceeds upload limit {size2}" : "Kopējais faila izmērs {size1} pārsniedz augšupielādes ierobežojumu {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nav pietiekami daudz brīvas vietas. Tiek augšupielādēti {size1}, bet pieejami tikai {size2}", "Could not get result from server." : "Nevar saņemt rezultātus no servera", + "Uploading..." : "Augšupielādē...", "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.", "Actions" : "Darbības", "Download" : "Lejupielādēt", @@ -81,7 +82,6 @@ OC.L10N.register( "Save" : "Saglabāt", "Settings" : "Iestatījumi", "WebDAV" : "WebDAV", - "Cancel upload" : "Atcelt augšupielādi", "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!", "No entries found in this folder" : "Šajā mapē nekas nav atrasts", "Select all" : "Atzīmēt visu", diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json index 685801c471f..3148589deb4 100644 --- a/apps/files/l10n/lv.json +++ b/apps/files/l10n/lv.json @@ -19,14 +19,15 @@ "Invalid directory." : "Nederīga direktorija.", "Files" : "Datnes", "All files" : "Visas datnes", - "Favorites" : "Iecienītie", "Home" : "Mājas", "Close" : "Aizvērt", + "Favorites" : "Iecienītie", "Upload cancelled." : "Augšupielāde ir atcelta.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Neizdodas augšupielādēt {filename}, jo tā ir vai nu mape vai 0 baitu saturošs fails.", "Total file size {size1} exceeds upload limit {size2}" : "Kopējais faila izmērs {size1} pārsniedz augšupielādes ierobežojumu {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nav pietiekami daudz brīvas vietas. Tiek augšupielādēti {size1}, bet pieejami tikai {size2}", "Could not get result from server." : "Nevar saņemt rezultātus no servera", + "Uploading..." : "Augšupielādē...", "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.", "Actions" : "Darbības", "Download" : "Lejupielādēt", @@ -79,7 +80,6 @@ "Save" : "Saglabāt", "Settings" : "Iestatījumi", "WebDAV" : "WebDAV", - "Cancel upload" : "Atcelt augšupielādi", "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!", "No entries found in this folder" : "Šajā mapē nekas nav atrasts", "Select all" : "Atzīmēt visu", diff --git a/apps/files/l10n/mk.js b/apps/files/l10n/mk.js index ec8387af0f6..d6a8369cab3 100644 --- a/apps/files/l10n/mk.js +++ b/apps/files/l10n/mk.js @@ -19,11 +19,12 @@ OC.L10N.register( "Invalid directory." : "Погрешна папка.", "Files" : "Датотеки", "All files" : "Сите датотеки", - "Favorites" : "Омилени", "Home" : "Дома", "Close" : "Затвори", + "Favorites" : "Омилени", "Upload cancelled." : "Преземањето е прекинато.", "Could not get result from server." : "Не можам да добијам резултат од серверот.", + "Uploading..." : "Подигнувам...", "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.", "Actions" : "Акции", "Download" : "Преземи", @@ -67,7 +68,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Недостасуваат пермисии за да уредувате од тука", "Settings" : "Подесувања", "WebDAV" : "WebDAV", - "Cancel upload" : "Откажи прикачување", "No files in here" : "Тука нема датотеки", "No entries found in this folder" : "Нема ништо во оваа папка", "Select all" : "Избери се", diff --git a/apps/files/l10n/mk.json b/apps/files/l10n/mk.json index e587f4883ef..b7523498fbd 100644 --- a/apps/files/l10n/mk.json +++ b/apps/files/l10n/mk.json @@ -17,11 +17,12 @@ "Invalid directory." : "Погрешна папка.", "Files" : "Датотеки", "All files" : "Сите датотеки", - "Favorites" : "Омилени", "Home" : "Дома", "Close" : "Затвори", + "Favorites" : "Омилени", "Upload cancelled." : "Преземањето е прекинато.", "Could not get result from server." : "Не можам да добијам резултат од серверот.", + "Uploading..." : "Подигнувам...", "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.", "Actions" : "Акции", "Download" : "Преземи", @@ -65,7 +66,6 @@ "Missing permissions to edit from here." : "Недостасуваат пермисии за да уредувате од тука", "Settings" : "Подесувања", "WebDAV" : "WebDAV", - "Cancel upload" : "Откажи прикачување", "No files in here" : "Тука нема датотеки", "No entries found in this folder" : "Нема ништо во оваа папка", "Select all" : "Избери се", diff --git a/apps/files/l10n/ms_MY.js b/apps/files/l10n/ms_MY.js index dcd0c8e15e8..c29758cfba1 100644 --- a/apps/files/l10n/ms_MY.js +++ b/apps/files/l10n/ms_MY.js @@ -30,7 +30,6 @@ OC.L10N.register( "max. possible: " : "maksimum:", "Save" : "Simpan", "Settings" : "Tetapan", - "Cancel upload" : "Batal muat naik", "Upload too large" : "Muatnaik terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server", "Text file" : "Fail teks" diff --git a/apps/files/l10n/ms_MY.json b/apps/files/l10n/ms_MY.json index 6f7b93d6ef1..c1202e3eb40 100644 --- a/apps/files/l10n/ms_MY.json +++ b/apps/files/l10n/ms_MY.json @@ -28,7 +28,6 @@ "max. possible: " : "maksimum:", "Save" : "Simpan", "Settings" : "Tetapan", - "Cancel upload" : "Batal muat naik", "Upload too large" : "Muatnaik terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server", "Text file" : "Fail teks" diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js index 086ed3bc144..c0eb97fbc18 100644 --- a/apps/files/l10n/nb_NO.js +++ b/apps/files/l10n/nb_NO.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Ugyldig katalog.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Favoritter", "Home" : "Hjem", "Close" : "Lukk", + "Favorites" : "Favoritter", "Upload cancelled." : "Opplasting avbrutt.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig", "Error uploading file \"{fileName}\": {message}" : "Feil ved opplasting av fil \"{fileName}\": {message}", "Could not get result from server." : "Fikk ikke resultat fra serveren.", + "Uploading..." : "Laster opp...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", "Actions" : "Handlinger", "Download" : "Last ned", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "Innstillinger", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Bruk adressen <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">for å få tilgang til WebDAV</a>", - "Cancel upload" : "Avbryt opplasting", "No files in here" : "Ingen filer her", "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!", "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen", diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json index 0f034867f51..95ae79f1d72 100644 --- a/apps/files/l10n/nb_NO.json +++ b/apps/files/l10n/nb_NO.json @@ -19,15 +19,17 @@ "Invalid directory." : "Ugyldig katalog.", "Files" : "Filer", "All files" : "Alle filer", - "Favorites" : "Favoritter", "Home" : "Hjem", "Close" : "Lukk", + "Favorites" : "Favoritter", "Upload cancelled." : "Opplasting avbrutt.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig", "Error uploading file \"{fileName}\": {message}" : "Feil ved opplasting av fil \"{fileName}\": {message}", "Could not get result from server." : "Fikk ikke resultat fra serveren.", + "Uploading..." : "Laster opp...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", "Actions" : "Handlinger", "Download" : "Last ned", @@ -105,7 +107,6 @@ "Settings" : "Innstillinger", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Bruk adressen <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">for å få tilgang til WebDAV</a>", - "Cancel upload" : "Avbryt opplasting", "No files in here" : "Ingen filer her", "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!", "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen", diff --git a/apps/files/l10n/nds.js b/apps/files/l10n/nds.js index bb3dc429711..487af19faef 100644 --- a/apps/files/l10n/nds.js +++ b/apps/files/l10n/nds.js @@ -2,9 +2,14 @@ OC.L10N.register( "files", { "Files" : "Dateien", + "Close" : "Schließen", + "Download" : "Download", "Delete" : "Löschen", "Details" : "Details", + "Could not move \"{file}\", target exists" : "\"{file}\" konnte nicht verschoben werden, weil das Ziel schon existiert", + "Could not move \"{file}\"" : "\"{file}\" konnte nicht verschoben werden", "Name" : "Name", + "New" : "Neu", "New folder" : "Neuer Ordner", "Upload" : "Hochladen", "Settings" : "Einstellungen", diff --git a/apps/files/l10n/nds.json b/apps/files/l10n/nds.json index c8e93f2fa2b..6fda367103a 100644 --- a/apps/files/l10n/nds.json +++ b/apps/files/l10n/nds.json @@ -1,8 +1,13 @@ { "translations": { "Files" : "Dateien", + "Close" : "Schließen", + "Download" : "Download", "Delete" : "Löschen", "Details" : "Details", + "Could not move \"{file}\", target exists" : "\"{file}\" konnte nicht verschoben werden, weil das Ziel schon existiert", + "Could not move \"{file}\"" : "\"{file}\" konnte nicht verschoben werden", "Name" : "Name", + "New" : "Neu", "New folder" : "Neuer Ordner", "Upload" : "Hochladen", "Settings" : "Einstellungen", diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index 1985179f72e..94483ede498 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Ongeldige directory.", "Files" : "Bestanden", "All files" : "Alle bestanden", - "Favorites" : "Favorieten", "Home" : "Thuis", "Close" : "Sluiten", + "Favorites" : "Favorieten", "Upload cancelled." : "Uploaden geannuleerd.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is", "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar", "Error uploading file \"{fileName}\": {message}" : "Fout tijdens het uploaden van bestand \"{fileName}\": {message}", "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.", + "Uploading..." : "Uploading...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.", "Actions" : "Acties", "Download" : "Downloaden", @@ -74,6 +76,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favoriet", "Favorite" : "Favoriet", + "Local link" : "Lokale link", "Folder" : "Map", "New folder" : "Nieuwe map", "{newname} already exists" : "{newname} bestaat al", @@ -107,7 +110,6 @@ OC.L10N.register( "Show hidden files" : "Tonen verborgen bestanden", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">om uw bestanden via WebDAV te benaderen</a>", - "Cancel upload" : "Upload afbreken", "No files in here" : "Hier geen bestanden", "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!", "No entries found in this folder" : "Niets", diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index 0e441ea88aa..524570f487e 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -19,15 +19,17 @@ "Invalid directory." : "Ongeldige directory.", "Files" : "Bestanden", "All files" : "Alle bestanden", - "Favorites" : "Favorieten", "Home" : "Thuis", "Close" : "Sluiten", + "Favorites" : "Favorieten", "Upload cancelled." : "Uploaden geannuleerd.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is", "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar", "Error uploading file \"{fileName}\": {message}" : "Fout tijdens het uploaden van bestand \"{fileName}\": {message}", "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.", + "Uploading..." : "Uploading...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.", "Actions" : "Acties", "Download" : "Downloaden", @@ -72,6 +74,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favoriet", "Favorite" : "Favoriet", + "Local link" : "Lokale link", "Folder" : "Map", "New folder" : "Nieuwe map", "{newname} already exists" : "{newname} bestaat al", @@ -105,7 +108,6 @@ "Show hidden files" : "Tonen verborgen bestanden", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">om uw bestanden via WebDAV te benaderen</a>", - "Cancel upload" : "Upload afbreken", "No files in here" : "Hier geen bestanden", "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!", "No entries found in this folder" : "Niets", diff --git a/apps/files/l10n/nn_NO.js b/apps/files/l10n/nn_NO.js index 1e138d91b85..73d01d0461f 100644 --- a/apps/files/l10n/nn_NO.js +++ b/apps/files/l10n/nn_NO.js @@ -17,12 +17,14 @@ OC.L10N.register( "Upload failed. Could not get file info." : "Feil ved opplasting. Klarte ikkje å henta filinfo.", "Invalid directory." : "Ugyldig mappe.", "Files" : "Filer", - "Favorites" : "Favorittar", + "All files" : "Alle filer", "Home" : "Heime", "Close" : "Lukk", + "Favorites" : "Favorittar", "Upload cancelled." : "Opplasting avbroten.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.", "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.", + "Uploading..." : "Lastar opp …", "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.", "Actions" : "Handlingar", "Download" : "Last ned", @@ -62,7 +64,6 @@ OC.L10N.register( "Save" : "Lagre", "Settings" : "Innstillingar", "WebDAV" : "WebDAV", - "Cancel upload" : "Avbryt opplasting", "Upload too large" : "For stor opplasting", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.", "Text file" : "Tekst fil" diff --git a/apps/files/l10n/nn_NO.json b/apps/files/l10n/nn_NO.json index 5645a61b6bc..199bb6aeb9a 100644 --- a/apps/files/l10n/nn_NO.json +++ b/apps/files/l10n/nn_NO.json @@ -15,12 +15,14 @@ "Upload failed. Could not get file info." : "Feil ved opplasting. Klarte ikkje å henta filinfo.", "Invalid directory." : "Ugyldig mappe.", "Files" : "Filer", - "Favorites" : "Favorittar", + "All files" : "Alle filer", "Home" : "Heime", "Close" : "Lukk", + "Favorites" : "Favorittar", "Upload cancelled." : "Opplasting avbroten.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.", "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.", + "Uploading..." : "Lastar opp …", "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.", "Actions" : "Handlingar", "Download" : "Last ned", @@ -60,7 +62,6 @@ "Save" : "Lagre", "Settings" : "Innstillingar", "WebDAV" : "WebDAV", - "Cancel upload" : "Avbryt opplasting", "Upload too large" : "For stor opplasting", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.", "Text file" : "Tekst fil" diff --git a/apps/files/l10n/oc.js b/apps/files/l10n/oc.js index 567e3bfa6f5..5e5bc3dc11b 100644 --- a/apps/files/l10n/oc.js +++ b/apps/files/l10n/oc.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Dorsièr invalid.", "Files" : "Fichièrs", "All files" : "Totes los fichièrs", - "Favorites" : "Favorits", "Home" : "Mos fichièrs", "Close" : "Tampar", + "Favorites" : "Favorits", "Upload cancelled." : "Mandadís anullat.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible de mandar {filename} perque s'agís d'un repertòri o d'un fichièr de talha nulla", "Total file size {size1} exceeds upload limit {size2}" : "La talha totala del fichièr {size1} excedís la talha maximala de mandadís {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espaci liure insufisent : ensajatz de mandar {size1} mas solament {size2} son disponibles", "Could not get result from server." : "Pòt pas recebre los resultats del servidor.", + "Uploading..." : "Mandadís en cors…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.", "Actions" : "Accions", "Download" : "Telecargar", @@ -105,7 +107,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "Manca de permissions per editar a partir d'aicí.", "Settings" : "Paramètres", "WebDAV" : "WebDAV", - "Cancel upload" : "Anullar lo mandadís", "No files in here" : "Pas cap de fichièr aicí", "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !", "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr", diff --git a/apps/files/l10n/oc.json b/apps/files/l10n/oc.json index a6e32c220ab..156794e707d 100644 --- a/apps/files/l10n/oc.json +++ b/apps/files/l10n/oc.json @@ -19,14 +19,16 @@ "Invalid directory." : "Dorsièr invalid.", "Files" : "Fichièrs", "All files" : "Totes los fichièrs", - "Favorites" : "Favorits", "Home" : "Mos fichièrs", "Close" : "Tampar", + "Favorites" : "Favorits", "Upload cancelled." : "Mandadís anullat.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible de mandar {filename} perque s'agís d'un repertòri o d'un fichièr de talha nulla", "Total file size {size1} exceeds upload limit {size2}" : "La talha totala del fichièr {size1} excedís la talha maximala de mandadís {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espaci liure insufisent : ensajatz de mandar {size1} mas solament {size2} son disponibles", "Could not get result from server." : "Pòt pas recebre los resultats del servidor.", + "Uploading..." : "Mandadís en cors…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.", "Actions" : "Accions", "Download" : "Telecargar", @@ -103,7 +105,6 @@ "Missing permissions to edit from here." : "Manca de permissions per editar a partir d'aicí.", "Settings" : "Paramètres", "WebDAV" : "WebDAV", - "Cancel upload" : "Anullar lo mandadís", "No files in here" : "Pas cap de fichièr aicí", "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !", "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr", diff --git a/apps/files/l10n/pa.js b/apps/files/l10n/pa.js index 847adbc5ac1..fd44d84e81c 100644 --- a/apps/files/l10n/pa.js +++ b/apps/files/l10n/pa.js @@ -8,7 +8,6 @@ OC.L10N.register( "Delete" : "ਹਟਾਓ", "Details" : "ਵੇਰਵ", "Upload" : "ਅੱਪਲੋਡ", - "Settings" : "ਸੈਟਿੰਗ", - "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ" + "Settings" : "ਸੈਟਿੰਗ" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/pa.json b/apps/files/l10n/pa.json index 6d7025feec1..0aebbb53bd0 100644 --- a/apps/files/l10n/pa.json +++ b/apps/files/l10n/pa.json @@ -6,7 +6,6 @@ "Delete" : "ਹਟਾਓ", "Details" : "ਵੇਰਵ", "Upload" : "ਅੱਪਲੋਡ", - "Settings" : "ਸੈਟਿੰਗ", - "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ" + "Settings" : "ਸੈਟਿੰਗ" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js index ae77a698287..6a5b74a253f 100644 --- a/apps/files/l10n/pl.js +++ b/apps/files/l10n/pl.js @@ -21,14 +21,17 @@ OC.L10N.register( "Invalid directory." : "Zła ścieżka.", "Files" : "Pliki", "All files" : "Wszystkie pliki", - "Favorites" : "Ulubione", "Home" : "Dom", "Close" : "Zamknij", + "Favorites" : "Ulubione", "Upload cancelled." : "Wczytywanie anulowane.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów", "Total file size {size1} exceeds upload limit {size2}" : "Całkowity rozmiar {size1} przekracza limit uploadu {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}", + "Error uploading file \"{fileName}\": {message}" : "Błąd podczas przekazywania \"{fileName}\": {message}", "Could not get result from server." : "Nie można uzyskać wyniku z serwera.", + "Uploading..." : "Wgrywanie....", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.", "Actions" : "Akcje", "Download" : "Pobierz", @@ -40,7 +43,11 @@ OC.L10N.register( "Select" : "Wybierz", "Pending" : "Oczekujące", "Unable to determine date" : "Nie można ustalić daty", + "This operation is forbidden" : "Ta operacja jest niedozwolona", "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.", + "Could not move \"{file}\"" : "Nie można było przenieść \"{file}\"", + "Could not create file \"{file}\"" : "Nie można było utworzyć pliku \"{file}\"", + "Could not create file \"{file}\" because it already exists" : "Nie można było utworzyć pliku \"{file}\", ponieważ ten plik już istnieje.", "Could not create folder \"{dir}\" because it already exists" : "Nie można utworzyć folderu „{dir}”, ponieważ już istnieje.", "Error deleting file \"{fileName}\"." : "Błąd podczas usuwania pliku „{fileName}”.", "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'", @@ -59,11 +66,14 @@ OC.L10N.register( "Your storage is full, files can not be updated or synced anymore!" : "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Miejsce dla {owner} jest na wyczerpaniu ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)", + "Path" : "Ścieżka", "Favorited" : "Ulubione", "Favorite" : "Ulubione", "Folder" : "Folder", "New folder" : "Nowy folder", + "{newname} already exists" : "{newname} już istnieje", "Upload" : "Wyślij", + "An error occurred while trying to update the tags" : "Wystąpił błąd podczas aktualizacji tagów", "A new file or folder has been <strong>created</strong>" : "Nowy plik lub folder został <strong>utworzony</strong>", "A file or folder has been <strong>changed</strong>" : "Plik lub folder został <strong>zmieniony</strong>", "A file or folder has been <strong>deleted</strong>" : "Plik lub folder został <strong>usunięty</strong>", @@ -78,19 +88,22 @@ OC.L10N.register( "You restored %1$s" : "Przywróciłeś %1$s", "%2$s restored %1$s" : "%2$s przywrócił %1$s", "Changed by %2$s" : "Zmienione przez %2$s", + "Deleted by %2$s" : "Usunięte przez %2$s", + "Restored by %2$s" : "Przywrócone przez %2$s", "Upload (max. %s)" : "Wysyłka (max. %s)", "File handling" : "Zarządzanie plikami", "Maximum upload size" : "Maksymalny rozmiar wysyłanego pliku", "max. possible: " : "maks. możliwy:", "Save" : "Zapisz", "Settings" : "Ustawienia", + "Show hidden files" : "Pokaż ukryte pliki", "WebDAV" : "WebDAV", - "Cancel upload" : "Anuluj wysyłanie", "No files in here" : "Brak plików", "No entries found in this folder" : "Brak wpisów w tym folderze", "Select all" : "Wybierz wszystko", "Upload too large" : "Ładowany plik jest za duży", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.", + "No favorites" : "Brak ulubionych", "Text file" : "Plik tekstowy", "New text file.txt" : "Nowy plik tekstowy.txt" }, diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json index 31eb9ac8cc4..e67527bc634 100644 --- a/apps/files/l10n/pl.json +++ b/apps/files/l10n/pl.json @@ -19,14 +19,17 @@ "Invalid directory." : "Zła ścieżka.", "Files" : "Pliki", "All files" : "Wszystkie pliki", - "Favorites" : "Ulubione", "Home" : "Dom", "Close" : "Zamknij", + "Favorites" : "Ulubione", "Upload cancelled." : "Wczytywanie anulowane.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów", "Total file size {size1} exceeds upload limit {size2}" : "Całkowity rozmiar {size1} przekracza limit uploadu {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}", + "Error uploading file \"{fileName}\": {message}" : "Błąd podczas przekazywania \"{fileName}\": {message}", "Could not get result from server." : "Nie można uzyskać wyniku z serwera.", + "Uploading..." : "Wgrywanie....", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.", "Actions" : "Akcje", "Download" : "Pobierz", @@ -38,7 +41,11 @@ "Select" : "Wybierz", "Pending" : "Oczekujące", "Unable to determine date" : "Nie można ustalić daty", + "This operation is forbidden" : "Ta operacja jest niedozwolona", "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.", + "Could not move \"{file}\"" : "Nie można było przenieść \"{file}\"", + "Could not create file \"{file}\"" : "Nie można było utworzyć pliku \"{file}\"", + "Could not create file \"{file}\" because it already exists" : "Nie można było utworzyć pliku \"{file}\", ponieważ ten plik już istnieje.", "Could not create folder \"{dir}\" because it already exists" : "Nie można utworzyć folderu „{dir}”, ponieważ już istnieje.", "Error deleting file \"{fileName}\"." : "Błąd podczas usuwania pliku „{fileName}”.", "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'", @@ -57,11 +64,14 @@ "Your storage is full, files can not be updated or synced anymore!" : "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Miejsce dla {owner} jest na wyczerpaniu ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)", + "Path" : "Ścieżka", "Favorited" : "Ulubione", "Favorite" : "Ulubione", "Folder" : "Folder", "New folder" : "Nowy folder", + "{newname} already exists" : "{newname} już istnieje", "Upload" : "Wyślij", + "An error occurred while trying to update the tags" : "Wystąpił błąd podczas aktualizacji tagów", "A new file or folder has been <strong>created</strong>" : "Nowy plik lub folder został <strong>utworzony</strong>", "A file or folder has been <strong>changed</strong>" : "Plik lub folder został <strong>zmieniony</strong>", "A file or folder has been <strong>deleted</strong>" : "Plik lub folder został <strong>usunięty</strong>", @@ -76,19 +86,22 @@ "You restored %1$s" : "Przywróciłeś %1$s", "%2$s restored %1$s" : "%2$s przywrócił %1$s", "Changed by %2$s" : "Zmienione przez %2$s", + "Deleted by %2$s" : "Usunięte przez %2$s", + "Restored by %2$s" : "Przywrócone przez %2$s", "Upload (max. %s)" : "Wysyłka (max. %s)", "File handling" : "Zarządzanie plikami", "Maximum upload size" : "Maksymalny rozmiar wysyłanego pliku", "max. possible: " : "maks. możliwy:", "Save" : "Zapisz", "Settings" : "Ustawienia", + "Show hidden files" : "Pokaż ukryte pliki", "WebDAV" : "WebDAV", - "Cancel upload" : "Anuluj wysyłanie", "No files in here" : "Brak plików", "No entries found in this folder" : "Brak wpisów w tym folderze", "Select all" : "Wybierz wszystko", "Upload too large" : "Ładowany plik jest za duży", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.", + "No favorites" : "Brak ulubionych", "Text file" : "Plik tekstowy", "New text file.txt" : "Nowy plik tekstowy.txt" },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index bf9b5208388..d8a7097161d 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Diretório inválido.", "Files" : "Arquivos", "All files" : "Todos os arquivos", - "Favorites" : "Favoritos", "Home" : "Home", "Close" : "Fechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envio cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}", "Error uploading file \"{fileName}\": {message}" : "Erro enviando o arquivo \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", + "Uploading..." : "Enviando...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hora{plural_s} esquerda", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuto{plural_s} esquerda", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} segundo{plural_s} esquerda", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "A qualquer momento...", + "Soon..." : "Logo...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.", "Actions" : "Ações", "Download" : "Baixar", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorito", "Favorite" : "Favorito", + "Local link" : "Link local", "Folder" : "Pasta", "New folder" : "Nova pasta", "{newname} already exists" : "{newname} já existe", @@ -108,7 +120,6 @@ OC.L10N.register( "Show hidden files" : "Mostrar arquivos escondidos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para acessar seus Arquivos via WebDAV</a>", - "Cancel upload" : "Cancelar envio", "No files in here" : "Nenhum arquivo aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!", "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index 873f1133869..f5fa97a94af 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -19,15 +19,26 @@ "Invalid directory." : "Diretório inválido.", "Files" : "Arquivos", "All files" : "Todos os arquivos", - "Favorites" : "Favoritos", "Home" : "Home", "Close" : "Fechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envio cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}", "Error uploading file \"{fileName}\": {message}" : "Erro enviando o arquivo \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", + "Uploading..." : "Enviando...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hora{plural_s} esquerda", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minuto{plural_s} esquerda", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} segundo{plural_s} esquerda", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "A qualquer momento...", + "Soon..." : "Logo...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.", "Actions" : "Ações", "Download" : "Baixar", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorito", "Favorite" : "Favorito", + "Local link" : "Link local", "Folder" : "Pasta", "New folder" : "Nova pasta", "{newname} already exists" : "{newname} já existe", @@ -106,7 +118,6 @@ "Show hidden files" : "Mostrar arquivos escondidos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para acessar seus Arquivos via WebDAV</a>", - "Cancel upload" : "Cancelar envio", "No files in here" : "Nenhum arquivo aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!", "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js index ed4819046a2..653f7552bb9 100644 --- a/apps/files/l10n/pt_PT.js +++ b/apps/files/l10n/pt_PT.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Diretoria inválida.", "Files" : "Ficheiros", "All files" : "Todos os ficheiros", - "Favorites" : "Favoritos", "Home" : "Casa", "Close" : "Fechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envio cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível", "Error uploading file \"{fileName}\": {message}" : "Erro ao carregar o ficheiro \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", + "Uploading..." : "A carregar...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.", "Actions" : "Ações", "Download" : "Descarregar", @@ -75,6 +77,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Assinalado como Favorito", "Favorite" : "Favorito", + "Local link" : "Ligação Local", "Folder" : "Pasta", "New folder" : "Nova Pasta", "{newname} already exists" : "{newname} já existe", @@ -108,7 +111,6 @@ OC.L10N.register( "Show hidden files" : "Mostrar ficheiros ocultos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">aceder aos seus ficheiros via WebDAV</a>", - "Cancel upload" : "Cancelar o envio", "No files in here" : "Nenhuns ficheiros aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!", "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json index c2104a25703..0a3e1b040e9 100644 --- a/apps/files/l10n/pt_PT.json +++ b/apps/files/l10n/pt_PT.json @@ -19,15 +19,17 @@ "Invalid directory." : "Diretoria inválida.", "Files" : "Ficheiros", "All files" : "Todos os ficheiros", - "Favorites" : "Favoritos", "Home" : "Casa", "Close" : "Fechar", + "Favorites" : "Favoritos", "Upload cancelled." : "Envio cancelado.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes", "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível", "Error uploading file \"{fileName}\": {message}" : "Erro ao carregar o ficheiro \"{fileName}\": {message}", "Could not get result from server." : "Não foi possível obter o resultado do servidor.", + "Uploading..." : "A carregar...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.", "Actions" : "Ações", "Download" : "Descarregar", @@ -73,6 +75,7 @@ "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Assinalado como Favorito", "Favorite" : "Favorito", + "Local link" : "Ligação Local", "Folder" : "Pasta", "New folder" : "Nova Pasta", "{newname} already exists" : "{newname} já existe", @@ -106,7 +109,6 @@ "Show hidden files" : "Mostrar ficheiros ocultos", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">aceder aos seus ficheiros via WebDAV</a>", - "Cancel upload" : "Cancelar o envio", "No files in here" : "Nenhuns ficheiros aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!", "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js index f9cbc9542f3..a0ecbc06e27 100644 --- a/apps/files/l10n/ro.js +++ b/apps/files/l10n/ro.js @@ -11,24 +11,25 @@ OC.L10N.register( "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML", "The uploaded file was only partially uploaded" : "Fișierul a fost încărcat doar parțial", - "No file was uploaded" : "Nu a fost încărcat nici un fișier", + "No file was uploaded" : "Nu a fost încărcat niciun fișier", "Missing a temporary folder" : "Lipsește un dosar temporar", "Failed to write to disk" : "Eroare la scrierea pe disc", - "Not enough storage available" : "Nu este disponibil suficient spațiu", + "Not enough storage available" : "Nu este disponibil suficient spațiu pe disc", "The target folder has been moved or deleted." : "Dosarul țintă a fost mutat sau șters.", "Upload failed. Could not find uploaded file" : "Încărcare eșuată. Nu se poate găsi fișierul încărcat", "Upload failed. Could not get file info." : "Încărcare eșuată. Nu se pot obține informații despre fișier.", - "Invalid directory." : "Dosar nevalid.", + "Invalid directory." : "Dosar invalid.", "Files" : "Fișiere", "All files" : "Toate fișierele.", - "Favorites" : "Favorite", "Home" : "Acasă", "Close" : "Închide", + "Favorites" : "Favorite", "Upload cancelled." : "Încărcare anulată.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți", "Total file size {size1} exceeds upload limit {size2}" : "Mărimea fișierului este {size1} ce depășește limita de încărcare de {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas", "Could not get result from server." : "Nu se poate obține rezultatul de la server.", + "Uploading..." : "Încărcare", "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.", "Actions" : "Acțiuni", "Download" : "Descarcă", @@ -39,6 +40,15 @@ OC.L10N.register( "Details" : "Detalii", "Select" : "Alege", "Pending" : "În așteptare", + "Unable to determine date" : "Nu s-a putut determina data", + "This operation is forbidden" : "Operațiunea este interzisă", + "This directory is unavailable, please check the logs or contact the administrator" : "Acest director nu este disponibil, te rugăm verifică logurile sau contactează un administrator", + "Could not move \"{file}\", target exists" : "Nu s-a putut muta fișierul \"{file}\", există deja un altul cu același nume în directorul destinație", + "Could not move \"{file}\"" : "Nu s-a putut muta fișierul \"{file}\"", + "{newName} already exists" : "{newName} există deja", + "Could not rename \"{fileName}\"" : "Nu s-a putut redenumi \"{fileName}\"", + "Could not create file \"{file}\"" : "Nu s-a putut crea fișierul \"{file}\"", + "Error deleting file \"{fileName}\"." : "Eroare la ștergerea fișierului \"{fileName}\".", "Name" : "Nume", "Size" : "Mărime", "Modified" : "Modificat", @@ -52,9 +62,13 @@ OC.L10N.register( "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.", "Your storage is full, files can not be updated or synced anymore!" : "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!", "Your storage is almost full ({usedSpacePercent}%)" : "Spațiul de stocare este aproape plin ({usedSpacePercent}%)", + "Path" : "Cale", + "_%n byte_::_%n bytes_" : ["%n octet","%n octeți","%n octeți"], "Favorite" : "Favorit", + "Local link" : "Legătură locală", "Folder" : "Dosar", "New folder" : "Un nou dosar", + "{newname} already exists" : "{newname} există deja", "Upload" : "Încărcă", "A new file or folder has been <strong>created</strong>" : "Un nou fișier sau dosar a fost <strong>creat</strong>", "A file or folder has been <strong>changed</strong>" : "Un nou fișier sau dosar a fost <strong>modificat</strong>", @@ -76,10 +90,12 @@ OC.L10N.register( "Save" : "Salvează", "Settings" : "Setări", "WebDAV" : "WebDAV", - "Cancel upload" : "Anulează încărcarea", + "No files in here" : "Niciun fișier aici", + "No entries found in this folder" : "Niciun element găsit în acest director", "Select all" : "Selectează tot", "Upload too large" : "Fișierul încărcat este prea mare", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.", - "Text file" : "Fișier text" + "Text file" : "Fișier text", + "New text file.txt" : "New text file.txt" }, "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json index bae42dd57b4..6adf4eaac55 100644 --- a/apps/files/l10n/ro.json +++ b/apps/files/l10n/ro.json @@ -9,24 +9,25 @@ "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML", "The uploaded file was only partially uploaded" : "Fișierul a fost încărcat doar parțial", - "No file was uploaded" : "Nu a fost încărcat nici un fișier", + "No file was uploaded" : "Nu a fost încărcat niciun fișier", "Missing a temporary folder" : "Lipsește un dosar temporar", "Failed to write to disk" : "Eroare la scrierea pe disc", - "Not enough storage available" : "Nu este disponibil suficient spațiu", + "Not enough storage available" : "Nu este disponibil suficient spațiu pe disc", "The target folder has been moved or deleted." : "Dosarul țintă a fost mutat sau șters.", "Upload failed. Could not find uploaded file" : "Încărcare eșuată. Nu se poate găsi fișierul încărcat", "Upload failed. Could not get file info." : "Încărcare eșuată. Nu se pot obține informații despre fișier.", - "Invalid directory." : "Dosar nevalid.", + "Invalid directory." : "Dosar invalid.", "Files" : "Fișiere", "All files" : "Toate fișierele.", - "Favorites" : "Favorite", "Home" : "Acasă", "Close" : "Închide", + "Favorites" : "Favorite", "Upload cancelled." : "Încărcare anulată.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți", "Total file size {size1} exceeds upload limit {size2}" : "Mărimea fișierului este {size1} ce depășește limita de încărcare de {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas", "Could not get result from server." : "Nu se poate obține rezultatul de la server.", + "Uploading..." : "Încărcare", "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.", "Actions" : "Acțiuni", "Download" : "Descarcă", @@ -37,6 +38,15 @@ "Details" : "Detalii", "Select" : "Alege", "Pending" : "În așteptare", + "Unable to determine date" : "Nu s-a putut determina data", + "This operation is forbidden" : "Operațiunea este interzisă", + "This directory is unavailable, please check the logs or contact the administrator" : "Acest director nu este disponibil, te rugăm verifică logurile sau contactează un administrator", + "Could not move \"{file}\", target exists" : "Nu s-a putut muta fișierul \"{file}\", există deja un altul cu același nume în directorul destinație", + "Could not move \"{file}\"" : "Nu s-a putut muta fișierul \"{file}\"", + "{newName} already exists" : "{newName} există deja", + "Could not rename \"{fileName}\"" : "Nu s-a putut redenumi \"{fileName}\"", + "Could not create file \"{file}\"" : "Nu s-a putut crea fișierul \"{file}\"", + "Error deleting file \"{fileName}\"." : "Eroare la ștergerea fișierului \"{fileName}\".", "Name" : "Nume", "Size" : "Mărime", "Modified" : "Modificat", @@ -50,9 +60,13 @@ "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.", "Your storage is full, files can not be updated or synced anymore!" : "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!", "Your storage is almost full ({usedSpacePercent}%)" : "Spațiul de stocare este aproape plin ({usedSpacePercent}%)", + "Path" : "Cale", + "_%n byte_::_%n bytes_" : ["%n octet","%n octeți","%n octeți"], "Favorite" : "Favorit", + "Local link" : "Legătură locală", "Folder" : "Dosar", "New folder" : "Un nou dosar", + "{newname} already exists" : "{newname} există deja", "Upload" : "Încărcă", "A new file or folder has been <strong>created</strong>" : "Un nou fișier sau dosar a fost <strong>creat</strong>", "A file or folder has been <strong>changed</strong>" : "Un nou fișier sau dosar a fost <strong>modificat</strong>", @@ -74,10 +88,12 @@ "Save" : "Salvează", "Settings" : "Setări", "WebDAV" : "WebDAV", - "Cancel upload" : "Anulează încărcarea", + "No files in here" : "Niciun fișier aici", + "No entries found in this folder" : "Niciun element găsit în acest director", "Select all" : "Selectează tot", "Upload too large" : "Fișierul încărcat este prea mare", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.", - "Text file" : "Fișier text" + "Text file" : "Fișier text", + "New text file.txt" : "New text file.txt" },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" }
\ No newline at end of file diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js index 183953629a2..1c54751807b 100644 --- a/apps/files/l10n/ru.js +++ b/apps/files/l10n/ru.js @@ -21,15 +21,26 @@ OC.L10N.register( "Invalid directory." : "Неверный каталог.", "Files" : "Файлы", "All files" : "Все файлы", - "Favorites" : "Избранное", "Home" : "Главная", "Close" : "Закрыть", + "Favorites" : "Избранное", "Upload cancelled." : "Загрузка отменена.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера", "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, Вы загружаете {size1}, но осталось только {size2}", "Error uploading file \"{fileName}\": {message}" : "Ошибка загрузки файла \"{fileName}\": {message}", "Could not get result from server." : "Не удалось получить ответ от сервера.", + "Uploading..." : "Загрузка...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} час{plural_s} осталось", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} минут{plural_s} осталось", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} секунд{plural_s} осталось", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "В любой момент...", + "Soon..." : "Скоро...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} из {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.", "Actions" : "Действия", "Download" : "Скачать", @@ -75,6 +86,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"], "Favorited" : "Избранное", "Favorite" : "Избранное", + "Local link" : "Локальная ссылка", "Folder" : "Каталог", "New folder" : "Новый каталог", "{newname} already exists" : "{newname} уже существует", @@ -105,9 +117,9 @@ OC.L10N.register( "With PHP-FPM it might take 5 minutes for changes to be applied." : "В режиме PHP-FPM применение изменений может занять до 5 минут.", "Missing permissions to edit from here." : "Отсутствуют права на удаление.", "Settings" : "Настройки", + "Show hidden files" : "Показать скрытые файлы", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Используйте этот адрес для <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">для доступа к вашим файлам по WebDAV</a>", - "Cancel upload" : "Отменить загрузку", "No files in here" : "Здесь нет файлов", "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!", "No entries found in this folder" : "Ничего не найдено", diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json index f75736df6ba..88cae3d0577 100644 --- a/apps/files/l10n/ru.json +++ b/apps/files/l10n/ru.json @@ -19,15 +19,26 @@ "Invalid directory." : "Неверный каталог.", "Files" : "Файлы", "All files" : "Все файлы", - "Favorites" : "Избранное", "Home" : "Главная", "Close" : "Закрыть", + "Favorites" : "Избранное", "Upload cancelled." : "Загрузка отменена.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера", "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, Вы загружаете {size1}, но осталось только {size2}", "Error uploading file \"{fileName}\": {message}" : "Ошибка загрузки файла \"{fileName}\": {message}", "Could not get result from server." : "Не удалось получить ответ от сервера.", + "Uploading..." : "Загрузка...", + "..." : "...", + "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} час{plural_s} осталось", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} минут{plural_s} осталось", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds} second{plural_s} left" : "{seconds} секунд{plural_s} осталось", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "В любой момент...", + "Soon..." : "Скоро...", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} из {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.", "Actions" : "Действия", "Download" : "Скачать", @@ -73,6 +84,7 @@ "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"], "Favorited" : "Избранное", "Favorite" : "Избранное", + "Local link" : "Локальная ссылка", "Folder" : "Каталог", "New folder" : "Новый каталог", "{newname} already exists" : "{newname} уже существует", @@ -103,9 +115,9 @@ "With PHP-FPM it might take 5 minutes for changes to be applied." : "В режиме PHP-FPM применение изменений может занять до 5 минут.", "Missing permissions to edit from here." : "Отсутствуют права на удаление.", "Settings" : "Настройки", + "Show hidden files" : "Показать скрытые файлы", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Используйте этот адрес для <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">для доступа к вашим файлам по WebDAV</a>", - "Cancel upload" : "Отменить загрузку", "No files in here" : "Здесь нет файлов", "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!", "No entries found in this folder" : "Ничего не найдено", diff --git a/apps/files/l10n/si_LK.js b/apps/files/l10n/si_LK.js index 4c26c421076..88db222a45c 100644 --- a/apps/files/l10n/si_LK.js +++ b/apps/files/l10n/si_LK.js @@ -12,6 +12,7 @@ OC.L10N.register( "Home" : "නිවස", "Close" : "වසන්න", "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී", + "Uploading..." : "උඩුගත කෙරේ...", "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත", "Download" : "බාන්න", "Rename" : "නැවත නම් කරන්න", @@ -33,7 +34,6 @@ OC.L10N.register( "max. possible: " : "හැකි උපරිමය:", "Save" : "සුරකින්න", "Settings" : "සිටුවම්", - "Cancel upload" : "උඩුගත කිරීම අත් හරින්න", "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය", "Text file" : "පෙළ ගොනුව" diff --git a/apps/files/l10n/si_LK.json b/apps/files/l10n/si_LK.json index 2db6c10b75c..72ec97a0067 100644 --- a/apps/files/l10n/si_LK.json +++ b/apps/files/l10n/si_LK.json @@ -10,6 +10,7 @@ "Home" : "නිවස", "Close" : "වසන්න", "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී", + "Uploading..." : "උඩුගත කෙරේ...", "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත", "Download" : "බාන්න", "Rename" : "නැවත නම් කරන්න", @@ -31,7 +32,6 @@ "max. possible: " : "හැකි උපරිමය:", "Save" : "සුරකින්න", "Settings" : "සිටුවම්", - "Cancel upload" : "උඩුගත කිරීම අත් හරින්න", "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය", "Text file" : "පෙළ ගොනුව" diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js index 3fc39663934..db8c505b02b 100644 --- a/apps/files/l10n/sk_SK.js +++ b/apps/files/l10n/sk_SK.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Neplatný priečinok.", "Files" : "Súbory", "All files" : "Všetky súbory", - "Favorites" : "Obľúbené", "Home" : "Domov", "Close" : "Zavrieť", + "Favorites" : "Obľúbené", "Upload cancelled." : "Odosielanie je zrušené.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov", "Total file size {size1} exceeds upload limit {size2}" : "Celková veľkosť súboru {size1} prekračuje upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}", "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.", + "Uploading..." : "Nahrávam...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.", "Actions" : "Akcie", "Download" : "Sťahovanie", @@ -89,7 +91,6 @@ OC.L10N.register( "Save" : "Uložiť", "Settings" : "Nastavenia", "WebDAV" : "WebDAV", - "Cancel upload" : "Zrušiť nahrávanie", "No files in here" : "Nie sú tu žiadne súbory", "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!", "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json index 5a672616260..1e1075ba958 100644 --- a/apps/files/l10n/sk_SK.json +++ b/apps/files/l10n/sk_SK.json @@ -19,14 +19,16 @@ "Invalid directory." : "Neplatný priečinok.", "Files" : "Súbory", "All files" : "Všetky súbory", - "Favorites" : "Obľúbené", "Home" : "Domov", "Close" : "Zavrieť", + "Favorites" : "Obľúbené", "Upload cancelled." : "Odosielanie je zrušené.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov", "Total file size {size1} exceeds upload limit {size2}" : "Celková veľkosť súboru {size1} prekračuje upload limit {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}", "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.", + "Uploading..." : "Nahrávam...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.", "Actions" : "Akcie", "Download" : "Sťahovanie", @@ -87,7 +89,6 @@ "Save" : "Uložiť", "Settings" : "Nastavenia", "WebDAV" : "WebDAV", - "Cancel upload" : "Zrušiť nahrávanie", "No files in here" : "Nie sú tu žiadne súbory", "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!", "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené", diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js index b9f19666fa0..e9f2247d098 100644 --- a/apps/files/l10n/sl.js +++ b/apps/files/l10n/sl.js @@ -21,15 +21,23 @@ OC.L10N.register( "Invalid directory." : "Neveljavna mapa.", "Files" : "Datoteke", "All files" : "Vse datoteke", - "Favorites" : "Priljubljene", "Home" : "Domači naslov", "Close" : "Zapri", + "Favorites" : "Priljubljene", "Upload cancelled." : "Pošiljanje je preklicano.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.", "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.", "Error uploading file \"{fileName}\": {message}" : "Napaka pošiljanja datoteke \"{fileName}\": {message}", "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.", + "Uploading..." : "Poteka pošiljanje ...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds}m" : "{minutes}:{seconds}min", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Vsak trenutek ...", + "Soon..." : "Kmalu", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} od {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", "Actions" : "Dejanja", "Download" : "Prejmi", @@ -75,6 +83,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bajt","%n bajta","%n bajti","%n bajtov"], "Favorited" : "Označeno kot priljubljeno", "Favorite" : "Priljubljene", + "Local link" : "Krajevna povezava", "Folder" : "Mapa", "New folder" : "Nova mapa", "{newname} already exists" : "{newname} že obstaja", @@ -108,7 +117,6 @@ OC.L10N.register( "Show hidden files" : "Pokaži skrite datoteke", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> za dostop do datotek prek sistema WebDAV</a>.", - "Cancel upload" : "Prekliči pošiljanje", "No files in here" : "V mapi ni datotek", "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!", "No entries found in this folder" : "V tej mapi ni najdenih predmetov.", diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json index ce674108901..74293263043 100644 --- a/apps/files/l10n/sl.json +++ b/apps/files/l10n/sl.json @@ -19,15 +19,23 @@ "Invalid directory." : "Neveljavna mapa.", "Files" : "Datoteke", "All files" : "Vse datoteke", - "Favorites" : "Priljubljene", "Home" : "Domači naslov", "Close" : "Zapri", + "Favorites" : "Priljubljene", "Upload cancelled." : "Pošiljanje je preklicano.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.", "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.", "Error uploading file \"{fileName}\": {message}" : "Napaka pošiljanja datoteke \"{fileName}\": {message}", "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.", + "Uploading..." : "Poteka pošiljanje ...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds}m" : "{minutes}:{seconds}min", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Vsak trenutek ...", + "Soon..." : "Kmalu", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} od {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", "Actions" : "Dejanja", "Download" : "Prejmi", @@ -73,6 +81,7 @@ "_%n byte_::_%n bytes_" : ["%n bajt","%n bajta","%n bajti","%n bajtov"], "Favorited" : "Označeno kot priljubljeno", "Favorite" : "Priljubljene", + "Local link" : "Krajevna povezava", "Folder" : "Mapa", "New folder" : "Nova mapa", "{newname} already exists" : "{newname} že obstaja", @@ -106,7 +115,6 @@ "Show hidden files" : "Pokaži skrite datoteke", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> za dostop do datotek prek sistema WebDAV</a>.", - "Cancel upload" : "Prekliči pošiljanje", "No files in here" : "V mapi ni datotek", "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!", "No entries found in this folder" : "V tej mapi ni najdenih predmetov.", diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js index 7ef830e631b..6ec154a9ac3 100644 --- a/apps/files/l10n/sq.js +++ b/apps/files/l10n/sq.js @@ -21,15 +21,23 @@ OC.L10N.register( "Invalid directory." : "Drejtori e pavlefshme.", "Files" : "Kartela", "All files" : "Krejt kartelat", - "Favorites" : "Të parapëlqyera", "Home" : "Kreu", "Close" : "Mbylle", + "Favorites" : "Të parapëlqyera", "Upload cancelled." : "Ngarkimi u anulua.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "S’arrihet të ngarkohet {filename}, ngaqë është drejtori ose ka 0 bajte", "Total file size {size1} exceeds upload limit {size2}" : "Madhësia gjithsej e kartelës {size1} e tejkalon kufirin {size2} për ngarkimet", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, po ngarkoni {size1}, por ka vetëm {size2} të lira", "Error uploading file \"{fileName}\": {message}" : "Gabim në ngarkimin e kartelës \"{fileName}\": {message}", "Could not get result from server." : "S’mori dot përfundime nga shërbyesi.", + "Uploading..." : "Po ngarkohet...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Në çdo çast tani…", + "Soon..." : "Së shpejti…", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} nga {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Ngarkimi i kartelës është në punë e sipër. Largimi nga faqja do të anulojë ngarkimin.", "Actions" : "Veprime", "Download" : "Shkarkoje", @@ -75,6 +83,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bajt","%n bajte"], "Favorited" : "U kalua e parapëlqyer", "Favorite" : "E parapëlqyer", + "Local link" : "Lidhje vendore", "Folder" : "Dosje", "New folder" : "Dosje e re", "{newname} already exists" : "Ka tashmë një {newname}", @@ -108,7 +117,6 @@ OC.L10N.register( "Show hidden files" : "Shfaq kartela të fshehura", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">të hyrë te Kartelat tuaja përmes WebDAV-it</a>", - "Cancel upload" : "Anuloje ngarkimin", "No files in here" : "S’ka kartela këtu", "Upload some content or sync with your devices!" : "Ngarkoni ca lëndë ose bëni njëkohësim me pajisjet tuaja!", "No entries found in this folder" : "Në këtë dosje s’u gjetën zëra", diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json index 9b14554309e..5520c286f19 100644 --- a/apps/files/l10n/sq.json +++ b/apps/files/l10n/sq.json @@ -19,15 +19,23 @@ "Invalid directory." : "Drejtori e pavlefshme.", "Files" : "Kartela", "All files" : "Krejt kartelat", - "Favorites" : "Të parapëlqyera", "Home" : "Kreu", "Close" : "Mbylle", + "Favorites" : "Të parapëlqyera", "Upload cancelled." : "Ngarkimi u anulua.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "S’arrihet të ngarkohet {filename}, ngaqë është drejtori ose ka 0 bajte", "Total file size {size1} exceeds upload limit {size2}" : "Madhësia gjithsej e kartelës {size1} e tejkalon kufirin {size2} për ngarkimet", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, po ngarkoni {size1}, por ka vetëm {size2} të lira", "Error uploading file \"{fileName}\": {message}" : "Gabim në ngarkimin e kartelës \"{fileName}\": {message}", "Could not get result from server." : "S’mori dot përfundime nga shërbyesi.", + "Uploading..." : "Po ngarkohet...", + "..." : "...", + "{hours}:{minutes}h" : "{hours}:{minutes}h", + "{minutes}:{seconds}m" : "{minutes}:{seconds}m", + "{seconds}s" : "{seconds}s", + "Any moment now..." : "Në çdo çast tani…", + "Soon..." : "Së shpejti…", + "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} nga {totalSize} ({bitrate})", "File upload is in progress. Leaving the page now will cancel the upload." : "Ngarkimi i kartelës është në punë e sipër. Largimi nga faqja do të anulojë ngarkimin.", "Actions" : "Veprime", "Download" : "Shkarkoje", @@ -73,6 +81,7 @@ "_%n byte_::_%n bytes_" : ["%n bajt","%n bajte"], "Favorited" : "U kalua e parapëlqyer", "Favorite" : "E parapëlqyer", + "Local link" : "Lidhje vendore", "Folder" : "Dosje", "New folder" : "Dosje e re", "{newname} already exists" : "Ka tashmë një {newname}", @@ -106,7 +115,6 @@ "Show hidden files" : "Shfaq kartela të fshehura", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">të hyrë te Kartelat tuaja përmes WebDAV-it</a>", - "Cancel upload" : "Anuloje ngarkimin", "No files in here" : "S’ka kartela këtu", "Upload some content or sync with your devices!" : "Ngarkoni ca lëndë ose bëni njëkohësim me pajisjet tuaja!", "No entries found in this folder" : "Në këtë dosje s’u gjetën zëra", diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js index b906d9cdeb6..74dd5dc3988 100644 --- a/apps/files/l10n/sr.js +++ b/apps/files/l10n/sr.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Неисправна фасцикла.", "Files" : "Фајлови", "All files" : "Сви фајлови", - "Favorites" : "Омиљени", "Home" : "Почетна", "Close" : "Затвори", + "Favorites" : "Омиљени", "Upload cancelled." : "Отпремање је отказано.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Не могу да отпремим {filename} јер је то директоријум или има 0 бајтова", "Total file size {size1} exceeds upload limit {size2}" : "Величина {size1} превазилази ограничење за отпремање од {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Нема простора. Отпремате {size1} али само {size2} је преостало", "Could not get result from server." : "Не могу да добијем резултат са сервера.", + "Uploading..." : "Отпремам…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.", "Actions" : "Радње", "Download" : "Преузми", @@ -92,7 +94,6 @@ OC.L10N.register( "Save" : "Сачувај", "Settings" : "Поставке", "WebDAV" : "ВебДАВ", - "Cancel upload" : "Откажи отпремање", "No files in here" : "Овде нема фајлова", "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!", "No entries found in this folder" : "Нема ничега у овој фасцикли", diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json index fa9a4b42b47..25683cd1df7 100644 --- a/apps/files/l10n/sr.json +++ b/apps/files/l10n/sr.json @@ -19,14 +19,16 @@ "Invalid directory." : "Неисправна фасцикла.", "Files" : "Фајлови", "All files" : "Сви фајлови", - "Favorites" : "Омиљени", "Home" : "Почетна", "Close" : "Затвори", + "Favorites" : "Омиљени", "Upload cancelled." : "Отпремање је отказано.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Не могу да отпремим {filename} јер је то директоријум или има 0 бајтова", "Total file size {size1} exceeds upload limit {size2}" : "Величина {size1} превазилази ограничење за отпремање од {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Нема простора. Отпремате {size1} али само {size2} је преостало", "Could not get result from server." : "Не могу да добијем резултат са сервера.", + "Uploading..." : "Отпремам…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.", "Actions" : "Радње", "Download" : "Преузми", @@ -90,7 +92,6 @@ "Save" : "Сачувај", "Settings" : "Поставке", "WebDAV" : "ВебДАВ", - "Cancel upload" : "Откажи отпремање", "No files in here" : "Овде нема фајлова", "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!", "No entries found in this folder" : "Нема ничега у овој фасцикли", diff --git a/apps/files/l10n/sr@latin.js b/apps/files/l10n/sr@latin.js index 6d6e3dfd414..736e4a1cc81 100644 --- a/apps/files/l10n/sr@latin.js +++ b/apps/files/l10n/sr@latin.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Neispravna fascikla.", "Files" : "Fajlovi", "All files" : "Svi fajlovi", - "Favorites" : "Omiljeni", "Home" : "Početna", "Close" : "Zatvori", + "Favorites" : "Omiljeni", "Upload cancelled." : "Otpremanje je otkazano.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne mogu da otpremim {filename} jer je to direktorijum ili ima 0 bajtova", "Total file size {size1} exceeds upload limit {size2}" : "Veličina {size1} prevazilazi ograničenje za otpremanje od {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema prostora. Otpremate {size1} ali samo {size2} je preostalo", "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.", + "Uploading..." : "Otpremam…", "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.", "Download" : "Preuzmi", "Rename" : "Preimenuj", @@ -81,7 +82,6 @@ OC.L10N.register( "Save" : "Sačuvaj", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Otkaži otpremanje", "No files in here" : "Ovde nema fajlova", "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!", "No entries found in this folder" : "Nema ničega u ovoj fascikli", diff --git a/apps/files/l10n/sr@latin.json b/apps/files/l10n/sr@latin.json index 29798adf208..0710435eb69 100644 --- a/apps/files/l10n/sr@latin.json +++ b/apps/files/l10n/sr@latin.json @@ -19,14 +19,15 @@ "Invalid directory." : "Neispravna fascikla.", "Files" : "Fajlovi", "All files" : "Svi fajlovi", - "Favorites" : "Omiljeni", "Home" : "Početna", "Close" : "Zatvori", + "Favorites" : "Omiljeni", "Upload cancelled." : "Otpremanje je otkazano.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne mogu da otpremim {filename} jer je to direktorijum ili ima 0 bajtova", "Total file size {size1} exceeds upload limit {size2}" : "Veličina {size1} prevazilazi ograničenje za otpremanje od {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema prostora. Otpremate {size1} ali samo {size2} je preostalo", "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.", + "Uploading..." : "Otpremam…", "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.", "Download" : "Preuzmi", "Rename" : "Preimenuj", @@ -79,7 +80,6 @@ "Save" : "Sačuvaj", "Settings" : "Postavke", "WebDAV" : "WebDAV", - "Cancel upload" : "Otkaži otpremanje", "No files in here" : "Ovde nema fajlova", "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!", "No entries found in this folder" : "Nema ničega u ovoj fascikli", diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js index 67506f252ac..d2f7df4a3a4 100644 --- a/apps/files/l10n/sv.js +++ b/apps/files/l10n/sv.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Felaktig mapp.", "Files" : "Filer", "All files" : "Alla filer", - "Favorites" : "Favoriter", "Home" : "Hem", "Close" : "Stäng", + "Favorites" : "Favoriter", "Upload cancelled." : "Uppladdning avbruten.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.", "Error uploading file \"{fileName}\": {message}" : "Fel vid uppladdning av fil \"{fileName}\": {message}", "Could not get result from server." : "Gick inte att hämta resultat från server.", + "Uploading..." : "Laddar upp...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.", "Actions" : "Åtgärder", "Download" : "Ladda ner", @@ -105,9 +107,9 @@ OC.L10N.register( "With PHP-FPM it might take 5 minutes for changes to be applied." : "Med PHP-FPM kan det ta cirka 5 minuter för ändringarna att träda i kraft.", "Missing permissions to edit from here." : "Saknar rättigheter att ändra härifrån.", "Settings" : "Inställningar", + "Show hidden files" : "Visa dolda filer", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Använd den här adressen för att <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">komma åt dina filer via WebDAV</a>", - "Cancel upload" : "Avbryt uppladdning", "No files in here" : "Inga filer kunde hittas", "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!", "No entries found in this folder" : "Inga innehåll hittades i denna mapp", diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json index 8a1c44b3ca9..c2d1d464bc9 100644 --- a/apps/files/l10n/sv.json +++ b/apps/files/l10n/sv.json @@ -19,15 +19,17 @@ "Invalid directory." : "Felaktig mapp.", "Files" : "Filer", "All files" : "Alla filer", - "Favorites" : "Favoriter", "Home" : "Hem", "Close" : "Stäng", + "Favorites" : "Favoriter", "Upload cancelled." : "Uppladdning avbruten.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.", "Total file size {size1} exceeds upload limit {size2}" : "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.", "Error uploading file \"{fileName}\": {message}" : "Fel vid uppladdning av fil \"{fileName}\": {message}", "Could not get result from server." : "Gick inte att hämta resultat från server.", + "Uploading..." : "Laddar upp...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.", "Actions" : "Åtgärder", "Download" : "Ladda ner", @@ -103,9 +105,9 @@ "With PHP-FPM it might take 5 minutes for changes to be applied." : "Med PHP-FPM kan det ta cirka 5 minuter för ändringarna att träda i kraft.", "Missing permissions to edit from here." : "Saknar rättigheter att ändra härifrån.", "Settings" : "Inställningar", + "Show hidden files" : "Visa dolda filer", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Använd den här adressen för att <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">komma åt dina filer via WebDAV</a>", - "Cancel upload" : "Avbryt uppladdning", "No files in here" : "Inga filer kunde hittas", "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!", "No entries found in this folder" : "Inga innehåll hittades i denna mapp", diff --git a/apps/files/l10n/ta_LK.js b/apps/files/l10n/ta_LK.js index 8b731d1f64b..f22aa9743ef 100644 --- a/apps/files/l10n/ta_LK.js +++ b/apps/files/l10n/ta_LK.js @@ -9,10 +9,11 @@ OC.L10N.register( "Missing a temporary folder" : "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை", "Failed to write to disk" : "வட்டில் எழுத முடியவில்லை", "Files" : "கோப்புகள்", - "Favorites" : "விருப்பங்கள்", "Home" : "அகம்", "Close" : "மூடுக", + "Favorites" : "விருப்பங்கள்", "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது", + "Uploading..." : "பதிவேற்றல்...", "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.", "Actions" : "செயல்கள்", "Download" : "பதிவிறக்குக", @@ -34,7 +35,6 @@ OC.L10N.register( "max. possible: " : "ஆகக் கூடியது:", "Save" : "சேமிக்க ", "Settings" : "அமைப்புகள்", - "Cancel upload" : "பதிவேற்றலை இரத்து செய்க", "Upload too large" : "பதிவேற்றல் மிகப்பெரியது", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.", "Text file" : "கோப்பு உரை" diff --git a/apps/files/l10n/ta_LK.json b/apps/files/l10n/ta_LK.json index 67cc6f18d88..4d5b92402ad 100644 --- a/apps/files/l10n/ta_LK.json +++ b/apps/files/l10n/ta_LK.json @@ -7,10 +7,11 @@ "Missing a temporary folder" : "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை", "Failed to write to disk" : "வட்டில் எழுத முடியவில்லை", "Files" : "கோப்புகள்", - "Favorites" : "விருப்பங்கள்", "Home" : "அகம்", "Close" : "மூடுக", + "Favorites" : "விருப்பங்கள்", "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது", + "Uploading..." : "பதிவேற்றல்...", "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.", "Actions" : "செயல்கள்", "Download" : "பதிவிறக்குக", @@ -32,7 +33,6 @@ "max. possible: " : "ஆகக் கூடியது:", "Save" : "சேமிக்க ", "Settings" : "அமைப்புகள்", - "Cancel upload" : "பதிவேற்றலை இரத்து செய்க", "Upload too large" : "பதிவேற்றல் மிகப்பெரியது", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.", "Text file" : "கோப்பு உரை" diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js index e3a78b4d794..06a02adab7f 100644 --- a/apps/files/l10n/th_TH.js +++ b/apps/files/l10n/th_TH.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "ไดเร็กทอรี่ไม่ถูกต้อง", "Files" : "ไฟล์", "All files" : "ไฟล์ทั้งหมด", - "Favorites" : "รายการโปรด", "Home" : "บ้าน", "Close" : "ปิด", + "Favorites" : "รายการโปรด", "Upload cancelled." : "การอัพโหลดถูกยกเลิก", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ไม่สามารถอัพโหลด {filename} มันเป็นไดเรกทอรีหรือมี 0 ไบต์", "Total file size {size1} exceeds upload limit {size2}" : "ขนาดไฟล์ {size1} ทั้งหมดเกินขีดจำกัด ของการอัพโหลด {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "พื้นที่ว่างไม่เพียงพอคุณจะอัพโหลด {size1} แต่มีพืนที่แค่ {size2}", "Error uploading file \"{fileName}\": {message}" : "ข้อผิดพลาดขณะอัพโหลดไฟล์ \"{fileName}\": {message}", "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์", + "Uploading..." : "กำลังอัพโหลด...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก", "Actions" : "การกระทำ", "Download" : "ดาวน์โหลด", @@ -108,7 +110,6 @@ OC.L10N.register( "Show hidden files" : "แสดงไฟล์ที่ซ่อนอยู่", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "ใช้ที่อยู่นี้เพื่อ <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">เข้าถึงไฟล์ของคุณผ่าน WebDAV</a>", - "Cancel upload" : "ยกเลิกการอัพโหลด", "No files in here" : "ไม่มีไฟล์ที่นี่", "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง", "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json index 623f61e86e1..5c526d80a65 100644 --- a/apps/files/l10n/th_TH.json +++ b/apps/files/l10n/th_TH.json @@ -19,15 +19,17 @@ "Invalid directory." : "ไดเร็กทอรี่ไม่ถูกต้อง", "Files" : "ไฟล์", "All files" : "ไฟล์ทั้งหมด", - "Favorites" : "รายการโปรด", "Home" : "บ้าน", "Close" : "ปิด", + "Favorites" : "รายการโปรด", "Upload cancelled." : "การอัพโหลดถูกยกเลิก", "Unable to upload {filename} as it is a directory or has 0 bytes" : "ไม่สามารถอัพโหลด {filename} มันเป็นไดเรกทอรีหรือมี 0 ไบต์", "Total file size {size1} exceeds upload limit {size2}" : "ขนาดไฟล์ {size1} ทั้งหมดเกินขีดจำกัด ของการอัพโหลด {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "พื้นที่ว่างไม่เพียงพอคุณจะอัพโหลด {size1} แต่มีพืนที่แค่ {size2}", "Error uploading file \"{fileName}\": {message}" : "ข้อผิดพลาดขณะอัพโหลดไฟล์ \"{fileName}\": {message}", "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์", + "Uploading..." : "กำลังอัพโหลด...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก", "Actions" : "การกระทำ", "Download" : "ดาวน์โหลด", @@ -106,7 +108,6 @@ "Show hidden files" : "แสดงไฟล์ที่ซ่อนอยู่", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "ใช้ที่อยู่นี้เพื่อ <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">เข้าถึงไฟล์ของคุณผ่าน WebDAV</a>", - "Cancel upload" : "ยกเลิกการอัพโหลด", "No files in here" : "ไม่มีไฟล์ที่นี่", "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง", "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js index d5b7a5bfe36..e878fdda386 100644 --- a/apps/files/l10n/tr.js +++ b/apps/files/l10n/tr.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "Geçersiz dizin.", "Files" : "Dosyalar", "All files" : "Tüm dosyalar", - "Favorites" : "Sık kullanılanlar", "Home" : "Ev", "Close" : "Kapat", + "Favorites" : "Sık kullanılanlar", "Upload cancelled." : "Yükleme iptal edildi.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi", "Total file size {size1} exceeds upload limit {size2}" : "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut", "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\" dosyası yüklenirken hata: {message}", "Could not get result from server." : "Sunucudan sonuç alınamadı.", + "Uploading..." : "Yükleniyor...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.", "Actions" : "Eylemler", "Download" : "İndir", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "Ayarlar", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Dosyalarınıza WebDAV ile erişmek için <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">bu adresi kullanın</a>", - "Cancel upload" : "Yüklemeyi iptal et", "No files in here" : "Burada hiç dosya yok", "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!", "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı", diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json index 1be304f7c3b..38e78fc6e6f 100644 --- a/apps/files/l10n/tr.json +++ b/apps/files/l10n/tr.json @@ -19,15 +19,17 @@ "Invalid directory." : "Geçersiz dizin.", "Files" : "Dosyalar", "All files" : "Tüm dosyalar", - "Favorites" : "Sık kullanılanlar", "Home" : "Ev", "Close" : "Kapat", + "Favorites" : "Sık kullanılanlar", "Upload cancelled." : "Yükleme iptal edildi.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi", "Total file size {size1} exceeds upload limit {size2}" : "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut", "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\" dosyası yüklenirken hata: {message}", "Could not get result from server." : "Sunucudan sonuç alınamadı.", + "Uploading..." : "Yükleniyor...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.", "Actions" : "Eylemler", "Download" : "İndir", @@ -105,7 +107,6 @@ "Settings" : "Ayarlar", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Dosyalarınıza WebDAV ile erişmek için <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">bu adresi kullanın</a>", - "Cancel upload" : "Yüklemeyi iptal et", "No files in here" : "Burada hiç dosya yok", "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!", "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı", diff --git a/apps/files/l10n/ug.js b/apps/files/l10n/ug.js index b587b590632..6f0c6f9a733 100644 --- a/apps/files/l10n/ug.js +++ b/apps/files/l10n/ug.js @@ -8,10 +8,11 @@ OC.L10N.register( "Failed to write to disk" : "دىسكىغا يازالمىدى", "Not enough storage available" : "يېتەرلىك ساقلاش بوشلۇقى يوق", "Files" : "ھۆججەتلەر", - "Favorites" : "يىغقۇچ", "Home" : "ئۆي", "Close" : "ياپ", + "Favorites" : "يىغقۇچ", "Upload cancelled." : "يۈكلەشتىن ۋاز كەچتى.", + "Uploading..." : "يۈكلەۋاتىدۇ…", "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.", "Actions" : "مەشغۇلاتلار", "Download" : "چۈشۈر", @@ -30,7 +31,6 @@ OC.L10N.register( "Save" : "ساقلا", "Settings" : "تەڭشەكلەر", "WebDAV" : "WebDAV", - "Cancel upload" : "يۈكلەشتىن ۋاز كەچ", "Upload too large" : "يۈكلەندىغىنى بەك چوڭ", "Text file" : "تېكىست ھۆججەت" }, diff --git a/apps/files/l10n/ug.json b/apps/files/l10n/ug.json index dd2e9c98ee5..e4e6e32e1c5 100644 --- a/apps/files/l10n/ug.json +++ b/apps/files/l10n/ug.json @@ -6,10 +6,11 @@ "Failed to write to disk" : "دىسكىغا يازالمىدى", "Not enough storage available" : "يېتەرلىك ساقلاش بوشلۇقى يوق", "Files" : "ھۆججەتلەر", - "Favorites" : "يىغقۇچ", "Home" : "ئۆي", "Close" : "ياپ", + "Favorites" : "يىغقۇچ", "Upload cancelled." : "يۈكلەشتىن ۋاز كەچتى.", + "Uploading..." : "يۈكلەۋاتىدۇ…", "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.", "Actions" : "مەشغۇلاتلار", "Download" : "چۈشۈر", @@ -28,7 +29,6 @@ "Save" : "ساقلا", "Settings" : "تەڭشەكلەر", "WebDAV" : "WebDAV", - "Cancel upload" : "يۈكلەشتىن ۋاز كەچ", "Upload too large" : "يۈكلەندىغىنى بەك چوڭ", "Text file" : "تېكىست ھۆججەت" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js index 43700de436d..d85ff0a6d14 100644 --- a/apps/files/l10n/uk.js +++ b/apps/files/l10n/uk.js @@ -21,14 +21,16 @@ OC.L10N.register( "Invalid directory." : "Невірний каталог.", "Files" : "Файли", "All files" : "Усі файли", - "Favorites" : "Улюблені", "Home" : "Домашня адреса", "Close" : "Закрити", + "Favorites" : "Улюблені", "Upload cancelled." : "Вивантаження скасовано.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неможливо вивантажити {filename}, оскільки це каталог або файл має розмір 0 байт.", "Total file size {size1} exceeds upload limit {size2}" : "Розмір файлу {size1} перевищує обмеження {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви вивантажуєте {size1}, а залишилося лише {size2}", "Could not get result from server." : "Не вдалося отримати результат від сервера.", + "Uploading..." : "Вивантаження...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.", "Actions" : "Дії", "Download" : "Завантажити", @@ -84,7 +86,6 @@ OC.L10N.register( "Save" : "Зберегти", "Settings" : "Налаштування", "WebDAV" : "WebDAV", - "Cancel upload" : "Скасувати вивантаження", "No files in here" : "Тут немає файлів", "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!", "No entries found in this folder" : "В цій теці нічого немає", diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json index 039cd449bfe..a4b4fd1a7c1 100644 --- a/apps/files/l10n/uk.json +++ b/apps/files/l10n/uk.json @@ -19,14 +19,16 @@ "Invalid directory." : "Невірний каталог.", "Files" : "Файли", "All files" : "Усі файли", - "Favorites" : "Улюблені", "Home" : "Домашня адреса", "Close" : "Закрити", + "Favorites" : "Улюблені", "Upload cancelled." : "Вивантаження скасовано.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неможливо вивантажити {filename}, оскільки це каталог або файл має розмір 0 байт.", "Total file size {size1} exceeds upload limit {size2}" : "Розмір файлу {size1} перевищує обмеження {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви вивантажуєте {size1}, а залишилося лише {size2}", "Could not get result from server." : "Не вдалося отримати результат від сервера.", + "Uploading..." : "Вивантаження...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.", "Actions" : "Дії", "Download" : "Завантажити", @@ -82,7 +84,6 @@ "Save" : "Зберегти", "Settings" : "Налаштування", "WebDAV" : "WebDAV", - "Cancel upload" : "Скасувати вивантаження", "No files in here" : "Тут немає файлів", "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!", "No entries found in this folder" : "В цій теці нічого немає", diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js index fda3539b886..5c50ebe4d52 100644 --- a/apps/files/l10n/vi.js +++ b/apps/files/l10n/vi.js @@ -21,14 +21,15 @@ OC.L10N.register( "Invalid directory." : "Thư mục không hợp lệ", "Files" : "Tập tin", "All files" : "Tất cả tệp tin", - "Favorites" : "Ưa thích", "Home" : "Nhà", "Close" : "Đóng", + "Favorites" : "Ưa thích", "Upload cancelled." : "Hủy tải lên", "Unable to upload {filename} as it is a directory or has 0 bytes" : "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte", "Total file size {size1} exceeds upload limit {size2}" : "Kích cở tập tin {size1} vượt giới hạn tải lên {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Không đủ dung lượng trống, bạn đang tải {size1} nhưng chỉ còn {size2} trống", "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.", + "Uploading..." : "tải lên...", "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.", "Actions" : "Actions", "Download" : "Tải về", @@ -81,7 +82,6 @@ OC.L10N.register( "Save" : "Lưu", "Settings" : "Cài đặt", "WebDAV" : "WebDAV", - "Cancel upload" : "Hủy upload", "No entries found in this folder" : "Chưa có mục nào trong thư mục", "Select all" : "Chọn tất cả", "Upload too large" : "Tập tin tải lên quá lớn", diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json index 5271940f0dc..5f9d64f2732 100644 --- a/apps/files/l10n/vi.json +++ b/apps/files/l10n/vi.json @@ -19,14 +19,15 @@ "Invalid directory." : "Thư mục không hợp lệ", "Files" : "Tập tin", "All files" : "Tất cả tệp tin", - "Favorites" : "Ưa thích", "Home" : "Nhà", "Close" : "Đóng", + "Favorites" : "Ưa thích", "Upload cancelled." : "Hủy tải lên", "Unable to upload {filename} as it is a directory or has 0 bytes" : "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte", "Total file size {size1} exceeds upload limit {size2}" : "Kích cở tập tin {size1} vượt giới hạn tải lên {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Không đủ dung lượng trống, bạn đang tải {size1} nhưng chỉ còn {size2} trống", "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.", + "Uploading..." : "tải lên...", "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.", "Actions" : "Actions", "Download" : "Tải về", @@ -79,7 +80,6 @@ "Save" : "Lưu", "Settings" : "Cài đặt", "WebDAV" : "WebDAV", - "Cancel upload" : "Hủy upload", "No entries found in this folder" : "Chưa có mục nào trong thư mục", "Select all" : "Chọn tất cả", "Upload too large" : "Tập tin tải lên quá lớn", diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js index 60a7a990f27..4e5afe599d2 100644 --- a/apps/files/l10n/zh_CN.js +++ b/apps/files/l10n/zh_CN.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "无效文件夹。", "Files" : "文件", "All files" : "全部文件", - "Favorites" : "收藏", "Home" : "家庭", "Close" : "关闭", + "Favorites" : "收藏", "Upload cancelled." : "上传已取消", "Unable to upload {filename} as it is a directory or has 0 bytes" : "不能上传文件 {filename} ，由于它是一个目录或者为0字节", "Total file size {size1} exceeds upload limit {size2}" : "总文件大小 {size1} 超过上传限制 {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "没有足够的可用空间，您正在上传 {size1} 的文件但是只有 {size2} 可用。", "Error uploading file \"{fileName}\": {message}" : "上传文件错误 \"{fileName}\": {message}", "Could not get result from server." : "不能从服务器得到结果", + "Uploading..." : "上传中...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。", "Actions" : "动作", "Download" : "下载", @@ -106,7 +108,6 @@ OC.L10N.register( "Missing permissions to edit from here." : "没有从这里进行编辑的权限", "Settings" : "设置", "WebDAV" : "WebDAV", - "Cancel upload" : "取消上传", "No files in here" : "无文件", "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!", "No entries found in this folder" : "此文件夹中无项目", diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json index 30b6ad1b78d..a4cd89935f6 100644 --- a/apps/files/l10n/zh_CN.json +++ b/apps/files/l10n/zh_CN.json @@ -19,15 +19,17 @@ "Invalid directory." : "无效文件夹。", "Files" : "文件", "All files" : "全部文件", - "Favorites" : "收藏", "Home" : "家庭", "Close" : "关闭", + "Favorites" : "收藏", "Upload cancelled." : "上传已取消", "Unable to upload {filename} as it is a directory or has 0 bytes" : "不能上传文件 {filename} ，由于它是一个目录或者为0字节", "Total file size {size1} exceeds upload limit {size2}" : "总文件大小 {size1} 超过上传限制 {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "没有足够的可用空间，您正在上传 {size1} 的文件但是只有 {size2} 可用。", "Error uploading file \"{fileName}\": {message}" : "上传文件错误 \"{fileName}\": {message}", "Could not get result from server." : "不能从服务器得到结果", + "Uploading..." : "上传中...", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。", "Actions" : "动作", "Download" : "下载", @@ -104,7 +106,6 @@ "Missing permissions to edit from here." : "没有从这里进行编辑的权限", "Settings" : "设置", "WebDAV" : "WebDAV", - "Cancel upload" : "取消上传", "No files in here" : "无文件", "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!", "No entries found in this folder" : "此文件夹中无项目", diff --git a/apps/files/l10n/zh_HK.js b/apps/files/l10n/zh_HK.js index 8ecae84be99..83cb534fe75 100644 --- a/apps/files/l10n/zh_HK.js +++ b/apps/files/l10n/zh_HK.js @@ -28,7 +28,6 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s 刪除了 %1$s", "Save" : "儲存", "Settings" : "設定", - "WebDAV" : "WebDAV", - "Cancel upload" : "取消上戴" + "WebDAV" : "WebDAV" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/zh_HK.json b/apps/files/l10n/zh_HK.json index 798dbe13abe..af7cfef52f7 100644 --- a/apps/files/l10n/zh_HK.json +++ b/apps/files/l10n/zh_HK.json @@ -26,7 +26,6 @@ "%2$s deleted %1$s" : "%2$s 刪除了 %1$s", "Save" : "儲存", "Settings" : "設定", - "WebDAV" : "WebDAV", - "Cancel upload" : "取消上戴" + "WebDAV" : "WebDAV" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js index 3d51a9a5133..98391b2cfee 100644 --- a/apps/files/l10n/zh_TW.js +++ b/apps/files/l10n/zh_TW.js @@ -21,15 +21,17 @@ OC.L10N.register( "Invalid directory." : "無效的資料夾", "Files" : "檔案", "All files" : "所有檔案", - "Favorites" : "最愛", "Home" : "家目錄", "Close" : " 關閉", + "Favorites" : "最愛", "Upload cancelled." : "上傳已取消", "Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳", "Total file size {size1} exceeds upload limit {size2}" : "檔案大小總和 {size1} 超過上傳限制 {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}", "Error uploading file \"{fileName}\": {message}" : "上傳檔案 \"{fileName}\" 發生錯誤：{message}", "Could not get result from server." : "無法從伺服器取回結果", + "Uploading..." : "上傳中…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳", "Actions" : "動作", "Download" : "下載", @@ -107,7 +109,6 @@ OC.L10N.register( "Settings" : "設定", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個位址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">使用 WebDAV 存取檔案</a>", - "Cancel upload" : "取消上傳", "No files in here" : "沒有任何檔案", "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容", "No entries found in this folder" : "在此資料夾中沒有任何項目", diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json index 0c70aab817c..fcc1d3baee3 100644 --- a/apps/files/l10n/zh_TW.json +++ b/apps/files/l10n/zh_TW.json @@ -19,15 +19,17 @@ "Invalid directory." : "無效的資料夾", "Files" : "檔案", "All files" : "所有檔案", - "Favorites" : "最愛", "Home" : "家目錄", "Close" : " 關閉", + "Favorites" : "最愛", "Upload cancelled." : "上傳已取消", "Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳", "Total file size {size1} exceeds upload limit {size2}" : "檔案大小總和 {size1} 超過上傳限制 {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}", "Error uploading file \"{fileName}\": {message}" : "上傳檔案 \"{fileName}\" 發生錯誤：{message}", "Could not get result from server." : "無法從伺服器取回結果", + "Uploading..." : "上傳中…", + "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳", "Actions" : "動作", "Download" : "下載", @@ -105,7 +107,6 @@ "Settings" : "設定", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個位址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">使用 WebDAV 存取檔案</a>", - "Cancel upload" : "取消上傳", "No files in here" : "沒有任何檔案", "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容", "No entries found in this folder" : "在此資料夾中沒有任何項目", diff --git a/apps/files/lib/activity.php b/apps/files/lib/Activity.php index 1cbd6c3b973..1cbd6c3b973 100644 --- a/apps/files/lib/activity.php +++ b/apps/files/lib/Activity.php diff --git a/apps/files/lib/activityhelper.php b/apps/files/lib/ActivityHelper.php index 046dd59bc76..046dd59bc76 100644 --- a/apps/files/lib/activityhelper.php +++ b/apps/files/lib/ActivityHelper.php diff --git a/apps/files/lib/app.php b/apps/files/lib/App.php index 981c41ff413..981c41ff413 100644 --- a/apps/files/lib/app.php +++ b/apps/files/lib/App.php diff --git a/apps/files/appinfo/application.php b/apps/files/lib/AppInfo/Application.php index 2d2decf6288..b2faa43cc3c 100644 --- a/apps/files/appinfo/application.php +++ b/apps/files/lib/AppInfo/Application.php @@ -26,6 +26,7 @@ use OCA\Files\Controller\ApiController; use OCP\AppFramework\App; use \OCA\Files\Service\TagService; use \OCP\IContainer; +use OCA\Files\Controller\ViewController; class Application extends App { public function __construct(array $urlParams=array()) { @@ -48,6 +49,21 @@ class Application extends App { ); }); + $container->registerService('ViewController', function (IContainer $c) use ($server) { + return new ViewController( + $c->query('AppName'), + $c->query('Request'), + $server->getURLGenerator(), + $server->getNavigationManager(), + $c->query('L10N'), + $server->getConfig(), + $server->getEventDispatcher(), + $server->getUserSession(), + $server->getAppManager(), + $server->getRootFolder() + ); + }); + /** * Core */ diff --git a/apps/files/lib/backgroundjob/cleanupfilelocks.php b/apps/files/lib/BackgroundJob/CleanupFileLocks.php index b5cf8e94551..b5cf8e94551 100644 --- a/apps/files/lib/backgroundjob/cleanupfilelocks.php +++ b/apps/files/lib/BackgroundJob/CleanupFileLocks.php diff --git a/apps/files/lib/backgroundjob/deleteorphaneditems.php b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php index 1eef9c24e0c..1eef9c24e0c 100644 --- a/apps/files/lib/backgroundjob/deleteorphaneditems.php +++ b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php diff --git a/apps/files/lib/backgroundjob/scanfiles.php b/apps/files/lib/BackgroundJob/ScanFiles.php index dcc180bcfbe..dcc180bcfbe 100644 --- a/apps/files/lib/backgroundjob/scanfiles.php +++ b/apps/files/lib/BackgroundJob/ScanFiles.php diff --git a/apps/files/lib/capabilities.php b/apps/files/lib/Capabilities.php index dc49ca174b3..dc49ca174b3 100644 --- a/apps/files/lib/capabilities.php +++ b/apps/files/lib/Capabilities.php diff --git a/apps/files/command/deleteorphanedfiles.php b/apps/files/lib/Command/DeleteOrphanedFiles.php index 91043471ce5..91043471ce5 100644 --- a/apps/files/command/deleteorphanedfiles.php +++ b/apps/files/lib/Command/DeleteOrphanedFiles.php diff --git a/apps/files/command/scan.php b/apps/files/lib/Command/Scan.php index f607b3e1af1..1ae04c585bb 100644 --- a/apps/files/command/scan.php +++ b/apps/files/lib/Command/Scan.php @@ -89,6 +89,15 @@ class Scan extends Base { ); } + public function checkScanWarning($fullPath, OutputInterface $output) { + $normalizedPath = basename(\OC\Files\Filesystem::normalizePath($fullPath)); + $path = basename($fullPath); + + if ($normalizedPath !== $path) { + $output->writeln("\t<error>Entry \"" . $fullPath . '" will not be accessible due to incompatible encoding</error>'); + } + } + protected function scanFiles($user, $path, $verbose, OutputInterface $output) { $scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection(), \OC::$server->getLogger()); # check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception @@ -126,6 +135,12 @@ class Scan extends Base { } }); } + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) { + $this->checkScanWarning($path, $output); + }); + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) { + $this->checkScanWarning($path, $output); + }); try { $scanner->scan($path); @@ -133,7 +148,9 @@ class Scan extends Base { $output->writeln("<error>Home storage for user $user not writable</error>"); $output->writeln("Make sure you're running the scan command only as the user the web server runs as"); } catch (\Exception $e) { - # exit the function if ctrl-c has been pressed + if ($e->getMessage() !== 'ctrl-c') { + $output->writeln('<error>Exception while scanning: ' . $e->getMessage() . "\n" . $e->getTraceAsString() . '</error>'); + } return; } } diff --git a/apps/files/command/transferownership.php b/apps/files/lib/Command/TransferOwnership.php index 1f46efdde0d..1f46efdde0d 100644 --- a/apps/files/command/transferownership.php +++ b/apps/files/lib/Command/TransferOwnership.php diff --git a/apps/files/controller/apicontroller.php b/apps/files/lib/Controller/ApiController.php index 072498c7b5f..072498c7b5f 100644 --- a/apps/files/controller/apicontroller.php +++ b/apps/files/lib/Controller/ApiController.php diff --git a/apps/files/controller/viewcontroller.php b/apps/files/lib/Controller/ViewController.php index ded6fd555df..7539a3ab649 100644 --- a/apps/files/controller/viewcontroller.php +++ b/apps/files/lib/Controller/ViewController.php @@ -3,6 +3,7 @@ * @author Christoph Wurst <christoph@winzerhof-wurst.at> * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 @@ -26,6 +27,7 @@ namespace OCA\Files\Controller; use OC\AppFramework\Http\Request; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\ContentSecurityPolicy; +use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\IConfig; @@ -35,6 +37,9 @@ use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUserSession; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use OCP\AppFramework\Http\NotFoundResponse; +use OCP\Files\Folder; +use OCP\App\IAppManager; /** * Class ViewController @@ -58,6 +63,10 @@ class ViewController extends Controller { protected $eventDispatcher; /** @var IUserSession */ protected $userSession; + /** @var IAppManager */ + protected $appManager; + /** @var \OCP\Files\Folder */ + protected $rootFolder; /** * @param string $appName @@ -68,6 +77,8 @@ class ViewController extends Controller { * @param IConfig $config * @param EventDispatcherInterface $eventDispatcherInterface * @param IUserSession $userSession + * @param IAppManager $appManager + * @param Folder $rootFolder */ public function __construct($appName, IRequest $request, @@ -76,7 +87,10 @@ class ViewController extends Controller { IL10N $l10n, IConfig $config, EventDispatcherInterface $eventDispatcherInterface, - IUserSession $userSession) { + IUserSession $userSession, + IAppManager $appManager, + Folder $rootFolder + ) { parent::__construct($appName, $request); $this->appName = $appName; $this->request = $request; @@ -86,6 +100,8 @@ class ViewController extends Controller { $this->config = $config; $this->eventDispatcher = $eventDispatcherInterface; $this->userSession = $userSession; + $this->appManager = $appManager; + $this->rootFolder = $rootFolder; } /** @@ -124,10 +140,15 @@ class ViewController extends Controller { * * @param string $dir * @param string $view + * @param string $fileid * @return TemplateResponse * @throws \OCP\Files\NotFoundException */ - public function index($dir = '', $view = '') { + public function index($dir = '', $view = '', $fileid = null) { + if ($fileid !== null) { + return $this->showFile($fileid); + } + $nav = new \OCP\Template('files', 'appnavigation', ''); // Load the files we need @@ -239,4 +260,45 @@ class ViewController extends Controller { return $response; } + + /** + * Redirects to the file list and highlight the given file id + * + * @param string $fileId file id to show + * @return Response redirect response or not found response + * + * @NoCSRFRequired + * @NoAdminRequired + */ + public function showFile($fileId) { + try { + $uid = $this->userSession->getUser()->getUID(); + $baseFolder = $this->rootFolder->get($uid . '/files/'); + $files = $baseFolder->getById($fileId); + $params = []; + + if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) { + $baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/'); + $files = $baseFolder->getById($fileId); + $params['view'] = 'trashbin'; + } + + if (!empty($files)) { + $file = current($files); + if ($file instanceof Folder) { + // set the full path to enter the folder + $params['dir'] = $baseFolder->getRelativePath($file->getPath()); + } else { + // set parent path as dir + $params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath()); + // and scroll to the entry + $params['scrollto'] = $file->getName(); + } + return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params)); + } + } catch (\OCP\Files\NotFoundException $e) { + return new NotFoundResponse(); + } + return new NotFoundResponse(); + } } diff --git a/apps/files/lib/helper.php b/apps/files/lib/Helper.php index d21a65afcee..d21a65afcee 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/Helper.php diff --git a/apps/files/service/tagservice.php b/apps/files/lib/Service/TagService.php index 57cad43a539..57cad43a539 100644 --- a/apps/files/service/tagservice.php +++ b/apps/files/lib/Service/TagService.php diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 29769bcd825..dda7a1814a0 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -1,12 +1,10 @@ <div id="controls"> <div class="actions creatable hidden"> <div id="uploadprogresswrapper"> - <div id="uploadprogressbar"></div> - <button class="stop icon-close" style="display:none"> - <span class="hidden-visually"> - <?php p($l->t('Cancel upload'))?> - </span> - </button> + <div id="uploadprogressbar"> + <em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...'));?></span><span class="mobile"><?php p($l->t('...'));?></span></em> + </div> + <input type="button" class="stop icon-close" style="display:none" value="" /> </div> </div> <div id="file_action_panel"></div> diff --git a/apps/files/tests/activitytest.php b/apps/files/tests/ActivityTest.php index 5e73ff0b5dd..bc062dd0542 100644 --- a/apps/files/tests/activitytest.php +++ b/apps/files/tests/ActivityTest.php @@ -33,7 +33,7 @@ use Test\TestCase; */ class ActivityTest extends TestCase { - /** @var \OC\ActivityManager */ + /** @var \OCP\Activity\IManager */ private $activityManager; /** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */ @@ -70,7 +70,7 @@ class ActivityTest extends TestCase { ->disableOriginalConstructor() ->getMock(); - $this->activityManager = new \OC\ActivityManager( + $this->activityManager = new \OC\Activity\Manager( $this->request, $this->session, $this->config diff --git a/apps/files/tests/backgroundjob/DeleteOrphanedItemsJobTest.php b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php index e802a248a9b..e802a248a9b 100644 --- a/apps/files/tests/backgroundjob/DeleteOrphanedItemsJobTest.php +++ b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php diff --git a/apps/files/tests/backgroundjob/ScanFilesTest.php b/apps/files/tests/BackgroundJob/ScanFilesTest.php index eab28071b70..eab28071b70 100644 --- a/apps/files/tests/backgroundjob/ScanFilesTest.php +++ b/apps/files/tests/BackgroundJob/ScanFilesTest.php diff --git a/apps/files/tests/command/deleteorphanedfilestest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php index ff29942bc4a..ff29942bc4a 100644 --- a/apps/files/tests/command/deleteorphanedfilestest.php +++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php diff --git a/apps/files/tests/controller/apicontrollertest.php b/apps/files/tests/Controller/ApiControllerTest.php index 2eba7d62feb..2eba7d62feb 100644 --- a/apps/files/tests/controller/apicontrollertest.php +++ b/apps/files/tests/Controller/ApiControllerTest.php diff --git a/apps/files/tests/controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 420e635b4b9..affcdb53a4b 100644 --- a/apps/files/tests/controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -26,6 +26,7 @@ namespace OCA\Files\Tests\Controller; use OCA\Files\Controller\ViewController; use OCP\AppFramework\Http; +use OCP\IUser; use OCP\Template; use Test\TestCase; use OCP\IRequest; @@ -36,6 +37,8 @@ use OCP\IL10N; use OCP\IConfig; use OCP\IUserSession; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use OCP\Files\Folder; +use OCP\App\IAppManager; /** * Class ViewControllerTest @@ -61,6 +64,10 @@ class ViewControllerTest extends TestCase { private $user; /** @var IUserSession */ private $userSession; + /** @var IAppManager */ + private $appManager; + /** @var Folder */ + private $rootFolder; public function setUp() { parent::setUp(); @@ -71,10 +78,15 @@ class ViewControllerTest extends TestCase { $this->config = $this->getMock('\OCP\IConfig'); $this->eventDispatcher = $this->getMock('\Symfony\Component\EventDispatcher\EventDispatcherInterface'); $this->userSession = $this->getMock('\OCP\IUserSession'); + $this->appManager = $this->getMock('\OCP\App\IAppManager'); $this->user = $this->getMock('\OCP\IUser'); + $this->user->expects($this->any()) + ->method('getUID') + ->will($this->returnValue('testuser1')); $this->userSession->expects($this->any()) ->method('getUser') ->will($this->returnValue($this->user)); + $this->rootFolder = $this->getMock('\OCP\Files\Folder'); $this->viewController = $this->getMockBuilder('\OCA\Files\Controller\ViewController') ->setConstructorArgs([ 'files', @@ -84,7 +96,9 @@ class ViewControllerTest extends TestCase { $this->l10n, $this->config, $this->eventDispatcher, - $this->userSession + $this->userSession, + $this->appManager, + $this->rootFolder ]) ->setMethods([ 'getStorageInfo', @@ -287,4 +301,182 @@ class ViewControllerTest extends TestCase { $expected->setContentSecurityPolicy($policy); $this->assertEquals($expected, $this->viewController->index('MyDir', 'MyView')); } + + public function showFileMethodProvider() { + return [ + [true], + [false], + ]; + } + + /** + * @dataProvider showFileMethodProvider + */ + public function testShowFileRouteWithFolder($useShowFile) { + $node = $this->getMock('\OCP\Files\Folder'); + $node->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('/testuser1/files/test/sub')); + + $baseFolder = $this->getMock('\OCP\Files\Folder'); + + $this->rootFolder->expects($this->once()) + ->method('get') + ->with('testuser1/files/') + ->will($this->returnValue($baseFolder)); + + $baseFolder->expects($this->at(0)) + ->method('getById') + ->with(123) + ->will($this->returnValue([$node])); + $baseFolder->expects($this->at(1)) + ->method('getRelativePath') + ->with('/testuser1/files/test/sub') + ->will($this->returnValue('/test/sub')); + + $this->urlGenerator + ->expects($this->once()) + ->method('linkToRoute') + ->with('files.view.index', ['dir' => '/test/sub']) + ->will($this->returnValue('/apps/files/?dir=/test/sub')); + + $expected = new Http\RedirectResponse('/apps/files/?dir=/test/sub'); + if ($useShowFile) { + $this->assertEquals($expected, $this->viewController->showFile(123)); + } else { + $this->assertEquals($expected, $this->viewController->index('/whatever', '', '123')); + } + } + + /** + * @dataProvider showFileMethodProvider + */ + public function testShowFileRouteWithFile($useShowFile) { + $parentNode = $this->getMock('\OCP\Files\Folder'); + $parentNode->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('testuser1/files/test')); + + $baseFolder = $this->getMock('\OCP\Files\Folder'); + + $this->rootFolder->expects($this->once()) + ->method('get') + ->with('testuser1/files/') + ->will($this->returnValue($baseFolder)); + + $node = $this->getMock('\OCP\Files\File'); + $node->expects($this->once()) + ->method('getParent') + ->will($this->returnValue($parentNode)); + $node->expects($this->once()) + ->method('getName') + ->will($this->returnValue('somefile.txt')); + + $baseFolder->expects($this->at(0)) + ->method('getById') + ->with(123) + ->will($this->returnValue([$node])); + $baseFolder->expects($this->at(1)) + ->method('getRelativePath') + ->with('testuser1/files/test') + ->will($this->returnValue('/test')); + + $this->urlGenerator + ->expects($this->once()) + ->method('linkToRoute') + ->with('files.view.index', ['dir' => '/test', 'scrollto' => 'somefile.txt']) + ->will($this->returnValue('/apps/files/?dir=/test/sub&scrollto=somefile.txt')); + + $expected = new Http\RedirectResponse('/apps/files/?dir=/test/sub&scrollto=somefile.txt'); + if ($useShowFile) { + $this->assertEquals($expected, $this->viewController->showFile(123)); + } else { + $this->assertEquals($expected, $this->viewController->index('/whatever', '', '123')); + } + } + + /** + * @dataProvider showFileMethodProvider + */ + public function testShowFileRouteWithInvalidFileId($useShowFile) { + $baseFolder = $this->getMock('\OCP\Files\Folder'); + $this->rootFolder->expects($this->once()) + ->method('get') + ->with('testuser1/files/') + ->will($this->returnValue($baseFolder)); + + $baseFolder->expects($this->at(0)) + ->method('getById') + ->with(123) + ->will($this->returnValue([])); + + $expected = new Http\NotFoundResponse(); + if ($useShowFile) { + $this->assertEquals($expected, $this->viewController->showFile(123)); + } else { + $this->assertEquals($expected, $this->viewController->index('/whatever', '', '123')); + } + } + + /** + * @dataProvider showFileMethodProvider + */ + public function testShowFileRouteWithTrashedFile($useShowFile) { + $this->appManager->expects($this->once()) + ->method('isEnabledForUser') + ->with('files_trashbin') + ->will($this->returnValue(true)); + + $parentNode = $this->getMock('\OCP\Files\Folder'); + $parentNode->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('testuser1/files_trashbin/files/test.d1462861890/sub')); + + $baseFolderFiles = $this->getMock('\OCP\Files\Folder'); + $baseFolderTrash = $this->getMock('\OCP\Files\Folder'); + + $this->rootFolder->expects($this->at(0)) + ->method('get') + ->with('testuser1/files/') + ->will($this->returnValue($baseFolderFiles)); + $this->rootFolder->expects($this->at(1)) + ->method('get') + ->with('testuser1/files_trashbin/files/') + ->will($this->returnValue($baseFolderTrash)); + + $baseFolderFiles->expects($this->once()) + ->method('getById') + ->with(123) + ->will($this->returnValue([])); + + $node = $this->getMock('\OCP\Files\File'); + $node->expects($this->once()) + ->method('getParent') + ->will($this->returnValue($parentNode)); + $node->expects($this->once()) + ->method('getName') + ->will($this->returnValue('somefile.txt')); + + $baseFolderTrash->expects($this->at(0)) + ->method('getById') + ->with(123) + ->will($this->returnValue([$node])); + $baseFolderTrash->expects($this->at(1)) + ->method('getRelativePath') + ->with('testuser1/files_trashbin/files/test.d1462861890/sub') + ->will($this->returnValue('/test.d1462861890/sub')); + + $this->urlGenerator + ->expects($this->once()) + ->method('linkToRoute') + ->with('files.view.index', ['view' => 'trashbin', 'dir' => '/test.d1462861890/sub', 'scrollto' => 'somefile.txt']) + ->will($this->returnValue('/apps/files/?view=trashbin&dir=/test.d1462861890/sub&scrollto=somefile.txt')); + + $expected = new Http\RedirectResponse('/apps/files/?view=trashbin&dir=/test.d1462861890/sub&scrollto=somefile.txt'); + if ($useShowFile) { + $this->assertEquals($expected, $this->viewController->showFile(123)); + } else { + $this->assertEquals($expected, $this->viewController->index('/whatever', '', '123')); + } + } } diff --git a/apps/files/tests/helper.php b/apps/files/tests/HelperTest.php index 654ec8332ed..d2d52b4f8a3 100644 --- a/apps/files/tests/helper.php +++ b/apps/files/tests/HelperTest.php @@ -23,12 +23,12 @@ * */ -use OCA\Files; +use OCA\Files\Tests; /** - * Class Test_Files_Helper + * Class Helper */ -class Test_Files_Helper extends \Test\TestCase { +class HelperTest extends \Test\TestCase { private function makeFileInfo($name, $size, $mtime, $isDir = false) { return new \OC\Files\FileInfo( diff --git a/apps/files/tests/service/tagservice.php b/apps/files/tests/Service/TagServiceTest.php index 5fcf64b1352..3f210b500ff 100644 --- a/apps/files/tests/service/tagservice.php +++ b/apps/files/tests/Service/TagServiceTest.php @@ -20,9 +20,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -namespace OCA\Files; +namespace OCA\Files\Tests\Service; -use \OCA\Files\Service\TagService; +use OCA\Files\Service\TagService; /** * Class TagServiceTest @@ -55,13 +55,11 @@ class TagServiceTest extends \Test\TestCase { protected function setUp() { parent::setUp(); - $this->user = $this->getUniqueId('user'); + $this->user = $this->getUniqueID('user'); \OC::$server->getUserManager()->createUser($this->user, 'test'); \OC_User::setUserId($this->user); \OC_Util::setupFS($this->user); - /** - * @var \OCP\IUser - */ + /** @var \OCP\IUser */ $user = new \OC\User\User($this->user, null); /** * @var \OCP\IUserSession @@ -105,12 +103,12 @@ class TagServiceTest extends \Test\TestCase { $this->assertEquals(array($fileId), $this->tagger->getIdsForTag($tag2)); // remove tag - $result = $this->tagService->updateFileTags('subdir/test.txt', array($tag2)); + $this->tagService->updateFileTags('subdir/test.txt', array($tag2)); $this->assertEquals(array(), $this->tagger->getIdsForTag($tag1)); $this->assertEquals(array($fileId), $this->tagger->getIdsForTag($tag2)); // clear tags - $result = $this->tagService->updateFileTags('subdir/test.txt', array()); + $this->tagService->updateFileTags('subdir/test.txt', array()); $this->assertEquals(array(), $this->tagger->getIdsForTag($tag1)); $this->assertEquals(array(), $this->tagger->getIdsForTag($tag2)); diff --git a/apps/files/tests/js/appSpec.js b/apps/files/tests/js/appSpec.js index dce513339f0..b9c323e7c12 100644 --- a/apps/files/tests/js/appSpec.js +++ b/apps/files/tests/js/appSpec.js @@ -22,6 +22,7 @@ describe('OCA.Files.App tests', function() { var App = OCA.Files.App; var pushStateStub; + var replaceStateStub; var parseUrlQueryStub; var oldLegacyFileActions; @@ -48,6 +49,7 @@ describe('OCA.Files.App tests', function() { OCA.Files.fileActions = new OCA.Files.FileActions(); pushStateStub = sinon.stub(OC.Util.History, 'pushState'); + replaceStateStub = sinon.stub(OC.Util.History, 'replaceState'); parseUrlQueryStub = sinon.stub(OC.Util.History, 'parseUrlQuery'); parseUrlQueryStub.returns({}); @@ -59,6 +61,7 @@ describe('OCA.Files.App tests', function() { window.FileActions = oldLegacyFileActions; pushStateStub.restore(); + replaceStateStub.restore(); parseUrlQueryStub.restore(); }); @@ -119,18 +122,39 @@ describe('OCA.Files.App tests', function() { describe('URL handling', function() { it('pushes the state to the URL when current app changed directory', function() { - $('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'subdir'})); + $('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'sub dir'})); expect(pushStateStub.calledOnce).toEqual(true); - expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir'); - expect(pushStateStub.getCall(0).args[0].view).not.toBeDefined(); + var params = OC.parseQueryString(pushStateStub.getCall(0).args[0]); + expect(params.dir).toEqual('sub dir'); + expect(params.view).not.toBeDefined(); $('li[data-id=other]>a').click(); pushStateStub.reset(); - $('#app-content-other').trigger(new $.Event('changeDirectory', {dir: 'subdir'})); + $('#app-content-other').trigger(new $.Event('changeDirectory', {dir: 'sub dir'})); expect(pushStateStub.calledOnce).toEqual(true); - expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir'); - expect(pushStateStub.getCall(0).args[0].view).toEqual('other'); + params = OC.parseQueryString(pushStateStub.getCall(0).args[0]); + expect(params.dir).toEqual('sub dir'); + expect(params.view).toEqual('other'); + }); + it('replaces the state to the URL when fileid is known', function() { + $('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'sub dir'})); + expect(pushStateStub.calledOnce).toEqual(true); + var params = OC.parseQueryString(pushStateStub.getCall(0).args[0]); + expect(params.dir).toEqual('sub dir'); + expect(params.view).not.toBeDefined(); + expect(replaceStateStub.notCalled).toEqual(true); + + parseUrlQueryStub.returns({dir: 'sub dir'}); + + $('#app-content-files').trigger(new $.Event('afterChangeDirectory', {dir: 'sub dir', fileId: 123})); + + expect(pushStateStub.calledOnce).toEqual(true); + expect(replaceStateStub.calledOnce).toEqual(true); + params = OC.parseQueryString(replaceStateStub.getCall(0).args[0]); + expect(params.dir).toEqual('sub dir'); + expect(params.view).not.toBeDefined(); + expect(params.fileid).toEqual('123'); }); describe('onpopstate', function() { it('sends "urlChanged" event to current app', function() { diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index cc3bcd74b46..7e6408128bb 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -1358,6 +1358,15 @@ describe('OCA.Files.FileList tests', function() { expect(handler.calledOnce).toEqual(true); expect(handler.getCall(0).args[0].dir).toEqual('/somedir'); }); + it('triggers "afterChangeDirectory" event with fileid after changing directory', function() { + var handler = sinon.stub(); + $('#app-content-files').on('afterChangeDirectory', handler); + fileList.changeDirectory('/somedir'); + deferredList.resolve(200, [testRoot].concat(testFiles)); + expect(handler.calledOnce).toEqual(true); + expect(handler.getCall(0).args[0].dir).toEqual('/somedir'); + expect(handler.getCall(0).args[0].fileId).toEqual(99); + }); it('changes the directory when receiving "urlChanged" event', function() { $('#app-content-files').trigger(new $.Event('urlChanged', {view: 'files', dir: '/somedir'})); expect(fileList.getCurrentDirectory()).toEqual('/somedir'); diff --git a/apps/files/tests/js/mainfileinfodetailviewSpec.js b/apps/files/tests/js/mainfileinfodetailviewSpec.js index 460629806c8..e81adbcf7ac 100644 --- a/apps/files/tests/js/mainfileinfodetailviewSpec.js +++ b/apps/files/tests/js/mainfileinfodetailviewSpec.js @@ -62,6 +62,11 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() { expect(view.$el.find('.date').attr('title')).toEqual(dateExpected); clock.restore(); }); + it('displays permalink', function() { + view.setFileInfo(testFileInfo); + expect(view.$el.find('.permalink').attr('href')) + .toEqual(OC.getProtocol() + '://' + OC.getHost() + OC.generateUrl('/f/5')); + }); it('displays favorite icon', function() { testFileInfo.set('tags', [OC.TAG_FAVORITE]); view.setFileInfo(testFileInfo); diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index 9338b8d3ee7..6dfb012b15e 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -18,6 +18,11 @@ td.mountPoint, td.backend { width:160px; } #addMountPoint>td.applicable { visibility:hidden; } #addMountPoint>td.hidden { visibility:hidden; } +#externalStorage .icon-settings { + padding: 11px 20px; + vertical-align: text-bottom; +} + #selectBackend { margin-left: -10px; width: 150px; @@ -45,6 +50,10 @@ td.mountPoint, td.backend { width:160px; } margin-right: 6px; } +#externalStorage td.configuration input.disabled-success { + background-color: rgba(134, 255, 110, 0.9); +} + #externalStorage td.applicable div.chzn-container { position: relative; diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js new file mode 100644 index 00000000000..8302f5711d6 --- /dev/null +++ b/apps/files_external/js/dropbox.js @@ -0,0 +1,30 @@ +$(document).ready(function() { + + function generateUrl($tr) { + var app_key = $tr.find('[data-parameter="app_key"]').val(); + if (app_key) { + return 'https://www.dropbox.com/developers/apps/info/' + app_key; + } else { + return 'https://www.dropbox.com/developers/apps'; + } + } + + OCA.External.Settings.mountConfig.whenSelectBackend(function($tr, backend, onCompletion) { + if (backend === 'dropbox') { + var backendEl = $tr.find('.backend'); + var el = $(document.createElement('a')) + .attr('href', generateUrl($tr)) + .attr('target', '_blank') + .attr('title', t('files_external', 'Dropbox App Configuration')) + .addClass('icon-settings svg') + ; + el.on('click', function(event) { + var a = $(event.target); + a.attr('href', generateUrl($(this).closest('tr'))); + }); + el.tooltip({placement: 'top'}); + backendEl.append(el); + } + }); + +}); diff --git a/apps/files_external/js/gdrive.js b/apps/files_external/js/gdrive.js new file mode 100644 index 00000000000..e02cedd6b45 --- /dev/null +++ b/apps/files_external/js/gdrive.js @@ -0,0 +1,26 @@ +$(document).ready(function() { + + function generateUrl($tr) { + // no mapping between client ID and Google 'project', so we always load the same URL + return 'https://console.developers.google.com/'; + } + + OCA.External.Settings.mountConfig.whenSelectBackend(function($tr, backend, onCompletion) { + if (backend === 'googledrive') { + var backendEl = $tr.find('.backend'); + var el = $(document.createElement('a')) + .attr('href', generateUrl($tr)) + .attr('target', '_blank') + .attr('title', t('files_external', 'Google Drive App Configuration')) + .addClass('icon-settings svg') + ; + el.on('click', function(event) { + var a = $(event.target); + a.attr('href', generateUrl($(this).closest('tr'))); + }); + el.tooltip({placement: 'top'}); + backendEl.append(el); + } + }); + +}); diff --git a/apps/files_external/js/oauth1.js b/apps/files_external/js/oauth1.js index e2ba25ebf8e..79248a3e3b2 100644 --- a/apps/files_external/js/oauth1.js +++ b/apps/files_external/js/oauth1.js @@ -1,5 +1,9 @@ $(document).ready(function() { + function displayGranted($tr) { + $tr.find('.configuration input.auth-param').attr('disabled', 'disabled').addClass('disabled-success'); + } + OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme, onCompletion) { if (authMechanism === 'oauth1::oauth1') { var config = $tr.find('.configuration'); @@ -13,8 +17,7 @@ $(document).ready(function() { onCompletion.then(function() { var configured = $tr.find('[data-parameter="configured"]'); if ($(configured).val() == 'true') { - $tr.find('.configuration input').attr('disabled', 'disabled'); - $tr.find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>'); + displayGranted($tr); } else { var app_key = $tr.find('.configuration [data-parameter="app_key"]').val(); var app_secret = $tr.find('.configuration [data-parameter="app_secret"]').val(); @@ -33,8 +36,7 @@ $(document).ready(function() { $(configured).val('true'); OCA.External.Settings.mountConfig.saveStorageConfig($tr, function(status) { if (status) { - $tr.find('.configuration input').attr('disabled', 'disabled'); - $tr.find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>'); + displayGranted($tr); } }); } else { diff --git a/apps/files_external/js/oauth2.js b/apps/files_external/js/oauth2.js index 2556bf45cae..13b5162694e 100644 --- a/apps/files_external/js/oauth2.js +++ b/apps/files_external/js/oauth2.js @@ -1,5 +1,9 @@ $(document).ready(function() { + function displayGranted($tr) { + $tr.find('.configuration input.auth-param').attr('disabled', 'disabled').addClass('disabled-success'); + } + OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme, onCompletion) { if (authMechanism === 'oauth2::oauth2') { var config = $tr.find('.configuration'); @@ -13,9 +17,7 @@ $(document).ready(function() { onCompletion.then(function() { var configured = $tr.find('[data-parameter="configured"]'); if ($(configured).val() == 'true') { - $tr.find('.configuration input').attr('disabled', 'disabled'); - $tr.find('.configuration').append($('<span/>').attr('id', 'access') - .text(t('files_external', 'Access granted'))); + displayGranted($tr); } else { var client_id = $tr.find('.configuration [data-parameter="client_id"]').val(); var client_secret = $tr.find('.configuration [data-parameter="client_secret"]') @@ -43,10 +45,7 @@ $(document).ready(function() { $(configured).val('true'); OCA.External.Settings.mountConfig.saveStorageConfig($tr, function(status) { if (status) { - $tr.find('.configuration input').attr('disabled', 'disabled'); - $tr.find('.configuration').append($('<span/>') - .attr('id', 'access') - .text(t('files_external', 'Access granted'))); + displayGranted($tr); } }); } else { diff --git a/apps/files_external/l10n/ast.js b/apps/files_external/l10n/ast.js index dde6d0c1e52..0fab7b15e81 100644 --- a/apps/files_external/l10n/ast.js +++ b/apps/files_external/l10n/ast.js @@ -7,7 +7,6 @@ OC.L10N.register( "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Conceder accesu", - "Access granted" : "Accesu concedíu", "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.", "(group)" : "(grupu)", "Saved" : "Guardáu", diff --git a/apps/files_external/l10n/ast.json b/apps/files_external/l10n/ast.json index f31a288618c..56bfc2757ea 100644 --- a/apps/files_external/l10n/ast.json +++ b/apps/files_external/l10n/ast.json @@ -5,7 +5,6 @@ "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Conceder accesu", - "Access granted" : "Accesu concedíu", "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.", "(group)" : "(grupu)", "Saved" : "Guardáu", diff --git a/apps/files_external/l10n/az.js b/apps/files_external/l10n/az.js index ebb84a1b6f3..75c15d57a12 100644 --- a/apps/files_external/l10n/az.js +++ b/apps/files_external/l10n/az.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Şəxsi", "System" : "Sistem", "Grant access" : "Yetkinin verilməsi", - "Access granted" : "Yetki verildi", "Generate keys" : "Açarları generasiya et", "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi", "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.", diff --git a/apps/files_external/l10n/az.json b/apps/files_external/l10n/az.json index a8ec16bf97d..608a083f736 100644 --- a/apps/files_external/l10n/az.json +++ b/apps/files_external/l10n/az.json @@ -8,7 +8,6 @@ "Personal" : "Şəxsi", "System" : "Sistem", "Grant access" : "Yetkinin verilməsi", - "Access granted" : "Yetki verildi", "Generate keys" : "Açarları generasiya et", "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi", "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.", diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js index 8e8ce312138..a0c5bccc65c 100644 --- a/apps/files_external/l10n/bg_BG.js +++ b/apps/files_external/l10n/bg_BG.js @@ -9,7 +9,6 @@ OC.L10N.register( "Personal" : "Личен", "System" : "Системен", "Grant access" : "Разреши достъп", - "Access granted" : "Достъпът разрешен", "Generate keys" : "Генериране на криптографски ключове", "Error generating key pair" : "Грешка при генериране на криптографски ключове", "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.", diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json index cc76db1ebed..dc358c71857 100644 --- a/apps/files_external/l10n/bg_BG.json +++ b/apps/files_external/l10n/bg_BG.json @@ -7,7 +7,6 @@ "Personal" : "Личен", "System" : "Системен", "Grant access" : "Разреши достъп", - "Access granted" : "Достъпът разрешен", "Generate keys" : "Генериране на криптографски ключове", "Error generating key pair" : "Грешка при генериране на криптографски ключове", "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.", diff --git a/apps/files_external/l10n/bn_BD.js b/apps/files_external/l10n/bn_BD.js index 13e9c436a01..4d99e32ffdd 100644 --- a/apps/files_external/l10n/bn_BD.js +++ b/apps/files_external/l10n/bn_BD.js @@ -5,7 +5,6 @@ OC.L10N.register( "External storage" : "বাহ্যিক সংরক্ষণাগার", "Personal" : "ব্যক্তিগত", "Grant access" : "অধিগমনের অনুমতি প্রদান কর", - "Access granted" : "অধিগমনের অনুমতি প্রদান করা হলো", "(group)" : "(গোষ্ঠি)", "Saved" : "সংরক্ষণ করা হলো", "Username" : "ব্যবহারকারী", diff --git a/apps/files_external/l10n/bn_BD.json b/apps/files_external/l10n/bn_BD.json index 979e0b43837..d7035b0737f 100644 --- a/apps/files_external/l10n/bn_BD.json +++ b/apps/files_external/l10n/bn_BD.json @@ -3,7 +3,6 @@ "External storage" : "বাহ্যিক সংরক্ষণাগার", "Personal" : "ব্যক্তিগত", "Grant access" : "অধিগমনের অনুমতি প্রদান কর", - "Access granted" : "অধিগমনের অনুমতি প্রদান করা হলো", "(group)" : "(গোষ্ঠি)", "Saved" : "সংরক্ষণ করা হলো", "Username" : "ব্যবহারকারী", diff --git a/apps/files_external/l10n/ca.js b/apps/files_external/l10n/ca.js index 767318876d2..c654e171e46 100644 --- a/apps/files_external/l10n/ca.js +++ b/apps/files_external/l10n/ca.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Concedeix accés", - "Access granted" : "S'ha concedit l'accés", "Generate keys" : "Generar claus", "Error generating key pair" : "Error en generar el parell de claus", "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.", diff --git a/apps/files_external/l10n/ca.json b/apps/files_external/l10n/ca.json index a88071fdbea..96e1a52f229 100644 --- a/apps/files_external/l10n/ca.json +++ b/apps/files_external/l10n/ca.json @@ -8,7 +8,6 @@ "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Concedeix accés", - "Access granted" : "S'ha concedit l'accés", "Generate keys" : "Generar claus", "Error generating key pair" : "Error en generar el parell de claus", "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.", diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js index 93c660187d1..c2d99356eb6 100644 --- a/apps/files_external/l10n/cs_CZ.js +++ b/apps/files_external/l10n/cs_CZ.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Osobní", "System" : "Systém", "Grant access" : "Povolit přístup", - "Access granted" : "Přístup povolen", "Error configuring OAuth1" : "Chyba nastavení OAuth1", "Error configuring OAuth2" : "Chyba nastavení OAuth2", "Generate keys" : "Vytvořit klíče", diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json index 85734785379..71704dccae8 100644 --- a/apps/files_external/l10n/cs_CZ.json +++ b/apps/files_external/l10n/cs_CZ.json @@ -20,7 +20,6 @@ "Personal" : "Osobní", "System" : "Systém", "Grant access" : "Povolit přístup", - "Access granted" : "Přístup povolen", "Error configuring OAuth1" : "Chyba nastavení OAuth1", "Error configuring OAuth2" : "Chyba nastavení OAuth2", "Generate keys" : "Vytvořit klíče", diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js index 7305364c686..a30d790d685 100644 --- a/apps/files_external/l10n/da.js +++ b/apps/files_external/l10n/da.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Personligt", "System" : "System", "Grant access" : "Godkend adgang", - "Access granted" : "Adgang godkendt", "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1", "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2", "Generate keys" : "Opret nøgler.", diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json index f2aa731623c..f0b79b1f93a 100644 --- a/apps/files_external/l10n/da.json +++ b/apps/files_external/l10n/da.json @@ -20,7 +20,6 @@ "Personal" : "Personligt", "System" : "System", "Grant access" : "Godkend adgang", - "Access granted" : "Adgang godkendt", "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1", "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2", "Generate keys" : "Opret nøgler.", diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js index af51458d8a4..003a2bd56b9 100644 --- a/apps/files_external/l10n/de.js +++ b/apps/files_external/l10n/de.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Speicher mit der ID \"%i\" kann nicht vom Benutzer bearbeitet werden", + "Dropbox App Configuration" : "Dropbox-App Konfiguration", + "Google Drive App Configuration" : "Google Drive - App Konfiguration", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", - "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim konfigurieren von OAuth1", "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2", "Generate keys" : "Schlüssel erzeugen", diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json index 2cb80cc32ae..a18205519fb 100644 --- a/apps/files_external/l10n/de.json +++ b/apps/files_external/l10n/de.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Speicher mit der ID \"%i\" kann nicht vom Benutzer bearbeitet werden", + "Dropbox App Configuration" : "Dropbox-App Konfiguration", + "Google Drive App Configuration" : "Google Drive - App Konfiguration", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", - "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim konfigurieren von OAuth1", "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2", "Generate keys" : "Schlüssel erzeugen", diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index 8582d672aa9..13769ab9787 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Der Speicher mit der ID „%i“ ist nicht bearbeitbar durch Benutzer", + "Dropbox App Configuration" : "Dropbox-App Konfiguration", + "Google Drive App Configuration" : "Google Drive - App Konfiguration", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", - "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim Konfigurieren von OAuth1", "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index c63904c89cb..996723d7dc5 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Der Speicher mit der ID „%i“ ist nicht bearbeitbar durch Benutzer", + "Dropbox App Configuration" : "Dropbox-App Konfiguration", + "Google Drive App Configuration" : "Google Drive - App Konfiguration", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", - "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim Konfigurieren von OAuth1", "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js index 8ca17f848d3..4cb950530bf 100644 --- a/apps/files_external/l10n/el.js +++ b/apps/files_external/l10n/el.js @@ -21,7 +21,6 @@ OC.L10N.register( "Personal" : "Προσωπικά", "System" : "Σύστημα", "Grant access" : "Παροχή πρόσβασης", - "Access granted" : "Πρόσβαση παρασχέθηκε", "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1", "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2", "Generate keys" : "Δημιουργία κλειδιών", diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json index 2bac56048a5..1a64c1eca06 100644 --- a/apps/files_external/l10n/el.json +++ b/apps/files_external/l10n/el.json @@ -19,7 +19,6 @@ "Personal" : "Προσωπικά", "System" : "Σύστημα", "Grant access" : "Παροχή πρόσβασης", - "Access granted" : "Πρόσβαση παρασχέθηκε", "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1", "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2", "Generate keys" : "Δημιουργία κλειδιών", diff --git a/apps/files_external/l10n/en@pirate.js b/apps/files_external/l10n/en@pirate.js deleted file mode 100644 index 7345429f750..00000000000 --- a/apps/files_external/l10n/en@pirate.js +++ /dev/null @@ -1,6 +0,0 @@ -OC.L10N.register( - "files_external", - { - "Password" : "Secret Code" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files_external/l10n/en@pirate.json b/apps/files_external/l10n/en@pirate.json deleted file mode 100644 index bde5153f309..00000000000 --- a/apps/files_external/l10n/en@pirate.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "translations": { - "Password" : "Secret Code" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js index 288a0561765..b9cf62e1965 100644 --- a/apps/files_external/l10n/en_GB.js +++ b/apps/files_external/l10n/en_GB.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Insufficient data: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Storage with id \"%i\" is not user editable", + "Dropbox App Configuration" : "Dropbox App Configuration", + "Google Drive App Configuration" : "Google Drive App Configuration", "Personal" : "Personal", "System" : "System", "Grant access" : "Grant access", - "Access granted" : "Access granted", "Error configuring OAuth1" : "Error configuring OAuth1", "Error configuring OAuth2" : "Error configuring OAuth2", "Generate keys" : "Generate keys", diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json index d479ff7b3af..f8eba19c544 100644 --- a/apps/files_external/l10n/en_GB.json +++ b/apps/files_external/l10n/en_GB.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Insufficient data: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Storage with id \"%i\" is not user editable", + "Dropbox App Configuration" : "Dropbox App Configuration", + "Google Drive App Configuration" : "Google Drive App Configuration", "Personal" : "Personal", "System" : "System", "Grant access" : "Grant access", - "Access granted" : "Access granted", "Error configuring OAuth1" : "Error configuring OAuth1", "Error configuring OAuth2" : "Error configuring OAuth2", "Generate keys" : "Generate keys", diff --git a/apps/files_external/l10n/eo.js b/apps/files_external/l10n/eo.js index 1a3e6145641..56c9dab1cf4 100644 --- a/apps/files_external/l10n/eo.js +++ b/apps/files_external/l10n/eo.js @@ -9,7 +9,6 @@ OC.L10N.register( "Personal" : "Persona", "System" : "Sistemo", "Grant access" : "Doni alirpermeson", - "Access granted" : "Alirpermeso donita", "Generate keys" : "Generi ŝlosilojn", "All users. Type to select user or group." : "Ĉiuj uzantoj. Tajpu por elekti uzanton aŭ grupon.", "(group)" : "(grupo)", diff --git a/apps/files_external/l10n/eo.json b/apps/files_external/l10n/eo.json index 7af3ffad2ca..5988fd66a5d 100644 --- a/apps/files_external/l10n/eo.json +++ b/apps/files_external/l10n/eo.json @@ -7,7 +7,6 @@ "Personal" : "Persona", "System" : "Sistemo", "Grant access" : "Doni alirpermeson", - "Access granted" : "Alirpermeso donita", "Generate keys" : "Generi ŝlosilojn", "All users. Type to select user or group." : "Ĉiuj uzantoj. Tajpu por elekti uzanton aŭ grupon.", "(group)" : "(grupo)", diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js index 71a93dc7da9..2fdeaf1c8a0 100644 --- a/apps/files_external/l10n/es.js +++ b/apps/files_external/l10n/es.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Datos insuficientes: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "El almacenamiento con id \"%i\" no es editable por usuarios", + "Dropbox App Configuration" : "Configuración de la app de Dropbox", + "Google Drive App Configuration" : "Configuración de la app de Google Drive", "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Conceder acceso", - "Access granted" : "Acceso concedido", "Error configuring OAuth1" : "Error al configurar OAuth1", "Error configuring OAuth2" : "Error al configurar OAuth2", "Generate keys" : "Generar claves", diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json index 351135e3011..912455132fa 100644 --- a/apps/files_external/l10n/es.json +++ b/apps/files_external/l10n/es.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Datos insuficientes: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "El almacenamiento con id \"%i\" no es editable por usuarios", + "Dropbox App Configuration" : "Configuración de la app de Dropbox", + "Google Drive App Configuration" : "Configuración de la app de Google Drive", "Personal" : "Personal", "System" : "Sistema", "Grant access" : "Conceder acceso", - "Access granted" : "Acceso concedido", "Error configuring OAuth1" : "Error al configurar OAuth1", "Error configuring OAuth2" : "Error al configurar OAuth2", "Generate keys" : "Generar claves", diff --git a/apps/files_external/l10n/es_AR.js b/apps/files_external/l10n/es_AR.js index 4b8367dfcc9..13c56f78ada 100644 --- a/apps/files_external/l10n/es_AR.js +++ b/apps/files_external/l10n/es_AR.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "Almacenamiento externo", "Personal" : "Personal", "Grant access" : "Permitir acceso", - "Access granted" : "Acceso permitido", "Saved" : "Guardado", "Username" : "Nombre de usuario", "Password" : "Contraseña", diff --git a/apps/files_external/l10n/es_AR.json b/apps/files_external/l10n/es_AR.json index 90e2ba255ba..4da77b799a1 100644 --- a/apps/files_external/l10n/es_AR.json +++ b/apps/files_external/l10n/es_AR.json @@ -2,7 +2,6 @@ "External storage" : "Almacenamiento externo", "Personal" : "Personal", "Grant access" : "Permitir acceso", - "Access granted" : "Acceso permitido", "Saved" : "Guardado", "Username" : "Nombre de usuario", "Password" : "Contraseña", diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js index e61b0efa2e1..be4478ab639 100644 --- a/apps/files_external/l10n/es_MX.js +++ b/apps/files_external/l10n/es_MX.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "Almacenamiento externo", "Personal" : "Personal", "Grant access" : "Conceder acceso", - "Access granted" : "Acceso concedido", "Saved" : "Guardado", "Username" : "Nombre de usuario", "Password" : "Contraseña", diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json index 904f0f3c8da..b37b125f036 100644 --- a/apps/files_external/l10n/es_MX.json +++ b/apps/files_external/l10n/es_MX.json @@ -2,7 +2,6 @@ "External storage" : "Almacenamiento externo", "Personal" : "Personal", "Grant access" : "Conceder acceso", - "Access granted" : "Acceso concedido", "Saved" : "Guardado", "Username" : "Nombre de usuario", "Password" : "Contraseña", diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js index 40bcef6bf05..dac4ed3b3fb 100644 --- a/apps/files_external/l10n/et_EE.js +++ b/apps/files_external/l10n/et_EE.js @@ -14,7 +14,6 @@ OC.L10N.register( "Personal" : "Isiklik", "System" : "Süsteem", "Grant access" : "Anna ligipääs", - "Access granted" : "Ligipääs on antud", "Error configuring OAuth1" : "OAuth1 seadistamise tõrge", "Error configuring OAuth2" : "OAuth2 seadistamise tõrge", "Generate keys" : "Loo võtmed", diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json index d9b5a2446f1..e941509ccfe 100644 --- a/apps/files_external/l10n/et_EE.json +++ b/apps/files_external/l10n/et_EE.json @@ -12,7 +12,6 @@ "Personal" : "Isiklik", "System" : "Süsteem", "Grant access" : "Anna ligipääs", - "Access granted" : "Ligipääs on antud", "Error configuring OAuth1" : "OAuth1 seadistamise tõrge", "Error configuring OAuth2" : "OAuth2 seadistamise tõrge", "Generate keys" : "Loo võtmed", diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js index 8790c1c1173..419a1fca697 100644 --- a/apps/files_external/l10n/eu.js +++ b/apps/files_external/l10n/eu.js @@ -7,7 +7,6 @@ OC.L10N.register( "Personal" : "Pertsonala", "System" : "Sistema", "Grant access" : "Baimendu sarrera", - "Access granted" : "Sarrera baimendua", "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.", "(group)" : "(taldea)", "Saved" : "Gordeta", diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json index b083c3e210a..9118d77b3a7 100644 --- a/apps/files_external/l10n/eu.json +++ b/apps/files_external/l10n/eu.json @@ -5,7 +5,6 @@ "Personal" : "Pertsonala", "System" : "Sistema", "Grant access" : "Baimendu sarrera", - "Access granted" : "Sarrera baimendua", "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.", "(group)" : "(taldea)", "Saved" : "Gordeta", diff --git a/apps/files_external/l10n/fa.js b/apps/files_external/l10n/fa.js index 629775c23a1..bfdf480cdfa 100644 --- a/apps/files_external/l10n/fa.js +++ b/apps/files_external/l10n/fa.js @@ -9,7 +9,6 @@ OC.L10N.register( "Personal" : "شخصی", "System" : "سیستم", "Grant access" : " مجوز اعطا دسترسی", - "Access granted" : "مجوز دسترسی صادر شد", "Error configuring OAuth1" : "خطا پیکربندی OAuth1", "Error configuring OAuth2" : "خطا پیکربندی OAuth2", "Generate keys" : "تولید کلید", diff --git a/apps/files_external/l10n/fa.json b/apps/files_external/l10n/fa.json index 4e7337b95c5..66da7c5785e 100644 --- a/apps/files_external/l10n/fa.json +++ b/apps/files_external/l10n/fa.json @@ -7,7 +7,6 @@ "Personal" : "شخصی", "System" : "سیستم", "Grant access" : " مجوز اعطا دسترسی", - "Access granted" : "مجوز دسترسی صادر شد", "Error configuring OAuth1" : "خطا پیکربندی OAuth1", "Error configuring OAuth2" : "خطا پیکربندی OAuth2", "Generate keys" : "تولید کلید", diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js index 3da8e1aea39..1a75d42efdb 100644 --- a/apps/files_external/l10n/fi_FI.js +++ b/apps/files_external/l10n/fi_FI.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Henkilökohtainen", "System" : "Järjestelmä", "Grant access" : "Salli pääsy", - "Access granted" : "Pääsy sallittu", "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä", "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä", "Generate keys" : "Luo avaimet", diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json index cc7e933d468..a342d6b84f7 100644 --- a/apps/files_external/l10n/fi_FI.json +++ b/apps/files_external/l10n/fi_FI.json @@ -8,7 +8,6 @@ "Personal" : "Henkilökohtainen", "System" : "Järjestelmä", "Grant access" : "Salli pääsy", - "Access granted" : "Pääsy sallittu", "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä", "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä", "Generate keys" : "Luo avaimet", diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index 12aeef22fc1..b6cb04355f0 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Données insuffisantes : %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Le support de stockage d'id \"%i\" n'est pas modifiable par les utilisateurs", + "Dropbox App Configuration" : "Configuration de l'application Dropbox", + "Google Drive App Configuration" : "Configuration de l'application Google Drive", "Personal" : "Personnel", "System" : "Système", "Grant access" : "Autoriser l'accès", - "Access granted" : "Accès autorisé", "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1", "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2", "Generate keys" : "Générer des clés", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index b345136b5fc..89bd6d19542 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Données insuffisantes : %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Le support de stockage d'id \"%i\" n'est pas modifiable par les utilisateurs", + "Dropbox App Configuration" : "Configuration de l'application Dropbox", + "Google Drive App Configuration" : "Configuration de l'application Google Drive", "Personal" : "Personnel", "System" : "Système", "Grant access" : "Autoriser l'accès", - "Access granted" : "Accès autorisé", "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1", "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2", "Generate keys" : "Générer des clés", diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js index 3206f829813..e0db1aac509 100644 --- a/apps/files_external/l10n/gl.js +++ b/apps/files_external/l10n/gl.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Persoal", "System" : "Sistema", "Grant access" : "Permitir o acceso", - "Access granted" : "Concedeuse acceso", "Generate keys" : "Xerar chaves", "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves", "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.", diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json index effb0b23fd5..f3df77435f7 100644 --- a/apps/files_external/l10n/gl.json +++ b/apps/files_external/l10n/gl.json @@ -8,7 +8,6 @@ "Personal" : "Persoal", "System" : "Sistema", "Grant access" : "Permitir o acceso", - "Access granted" : "Concedeuse acceso", "Generate keys" : "Xerar chaves", "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves", "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.", diff --git a/apps/files_external/l10n/he.js b/apps/files_external/l10n/he.js index 5e07126d249..f2d23c61b7b 100644 --- a/apps/files_external/l10n/he.js +++ b/apps/files_external/l10n/he.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "אישי", "System" : "מערכת", "Grant access" : "הענקת גישה", - "Access granted" : "הוענקה גישה", "Error configuring OAuth1" : "שגיאה בתצורת OAuth1", "Error configuring OAuth2" : "שגיאה בתצורת OAuth2", "Generate keys" : "יצירת מפתחות", diff --git a/apps/files_external/l10n/he.json b/apps/files_external/l10n/he.json index 5ece8736fc3..9e3ac62475f 100644 --- a/apps/files_external/l10n/he.json +++ b/apps/files_external/l10n/he.json @@ -20,7 +20,6 @@ "Personal" : "אישי", "System" : "מערכת", "Grant access" : "הענקת גישה", - "Access granted" : "הוענקה גישה", "Error configuring OAuth1" : "שגיאה בתצורת OAuth1", "Error configuring OAuth2" : "שגיאה בתצורת OAuth2", "Generate keys" : "יצירת מפתחות", diff --git a/apps/files_external/l10n/hr.js b/apps/files_external/l10n/hr.js index 021c29253bc..7b5fda27d11 100644 --- a/apps/files_external/l10n/hr.js +++ b/apps/files_external/l10n/hr.js @@ -7,7 +7,6 @@ OC.L10N.register( "Personal" : "Osobno", "System" : "Sustav", "Grant access" : "Dodijeli pristup", - "Access granted" : "Pristup odobren", "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.", "(group)" : "(grupa)", "Saved" : "Spremljeno", diff --git a/apps/files_external/l10n/hr.json b/apps/files_external/l10n/hr.json index 35da2cb9109..211a19849f4 100644 --- a/apps/files_external/l10n/hr.json +++ b/apps/files_external/l10n/hr.json @@ -5,7 +5,6 @@ "Personal" : "Osobno", "System" : "Sustav", "Grant access" : "Dodijeli pristup", - "Access granted" : "Pristup odobren", "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.", "(group)" : "(grupa)", "Saved" : "Spremljeno", diff --git a/apps/files_external/l10n/hu_HU.js b/apps/files_external/l10n/hu_HU.js index ce9f7561373..63f31d417ec 100644 --- a/apps/files_external/l10n/hu_HU.js +++ b/apps/files_external/l10n/hu_HU.js @@ -6,7 +6,6 @@ OC.L10N.register( "Personal" : "Személyes", "System" : "Rendszer", "Grant access" : "Megadom a hozzáférést", - "Access granted" : "Érvényes hozzáférés", "Generate keys" : "Kulcsok generálása", "Error generating key pair" : "Hiba történt a kulcspár generálása közben", "All users. Type to select user or group." : "Összes felhasználó. Írj be egy felhasználót vagy csoportot.", diff --git a/apps/files_external/l10n/hu_HU.json b/apps/files_external/l10n/hu_HU.json index d98753c9838..582ebb4aa36 100644 --- a/apps/files_external/l10n/hu_HU.json +++ b/apps/files_external/l10n/hu_HU.json @@ -4,7 +4,6 @@ "Personal" : "Személyes", "System" : "Rendszer", "Grant access" : "Megadom a hozzáférést", - "Access granted" : "Érvényes hozzáférés", "Generate keys" : "Kulcsok generálása", "Error generating key pair" : "Hiba történt a kulcspár generálása közben", "All users. Type to select user or group." : "Összes felhasználó. Írj be egy felhasználót vagy csoportot.", diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js index 6707a8cb455..d4fae999373 100644 --- a/apps/files_external/l10n/id.js +++ b/apps/files_external/l10n/id.js @@ -19,7 +19,6 @@ OC.L10N.register( "Personal" : "Pribadi", "System" : "Sistem", "Grant access" : "Berikan hak akses", - "Access granted" : "Akses diberikan", "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1", "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2", "Generate keys" : "Hasilkan kunci", diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json index cec244e4a83..7d83789176a 100644 --- a/apps/files_external/l10n/id.json +++ b/apps/files_external/l10n/id.json @@ -17,7 +17,6 @@ "Personal" : "Pribadi", "System" : "Sistem", "Grant access" : "Berikan hak akses", - "Access granted" : "Akses diberikan", "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1", "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2", "Generate keys" : "Hasilkan kunci", diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js index ab588b8785c..06839f9d3d9 100644 --- a/apps/files_external/l10n/is.js +++ b/apps/files_external/l10n/is.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Einka", "System" : "Kerfi", "Grant access" : "Veita aðgengi", - "Access granted" : "Aðgengi veitt", "Error configuring OAuth1" : "Villa við uppsetningu OAuth1", "Error configuring OAuth2" : "Villa við uppsetningu OAuth2", "Generate keys" : "Útbúa lykla", diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json index 1b57e9d55c8..2a9f31333e9 100644 --- a/apps/files_external/l10n/is.json +++ b/apps/files_external/l10n/is.json @@ -20,7 +20,6 @@ "Personal" : "Einka", "System" : "Kerfi", "Grant access" : "Veita aðgengi", - "Access granted" : "Aðgengi veitt", "Error configuring OAuth1" : "Villa við uppsetningu OAuth1", "Error configuring OAuth2" : "Villa við uppsetningu OAuth2", "Generate keys" : "Útbúa lykla", diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js index 9a9df7bf093..f95c3c69155 100644 --- a/apps/files_external/l10n/it.js +++ b/apps/files_external/l10n/it.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Dati insufficienti: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "L'archiviazione con ID \"%i\" non è modificabile dall'utente", + "Dropbox App Configuration" : "Configurazione applicazione Dropbox", + "Google Drive App Configuration" : "Configurazione applicazione Google Drive", "Personal" : "Personale", "System" : "Sistema", "Grant access" : "Concedi l'accesso", - "Access granted" : "Accesso consentito", "Error configuring OAuth1" : "Errore di configurazione OAuth1", "Error configuring OAuth2" : "Errore di configurazione OAuth2", "Generate keys" : "Genera la chiavi", diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json index 50f00242721..30b3445558b 100644 --- a/apps/files_external/l10n/it.json +++ b/apps/files_external/l10n/it.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Dati insufficienti: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "L'archiviazione con ID \"%i\" non è modificabile dall'utente", + "Dropbox App Configuration" : "Configurazione applicazione Dropbox", + "Google Drive App Configuration" : "Configurazione applicazione Google Drive", "Personal" : "Personale", "System" : "Sistema", "Grant access" : "Concedi l'accesso", - "Access granted" : "Accesso consentito", "Error configuring OAuth1" : "Errore di configurazione OAuth1", "Error configuring OAuth2" : "Errore di configurazione OAuth2", "Generate keys" : "Genera la chiavi", diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js index 6406699d412..e8dc52136aa 100644 --- a/apps/files_external/l10n/ja.js +++ b/apps/files_external/l10n/ja.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "個人", "System" : "システム", "Grant access" : "アクセスを許可", - "Access granted" : "アクセスは許可されました", "Error configuring OAuth1" : "OAuth1 設定エラー", "Error configuring OAuth2" : "OAuth2 設定エラー", "Generate keys" : "キーを生成", diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json index e44969c7c66..d6babb07ec5 100644 --- a/apps/files_external/l10n/ja.json +++ b/apps/files_external/l10n/ja.json @@ -20,7 +20,6 @@ "Personal" : "個人", "System" : "システム", "Grant access" : "アクセスを許可", - "Access granted" : "アクセスは許可されました", "Error configuring OAuth1" : "OAuth1 設定エラー", "Error configuring OAuth2" : "OAuth2 設定エラー", "Generate keys" : "キーを生成", diff --git a/apps/files_external/l10n/ka_GE.js b/apps/files_external/l10n/ka_GE.js index c1a729b6655..46fcbd6238c 100644 --- a/apps/files_external/l10n/ka_GE.js +++ b/apps/files_external/l10n/ka_GE.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "ექსტერნალ საცავი", "Personal" : "პირადი", "Grant access" : "დაშვების მინიჭება", - "Access granted" : "დაშვება მინიჭებულია", "Username" : "მომხმარებლის სახელი", "Password" : "პაროლი", "Save" : "შენახვა", diff --git a/apps/files_external/l10n/ka_GE.json b/apps/files_external/l10n/ka_GE.json index f6b0891bb0a..08f0d76d0fb 100644 --- a/apps/files_external/l10n/ka_GE.json +++ b/apps/files_external/l10n/ka_GE.json @@ -2,7 +2,6 @@ "External storage" : "ექსტერნალ საცავი", "Personal" : "პირადი", "Grant access" : "დაშვების მინიჭება", - "Access granted" : "დაშვება მინიჭებულია", "Username" : "მომხმარებლის სახელი", "Password" : "პაროლი", "Save" : "შენახვა", diff --git a/apps/files_external/l10n/km.js b/apps/files_external/l10n/km.js index 5986399f84c..3f42823824b 100644 --- a/apps/files_external/l10n/km.js +++ b/apps/files_external/l10n/km.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "ឃ្លាំងផ្ទុកខាងក្រៅ", "Personal" : "ផ្ទាល់ខ្លួន", "Grant access" : "ទទួលសិទ្ធិចូល", - "Access granted" : "បានទទួលសិទ្ធិចូល", "Saved" : "បានរក្សាទុក", "Username" : "ឈ្មោះអ្នកប្រើ", "Password" : "ពាក្យសម្ងាត់", diff --git a/apps/files_external/l10n/km.json b/apps/files_external/l10n/km.json index 83036382487..06ab103b606 100644 --- a/apps/files_external/l10n/km.json +++ b/apps/files_external/l10n/km.json @@ -2,7 +2,6 @@ "External storage" : "ឃ្លាំងផ្ទុកខាងក្រៅ", "Personal" : "ផ្ទាល់ខ្លួន", "Grant access" : "ទទួលសិទ្ធិចូល", - "Access granted" : "បានទទួលសិទ្ធិចូល", "Saved" : "បានរក្សាទុក", "Username" : "ឈ្មោះអ្នកប្រើ", "Password" : "ពាក្យសម្ងាត់", diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js index b1df3ab3ef1..2f6d48529a7 100644 --- a/apps/files_external/l10n/ko.js +++ b/apps/files_external/l10n/ko.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "개인", "System" : "시스템", "Grant access" : "접근 권한 부여", - "Access granted" : "접근 허가됨", "Error configuring OAuth1" : "OAuth1 설정 오류", "Error configuring OAuth2" : "OAuth2 설정 오류", "Generate keys" : "키 생성", diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json index 0dfedaf5cee..e1c127a9e13 100644 --- a/apps/files_external/l10n/ko.json +++ b/apps/files_external/l10n/ko.json @@ -20,7 +20,6 @@ "Personal" : "개인", "System" : "시스템", "Grant access" : "접근 권한 부여", - "Access granted" : "접근 허가됨", "Error configuring OAuth1" : "OAuth1 설정 오류", "Error configuring OAuth2" : "OAuth2 설정 오류", "Generate keys" : "키 생성", diff --git a/apps/files_external/l10n/lt_LT.js b/apps/files_external/l10n/lt_LT.js index 1cdb7b7e715..80399022794 100644 --- a/apps/files_external/l10n/lt_LT.js +++ b/apps/files_external/l10n/lt_LT.js @@ -7,7 +7,6 @@ OC.L10N.register( "External storage" : "Išorinė saugykla", "Personal" : "Asmeniniai", "Grant access" : "Suteikti priėjimą", - "Access granted" : "Priėjimas suteiktas", "Saved" : "Išsaugoti", "Username" : "Prisijungimo vardas", "Password" : "Slaptažodis", diff --git a/apps/files_external/l10n/lt_LT.json b/apps/files_external/l10n/lt_LT.json index f4eca160de3..d7c4d7966ac 100644 --- a/apps/files_external/l10n/lt_LT.json +++ b/apps/files_external/l10n/lt_LT.json @@ -5,7 +5,6 @@ "External storage" : "Išorinė saugykla", "Personal" : "Asmeniniai", "Grant access" : "Suteikti priėjimą", - "Access granted" : "Priėjimas suteiktas", "Saved" : "Išsaugoti", "Username" : "Prisijungimo vardas", "Password" : "Slaptažodis", diff --git a/apps/files_external/l10n/lv.js b/apps/files_external/l10n/lv.js index b31323bc859..2034054737e 100644 --- a/apps/files_external/l10n/lv.js +++ b/apps/files_external/l10n/lv.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "Ārējā krātuve", "Personal" : "Personīgi", "Grant access" : "Piešķirt pieeju", - "Access granted" : "Piešķirta pieeja", "Saved" : "Saglabāts", "Username" : "Lietotājvārds", "Password" : "Parole", diff --git a/apps/files_external/l10n/lv.json b/apps/files_external/l10n/lv.json index 59192d946e7..59321f9957a 100644 --- a/apps/files_external/l10n/lv.json +++ b/apps/files_external/l10n/lv.json @@ -2,7 +2,6 @@ "External storage" : "Ārējā krātuve", "Personal" : "Personīgi", "Grant access" : "Piešķirt pieeju", - "Access granted" : "Piešķirta pieeja", "Saved" : "Saglabāts", "Username" : "Lietotājvārds", "Password" : "Parole", diff --git a/apps/files_external/l10n/mk.js b/apps/files_external/l10n/mk.js index 69649d9ffeb..e18307a8fc1 100644 --- a/apps/files_external/l10n/mk.js +++ b/apps/files_external/l10n/mk.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Personal" : "Лично", "Grant access" : "Дозволи пристап", - "Access granted" : "Пристапот е дозволен", "Saved" : "Снимено", "Username" : "Корисничко име", "Password" : "Лозинка", diff --git a/apps/files_external/l10n/mk.json b/apps/files_external/l10n/mk.json index fea359e8e52..49ac252700b 100644 --- a/apps/files_external/l10n/mk.json +++ b/apps/files_external/l10n/mk.json @@ -1,7 +1,6 @@ { "translations": { "Personal" : "Лично", "Grant access" : "Дозволи пристап", - "Access granted" : "Пристапот е дозволен", "Saved" : "Снимено", "Username" : "Корисничко име", "Password" : "Лозинка", diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js index 5a2f725e483..bc135fea960 100644 --- a/apps/files_external/l10n/nb_NO.js +++ b/apps/files_external/l10n/nb_NO.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Personlig", "System" : "System", "Grant access" : "Gi tilgang", - "Access granted" : "Tilgang innvilget", "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1", "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2", "Generate keys" : "Generer nøkler", diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json index 071557b23ca..37d3ffd61cd 100644 --- a/apps/files_external/l10n/nb_NO.json +++ b/apps/files_external/l10n/nb_NO.json @@ -20,7 +20,6 @@ "Personal" : "Personlig", "System" : "System", "Grant access" : "Gi tilgang", - "Access granted" : "Tilgang innvilget", "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1", "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2", "Generate keys" : "Generer nøkler", diff --git a/apps/files_external/l10n/nds.js b/apps/files_external/l10n/nds.js index 6f5d9739018..b6de58cc433 100644 --- a/apps/files_external/l10n/nds.js +++ b/apps/files_external/l10n/nds.js @@ -19,7 +19,6 @@ OC.L10N.register( "Personal" : "Persönlich", "System" : "System", "Grant access" : "Erlaube Zugriff", - "Access granted" : "Zugriff erlaubt", "Error configuring OAuth1" : "Fehler bei der Konfiguration von OAuth1", "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2", "Generate keys" : "Generiere Schlüssel", diff --git a/apps/files_external/l10n/nds.json b/apps/files_external/l10n/nds.json index d1d939702f3..d1aa0f4751d 100644 --- a/apps/files_external/l10n/nds.json +++ b/apps/files_external/l10n/nds.json @@ -17,7 +17,6 @@ "Personal" : "Persönlich", "System" : "System", "Grant access" : "Erlaube Zugriff", - "Access granted" : "Zugriff erlaubt", "Error configuring OAuth1" : "Fehler bei der Konfiguration von OAuth1", "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2", "Generate keys" : "Generiere Schlüssel", diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js index 5b4f3050e70..bcbd185aed8 100644 --- a/apps/files_external/l10n/nl.js +++ b/apps/files_external/l10n/nl.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Persoonlijk", "System" : "Systeem", "Grant access" : "Sta toegang toe", - "Access granted" : "Toegang toegestaan", "Error configuring OAuth1" : "Fout bij configureren OAuth1", "Error configuring OAuth2" : "Fout bij configureren OAuth2", "Generate keys" : "Genereer sleutels", diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json index 062aee79c16..ddc7ccfa8cc 100644 --- a/apps/files_external/l10n/nl.json +++ b/apps/files_external/l10n/nl.json @@ -20,7 +20,6 @@ "Personal" : "Persoonlijk", "System" : "Systeem", "Grant access" : "Sta toegang toe", - "Access granted" : "Toegang toegestaan", "Error configuring OAuth1" : "Fout bij configureren OAuth1", "Error configuring OAuth2" : "Fout bij configureren OAuth2", "Generate keys" : "Genereer sleutels", diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js index 40c222e0cf3..3ac21f8748d 100644 --- a/apps/files_external/l10n/oc.js +++ b/apps/files_external/l10n/oc.js @@ -21,7 +21,6 @@ OC.L10N.register( "Personal" : "Personal", "System" : "Sistèma", "Grant access" : "Autorizar l'accès", - "Access granted" : "Accès autorizat", "Error configuring OAuth1" : "Error al moment de la configuracion d'OAuth1", "Error configuring OAuth2" : "Error al moment de la configuracion d'OAuth2", "Generate keys" : "Generar de claus", diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json index 06992b89604..02283c7098b 100644 --- a/apps/files_external/l10n/oc.json +++ b/apps/files_external/l10n/oc.json @@ -19,7 +19,6 @@ "Personal" : "Personal", "System" : "Sistèma", "Grant access" : "Autorizar l'accès", - "Access granted" : "Accès autorizat", "Error configuring OAuth1" : "Error al moment de la configuracion d'OAuth1", "Error configuring OAuth2" : "Error al moment de la configuracion d'OAuth2", "Generate keys" : "Generar de claus", diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js index ac074059712..2034b73bd8a 100644 --- a/apps/files_external/l10n/pl.js +++ b/apps/files_external/l10n/pl.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Osobiste", "System" : "System", "Grant access" : "Udziel dostępu", - "Access granted" : "Dostęp do", "Generate keys" : "Wygeneruj klucze", "Error generating key pair" : "Błąd podczas generowania pary kluczy", "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json index a583a454f1c..0d1a97abfcb 100644 --- a/apps/files_external/l10n/pl.json +++ b/apps/files_external/l10n/pl.json @@ -8,7 +8,6 @@ "Personal" : "Osobiste", "System" : "System", "Grant access" : "Udziel dostępu", - "Access granted" : "Dostęp do", "Generate keys" : "Wygeneruj klucze", "Error generating key pair" : "Błąd podczas generowania pary kluczy", "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js index 08e1bac5ae6..74d6e30f9da 100644 --- a/apps/files_external/l10n/pt_BR.js +++ b/apps/files_external/l10n/pt_BR.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Dados insuficientes: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Armazenamento com ID \"%i\" não é editável pelo usuário", + "Dropbox App Configuration" : "Configuração do Aplicativo Dropbox", + "Google Drive App Configuration" : "Configuração do Aplicativo Google Drive", "Personal" : "Pessoal", "System" : "Sistema", "Grant access" : "Permitir acesso", - "Access granted" : "Acesso concedido", "Error configuring OAuth1" : "Erro configurando OAuth1", "Error configuring OAuth2" : "Erro configurando OAuth2", "Generate keys" : "Gerar chaves", diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json index a1e52e280ee..7f1db48e93f 100644 --- a/apps/files_external/l10n/pt_BR.json +++ b/apps/files_external/l10n/pt_BR.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Dados insuficientes: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Armazenamento com ID \"%i\" não é editável pelo usuário", + "Dropbox App Configuration" : "Configuração do Aplicativo Dropbox", + "Google Drive App Configuration" : "Configuração do Aplicativo Google Drive", "Personal" : "Pessoal", "System" : "Sistema", "Grant access" : "Permitir acesso", - "Access granted" : "Acesso concedido", "Error configuring OAuth1" : "Erro configurando OAuth1", "Error configuring OAuth2" : "Erro configurando OAuth2", "Generate keys" : "Gerar chaves", diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js index 0b596bb2553..771e2571b78 100644 --- a/apps/files_external/l10n/pt_PT.js +++ b/apps/files_external/l10n/pt_PT.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Pessoal", "System" : "Sistema", "Grant access" : "Conceder acesso", - "Access granted" : "Acesso autorizado", "Error configuring OAuth1" : "Erro de configuração OAuth1", "Error configuring OAuth2" : "Erro de configuração OAuth2", "Generate keys" : "Gerar chaves", diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json index f8487134f1a..4982d50e555 100644 --- a/apps/files_external/l10n/pt_PT.json +++ b/apps/files_external/l10n/pt_PT.json @@ -20,7 +20,6 @@ "Personal" : "Pessoal", "System" : "Sistema", "Grant access" : "Conceder acesso", - "Access granted" : "Acesso autorizado", "Error configuring OAuth1" : "Erro de configuração OAuth1", "Error configuring OAuth2" : "Erro de configuração OAuth2", "Generate keys" : "Gerar chaves", diff --git a/apps/files_external/l10n/ro.js b/apps/files_external/l10n/ro.js index e097cbb5c15..8a2d8950068 100644 --- a/apps/files_external/l10n/ro.js +++ b/apps/files_external/l10n/ro.js @@ -1,36 +1,78 @@ OC.L10N.register( "files_external", { + "Step 1 failed. Exception: %s" : "Pasul 1 a eșuat. Excepție: %s", + "Step 2 failed. Exception: %s" : "Pasul 2 a eșuat. Excepție: %s", "External storage" : "Stocare externă", "Personal" : "Personal", "Grant access" : "Permite accesul", - "Access granted" : "Acces permis", + "Generate keys" : "Generează chei", + "Error generating key pair" : "Eroarea la generarea cheilor", + "(group)" : "(grup)", + "Admin defined" : "Administrator definit", "Saved" : "Salvat", + "Empty response from the server" : "Răspuns nul de la server", + "external-storage" : "Stocare externă", "Username" : "Nume utilizator", "Password" : "Parolă", + "Credentials saved" : "Detalii de autentificare salvate", + "Credentials saving failed" : "Salvarea detaliilor de autentificare a eșuat", + "Credentials required" : "Detalii de autentificare necesare", "Save" : "Salvează", + "Access key" : "Cheie de acces", + "Secret key" : "Cheie secretă", + "Builtin" : "Inclus", "None" : "Niciuna", + "OAuth1" : "OAuth1", + "App key" : "Cheie aplicație", + "App secret" : "Secret aplicație", + "OAuth2" : "OAuth2", + "Client ID" : "ID client", + "Client secret" : "Secret client", + "OpenStack" : "OpenStack", + "Tenant name" : "Nume titular", "API key" : "Cheie API", + "Username and password" : "Nume de utilizator și parolă", + "RSA public key" : "Cheie publică RSA", "Public key" : "Cheie publică", "Amazon S3" : "Amazon S3", - "Hostname" : "Hostname", - "Port" : "Portul", + "Hostname" : "Nume mașină", + "Port" : "Port", "Region" : "Regiune", + "Enable SSL" : "Activează SSL", "WebDAV" : "WebDAV", "URL" : "URL", + "Secure https://" : "https:// sigur", "Dropbox" : "Dropbox", + "FTP" : "FTP", "Host" : "Gazdă", + "Secure ftps://" : "ftps:// sigur", + "Google Drive" : "Google Drive", "Local" : "Local", "Location" : "Locație", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "Root" : "Root", + "SFTP with secret key login" : "SFTP cu cheie secretă de autentificare", + "SMB / CIFS" : "SMB / CIFS", "Share" : "Partajează", + "Domain" : "Domeniu", + "SMB / CIFS using OC login" : "SMB / CIFS folosind autentificare OC", + "Service name" : "Nume serviciu", "Name" : "Nume", "Storage type" : "Tip stocare", + "Enable encryption" : "Activează criptarea", + "Enable previews" : "Activează previzualizările", + "Enable sharing" : "Activează partajarea", + "Check for changes" : "Verifică dacă au intervenit modificări", + "Never" : "Niciodată", "External Storage" : "Stocare externă", "Folder name" : "Denumire director", + "Authentication" : "Autentificare", "Configuration" : "Configurație", + "Available for" : "Disponibil pentru", "Add storage" : "Adauga stocare", + "Advanced settings" : "Setări avansate", "Delete" : "Șterge", "Allow users to mount the following external storage" : "Permite utilizatorilor să monteze următoarea unitate de stocare" }, diff --git a/apps/files_external/l10n/ro.json b/apps/files_external/l10n/ro.json index 14bfe656c1c..6107ad0e0f5 100644 --- a/apps/files_external/l10n/ro.json +++ b/apps/files_external/l10n/ro.json @@ -1,34 +1,76 @@ { "translations": { + "Step 1 failed. Exception: %s" : "Pasul 1 a eșuat. Excepție: %s", + "Step 2 failed. Exception: %s" : "Pasul 2 a eșuat. Excepție: %s", "External storage" : "Stocare externă", "Personal" : "Personal", "Grant access" : "Permite accesul", - "Access granted" : "Acces permis", + "Generate keys" : "Generează chei", + "Error generating key pair" : "Eroarea la generarea cheilor", + "(group)" : "(grup)", + "Admin defined" : "Administrator definit", "Saved" : "Salvat", + "Empty response from the server" : "Răspuns nul de la server", + "external-storage" : "Stocare externă", "Username" : "Nume utilizator", "Password" : "Parolă", + "Credentials saved" : "Detalii de autentificare salvate", + "Credentials saving failed" : "Salvarea detaliilor de autentificare a eșuat", + "Credentials required" : "Detalii de autentificare necesare", "Save" : "Salvează", + "Access key" : "Cheie de acces", + "Secret key" : "Cheie secretă", + "Builtin" : "Inclus", "None" : "Niciuna", + "OAuth1" : "OAuth1", + "App key" : "Cheie aplicație", + "App secret" : "Secret aplicație", + "OAuth2" : "OAuth2", + "Client ID" : "ID client", + "Client secret" : "Secret client", + "OpenStack" : "OpenStack", + "Tenant name" : "Nume titular", "API key" : "Cheie API", + "Username and password" : "Nume de utilizator și parolă", + "RSA public key" : "Cheie publică RSA", "Public key" : "Cheie publică", "Amazon S3" : "Amazon S3", - "Hostname" : "Hostname", - "Port" : "Portul", + "Hostname" : "Nume mașină", + "Port" : "Port", "Region" : "Regiune", + "Enable SSL" : "Activează SSL", "WebDAV" : "WebDAV", "URL" : "URL", + "Secure https://" : "https:// sigur", "Dropbox" : "Dropbox", + "FTP" : "FTP", "Host" : "Gazdă", + "Secure ftps://" : "ftps:// sigur", + "Google Drive" : "Google Drive", "Local" : "Local", "Location" : "Locație", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "Root" : "Root", + "SFTP with secret key login" : "SFTP cu cheie secretă de autentificare", + "SMB / CIFS" : "SMB / CIFS", "Share" : "Partajează", + "Domain" : "Domeniu", + "SMB / CIFS using OC login" : "SMB / CIFS folosind autentificare OC", + "Service name" : "Nume serviciu", "Name" : "Nume", "Storage type" : "Tip stocare", + "Enable encryption" : "Activează criptarea", + "Enable previews" : "Activează previzualizările", + "Enable sharing" : "Activează partajarea", + "Check for changes" : "Verifică dacă au intervenit modificări", + "Never" : "Niciodată", "External Storage" : "Stocare externă", "Folder name" : "Denumire director", + "Authentication" : "Autentificare", "Configuration" : "Configurație", + "Available for" : "Disponibil pentru", "Add storage" : "Adauga stocare", + "Advanced settings" : "Setări avansate", "Delete" : "Șterge", "Allow users to mount the following external storage" : "Permite utilizatorilor să monteze următoarea unitate de stocare" },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js index 92bebd4f008..644596d34ba 100644 --- a/apps/files_external/l10n/ru.js +++ b/apps/files_external/l10n/ru.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Недостаточно данных: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Пользователь не может редактировать хранилище \"%i\"", + "Dropbox App Configuration" : "Настройка приложения Dropbox", + "Google Drive App Configuration" : "Настройка приложения Google Drive", "Personal" : "Личное", "System" : "Система", "Grant access" : "Предоставить доступ", - "Access granted" : "Доступ предоставлен", "Error configuring OAuth1" : "Ошибка настройки OAuth1", "Error configuring OAuth2" : "Ошибка настройки OAuth2", "Generate keys" : "Создать ключи", diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json index 65281caec0b..c86c1bac477 100644 --- a/apps/files_external/l10n/ru.json +++ b/apps/files_external/l10n/ru.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Недостаточно данных: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Пользователь не может редактировать хранилище \"%i\"", + "Dropbox App Configuration" : "Настройка приложения Dropbox", + "Google Drive App Configuration" : "Настройка приложения Google Drive", "Personal" : "Личное", "System" : "Система", "Grant access" : "Предоставить доступ", - "Access granted" : "Доступ предоставлен", "Error configuring OAuth1" : "Ошибка настройки OAuth1", "Error configuring OAuth2" : "Ошибка настройки OAuth2", "Generate keys" : "Создать ключи", diff --git a/apps/files_external/l10n/si_LK.js b/apps/files_external/l10n/si_LK.js index 21c808a4644..ae57532622d 100644 --- a/apps/files_external/l10n/si_LK.js +++ b/apps/files_external/l10n/si_LK.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Personal" : "පෞද්ගලික", "Grant access" : "පිවිසුම ලබාදෙන්න", - "Access granted" : "පිවිසීමට හැක", "Username" : "පරිශීලක නම", "Password" : "මුර පදය", "Save" : "සුරකින්න", diff --git a/apps/files_external/l10n/si_LK.json b/apps/files_external/l10n/si_LK.json index 3d2c31fb87f..5f6a8fcb106 100644 --- a/apps/files_external/l10n/si_LK.json +++ b/apps/files_external/l10n/si_LK.json @@ -1,7 +1,6 @@ { "translations": { "Personal" : "පෞද්ගලික", "Grant access" : "පිවිසුම ලබාදෙන්න", - "Access granted" : "පිවිසීමට හැක", "Username" : "පරිශීලක නම", "Password" : "මුර පදය", "Save" : "සුරකින්න", diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js index ab820378a81..3f4a6bd0b8a 100644 --- a/apps/files_external/l10n/sk_SK.js +++ b/apps/files_external/l10n/sk_SK.js @@ -19,7 +19,6 @@ OC.L10N.register( "Personal" : "Osobné", "System" : "Systém", "Grant access" : "Povoliť prístup", - "Access granted" : "Prístup povolený", "Error configuring OAuth1" : "Chyba konfigurovania OAuth1", "Error configuring OAuth2" : "Chyba konfigurovania OAuth2", "Generate keys" : "Vytvoriť kľúče", diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json index 28d37a83697..6bc96ad35c2 100644 --- a/apps/files_external/l10n/sk_SK.json +++ b/apps/files_external/l10n/sk_SK.json @@ -17,7 +17,6 @@ "Personal" : "Osobné", "System" : "Systém", "Grant access" : "Povoliť prístup", - "Access granted" : "Prístup povolený", "Error configuring OAuth1" : "Chyba konfigurovania OAuth1", "Error configuring OAuth2" : "Chyba konfigurovania OAuth2", "Generate keys" : "Vytvoriť kľúče", diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js index 8ce2cd450f6..5b58901b372 100644 --- a/apps/files_external/l10n/sl.js +++ b/apps/files_external/l10n/sl.js @@ -18,10 +18,11 @@ OC.L10N.register( "Unsatisfied authentication mechanism parameters" : "Nezadovoljivi parametri mehanizma overitve", "Insufficient data: %s" : "Nepopolni podatki: %s", "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Shramba z ID \"%i\" ni uporabniško uredljiva.", + "Google Drive App Configuration" : "Nastavitve programa Google Drive", "Personal" : "Osebno", "System" : "Sistem", "Grant access" : "Odobri dostop", - "Access granted" : "Dostop je odobren", "Error configuring OAuth1" : "Napaka nastavljanja OAuth1", "Error configuring OAuth2" : "Napaka nastavljanja OAuth2", "Generate keys" : "Ustvari ključe", @@ -31,11 +32,14 @@ OC.L10N.register( "Admin defined" : "Skrbnik je določen", "Saved" : "Shranjeno", "Empty response from the server" : "S strežnika je prejet odziv brez vsebine.", + "Couldn't access. Please logout and login to activate this mount point" : "Dostop ni mogoč. Za priklop točke se odjavite in ponovno prijavite.", "Couldn't get the information from the ownCloud server: {code} {type}" : "Ni mogoče pridobiti podrobnosti s strežnika ownCloud:{koda} {vrsta}", "Couldn't get the list of external mount points: {type}" : "Ni mogoče pridobiti seznama zunanjih priklopnih točk: {type}", "There was an error with message: " : "Prišlo je do napake s sporočilom:", "External mount error" : "Notranja napaka priklopa", "external-storage" : "zunanja-shramba", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Ni mogoče pridobiti seznama priklopnih točk omrežnega pogona: ni odziva s strežnika", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Nekatere izmed nastavljenih zunanjih priklopnih točk niso povezane. Več podrobnosti je na voljo s klikom na rdeče vrstice.", "Please enter the credentials for the {mount} mount" : "Vpišite poverila za priklopno točko {mount}", "Username" : "Uporabniško ime", "Password" : "Geslo", @@ -56,6 +60,7 @@ OC.L10N.register( "OpenStack" : "OpenStack", "Tenant name" : "Ime uporabnika", "Identity endpoint URL" : "Naslov URL končne točke istovetnosti", + "Rackspace" : "Rackspace", "API key" : "Ključ API", "Username and password" : "Uporabniško ime in geslo", "Log-in credentials, save in session" : "Prijavna poverila, shrani v seji", diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json index 753a401d536..2bf8565b7e2 100644 --- a/apps/files_external/l10n/sl.json +++ b/apps/files_external/l10n/sl.json @@ -16,10 +16,11 @@ "Unsatisfied authentication mechanism parameters" : "Nezadovoljivi parametri mehanizma overitve", "Insufficient data: %s" : "Nepopolni podatki: %s", "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Shramba z ID \"%i\" ni uporabniško uredljiva.", + "Google Drive App Configuration" : "Nastavitve programa Google Drive", "Personal" : "Osebno", "System" : "Sistem", "Grant access" : "Odobri dostop", - "Access granted" : "Dostop je odobren", "Error configuring OAuth1" : "Napaka nastavljanja OAuth1", "Error configuring OAuth2" : "Napaka nastavljanja OAuth2", "Generate keys" : "Ustvari ključe", @@ -29,11 +30,14 @@ "Admin defined" : "Skrbnik je določen", "Saved" : "Shranjeno", "Empty response from the server" : "S strežnika je prejet odziv brez vsebine.", + "Couldn't access. Please logout and login to activate this mount point" : "Dostop ni mogoč. Za priklop točke se odjavite in ponovno prijavite.", "Couldn't get the information from the ownCloud server: {code} {type}" : "Ni mogoče pridobiti podrobnosti s strežnika ownCloud:{koda} {vrsta}", "Couldn't get the list of external mount points: {type}" : "Ni mogoče pridobiti seznama zunanjih priklopnih točk: {type}", "There was an error with message: " : "Prišlo je do napake s sporočilom:", "External mount error" : "Notranja napaka priklopa", "external-storage" : "zunanja-shramba", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Ni mogoče pridobiti seznama priklopnih točk omrežnega pogona: ni odziva s strežnika", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Nekatere izmed nastavljenih zunanjih priklopnih točk niso povezane. Več podrobnosti je na voljo s klikom na rdeče vrstice.", "Please enter the credentials for the {mount} mount" : "Vpišite poverila za priklopno točko {mount}", "Username" : "Uporabniško ime", "Password" : "Geslo", @@ -54,6 +58,7 @@ "OpenStack" : "OpenStack", "Tenant name" : "Ime uporabnika", "Identity endpoint URL" : "Naslov URL končne točke istovetnosti", + "Rackspace" : "Rackspace", "API key" : "Ključ API", "Username and password" : "Uporabniško ime in geslo", "Log-in credentials, save in session" : "Prijavna poverila, shrani v seji", diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js index c2bd82ebde0..9b23453e3e4 100644 --- a/apps/files_external/l10n/sq.js +++ b/apps/files_external/l10n/sq.js @@ -19,10 +19,11 @@ OC.L10N.register( "Insufficient data: %s" : "Të dhëna të pamjaftueshme: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Depozita me id \"%i\" s’është e përpunueshme nga përdoruesi", + "Dropbox App Configuration" : "Formësim i Aplikacionit Dropbox", + "Google Drive App Configuration" : "Formësim i Aplikacionit Google Drive", "Personal" : "Personale", "System" : "Sistem", "Grant access" : "Akordoji hyrje", - "Access granted" : "Hyrja u akordua", "Error configuring OAuth1" : "Gabim gjatë formësimit të OAuth1", "Error configuring OAuth2" : "Gabim gjatë formësimit të OAuth2", "Generate keys" : "Prodho kyçe", diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json index 3979fc3d23b..f0e420e1ab9 100644 --- a/apps/files_external/l10n/sq.json +++ b/apps/files_external/l10n/sq.json @@ -17,10 +17,11 @@ "Insufficient data: %s" : "Të dhëna të pamjaftueshme: %s", "%s" : "%s", "Storage with id \"%i\" is not user editable" : "Depozita me id \"%i\" s’është e përpunueshme nga përdoruesi", + "Dropbox App Configuration" : "Formësim i Aplikacionit Dropbox", + "Google Drive App Configuration" : "Formësim i Aplikacionit Google Drive", "Personal" : "Personale", "System" : "Sistem", "Grant access" : "Akordoji hyrje", - "Access granted" : "Hyrja u akordua", "Error configuring OAuth1" : "Gabim gjatë formësimit të OAuth1", "Error configuring OAuth2" : "Gabim gjatë formësimit të OAuth2", "Generate keys" : "Prodho kyçe", diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js index 8a96b403134..a0888bbb0b9 100644 --- a/apps/files_external/l10n/sr.js +++ b/apps/files_external/l10n/sr.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Лично", "System" : "Систем", "Grant access" : "Одобри приступ", - "Access granted" : "Приступ одобрен", "Generate keys" : "Генериши кључеве", "Error generating key pair" : "Грешка при генерисању пара кључева", "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.", diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json index d9b9300ae94..143f0dae15a 100644 --- a/apps/files_external/l10n/sr.json +++ b/apps/files_external/l10n/sr.json @@ -8,7 +8,6 @@ "Personal" : "Лично", "System" : "Систем", "Grant access" : "Одобри приступ", - "Access granted" : "Приступ одобрен", "Generate keys" : "Генериши кључеве", "Error generating key pair" : "Грешка при генерисању пара кључева", "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.", diff --git a/apps/files_external/l10n/sr@latin.js b/apps/files_external/l10n/sr@latin.js index 68954a6b6ae..2cc12ecf4aa 100644 --- a/apps/files_external/l10n/sr@latin.js +++ b/apps/files_external/l10n/sr@latin.js @@ -7,7 +7,6 @@ OC.L10N.register( "Personal" : "Lično", "System" : "Sistemsko", "Grant access" : "Dozvoli pristup", - "Access granted" : "Pristup Dozvoljen", "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.", "(group)" : "(grupa)", "Saved" : "Sačuvano", diff --git a/apps/files_external/l10n/sr@latin.json b/apps/files_external/l10n/sr@latin.json index ffe95d4a52e..2460d2544a4 100644 --- a/apps/files_external/l10n/sr@latin.json +++ b/apps/files_external/l10n/sr@latin.json @@ -5,7 +5,6 @@ "Personal" : "Lično", "System" : "Sistemsko", "Grant access" : "Dozvoli pristup", - "Access granted" : "Pristup Dozvoljen", "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.", "(group)" : "(grupa)", "Saved" : "Sačuvano", diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js index 25a637e31fa..bee41cf7322 100644 --- a/apps/files_external/l10n/sv.js +++ b/apps/files_external/l10n/sv.js @@ -11,7 +11,6 @@ OC.L10N.register( "Personal" : "Personligt", "System" : "System", "Grant access" : "Bevilja åtkomst", - "Access granted" : "Åtkomst beviljad", "Generate keys" : "Generera nycklar", "Error generating key pair" : "Fel vid generering av nyckelpar", "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.", diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json index 5e6ee5e75bf..66b95d84a0b 100644 --- a/apps/files_external/l10n/sv.json +++ b/apps/files_external/l10n/sv.json @@ -9,7 +9,6 @@ "Personal" : "Personligt", "System" : "System", "Grant access" : "Bevilja åtkomst", - "Access granted" : "Åtkomst beviljad", "Generate keys" : "Generera nycklar", "Error generating key pair" : "Fel vid generering av nyckelpar", "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.", diff --git a/apps/files_external/l10n/ta_LK.js b/apps/files_external/l10n/ta_LK.js index 2aeb63ed2cf..8b24951e118 100644 --- a/apps/files_external/l10n/ta_LK.js +++ b/apps/files_external/l10n/ta_LK.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Personal" : "தனிப்பட்ட", "Grant access" : "அனுமதியை வழங்கல்", - "Access granted" : "அனுமதி வழங்கப்பட்டது", "Username" : "பயனாளர் பெயர்", "Password" : "கடவுச்சொல்", "Save" : "சேமிக்க ", diff --git a/apps/files_external/l10n/ta_LK.json b/apps/files_external/l10n/ta_LK.json index 8c0ad0a9cae..15936d3f191 100644 --- a/apps/files_external/l10n/ta_LK.json +++ b/apps/files_external/l10n/ta_LK.json @@ -1,7 +1,6 @@ { "translations": { "Personal" : "தனிப்பட்ட", "Grant access" : "அனுமதியை வழங்கல்", - "Access granted" : "அனுமதி வழங்கப்பட்டது", "Username" : "பயனாளர் பெயர்", "Password" : "கடவுச்சொல்", "Save" : "சேமிக்க ", diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js index d2abf4eb427..8ee72ac0eff 100644 --- a/apps/files_external/l10n/th_TH.js +++ b/apps/files_external/l10n/th_TH.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "ส่วนตัว", "System" : "ระบบ", "Grant access" : "อนุญาตให้เข้าถึงได้", - "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว", "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1", "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2", "Generate keys" : "สร้างคีย์", diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json index 16035bfc6b5..380a69402b0 100644 --- a/apps/files_external/l10n/th_TH.json +++ b/apps/files_external/l10n/th_TH.json @@ -20,7 +20,6 @@ "Personal" : "ส่วนตัว", "System" : "ระบบ", "Grant access" : "อนุญาตให้เข้าถึงได้", - "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว", "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1", "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2", "Generate keys" : "สร้างคีย์", diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js index 28e95fd5eed..8365741a128 100644 --- a/apps/files_external/l10n/tr.js +++ b/apps/files_external/l10n/tr.js @@ -22,7 +22,6 @@ OC.L10N.register( "Personal" : "Kişisel", "System" : "Sistem", "Grant access" : "Erişimi sağla", - "Access granted" : "Giriş kabul edildi", "Error configuring OAuth1" : "OAuth1 yapılandırma hatası", "Error configuring OAuth2" : "OAuth2 yapılandırma hatası", "Generate keys" : "Anahtarlar üret", diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json index 4b131181b9e..f035cbdb134 100644 --- a/apps/files_external/l10n/tr.json +++ b/apps/files_external/l10n/tr.json @@ -20,7 +20,6 @@ "Personal" : "Kişisel", "System" : "Sistem", "Grant access" : "Erişimi sağla", - "Access granted" : "Giriş kabul edildi", "Error configuring OAuth1" : "OAuth1 yapılandırma hatası", "Error configuring OAuth2" : "OAuth2 yapılandırma hatası", "Generate keys" : "Anahtarlar üret", diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js index d21348ff73b..0f1e4e35e94 100644 --- a/apps/files_external/l10n/uk.js +++ b/apps/files_external/l10n/uk.js @@ -10,7 +10,6 @@ OC.L10N.register( "Personal" : "Особисте", "System" : "Система", "Grant access" : "Дозволити доступ", - "Access granted" : "Доступ дозволено", "Generate keys" : "Створити ключі", "Error generating key pair" : "Помилка створення ключової пари", "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.", diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json index 33886b821cc..72f74347d03 100644 --- a/apps/files_external/l10n/uk.json +++ b/apps/files_external/l10n/uk.json @@ -8,7 +8,6 @@ "Personal" : "Особисте", "System" : "Система", "Grant access" : "Дозволити доступ", - "Access granted" : "Доступ дозволено", "Generate keys" : "Створити ключі", "Error generating key pair" : "Помилка створення ключової пари", "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.", diff --git a/apps/files_external/l10n/vi.js b/apps/files_external/l10n/vi.js index fae262730cf..0e99f70c3a4 100644 --- a/apps/files_external/l10n/vi.js +++ b/apps/files_external/l10n/vi.js @@ -4,7 +4,6 @@ OC.L10N.register( "External storage" : "Lưu trữ ngoài", "Personal" : "Cá nhân", "Grant access" : "Cấp quyền truy cập", - "Access granted" : "Đã cấp quyền truy cập", "Saved" : "Đã lưu", "Username" : "Tên đăng nhập", "Password" : "Mật khẩu", diff --git a/apps/files_external/l10n/vi.json b/apps/files_external/l10n/vi.json index b6deab1dfdf..90e2a0d97c3 100644 --- a/apps/files_external/l10n/vi.json +++ b/apps/files_external/l10n/vi.json @@ -2,7 +2,6 @@ "External storage" : "Lưu trữ ngoài", "Personal" : "Cá nhân", "Grant access" : "Cấp quyền truy cập", - "Access granted" : "Đã cấp quyền truy cập", "Saved" : "Đã lưu", "Username" : "Tên đăng nhập", "Password" : "Mật khẩu", diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js index 805ae91d4de..cc7edb361fd 100644 --- a/apps/files_external/l10n/zh_CN.js +++ b/apps/files_external/l10n/zh_CN.js @@ -9,7 +9,6 @@ OC.L10N.register( "Personal" : "个人", "System" : "系统", "Grant access" : "授权", - "Access granted" : "权限已授予。", "Saved" : "已保存", "External mount error" : "外部挂载错误", "external-storage" : "外部存储", diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json index 71babc081f6..105cf564843 100644 --- a/apps/files_external/l10n/zh_CN.json +++ b/apps/files_external/l10n/zh_CN.json @@ -7,7 +7,6 @@ "Personal" : "个人", "System" : "系统", "Grant access" : "授权", - "Access granted" : "权限已授予。", "Saved" : "已保存", "External mount error" : "外部挂载错误", "external-storage" : "外部存储", diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js index cf3eb29c250..1749eda96dd 100644 --- a/apps/files_external/l10n/zh_TW.js +++ b/apps/files_external/l10n/zh_TW.js @@ -21,7 +21,6 @@ OC.L10N.register( "Personal" : "個人", "System" : "系統", "Grant access" : "允許存取", - "Access granted" : "允許存取", "Error configuring OAuth1" : "設定 OAuth1 時發生錯誤", "Error configuring OAuth2" : "設定 OAuth2 時發生錯誤", "Generate keys" : "產生金鑰", diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json index 9dcfdba255f..7b49bb919ca 100644 --- a/apps/files_external/l10n/zh_TW.json +++ b/apps/files_external/l10n/zh_TW.json @@ -19,7 +19,6 @@ "Personal" : "個人", "System" : "系統", "Grant access" : "允許存取", - "Access granted" : "允許存取", "Error configuring OAuth1" : "設定 OAuth1 時發生錯誤", "Error configuring OAuth2" : "設定 OAuth2 時發生錯誤", "Generate keys" : "產生金鑰", diff --git a/apps/files_external/lib/auth/oauth1/oauth1.php b/apps/files_external/lib/auth/oauth1/oauth1.php index dd83c9a6a69..808681530ea 100644 --- a/apps/files_external/lib/auth/oauth1/oauth1.php +++ b/apps/files_external/lib/auth/oauth1/oauth1.php @@ -46,7 +46,7 @@ class OAuth1 extends AuthMechanism { (new DefinitionParameter('token_secret', 'token_secret')) ->setType(DefinitionParameter::VALUE_HIDDEN), ]) - ->setCustomJs('oauth1') + ->addCustomJs('oauth1') ; } diff --git a/apps/files_external/lib/auth/oauth2/oauth2.php b/apps/files_external/lib/auth/oauth2/oauth2.php index c89007b52ba..d4bba8ef0eb 100644 --- a/apps/files_external/lib/auth/oauth2/oauth2.php +++ b/apps/files_external/lib/auth/oauth2/oauth2.php @@ -44,7 +44,7 @@ class OAuth2 extends AuthMechanism { (new DefinitionParameter('token', 'token')) ->setType(DefinitionParameter::VALUE_HIDDEN), ]) - ->setCustomJs('oauth2') + ->addCustomJs('oauth2') ; } diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/auth/publickey/rsa.php index 9045f6818f9..7732beeddf8 100644 --- a/apps/files_external/lib/auth/publickey/rsa.php +++ b/apps/files_external/lib/auth/publickey/rsa.php @@ -52,7 +52,7 @@ class RSA extends AuthMechanism { (new DefinitionParameter('private_key', 'private_key')) ->setType(DefinitionParameter::VALUE_HIDDEN), ]) - ->setCustomJs('public_key') + ->addCustomJs('public_key') ; } diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/backend/dropbox.php index f9156082515..2133c274996 100644 --- a/apps/files_external/lib/backend/dropbox.php +++ b/apps/files_external/lib/backend/dropbox.php @@ -44,6 +44,7 @@ class Dropbox extends Backend { // all parameters handled in OAuth1 mechanism ]) ->addAuthScheme(AuthMechanism::SCHEME_OAUTH1) + ->addCustomJs('dropbox') ->setLegacyAuthMechanism($legacyAuth) ; } diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/backend/google.php index b2b48a0e402..b18b7bdb348 100644 --- a/apps/files_external/lib/backend/google.php +++ b/apps/files_external/lib/backend/google.php @@ -44,6 +44,7 @@ class Google extends Backend { // all parameters handled in OAuth2 mechanism ]) ->addAuthScheme(AuthMechanism::SCHEME_OAUTH2) + ->addCustomJs('gdrive') ->setLegacyAuthMechanism($legacyAuth) ; } diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/backend/legacybackend.php index 084758ff78a..752c501e1ec 100644 --- a/apps/files_external/lib/backend/legacybackend.php +++ b/apps/files_external/lib/backend/legacybackend.php @@ -84,7 +84,7 @@ class LegacyBackend extends Backend { $this->setPriority($definition['priority']); } if (isset($definition['custom'])) { - $this->setCustomJs($definition['custom']); + $this->addCustomJs($definition['custom']); } if (isset($definition['has_dependencies']) && $definition['has_dependencies']) { $this->hasDependencies = true; diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/frontenddefinitiontrait.php index 9f2b7c40f7f..ccc2a75fd1b 100644 --- a/apps/files_external/lib/frontenddefinitiontrait.php +++ b/apps/files_external/lib/frontenddefinitiontrait.php @@ -36,8 +36,8 @@ trait FrontendDefinitionTrait { /** @var DefinitionParameter[] parameters for mechanism */ private $parameters = []; - /** @var string|null custom JS */ - private $customJs = null; + /** @var string[] custom JS */ + private $customJs = []; /** * @return string @@ -92,7 +92,7 @@ trait FrontendDefinitionTrait { } /** - * @return string|null + * @return string[] */ public function getCustomJs() { return $this->customJs; @@ -102,8 +102,18 @@ trait FrontendDefinitionTrait { * @param string $custom * @return self */ + public function addCustomJs($custom) { + $this->customJs[] = $custom; + return $this; + } + + /** + * @param string $custom + * @return self + * @deprecated 9.1.0, use addCustomJs() instead + */ public function setCustomJs($custom) { - $this->customJs = $custom; + $this->customJs = [$custom]; return $this; } @@ -121,10 +131,8 @@ trait FrontendDefinitionTrait { $data = [ 'name' => $this->getText(), 'configuration' => $configuration, + 'custom' => $this->getCustomJs(), ]; - if (isset($this->customJs)) { - $data['custom'] = $this->getCustomJs(); - } return $data; } diff --git a/apps/files_external/lib/storage/smb.php b/apps/files_external/lib/storage/smb.php index 4249d13168c..868c52a63b4 100644 --- a/apps/files_external/lib/storage/smb.php +++ b/apps/files_external/lib/storage/smb.php @@ -100,7 +100,7 @@ class SMB extends \OC\Files\Storage\Common { * @return string */ protected function buildPath($path) { - return Filesystem::normalizePath($this->root . '/' . $path); + return Filesystem::normalizePath($this->root . '/' . $path, true, false, true); } /** diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 7edd66fe4d5..c9cc40b0ba0 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -1,5 +1,6 @@ <?php use \OCA\Files_External\Lib\Backend\Backend; + use \OCA\Files_External\Lib\Auth\AuthMechanism; use \OCA\Files_External\Lib\DefinitionParameter; use \OCA\Files_External\Service\BackendService; @@ -16,13 +17,16 @@ // load custom JS foreach ($_['backends'] as $backend) { /** @var Backend $backend */ - if ($backend->getCustomJs()) { - script('files_external', $backend->getCustomJs()); + $scripts = $backend->getCustomJs(); + foreach ($scripts as $script) { + script('files_external', $script); } } foreach ($_['authMechanisms'] as $authMechanism) { - if ($authMechanism->getCustomJs()) { - script('files_external', $authMechanism->getCustomJs()); + /** @var AuthMechanism $authMechanism */ + $scripts = $authMechanism->getCustomJs(); + foreach ($scripts as $script) { + script('files_external', $script); } } diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/backend/legacybackendtest.php index d825b7627b7..465b79a6be6 100644 --- a/apps/files_external/tests/backend/legacybackendtest.php +++ b/apps/files_external/tests/backend/legacybackendtest.php @@ -62,7 +62,7 @@ class LegacyBackendTest extends \Test\TestCase { $this->assertEquals('\OCA\Files_External\Tests\Backend\LegacyBackendTest', $backend->getStorageClass()); $this->assertEquals('Backend text', $backend->getText()); $this->assertEquals(123, $backend->getPriority()); - $this->assertEquals('foo/bar.js', $backend->getCustomJs()); + $this->assertContains('foo/bar.js', $backend->getCustomJs()); $this->assertArrayHasKey('builtin', $backend->getAuthSchemes()); $this->assertEquals($auth, $backend->getLegacyAuthMechanism()); diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/frontenddefinitiontraittest.php index 2afc87762e9..b3846fa1510 100644 --- a/apps/files_external/tests/frontenddefinitiontraittest.php +++ b/apps/files_external/tests/frontenddefinitiontraittest.php @@ -33,12 +33,14 @@ class FrontendDefinitionTraitTest extends \Test\TestCase { $trait = $this->getMockForTrait('\OCA\Files_External\Lib\FrontendDefinitionTrait'); $trait->setText('test'); $trait->addParameters([$param]); - $trait->setCustomJs('foo/bar.js'); + $trait->addCustomJs('foo/bar.js'); + $trait->addCustomJs('bar/foo.js'); $json = $trait->jsonSerializeDefinition(); $this->assertEquals('test', $json['name']); - $this->assertEquals('foo/bar.js', $json['custom']); + $this->assertContains('foo/bar.js', $json['custom']); + $this->assertContains('bar/foo.js', $json['custom']); $configuration = $json['configuration']; $this->assertArrayHasKey('foo', $configuration); diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php index 68098530017..af762845326 100644 --- a/apps/files_sharing/api/share20ocs.php +++ b/apps/files_sharing/api/share20ocs.php @@ -28,11 +28,12 @@ use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUser; use OCP\Files\IRootFolder; +use OCP\Lock\LockedException; use OCP\Share; use OCP\Share\IManager; - use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\Exceptions\GenericShareException; +use OCP\Lock\ILockingProvider; /** * Class Share20OCS @@ -205,12 +206,21 @@ class Share20OCS { return new \OC_OCS_Result(null, 404, $this->l->t('Wrong share ID, share doesn\'t exist')); } + try { + $share->getNode()->lock(ILockingProvider::LOCK_SHARED); + } catch (LockedException $e) { + return new \OC_OCS_Result(null, 404, 'could not delete share'); + } + if (!$this->canAccessShare($share)) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, $this->l->t('Could not delete share')); } $this->shareManager->deleteShare($share); + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); + return new \OC_OCS_Result(); } @@ -233,12 +243,18 @@ class Share20OCS { $userFolder = $this->rootFolder->getUserFolder($this->currentUser->getUID()); try { $path = $userFolder->get($path); - } catch (\OCP\Files\NotFoundException $e) { + } catch (NotFoundException $e) { return new \OC_OCS_Result(null, 404, $this->l->t('Wrong path, file/folder doesn\'t exist')); } $share->setNode($path); + try { + $share->getNode()->lock(ILockingProvider::LOCK_SHARED); + } catch (LockedException $e) { + return new \OC_OCS_Result(null, 404, 'Could not create share'); + } + // Parse permissions (if available) $permissions = $this->request->getParam('permissions', null); if ($permissions === null) { @@ -248,6 +264,7 @@ class Share20OCS { } if ($permissions < 0 || $permissions > \OCP\Constants::PERMISSION_ALL) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, 'invalid permissions'); } @@ -275,17 +292,20 @@ class Share20OCS { if ($shareType === \OCP\Share::SHARE_TYPE_USER) { // Valid user is required to share if ($shareWith === null || !$this->userManager->userExists($shareWith)) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, $this->l->t('Please specify a valid user')); } $share->setSharedWith($shareWith); $share->setPermissions($permissions); } else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) { if (!$this->shareManager->allowGroupSharing()) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, $this->l->t('Group sharing is disabled by the administrator')); } // Valid group is required to share if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, $this->l->t('Please specify a valid group')); } $share->setSharedWith($shareWith); @@ -293,6 +313,7 @@ class Share20OCS { } else if ($shareType === \OCP\Share::SHARE_TYPE_LINK) { //Can we even share links? if (!$this->shareManager->shareApiAllowLinks()) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, $this->l->t('Public link sharing is disabled by the administrator')); } @@ -302,6 +323,7 @@ class Share20OCS { */ $existingShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_LINK, $path, false, 1, 0); if (!empty($existingShares)) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result($this->formatShare($existingShares[0])); } @@ -309,11 +331,13 @@ class Share20OCS { if ($publicUpload === 'true') { // Check if public upload is allowed if (!$this->shareManager->shareApiLinkAllowPublicUpload()) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 403, $this->l->t('Public upload disabled by the administrator')); } // Public upload can only be set for folders if ($path instanceof \OCP\Files\File) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, $this->l->t('Public upload is only possible for publicly shared folders')); } @@ -341,18 +365,21 @@ class Share20OCS { $expireDate = $this->parseDate($expireDate); $share->setExpirationDate($expireDate); } catch (\Exception $e) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, $this->l->t('Invalid date, date format must be YYYY-MM-DD')); } } } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) { if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 403, $this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType])); } $share->setSharedWith($shareWith); $share->setPermissions($permissions); } else { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 400, $this->l->t('Unknown share type')); } @@ -363,13 +390,18 @@ class Share20OCS { $share = $this->shareManager->createShare($share); } catch (GenericShareException $e) { $code = $e->getCode() === 0 ? 403 : $e->getCode(); + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, $code, $e->getHint()); }catch (\Exception $e) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 403, $e->getMessage()); } - $share = $this->formatShare($share); - return new \OC_OCS_Result($share); + $output = $this->formatShare($share); + + $share->getNode()->unlock(\OCP\Lock\ILockingProvider::LOCK_SHARED); + + return new \OC_OCS_Result($output); } /** @@ -454,17 +486,28 @@ class Share20OCS { $userFolder = $this->rootFolder->getUserFolder($this->currentUser->getUID()); try { $path = $userFolder->get($path); + $path->lock(ILockingProvider::LOCK_SHARED); } catch (\OCP\Files\NotFoundException $e) { return new \OC_OCS_Result(null, 404, $this->l->t('Wrong path, file/folder doesn\'t exist')); + } catch (LockedException $e) { + return new \OC_OCS_Result(null, 404, $this->l->t('Could not lock path')); } } if ($sharedWithMe === 'true') { - return $this->getSharedWithMe($path); + $result = $this->getSharedWithMe($path); + if ($path !== null) { + $path->unlock(ILockingProvider::LOCK_SHARED); + } + return $result; } if ($subfiles === 'true') { - return $this->getSharesInDir($path); + $result = $this->getSharesInDir($path); + if ($path !== null) { + $path->unlock(ILockingProvider::LOCK_SHARED); + } + return $result; } if ($reshares === 'true') { @@ -494,6 +537,10 @@ class Share20OCS { } } + if ($path !== null) { + $path->unlock(ILockingProvider::LOCK_SHARED); + } + return new \OC_OCS_Result($formatted); } @@ -512,7 +559,10 @@ class Share20OCS { return new \OC_OCS_Result(null, 404, $this->l->t('Wrong share ID, share doesn\'t exist')); } + $share->getNode()->lock(\OCP\Lock\ILockingProvider::LOCK_SHARED); + if (!$this->canAccessShare($share)) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, $this->l->t('Wrong share ID, share doesn\'t exist')); } @@ -526,6 +576,7 @@ class Share20OCS { */ if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) { if ($permissions === null && $password === null && $publicUpload === null && $expireDate === null) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 400, 'Wrong or no update parameter given'); } @@ -543,15 +594,18 @@ class Share20OCS { if ($newPermissions !== null && $newPermissions !== \OCP\Constants::PERMISSION_READ && $newPermissions !== (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE)) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 400, $this->l->t('Can\'t change permissions for public share links')); } if ($newPermissions === (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE)) { if (!$this->shareManager->shareApiLinkAllowPublicUpload()) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 403, $this->l->t('Public upload disabled by the administrator')); } if (!($share->getNode() instanceof \OCP\Files\Folder)) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 400, $this->l->t('Public upload is only possible for publicly shared folders')); } } @@ -566,6 +620,7 @@ class Share20OCS { try { $expireDate = $this->parseDate($expireDate); } catch (\Exception $e) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 400, $e->getMessage()); } $share->setExpirationDate($expireDate); @@ -580,6 +635,7 @@ class Share20OCS { } else { // For other shares only permissions is valid. if ($permissions === null) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 400, $this->l->t('Wrong or no update parameter given')); } else { $permissions = (int)$permissions; @@ -599,6 +655,7 @@ class Share20OCS { } if ($share->getPermissions() & ~$maxPermissions) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 404, $this->l->t('Cannot increase permissions')); } } @@ -608,9 +665,12 @@ class Share20OCS { try { $share = $this->shareManager->updateShare($share); } catch (\Exception $e) { + $share->getNode()->unlock(ILockingProvider::LOCK_SHARED); return new \OC_OCS_Result(null, 400, $e->getMessage()); } + $share->getNode()->unlock(\OCP\Lock\ILockingProvider::LOCK_SHARED); + return new \OC_OCS_Result($this->formatShare($share)); } diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index e0cbfd7f5ba..da573d11ec5 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -33,13 +33,6 @@ $l = \OC::$server->getL10N('files_sharing'); \OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php'; \OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php'; \OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php'; -\OC::$CLASSPATH['OC\Files\Cache\SharedScanner'] = 'files_sharing/lib/scanner.php'; -\OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'files_sharing/lib/cache.php'; -\OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permissions.php'; -\OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php'; -\OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php'; -\OC::$CLASSPATH['OCA\Files\Share\Maintainer'] = 'files_sharing/lib/maintainer.php'; -\OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php'; $application = new Application(); $application->registerMountProviders(); diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index 6b09e73a022..7e49e267275 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -20,4 +20,9 @@ Turning the feature off removes shared files and folders on the server for all s <public> <files>public.php</files> </public> + + <background-jobs> + <job>OCA\Files_sharing\Lib\DeleteOrphanedSharesJob</job> + <job>OCA\Files_sharing\ExpireSharesJob</job> + </background-jobs> </info> diff --git a/apps/files_sharing/appinfo/install.php b/apps/files_sharing/appinfo/install.php deleted file mode 100644 index 33bbc8e2a84..00000000000 --- a/apps/files_sharing/appinfo/install.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php -/** - * @author Joas Schilling <nickvergessen@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> - * - * @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/> - * - */ - -\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob'); -\OC::$server->getJobList()->add('OCA\Files_sharing\ExpireSharesJob'); diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index adfff183b3f..afa6f4383a3 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -31,6 +31,3 @@ if (version_compare($installedVersion, '0.9.1', '<')) { $m->removeReShares(); $m->updateInitiatorInfo(); } - -\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob'); -\OC::$server->getJobList()->add('OCA\Files_sharing\ExpireSharesJob'); diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index ffaaa9a841a..f6e937a723d 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -23,6 +23,7 @@ OC.L10N.register( "Sharing %s failed because the back end does not allow shares from type %s" : "Sdílení %s selhalo, podpůrná vrstva nepodporuje typ sdílení %s", "Unknown share type" : "Neznámý typ sdílení", "Not a directory" : "Žádný adresář", + "Could not lock path" : "Nepodařilo se uzamknout cestu", "Can't change permissions for public share links" : "Nelze změnit oprávnění pro veřejně sdílené odkazy", "Wrong or no update parameter given" : "Chyba nebo žádná aktualizace dle zadaných parametrů", "Cannot increase permissions" : "Nelze navýšit oprávnění", diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index 533f5bdeb4f..45c81e4e4e0 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -21,6 +21,7 @@ "Sharing %s failed because the back end does not allow shares from type %s" : "Sdílení %s selhalo, podpůrná vrstva nepodporuje typ sdílení %s", "Unknown share type" : "Neznámý typ sdílení", "Not a directory" : "Žádný adresář", + "Could not lock path" : "Nepodařilo se uzamknout cestu", "Can't change permissions for public share links" : "Nelze změnit oprávnění pro veřejně sdílené odkazy", "Wrong or no update parameter given" : "Chyba nebo žádná aktualizace dle zadaných parametrů", "Cannot increase permissions" : "Nelze navýšit oprávnění", diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index a300dd15118..ac9083183f2 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -23,6 +23,7 @@ OC.L10N.register( "Sharing %s failed because the back end does not allow shares from type %s" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %s nicht erlaubt.", "Unknown share type" : "Unbekannter Freigabetyp", "Not a directory" : "Kein Verzeichnis", + "Could not lock path" : "Pfad konnte nicht gesperrt werden", "Can't change permissions for public share links" : "Berechtigungen für öffentlich freigegebene Links konnten nicht geändert werden", "Wrong or no update parameter given" : "Falscher oder kein Updateparameter wurde übergeben", "Cannot increase permissions" : "Berechtigungen können nicht erhöht werden", diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index bb68ef07639..be648efa1f4 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -21,6 +21,7 @@ "Sharing %s failed because the back end does not allow shares from type %s" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %s nicht erlaubt.", "Unknown share type" : "Unbekannter Freigabetyp", "Not a directory" : "Kein Verzeichnis", + "Could not lock path" : "Pfad konnte nicht gesperrt werden", "Can't change permissions for public share links" : "Berechtigungen für öffentlich freigegebene Links konnten nicht geändert werden", "Wrong or no update parameter given" : "Falscher oder kein Updateparameter wurde übergeben", "Cannot increase permissions" : "Berechtigungen können nicht erhöht werden", diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index c1a4f9189d4..c5176f52818 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -23,6 +23,7 @@ OC.L10N.register( "Sharing %s failed because the back end does not allow shares from type %s" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %s nicht erlaubt.", "Unknown share type" : "Unbekannter Freigabetyp", "Not a directory" : "Kein Verzeichnis", + "Could not lock path" : "Pfad konnte nicht gesperrt werden", "Can't change permissions for public share links" : "Berechtigungen für öffentlich freigegebene Links konnten nicht geändert werden", "Wrong or no update parameter given" : "Falscher oder kein Updateparameter wurde übergeben", "Cannot increase permissions" : "Berechtigungen können nicht erhöht werden", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index b5ae9602ab0..c0d279c4a95 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -21,6 +21,7 @@ "Sharing %s failed because the back end does not allow shares from type %s" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %s nicht erlaubt.", "Unknown share type" : "Unbekannter Freigabetyp", "Not a directory" : "Kein Verzeichnis", + "Could not lock path" : "Pfad konnte nicht gesperrt werden", "Can't change permissions for public share links" : "Berechtigungen für öffentlich freigegebene Links konnten nicht geändert werden", "Wrong or no update parameter given" : "Falscher oder kein Updateparameter wurde übergeben", "Cannot increase permissions" : "Berechtigungen können nicht erhöht werden", diff --git a/apps/files_sharing/l10n/en@pirate.js b/apps/files_sharing/l10n/en@pirate.js deleted file mode 100644 index 84e0fabadc6..00000000000 --- a/apps/files_sharing/l10n/en@pirate.js +++ /dev/null @@ -1,7 +0,0 @@ -OC.L10N.register( - "files_sharing", - { - "Password" : "Secret Code", - "Download" : "Download" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/en@pirate.json b/apps/files_sharing/l10n/en@pirate.json deleted file mode 100644 index ec5b5f4b272..00000000000 --- a/apps/files_sharing/l10n/en@pirate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "translations": { - "Password" : "Secret Code", - "Download" : "Download" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js index f8ba89b2fa0..81ddc030559 100644 --- a/apps/files_sharing/l10n/en_GB.js +++ b/apps/files_sharing/l10n/en_GB.js @@ -8,6 +8,25 @@ OC.L10N.register( "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong", "Storage not valid" : "Storage not valid", "Couldn't add remote share" : "Couldn't add remote share", + "Share API is disabled" : "Share API is disabled", + "Wrong share ID, share doesn't exist" : "Wrong share ID, share doesn't exist", + "Could not delete share" : "Could not delete share", + "Please specify a file or folder path" : "Please specify a file or folder path", + "Wrong path, file/folder doesn't exist" : "Wrong path, file/folder doesn't exist", + "Please specify a valid user" : "Please specify a valid user", + "Group sharing is disabled by the administrator" : "Group sharing is disabled by the administrator", + "Please specify a valid group" : "Please specify a valid group", + "Public link sharing is disabled by the administrator" : "Public link sharing is disabled by the administrator", + "Public upload disabled by the administrator" : "Public upload disabled by the administrator", + "Public upload is only possible for publicly shared folders" : "Public upload is only possible for publicly shared folders", + "Invalid date, date format must be YYYY-MM-DD" : "Invalid date, date format must be YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Sharing %s failed because the back end does not allow shares from type %s", + "Unknown share type" : "Unknown share type", + "Not a directory" : "Not a directory", + "Could not lock path" : "Could not lock path", + "Can't change permissions for public share links" : "Can't change permissions for public share links", + "Wrong or no update parameter given" : "Wrong or no update parameter given", + "Cannot increase permissions" : "Cannot increase permissions", "Shared with you" : "Shared with you", "Shared with others" : "Shared with others", "Shared by link" : "Shared by link", diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json index 9ab2cabe562..f9abf165f59 100644 --- a/apps/files_sharing/l10n/en_GB.json +++ b/apps/files_sharing/l10n/en_GB.json @@ -6,6 +6,25 @@ "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong", "Storage not valid" : "Storage not valid", "Couldn't add remote share" : "Couldn't add remote share", + "Share API is disabled" : "Share API is disabled", + "Wrong share ID, share doesn't exist" : "Wrong share ID, share doesn't exist", + "Could not delete share" : "Could not delete share", + "Please specify a file or folder path" : "Please specify a file or folder path", + "Wrong path, file/folder doesn't exist" : "Wrong path, file/folder doesn't exist", + "Please specify a valid user" : "Please specify a valid user", + "Group sharing is disabled by the administrator" : "Group sharing is disabled by the administrator", + "Please specify a valid group" : "Please specify a valid group", + "Public link sharing is disabled by the administrator" : "Public link sharing is disabled by the administrator", + "Public upload disabled by the administrator" : "Public upload disabled by the administrator", + "Public upload is only possible for publicly shared folders" : "Public upload is only possible for publicly shared folders", + "Invalid date, date format must be YYYY-MM-DD" : "Invalid date, date format must be YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Sharing %s failed because the back end does not allow shares from type %s", + "Unknown share type" : "Unknown share type", + "Not a directory" : "Not a directory", + "Could not lock path" : "Could not lock path", + "Can't change permissions for public share links" : "Can't change permissions for public share links", + "Wrong or no update parameter given" : "Wrong or no update parameter given", + "Cannot increase permissions" : "Cannot increase permissions", "Shared with you" : "Shared with you", "Shared with others" : "Shared with others", "Shared by link" : "Shared by link", diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 964aef9e0df..503529b7a5b 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -8,8 +8,19 @@ OC.L10N.register( "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña", "Storage not valid" : "Almacenamiento inválido", "Couldn't add remote share" : "No se puede añadir un compartido remoto", + "Share API is disabled" : "El API de compartir está deshabilitado", + "Wrong share ID, share doesn't exist" : "El ID del recurso compartido no es correcto, el recurso compartido no existe", + "Could not delete share" : "No se ha podido eliminar el recurso compartido", + "Please specify a file or folder path" : "Por favor, especifica la ubicación de un archivo o carpeta", + "Wrong path, file/folder doesn't exist" : "Ubicación incorrecta, el archivo/carpeta no existe", + "Please specify a valid user" : "Por favor, especifica un usuario válido", + "Group sharing is disabled by the administrator" : "Compartir en grupo está deshabilitado por el administrador", + "Please specify a valid group" : "Por favor, especifica un grupo válido", + "Public link sharing is disabled by the administrator" : "Compartir enlaces de forma pública está deshabilitado por el administrador", "Invalid date, date format must be YYYY-MM-DD" : "Fecha inválida, el formato de las fechas debe ser YYYY-MM-DD", + "Unknown share type" : "Tipo desconocido de recurso compartido", "Not a directory" : "No es un directorio", + "Can't change permissions for public share links" : "No se pueden cambiar los permisos para los enlaces de recursos compartidos públicos", "Cannot increase permissions" : "No es posible aumentar permisos", "Shared with you" : "Compartido contigo", "Shared with others" : "Compartido con otros", diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 172de7e3f47..ca2f1aa196f 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -6,8 +6,19 @@ "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña", "Storage not valid" : "Almacenamiento inválido", "Couldn't add remote share" : "No se puede añadir un compartido remoto", + "Share API is disabled" : "El API de compartir está deshabilitado", + "Wrong share ID, share doesn't exist" : "El ID del recurso compartido no es correcto, el recurso compartido no existe", + "Could not delete share" : "No se ha podido eliminar el recurso compartido", + "Please specify a file or folder path" : "Por favor, especifica la ubicación de un archivo o carpeta", + "Wrong path, file/folder doesn't exist" : "Ubicación incorrecta, el archivo/carpeta no existe", + "Please specify a valid user" : "Por favor, especifica un usuario válido", + "Group sharing is disabled by the administrator" : "Compartir en grupo está deshabilitado por el administrador", + "Please specify a valid group" : "Por favor, especifica un grupo válido", + "Public link sharing is disabled by the administrator" : "Compartir enlaces de forma pública está deshabilitado por el administrador", "Invalid date, date format must be YYYY-MM-DD" : "Fecha inválida, el formato de las fechas debe ser YYYY-MM-DD", + "Unknown share type" : "Tipo desconocido de recurso compartido", "Not a directory" : "No es un directorio", + "Can't change permissions for public share links" : "No se pueden cambiar los permisos para los enlaces de recursos compartidos públicos", "Cannot increase permissions" : "No es posible aumentar permisos", "Shared with you" : "Compartido contigo", "Shared with others" : "Compartido con otros", diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index e13201a4675..7fdf08c326d 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -20,7 +20,13 @@ OC.L10N.register( "Public upload disabled by the administrator" : "Téléversement public désactivé par l'administrateur", "Public upload is only possible for publicly shared folders" : "Le téléversement public est possible uniquement pour les dossiers partagés publiquement", "Invalid date, date format must be YYYY-MM-DD" : "Date invalide, le format doit être YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Le partage %s a échoué parce que l'infrastructure n'autorise pas les partages du type %s", "Unknown share type" : "Type de partage inconnu", + "Not a directory" : "N'est pas un répertoire", + "Could not lock path" : "Impossible de verrouiller le chemin", + "Can't change permissions for public share links" : "Impossible de changer les permissions pour les liens de partage public", + "Wrong or no update parameter given" : "Mauvais ou aucun paramètre donné ", + "Cannot increase permissions" : "Impossible d'augmenter les permissions", "Shared with you" : "Partagés avec vous", "Shared with others" : "Partagés avec d'autres", "Shared by link" : "Partagés par lien", diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index ce7eb9c0a5d..5bbf1dbacac 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -18,7 +18,13 @@ "Public upload disabled by the administrator" : "Téléversement public désactivé par l'administrateur", "Public upload is only possible for publicly shared folders" : "Le téléversement public est possible uniquement pour les dossiers partagés publiquement", "Invalid date, date format must be YYYY-MM-DD" : "Date invalide, le format doit être YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Le partage %s a échoué parce que l'infrastructure n'autorise pas les partages du type %s", "Unknown share type" : "Type de partage inconnu", + "Not a directory" : "N'est pas un répertoire", + "Could not lock path" : "Impossible de verrouiller le chemin", + "Can't change permissions for public share links" : "Impossible de changer les permissions pour les liens de partage public", + "Wrong or no update parameter given" : "Mauvais ou aucun paramètre donné ", + "Cannot increase permissions" : "Impossible d'augmenter les permissions", "Shared with you" : "Partagés avec vous", "Shared with others" : "Partagés avec d'autres", "Shared by link" : "Partagés par lien", diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index a946482b164..f56e0c9bcc8 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -23,6 +23,7 @@ OC.L10N.register( "Sharing %s failed because the back end does not allow shares from type %s" : "Condivisione di %s non riuscita poiché il motore non consente condivisioni del tipo %s", "Unknown share type" : "Tipo di condivisione sconosciuto", "Not a directory" : "Non è una cartella", + "Could not lock path" : "Impossibile bloccare il percorso", "Can't change permissions for public share links" : "Impossibile cambiare i permessi per i collegamenti di condivisione pubblici", "Wrong or no update parameter given" : "Parametro fornito non valido o non di aggiornamento", "Cannot increase permissions" : "Impossibile aumentare i permessi", diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index 048414b8346..9eec1cf368c 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -21,6 +21,7 @@ "Sharing %s failed because the back end does not allow shares from type %s" : "Condivisione di %s non riuscita poiché il motore non consente condivisioni del tipo %s", "Unknown share type" : "Tipo di condivisione sconosciuto", "Not a directory" : "Non è una cartella", + "Could not lock path" : "Impossibile bloccare il percorso", "Can't change permissions for public share links" : "Impossibile cambiare i permessi per i collegamenti di condivisione pubblici", "Wrong or no update parameter given" : "Parametro fornito non valido o non di aggiornamento", "Cannot increase permissions" : "Impossibile aumentare i permessi", diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index a643bf7f445..a7f7dcda890 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -8,6 +8,25 @@ OC.L10N.register( "Could not authenticate to remote share, password might be wrong" : "リモート共有が認証できませんでした，パスワードが間違っているかもしれません", "Storage not valid" : "ストレージが無効です", "Couldn't add remote share" : "リモート共有を追加できませんでした", + "Share API is disabled" : "共有APIが無効です。", + "Wrong share ID, share doesn't exist" : "共有IDが間違っています。共有がありません。", + "Could not delete share" : "共有を削除できませんでした", + "Please specify a file or folder path" : "ファイルかフォルダーのパスを指定してください", + "Wrong path, file/folder doesn't exist" : "パスが間違っています。ファイル/フォルダーがありません", + "Please specify a valid user" : "正しいユーザーを指定してください", + "Group sharing is disabled by the administrator" : "グループ共有が管理者によって無効にされています。", + "Please specify a valid group" : "正しいグループを指定してください", + "Public link sharing is disabled by the administrator" : "URL共有が管理者によって無効されています。", + "Public upload disabled by the administrator" : "URL共有へのアップロードが管理者によって無効されています。", + "Public upload is only possible for publicly shared folders" : "公開共有されているフォルダーにしか公開アップロードはできません。", + "Invalid date, date format must be YYYY-MM-DD" : "無効な日付です。YYYY-MM-DDのフォーマットで日付を指定してください。", + "Sharing %s failed because the back end does not allow shares from type %s" : "%s の共有に失敗しました。バックエンド側で %s タイプの共有が許可されていません。", + "Unknown share type" : "不明な共有タイプ", + "Not a directory" : "ディレクトリではありません", + "Could not lock path" : "パスをロックできませんでした", + "Can't change permissions for public share links" : "URLリンク共有のパーミッションを変更できません", + "Wrong or no update parameter given" : "間違っている、もしくはパラメータが更新されていません", + "Cannot increase permissions" : "パーミッションを追加できません", "Shared with you" : "他ユーザーがあなたと共有中", "Shared with others" : "他ユーザーと共有中", "Shared by link" : "URLリンクで共有中", diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index a7adc456d9f..bed19ba3db1 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -6,6 +6,25 @@ "Could not authenticate to remote share, password might be wrong" : "リモート共有が認証できませんでした，パスワードが間違っているかもしれません", "Storage not valid" : "ストレージが無効です", "Couldn't add remote share" : "リモート共有を追加できませんでした", + "Share API is disabled" : "共有APIが無効です。", + "Wrong share ID, share doesn't exist" : "共有IDが間違っています。共有がありません。", + "Could not delete share" : "共有を削除できませんでした", + "Please specify a file or folder path" : "ファイルかフォルダーのパスを指定してください", + "Wrong path, file/folder doesn't exist" : "パスが間違っています。ファイル/フォルダーがありません", + "Please specify a valid user" : "正しいユーザーを指定してください", + "Group sharing is disabled by the administrator" : "グループ共有が管理者によって無効にされています。", + "Please specify a valid group" : "正しいグループを指定してください", + "Public link sharing is disabled by the administrator" : "URL共有が管理者によって無効されています。", + "Public upload disabled by the administrator" : "URL共有へのアップロードが管理者によって無効されています。", + "Public upload is only possible for publicly shared folders" : "公開共有されているフォルダーにしか公開アップロードはできません。", + "Invalid date, date format must be YYYY-MM-DD" : "無効な日付です。YYYY-MM-DDのフォーマットで日付を指定してください。", + "Sharing %s failed because the back end does not allow shares from type %s" : "%s の共有に失敗しました。バックエンド側で %s タイプの共有が許可されていません。", + "Unknown share type" : "不明な共有タイプ", + "Not a directory" : "ディレクトリではありません", + "Could not lock path" : "パスをロックできませんでした", + "Can't change permissions for public share links" : "URLリンク共有のパーミッションを変更できません", + "Wrong or no update parameter given" : "間違っている、もしくはパラメータが更新されていません", + "Cannot increase permissions" : "パーミッションを追加できません", "Shared with you" : "他ユーザーがあなたと共有中", "Shared with others" : "他ユーザーと共有中", "Shared by link" : "URLリンクで共有中", diff --git a/apps/files_sharing/l10n/nds.js b/apps/files_sharing/l10n/nds.js index e263ab143a8..a92b2527c37 100644 --- a/apps/files_sharing/l10n/nds.js +++ b/apps/files_sharing/l10n/nds.js @@ -2,7 +2,11 @@ OC.L10N.register( "files_sharing", { "Cancel" : "Abbrechen", + "Invalid ownCloud url" : "Fehlerhafte ownCloud URL", + "The password is wrong. Try again." : "Dieses Passwort ist falsch. Bitte versuche es erneut.", "Password" : "Passwort", - "Name" : "Name" + "Name" : "Name", + "Add to your ownCloud" : "Zu deiner ownCloud hinzufügen", + "Download" : "Download" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nds.json b/apps/files_sharing/l10n/nds.json index 15e6870cb0e..5193f886a35 100644 --- a/apps/files_sharing/l10n/nds.json +++ b/apps/files_sharing/l10n/nds.json @@ -1,6 +1,10 @@ { "translations": { "Cancel" : "Abbrechen", + "Invalid ownCloud url" : "Fehlerhafte ownCloud URL", + "The password is wrong. Try again." : "Dieses Passwort ist falsch. Bitte versuche es erneut.", "Password" : "Passwort", - "Name" : "Name" + "Name" : "Name", + "Add to your ownCloud" : "Zu deiner ownCloud hinzufügen", + "Download" : "Download" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index 0b457da4946..34145262f74 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -9,6 +9,24 @@ OC.L10N.register( "Storage not valid" : "Opslag ongeldig", "Couldn't add remote share" : "Kon geen externe share toevoegen", "Share API is disabled" : "Delen API is uitgeschakeld", + "Wrong share ID, share doesn't exist" : "Onjuist deel-ID, de share bestaat niet", + "Could not delete share" : "Kon share niet verwijderen", + "Please specify a file or folder path" : "Geef een bestand of pad van een map op", + "Wrong path, file/folder doesn't exist" : "Onjuist pad, bestand/map bestaat niet", + "Please specify a valid user" : "Geef een geldige gebruiker op", + "Group sharing is disabled by the administrator" : "Delen voor groepen is uitgeschakeld door de beheerder", + "Please specify a valid group" : "Geef een geldige groep op", + "Public link sharing is disabled by the administrator" : "Delen van openbare links is uitgeschakeld door de beheerder", + "Public upload disabled by the administrator" : "Publieke upload uitgeschakeld door de systeembeheerder", + "Public upload is only possible for publicly shared folders" : "Publieke upload is alleen mogelijk voor publiek gedeelde mappen", + "Invalid date, date format must be YYYY-MM-DD" : "Ongeldige datum, datumnotatie moet in de vorm YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Delen van %s mislukte omdat de backend het delen van type %s niet ondersteunt", + "Unknown share type" : "Onbekend type share", + "Not a directory" : "Geen directory", + "Could not lock path" : "Kon pad niet blokkeren", + "Can't change permissions for public share links" : "Kan permissies voor openbare share links niet wijzigen", + "Wrong or no update parameter given" : "Verkeerde of geen update parameter gegeven", + "Cannot increase permissions" : "Kan de rechten niet verruimen", "Shared with you" : "Gedeeld met u", "Shared with others" : "Gedeeld door u", "Shared by link" : "Gedeeld via een link", diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index 0fa5d9677d8..5b567150c8f 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -7,6 +7,24 @@ "Storage not valid" : "Opslag ongeldig", "Couldn't add remote share" : "Kon geen externe share toevoegen", "Share API is disabled" : "Delen API is uitgeschakeld", + "Wrong share ID, share doesn't exist" : "Onjuist deel-ID, de share bestaat niet", + "Could not delete share" : "Kon share niet verwijderen", + "Please specify a file or folder path" : "Geef een bestand of pad van een map op", + "Wrong path, file/folder doesn't exist" : "Onjuist pad, bestand/map bestaat niet", + "Please specify a valid user" : "Geef een geldige gebruiker op", + "Group sharing is disabled by the administrator" : "Delen voor groepen is uitgeschakeld door de beheerder", + "Please specify a valid group" : "Geef een geldige groep op", + "Public link sharing is disabled by the administrator" : "Delen van openbare links is uitgeschakeld door de beheerder", + "Public upload disabled by the administrator" : "Publieke upload uitgeschakeld door de systeembeheerder", + "Public upload is only possible for publicly shared folders" : "Publieke upload is alleen mogelijk voor publiek gedeelde mappen", + "Invalid date, date format must be YYYY-MM-DD" : "Ongeldige datum, datumnotatie moet in de vorm YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Delen van %s mislukte omdat de backend het delen van type %s niet ondersteunt", + "Unknown share type" : "Onbekend type share", + "Not a directory" : "Geen directory", + "Could not lock path" : "Kon pad niet blokkeren", + "Can't change permissions for public share links" : "Kan permissies voor openbare share links niet wijzigen", + "Wrong or no update parameter given" : "Verkeerde of geen update parameter gegeven", + "Cannot increase permissions" : "Kan de rechten niet verruimen", "Shared with you" : "Gedeeld met u", "Shared with others" : "Gedeeld door u", "Shared by link" : "Gedeeld via een link", diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index 85f514f0ef4..e6429bdb394 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -23,6 +23,7 @@ OC.L10N.register( "Sharing %s failed because the back end does not allow shares from type %s" : "O compartilhando %s falhou porque o backend não permite ações de tipo %s", "Unknown share type" : "Tipo de compartilhamento desconhecido", "Not a directory" : "Não é um diretório", + "Could not lock path" : "Não foi possível bloquear o caminho", "Can't change permissions for public share links" : "Não é possível alterar permissões para compartilhar links públicos", "Wrong or no update parameter given" : "Está errado ou nenhum parâmetro de atualização foi fornecido", "Cannot increase permissions" : "Não pode haver aumento de permissões", diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 2b6769e9aca..75e9d6e8318 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -21,6 +21,7 @@ "Sharing %s failed because the back end does not allow shares from type %s" : "O compartilhando %s falhou porque o backend não permite ações de tipo %s", "Unknown share type" : "Tipo de compartilhamento desconhecido", "Not a directory" : "Não é um diretório", + "Could not lock path" : "Não foi possível bloquear o caminho", "Can't change permissions for public share links" : "Não é possível alterar permissões para compartilhar links públicos", "Wrong or no update parameter given" : "Está errado ou nenhum parâmetro de atualização foi fornecido", "Cannot increase permissions" : "Não pode haver aumento de permissões", diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js index 41c20a6ff4f..611295f947a 100644 --- a/apps/files_sharing/l10n/pt_PT.js +++ b/apps/files_sharing/l10n/pt_PT.js @@ -8,6 +8,10 @@ OC.L10N.register( "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada", "Storage not valid" : "Armazenamento inválido", "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", + "Please specify a valid user" : "Por favor indique um utilizador válido", + "Please specify a valid group" : "Por favor indique um grupo válido", + "Unknown share type" : "Tipo de partilha desconhecido", + "Not a directory" : "Não é um directoria", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json index 5ff546a1397..b817385e060 100644 --- a/apps/files_sharing/l10n/pt_PT.json +++ b/apps/files_sharing/l10n/pt_PT.json @@ -6,6 +6,10 @@ "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada", "Storage not valid" : "Armazenamento inválido", "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", + "Please specify a valid user" : "Por favor indique um utilizador válido", + "Please specify a valid group" : "Por favor indique um grupo válido", + "Unknown share type" : "Tipo de partilha desconhecido", + "Not a directory" : "Não é um directoria", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js index dbbff12cd6c..ac3de75f4e2 100644 --- a/apps/files_sharing/l10n/ro.js +++ b/apps/files_sharing/l10n/ro.js @@ -2,11 +2,17 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "Partajarea server-server nu este activată pe acest server", + "Invalid or untrusted SSL certificate" : "Certificat SSL invalid sau emis de o autoritate care nu se află pe lista celor în care se are încredere", + "Not a directory" : "Nu este un director", + "Could not lock path" : "Calea nu a putut fi blocată", + "Cannot increase permissions" : "Nu se pot extinde permisiunile", "Shared with you" : "Partajat cu tine", "Shared with others" : "Partajat cu alții", "Nothing shared with you yet" : "Nimic nu e partajat cu tine încă", "Nothing shared yet" : "Nimic partajat încă", "Cancel" : "Anulare", + "No ownCloud installation (7 or higher) found at {remote}" : "Nu s-a găsit nicio instanță ownCloud (versiunea 7 sau mai mare) la {remote}", + "Invalid ownCloud url" : "URL ownCloud invalid", "Shared by" : "impartite in ", "Sharing" : "Partajare", "A file or folder has been <strong>shared</strong>" : "Un fișier sau director a fost <strong>partajat</strong>", @@ -18,6 +24,7 @@ OC.L10N.register( "This share is password-protected" : "Această partajare este protejată cu parolă", "The password is wrong. Try again." : "Parola este incorectă. Încercaţi din nou.", "Password" : "Parolă", + "No entries found in this folder" : "Niciun element găsit în acest director", "Name" : "Nume", "Reasons might be:" : "Motive posibile ar fi:", "the item was removed" : "acest articol a fost șters", diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json index 19554a0c950..2fa1f4a049e 100644 --- a/apps/files_sharing/l10n/ro.json +++ b/apps/files_sharing/l10n/ro.json @@ -1,10 +1,16 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Partajarea server-server nu este activată pe acest server", + "Invalid or untrusted SSL certificate" : "Certificat SSL invalid sau emis de o autoritate care nu se află pe lista celor în care se are încredere", + "Not a directory" : "Nu este un director", + "Could not lock path" : "Calea nu a putut fi blocată", + "Cannot increase permissions" : "Nu se pot extinde permisiunile", "Shared with you" : "Partajat cu tine", "Shared with others" : "Partajat cu alții", "Nothing shared with you yet" : "Nimic nu e partajat cu tine încă", "Nothing shared yet" : "Nimic partajat încă", "Cancel" : "Anulare", + "No ownCloud installation (7 or higher) found at {remote}" : "Nu s-a găsit nicio instanță ownCloud (versiunea 7 sau mai mare) la {remote}", + "Invalid ownCloud url" : "URL ownCloud invalid", "Shared by" : "impartite in ", "Sharing" : "Partajare", "A file or folder has been <strong>shared</strong>" : "Un fișier sau director a fost <strong>partajat</strong>", @@ -16,6 +22,7 @@ "This share is password-protected" : "Această partajare este protejată cu parolă", "The password is wrong. Try again." : "Parola este incorectă. Încercaţi din nou.", "Password" : "Parolă", + "No entries found in this folder" : "Niciun element găsit în acest director", "Name" : "Nume", "Reasons might be:" : "Motive posibile ar fi:", "the item was removed" : "acest articol a fost șters", diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index e66de69ec44..c181742df7a 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -8,13 +8,22 @@ OC.L10N.register( "Could not authenticate to remote share, password might be wrong" : "Ni mogoče overiti istovetnosti oddaljene mape za souporabo. Najverjetneje je uporabljeno napačno geslo.", "Storage not valid" : "Shramba ni veljavna", "Couldn't add remote share" : "Ni mogoče dodati oddaljenega mesta za souporabo", + "Wrong share ID, share doesn't exist" : "Napačen ID mesta uporabe; mesto ne obstaja!", "Could not delete share" : "Tega predmeta v souporabi ni mogoče izbrisati.", "Please specify a file or folder path" : "Določiti je treba datoteko ali pot do mape", "Wrong path, file/folder doesn't exist" : "Napačna pot; datoteka ali mapa ne obstaja", "Please specify a valid user" : "Navesti je treba veljavnega uporabnika.", + "Group sharing is disabled by the administrator" : "Skupinska souporaba je skrbniško onemogočena", "Please specify a valid group" : "Navesti je treba veljavno skupino", + "Public link sharing is disabled by the administrator" : "Souporaba prek javne povezave je skrbniško onemogočena", + "Public upload disabled by the administrator" : "Javno pošiljanje v oblak je skrbniško onemogočeno", + "Public upload is only possible for publicly shared folders" : "Javno pošiljanje v oblak je mogoče le za javne mape v skupni rabi.", + "Invalid date, date format must be YYYY-MM-DD" : "Neveljaven zapis časa; biti mora v zapisu YYYY-MM-DD", "Unknown share type" : "Neznana vrsta mesta souporabe", "Not a directory" : "Predmet ni mapa", + "Could not lock path" : "Poti ni mogoče zakleniti", + "Can't change permissions for public share links" : "Za javne povezave souporabe, spreminjanje dovoljenj ni mogoče.", + "Wrong or no update parameter given" : "Parameter posodobitve ni podan ali pa je navedena napačna vrednost", "Cannot increase permissions" : "Ni mogoče povišati dovoljenj", "Shared with you" : "V souporabi z vami", "Shared with others" : "V souporabi z drugimi", @@ -36,28 +45,29 @@ OC.L10N.register( "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud", "Shared by" : "V souporabi z", "Sharing" : "Souporaba", - "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je odobrena <strong>souporaba</strong>.", - "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je odobrena.", + "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je omogočena <strong>souporaba</strong>.", + "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je omogočena.", "A public shared file or folder was <strong>downloaded</strong>" : "Mapa ali datoteka v souporabi je bila <strong>prejeta</strong>.", - "You received a new remote share %2$s from %1$s" : "Prejeli ste oddaljeno mapo za souporabo %2$s od %1$s", + "You received a new remote share %2$s from %1$s" : "Uporabnik %1$s vam je omogočil souporabo mape %2$s", "You received a new remote share from %s" : "Prejeli ste mapo za oddaljeno souporabo z %s", "%1$s accepted remote share %2$s" : "Uporabnik %1$s je prejel oddaljeno souporabo %2$s", "%1$s declined remote share %2$s" : "Uporabnik %1$s je zavrnil souporabo %2$s", "%1$s unshared %2$s from you" : "Uporabnik %1$s je onemogoči souporabo %2$s z vami", - "Public shared folder %1$s was downloaded" : "Mapa v souporabi %1$s je bila prejeta", + "Public shared folder %1$s was downloaded" : "Mapa v souporabi %1$s je bila prejeta.", "Public shared file %1$s was downloaded" : "Datoteka v souporabi %1$s je bila prejeta", "You shared %1$s with %2$s" : "Omogočili ste souporabo %1$s z uporabnikom %2$s", - "%2$s shared %1$s with %3$s" : "%2$s je omogočil souporabo %1$s z %3$s", - "You removed the share of %2$s for %1$s" : "Odstranili ste mapo za souporabo %2$s za %1$s", + "%2$s shared %1$s with %3$s" : "Uporabnik %2$s je omogočil souporabo %1$s z %3$s", + "You removed the share of %2$s for %1$s" : "Odstranili ste mapo v souporabi %2$s za %1$s", "You shared %1$s with group %2$s" : "Omogočili ste souporabo %1$s s skupino %2$s", "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave", "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s", "Downloaded via public link" : "Prejeto preko javne povezave", - "Shared with %2$s" : "Omogočena souporaba z %2$s", - "Shared via public link" : "Omogočena javna povezava za souporabo", + "Shared with %2$s" : "V souporabi z %2$s", + "Shared via public link" : "V souporabi prek javne povezave", "Removed public link" : "Javno povezava je odstranjena", "Public link expired" : "Javna povezava je potekla", - "Shared by %2$s" : "Omogočena souporaba iz strani %2$s", + "Public link of %2$s expired" : "Javna povezava %2$s je potekla", + "Shared by %2$s" : "Souporabo je omogočil uporabnik %2$s", "Shares" : "Souporaba", "Accept" : "Sprejmi", "Decline" : "Zavrni", diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index 1b72f864fbe..aab8c565335 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -6,13 +6,22 @@ "Could not authenticate to remote share, password might be wrong" : "Ni mogoče overiti istovetnosti oddaljene mape za souporabo. Najverjetneje je uporabljeno napačno geslo.", "Storage not valid" : "Shramba ni veljavna", "Couldn't add remote share" : "Ni mogoče dodati oddaljenega mesta za souporabo", + "Wrong share ID, share doesn't exist" : "Napačen ID mesta uporabe; mesto ne obstaja!", "Could not delete share" : "Tega predmeta v souporabi ni mogoče izbrisati.", "Please specify a file or folder path" : "Določiti je treba datoteko ali pot do mape", "Wrong path, file/folder doesn't exist" : "Napačna pot; datoteka ali mapa ne obstaja", "Please specify a valid user" : "Navesti je treba veljavnega uporabnika.", + "Group sharing is disabled by the administrator" : "Skupinska souporaba je skrbniško onemogočena", "Please specify a valid group" : "Navesti je treba veljavno skupino", + "Public link sharing is disabled by the administrator" : "Souporaba prek javne povezave je skrbniško onemogočena", + "Public upload disabled by the administrator" : "Javno pošiljanje v oblak je skrbniško onemogočeno", + "Public upload is only possible for publicly shared folders" : "Javno pošiljanje v oblak je mogoče le za javne mape v skupni rabi.", + "Invalid date, date format must be YYYY-MM-DD" : "Neveljaven zapis časa; biti mora v zapisu YYYY-MM-DD", "Unknown share type" : "Neznana vrsta mesta souporabe", "Not a directory" : "Predmet ni mapa", + "Could not lock path" : "Poti ni mogoče zakleniti", + "Can't change permissions for public share links" : "Za javne povezave souporabe, spreminjanje dovoljenj ni mogoče.", + "Wrong or no update parameter given" : "Parameter posodobitve ni podan ali pa je navedena napačna vrednost", "Cannot increase permissions" : "Ni mogoče povišati dovoljenj", "Shared with you" : "V souporabi z vami", "Shared with others" : "V souporabi z drugimi", @@ -34,28 +43,29 @@ "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud", "Shared by" : "V souporabi z", "Sharing" : "Souporaba", - "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je odobrena <strong>souporaba</strong>.", - "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je odobrena.", + "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je omogočena <strong>souporaba</strong>.", + "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je omogočena.", "A public shared file or folder was <strong>downloaded</strong>" : "Mapa ali datoteka v souporabi je bila <strong>prejeta</strong>.", - "You received a new remote share %2$s from %1$s" : "Prejeli ste oddaljeno mapo za souporabo %2$s od %1$s", + "You received a new remote share %2$s from %1$s" : "Uporabnik %1$s vam je omogočil souporabo mape %2$s", "You received a new remote share from %s" : "Prejeli ste mapo za oddaljeno souporabo z %s", "%1$s accepted remote share %2$s" : "Uporabnik %1$s je prejel oddaljeno souporabo %2$s", "%1$s declined remote share %2$s" : "Uporabnik %1$s je zavrnil souporabo %2$s", "%1$s unshared %2$s from you" : "Uporabnik %1$s je onemogoči souporabo %2$s z vami", - "Public shared folder %1$s was downloaded" : "Mapa v souporabi %1$s je bila prejeta", + "Public shared folder %1$s was downloaded" : "Mapa v souporabi %1$s je bila prejeta.", "Public shared file %1$s was downloaded" : "Datoteka v souporabi %1$s je bila prejeta", "You shared %1$s with %2$s" : "Omogočili ste souporabo %1$s z uporabnikom %2$s", - "%2$s shared %1$s with %3$s" : "%2$s je omogočil souporabo %1$s z %3$s", - "You removed the share of %2$s for %1$s" : "Odstranili ste mapo za souporabo %2$s za %1$s", + "%2$s shared %1$s with %3$s" : "Uporabnik %2$s je omogočil souporabo %1$s z %3$s", + "You removed the share of %2$s for %1$s" : "Odstranili ste mapo v souporabi %2$s za %1$s", "You shared %1$s with group %2$s" : "Omogočili ste souporabo %1$s s skupino %2$s", "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave", "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s", "Downloaded via public link" : "Prejeto preko javne povezave", - "Shared with %2$s" : "Omogočena souporaba z %2$s", - "Shared via public link" : "Omogočena javna povezava za souporabo", + "Shared with %2$s" : "V souporabi z %2$s", + "Shared via public link" : "V souporabi prek javne povezave", "Removed public link" : "Javno povezava je odstranjena", "Public link expired" : "Javna povezava je potekla", - "Shared by %2$s" : "Omogočena souporaba iz strani %2$s", + "Public link of %2$s expired" : "Javna povezava %2$s je potekla", + "Shared by %2$s" : "Souporabo je omogočil uporabnik %2$s", "Shares" : "Souporaba", "Accept" : "Sprejmi", "Decline" : "Zavrni", diff --git a/apps/files_sharing/l10n/sq.js b/apps/files_sharing/l10n/sq.js index f97bbbb3b7e..c94c089917c 100644 --- a/apps/files_sharing/l10n/sq.js +++ b/apps/files_sharing/l10n/sq.js @@ -23,6 +23,7 @@ OC.L10N.register( "Sharing %s failed because the back end does not allow shares from type %s" : "Ndarja e %s dështoi, ngaqë pjesa përgjegjëse e shërbyesit nuk lejon ndarje prej llojit %s", "Unknown share type" : "Lloj i panjohur ndarjesh", "Not a directory" : "S’është drejtori", + "Could not lock path" : "S’u kyç dot shtegu", "Can't change permissions for public share links" : "S’mund të ndryshohen lejet për lidhje ndarjesh publike", "Wrong or no update parameter given" : "Ose u dha parametër i gabuar përditësimesh, pse s’u dha fare ", "Cannot increase permissions" : "S’mund të fuqizohen lejet", diff --git a/apps/files_sharing/l10n/sq.json b/apps/files_sharing/l10n/sq.json index 1dd8b7e462c..f55d83f095a 100644 --- a/apps/files_sharing/l10n/sq.json +++ b/apps/files_sharing/l10n/sq.json @@ -21,6 +21,7 @@ "Sharing %s failed because the back end does not allow shares from type %s" : "Ndarja e %s dështoi, ngaqë pjesa përgjegjëse e shërbyesit nuk lejon ndarje prej llojit %s", "Unknown share type" : "Lloj i panjohur ndarjesh", "Not a directory" : "S’është drejtori", + "Could not lock path" : "S’u kyç dot shtegu", "Can't change permissions for public share links" : "S’mund të ndryshohen lejet për lidhje ndarjesh publike", "Wrong or no update parameter given" : "Ose u dha parametër i gabuar përditësimesh, pse s’u dha fare ", "Cannot increase permissions" : "S’mund të fuqizohen lejet", diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js index 366f04aa47b..5ff7b59006a 100644 --- a/apps/files_sharing/l10n/th_TH.js +++ b/apps/files_sharing/l10n/th_TH.js @@ -23,6 +23,7 @@ OC.L10N.register( "Sharing %s failed because the back end does not allow shares from type %s" : "แชร์ %s ล้มเหลวเพราะแบ็กเอนด์ไม่อนุญาตให้แชร์ไฟล์ประเภท %s", "Unknown share type" : "ไม่รู้จักประเภทของแชร์", "Not a directory" : "ไม่ได้เป็นไดเรกทอรี", + "Could not lock path" : "ไม่สามารถล็อคเส้นทาง", "Can't change permissions for public share links" : "ไม่สามารถเปลี่ยนสิทธิ์สำหรับลิงค์แชร์สาธารณะ", "Wrong or no update parameter given" : "ไม่ถูกต้องหรือไม่ได้อัพเดทพารามิเตอร์", "Cannot increase permissions" : "ไม่สามารถเพิ่มสิทธิ์", diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json index 9d6d2965724..c6f180f6f89 100644 --- a/apps/files_sharing/l10n/th_TH.json +++ b/apps/files_sharing/l10n/th_TH.json @@ -21,6 +21,7 @@ "Sharing %s failed because the back end does not allow shares from type %s" : "แชร์ %s ล้มเหลวเพราะแบ็กเอนด์ไม่อนุญาตให้แชร์ไฟล์ประเภท %s", "Unknown share type" : "ไม่รู้จักประเภทของแชร์", "Not a directory" : "ไม่ได้เป็นไดเรกทอรี", + "Could not lock path" : "ไม่สามารถล็อคเส้นทาง", "Can't change permissions for public share links" : "ไม่สามารถเปลี่ยนสิทธิ์สำหรับลิงค์แชร์สาธารณะ", "Wrong or no update parameter given" : "ไม่ถูกต้องหรือไม่ได้อัพเดทพารามิเตอร์", "Cannot increase permissions" : "ไม่สามารถเพิ่มสิทธิ์", diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index a9f676fad98..f0f659d1bc6 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -2,15 +2,41 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能", + "The mountpoint name contains invalid characters." : "挂载点的名称包含无效字符。", + "Not allowed to create a federated share with the same user server" : "不允许使用相同的用户服务器创建联合共享", "Invalid or untrusted SSL certificate" : "无效或是不被信任的 SSL 证书", + "Could not authenticate to remote share, password might be wrong" : "无法验证远程共享，可能是密码错误", + "Storage not valid" : "存储无效", "Couldn't add remote share" : "无法添加远程分享", + "Share API is disabled" : "共享 API 已被禁用", + "Wrong share ID, share doesn't exist" : "错误的共享 ID，共享不存在", + "Could not delete share" : "不能删除共享", + "Please specify a file or folder path" : "请指定一个文件或文件夹路径", + "Wrong path, file/folder doesn't exist" : "路径错误，文件/文件夹不存在", + "Please specify a valid user" : "请指定一个有效的用户", + "Group sharing is disabled by the administrator" : "群组共享已被管理员禁用", + "Please specify a valid group" : "请指定一个有效的组", + "Public link sharing is disabled by the administrator" : "公共链接共享已被管理员禁用", + "Public upload disabled by the administrator" : "公共上传已被管理员禁用", + "Public upload is only possible for publicly shared folders" : "公共上传仅适用于公共共享文件夹", + "Invalid date, date format must be YYYY-MM-DD" : "无效的日期，日期格式必须是 YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "共享 %s 失败，后端不允许共享 %s 类型", + "Unknown share type" : "未知共享类型", + "Not a directory" : "不是一个目录", + "Could not lock path" : "无法锁定路径", + "Can't change permissions for public share links" : "不能改变公共分享链接权限", + "Wrong or no update parameter given" : "错误或没有更新参数给出", + "Cannot increase permissions" : "不能增加权限", "Shared with you" : "分享给您的文件", "Shared with others" : "您分享的文件", "Shared by link" : "分享链接的文件", "Federated sharing" : "联合云共享", "Nothing shared with you yet" : "你还没有收到任何共享的文件", + "Files and folders others share with you will show up here" : "其它人共享给您的文件和文件夹将显示在这里", "Nothing shared yet" : "还没有共享过文件", + "Files and folders you share will show up here" : "您共享的文件和文件夹将显示在这里", "No shared links" : "无分享链接", + "Files and folders you share by link will show up here" : "您通过链接共享的文件和文件夹将显示在这里", "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？", "Remote share" : "远程分享", "Remote share password" : "远程分享密码", @@ -22,21 +48,40 @@ OC.L10N.register( "Shared by" : "共享人", "Sharing" : "共享", "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。", + "A file or folder was shared from <strong>another server</strong>" : "<strong>其它服务器</strong> 中一个文件或者文件夹被共享 ", + "A public shared file or folder was <strong>downloaded</strong>" : "一个公共共享的文件或文件夹<strong>已下载</strong>", + "You received a new remote share %2$s from %1$s" : "您收到一个新的远程共享 %2$s 来自于 %1$s", "You received a new remote share from %s" : "您从%s收到了新的远程分享", "%1$s accepted remote share %2$s" : "%1$s 接受了远程分享 %2$s", "%1$s declined remote share %2$s" : "%1$s 拒绝了远程分享 %2$s", + "%1$s unshared %2$s from you" : "%1$s 未共享你的 %2$s ", "Public shared folder %1$s was downloaded" : "公共共享文件夹 %1$s 已被下载", "Public shared file %1$s was downloaded" : "公共共享文件 %1$s 已被下载", "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s", + "%2$s shared %1$s with %3$s" : "%2$s 共享 %1$s 给 %3$s", + "You removed the share of %2$s for %1$s" : "你移除了 %2$s 的共享 %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s 移除了 %3$s 的共享 %1$s", "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组", + "%2$s shared %1$s with group %3$s" : "%2$s 共享 %1$s 给群组 %3$s", + "You removed the share of group %2$s for %1$s" : "你移除了组 %2$s 的共享 %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s 移除了组 %3$s 的共享 %1$s", "%2$s shared %1$s via link" : "%2$s 以链接方式共享 %1$s", "You shared %1$s via link" : "您通过链接共享了 %1$s", + "You removed the public link for %1$s" : "你移除了公共链接 %1$s", + "%2$s removed the public link for %1$s" : "%2$s 移除了公共链接 %1$s", + "Your public link for %1$s expired" : "你的公开链接 %1$s 已过期", + "The public link of %2$s for %1$s expired" : "%2$s 的公开链接 %1$s 已过期", "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您", + "%2$s removed the share for %1$s" : "%2$s 移除了共享 %1$s", "Downloaded via public link" : "通过公开链接下载", "Shared with %2$s" : "共享给 %2$s", "Shared with %3$s by %2$s" : "由 %2$s 共享给 %3$s", + "Removed share for %2$s" : "移除共享 %2$s", + "%2$s removed share for %3$s" : "%2$s 移除共享 %3$s", "Shared with group %2$s" : "共享给组%2$s", "Shared with group %3$s by %2$s" : "由 %2$s 共享给组 %3$s", + "Removed share of group %2$s" : "移除了组 %2$s 的共享", + "%2$s removed share of group %3$s" : "%2$s 移除了群 %3$s 的共享", "Shared via link by %2$s" : "%2$s 以链接方式共享", "Shared via public link" : "通过公开链接共享", "Removed public link" : "移除公开链接", diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index bffaa9b6b5b..e1ba3104700 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -1,14 +1,40 @@ { "translations": { "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能", + "The mountpoint name contains invalid characters." : "挂载点的名称包含无效字符。", + "Not allowed to create a federated share with the same user server" : "不允许使用相同的用户服务器创建联合共享", "Invalid or untrusted SSL certificate" : "无效或是不被信任的 SSL 证书", + "Could not authenticate to remote share, password might be wrong" : "无法验证远程共享，可能是密码错误", + "Storage not valid" : "存储无效", "Couldn't add remote share" : "无法添加远程分享", + "Share API is disabled" : "共享 API 已被禁用", + "Wrong share ID, share doesn't exist" : "错误的共享 ID，共享不存在", + "Could not delete share" : "不能删除共享", + "Please specify a file or folder path" : "请指定一个文件或文件夹路径", + "Wrong path, file/folder doesn't exist" : "路径错误，文件/文件夹不存在", + "Please specify a valid user" : "请指定一个有效的用户", + "Group sharing is disabled by the administrator" : "群组共享已被管理员禁用", + "Please specify a valid group" : "请指定一个有效的组", + "Public link sharing is disabled by the administrator" : "公共链接共享已被管理员禁用", + "Public upload disabled by the administrator" : "公共上传已被管理员禁用", + "Public upload is only possible for publicly shared folders" : "公共上传仅适用于公共共享文件夹", + "Invalid date, date format must be YYYY-MM-DD" : "无效的日期，日期格式必须是 YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "共享 %s 失败，后端不允许共享 %s 类型", + "Unknown share type" : "未知共享类型", + "Not a directory" : "不是一个目录", + "Could not lock path" : "无法锁定路径", + "Can't change permissions for public share links" : "不能改变公共分享链接权限", + "Wrong or no update parameter given" : "错误或没有更新参数给出", + "Cannot increase permissions" : "不能增加权限", "Shared with you" : "分享给您的文件", "Shared with others" : "您分享的文件", "Shared by link" : "分享链接的文件", "Federated sharing" : "联合云共享", "Nothing shared with you yet" : "你还没有收到任何共享的文件", + "Files and folders others share with you will show up here" : "其它人共享给您的文件和文件夹将显示在这里", "Nothing shared yet" : "还没有共享过文件", + "Files and folders you share will show up here" : "您共享的文件和文件夹将显示在这里", "No shared links" : "无分享链接", + "Files and folders you share by link will show up here" : "您通过链接共享的文件和文件夹将显示在这里", "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？", "Remote share" : "远程分享", "Remote share password" : "远程分享密码", @@ -20,21 +46,40 @@ "Shared by" : "共享人", "Sharing" : "共享", "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。", + "A file or folder was shared from <strong>another server</strong>" : "<strong>其它服务器</strong> 中一个文件或者文件夹被共享 ", + "A public shared file or folder was <strong>downloaded</strong>" : "一个公共共享的文件或文件夹<strong>已下载</strong>", + "You received a new remote share %2$s from %1$s" : "您收到一个新的远程共享 %2$s 来自于 %1$s", "You received a new remote share from %s" : "您从%s收到了新的远程分享", "%1$s accepted remote share %2$s" : "%1$s 接受了远程分享 %2$s", "%1$s declined remote share %2$s" : "%1$s 拒绝了远程分享 %2$s", + "%1$s unshared %2$s from you" : "%1$s 未共享你的 %2$s ", "Public shared folder %1$s was downloaded" : "公共共享文件夹 %1$s 已被下载", "Public shared file %1$s was downloaded" : "公共共享文件 %1$s 已被下载", "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s", + "%2$s shared %1$s with %3$s" : "%2$s 共享 %1$s 给 %3$s", + "You removed the share of %2$s for %1$s" : "你移除了 %2$s 的共享 %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s 移除了 %3$s 的共享 %1$s", "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组", + "%2$s shared %1$s with group %3$s" : "%2$s 共享 %1$s 给群组 %3$s", + "You removed the share of group %2$s for %1$s" : "你移除了组 %2$s 的共享 %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s 移除了组 %3$s 的共享 %1$s", "%2$s shared %1$s via link" : "%2$s 以链接方式共享 %1$s", "You shared %1$s via link" : "您通过链接共享了 %1$s", + "You removed the public link for %1$s" : "你移除了公共链接 %1$s", + "%2$s removed the public link for %1$s" : "%2$s 移除了公共链接 %1$s", + "Your public link for %1$s expired" : "你的公开链接 %1$s 已过期", + "The public link of %2$s for %1$s expired" : "%2$s 的公开链接 %1$s 已过期", "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您", + "%2$s removed the share for %1$s" : "%2$s 移除了共享 %1$s", "Downloaded via public link" : "通过公开链接下载", "Shared with %2$s" : "共享给 %2$s", "Shared with %3$s by %2$s" : "由 %2$s 共享给 %3$s", + "Removed share for %2$s" : "移除共享 %2$s", + "%2$s removed share for %3$s" : "%2$s 移除共享 %3$s", "Shared with group %2$s" : "共享给组%2$s", "Shared with group %3$s by %2$s" : "由 %2$s 共享给组 %3$s", + "Removed share of group %2$s" : "移除了组 %2$s 的共享", + "%2$s removed share of group %3$s" : "%2$s 移除了群 %3$s 的共享", "Shared via link by %2$s" : "%2$s 以链接方式共享", "Shared via public link" : "通过公开链接共享", "Removed public link" : "移除公开链接", diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 4dcdaa892ad..abd75282579 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -23,7 +23,7 @@ * */ -namespace OC\Files\Cache; +namespace OCA\Files_Sharing; use OC\Files\Cache\Wrapper\CacheJail; use OCP\Files\Cache\ICacheEntry; @@ -34,7 +34,7 @@ use OCP\Files\Storage\IStorage; * * don't use this class directly if you need to get metadata, use \OC\Files\Filesystem::getFileInfo instead */ -class Shared_Cache extends CacheJail { +class Cache extends CacheJail { /** * @var \OC\Files\Storage\Shared */ diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php index 8dad84eca49..500d82cb2d2 100644 --- a/apps/files_sharing/lib/helper.php +++ b/apps/files_sharing/lib/helper.php @@ -36,9 +36,9 @@ use OCP\User; class Helper { public static function registerHooks() { - \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); + \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook'); \OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren'); - \OCP\Util::connectHook('OC_Appconfig', 'post_set_value', '\OCA\Files\Share\Maintainer', 'configChangeHook'); + \OCP\Util::connectHook('OC_Appconfig', 'post_set_value', '\OCA\Files_Sharing\Maintainer', 'configChangeHook'); \OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser'); } diff --git a/apps/files_sharing/lib/maintainer.php b/apps/files_sharing/lib/maintainer.php index a728f6bbb67..1d06a34bd0c 100644 --- a/apps/files_sharing/lib/maintainer.php +++ b/apps/files_sharing/lib/maintainer.php @@ -20,7 +20,7 @@ * */ -namespace OCA\Files\Share; +namespace OCA\Files_Sharing; /** * Maintains stuff around the sharing functionality diff --git a/apps/files_sharing/lib/scanner.php b/apps/files_sharing/lib/scanner.php index 2e951423aa2..215c0a7b6ae 100644 --- a/apps/files_sharing/lib/scanner.php +++ b/apps/files_sharing/lib/scanner.php @@ -21,15 +21,14 @@ * */ -namespace OC\Files\Cache; +namespace OCA\Files_Sharing; use OC\Files\ObjectStore\NoopScanner; -use OC\Files\Storage\Shared; /** * Scanner for SharedStorage */ -class SharedScanner extends Scanner { +class Scanner extends \OC\Files\Cache\Scanner { private $sourceScanner; /** diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 1a040364f11..ce214822aa7 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -318,14 +318,14 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage { if (!$storage) { $storage = $this; } - return new \OC\Files\Cache\Shared_Cache($storage, $this->sourceStorage, $this->sourceRootInfo); + return new \OCA\Files_Sharing\Cache($storage, $this->sourceStorage, $this->sourceRootInfo); } public function getScanner($path = '', $storage = null) { if (!$storage) { $storage = $this; } - return new \OC\Files\Cache\SharedScanner($storage); + return new \OCA\Files_Sharing\Scanner($storage); } public function getPropagator($storage = null) { diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index de68e2ea0fc..02c349e94b6 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -25,9 +25,9 @@ * */ -namespace OC\Files\Cache; +namespace OCA\Files_Sharing; -class Shared_Updater { +class Updater { /** * @param array $params @@ -85,21 +85,6 @@ class Shared_Updater { } /** - * clean up oc_share table from files which are no longer exists - * - * This fixes issues from updates from files_sharing < 0.3.5.6 (ownCloud 4.5) - * It will just be called during the update of the app - */ - static public function fixBrokenSharesOnAppUpdate() { - // delete all shares where the original file no longer exists - $findAndRemoveShares = \OCP\DB::prepare('DELETE FROM `*PREFIX*share` ' . - 'WHERE `item_type` IN (\'file\', \'folder\') ' . - 'AND `file_source` NOT IN (SELECT `fileid` FROM `*PREFIX*filecache`)' - ); - $findAndRemoveShares->execute(array()); - } - - /** * rename mount point from the children if the parent was renamed * * @param string $oldPath old path relative to data/user/files diff --git a/apps/files_sharing/tests/api/share20ocstest.php b/apps/files_sharing/tests/api/share20ocstest.php index 56c350aa99a..ffb74da2af7 100644 --- a/apps/files_sharing/tests/api/share20ocstest.php +++ b/apps/files_sharing/tests/api/share20ocstest.php @@ -29,6 +29,7 @@ use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUser; use OCP\Files\IRootFolder; +use OCP\Lock\LockedException; /** * Class Share20OCSTest @@ -137,8 +138,11 @@ class Share20OCSTest extends \Test\TestCase { } public function testDeleteShare() { + $node = $this->getMock('\OCP\Files\File'); + $share = $this->newShare(); - $share->setSharedBy($this->currentUser->getUID()); + $share->setSharedBy($this->currentUser->getUID()) + ->setNode($node); $this->shareManager ->expects($this->once()) ->method('getShareById') @@ -149,10 +153,45 @@ class Share20OCSTest extends \Test\TestCase { ->method('deleteShare') ->with($share); + $node->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $node->expects($this->once()) + ->method('unlock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $expected = new \OC_OCS_Result(); $this->assertEquals($expected, $this->ocs->deleteShare(42)); } + public function testDeleteShareLocked() { + $node = $this->getMock('\OCP\Files\File'); + + $share = $this->newShare(); + $share->setSharedBy($this->currentUser->getUID()) + ->setNode($node); + $this->shareManager + ->expects($this->once()) + ->method('getShareById') + ->with('ocinternal:42') + ->willReturn($share); + $this->shareManager + ->expects($this->never()) + ->method('deleteShare') + ->with($share); + + $node->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED) + ->will($this->throwException(new LockedException('mypath'))); + $node->expects($this->never()) + ->method('unlock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + + $expected = new \OC_OCS_Result(null, 404, 'could not delete share'); + $this->assertEquals($expected, $this->ocs->deleteShare(42)); + } + /* * FIXME: Enable once we have a federated Share Provider @@ -526,7 +565,7 @@ class Share20OCSTest extends \Test\TestCase { } public function testCreateShareInvalidPermissions() { - $share = $this->getMock('\OCP\Share\IShare'); + $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); $this->request @@ -548,6 +587,10 @@ class Share20OCSTest extends \Test\TestCase { ->with('valid-path') ->willReturn($path); + $path->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $expected = new \OC_OCS_Result(null, 404, 'invalid permissions'); $result = $this->ocs->createShare(); @@ -557,7 +600,7 @@ class Share20OCSTest extends \Test\TestCase { } public function testCreateShareUserNoShareWith() { - $share = $this->getMock('\OCP\Share\IShare'); + $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); $this->request @@ -585,6 +628,10 @@ class Share20OCSTest extends \Test\TestCase { ->with('valid-path') ->willReturn($path); + $path->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $expected = new \OC_OCS_Result(null, 404, 'Please specify a valid user'); $result = $this->ocs->createShare(); @@ -594,7 +641,7 @@ class Share20OCSTest extends \Test\TestCase { } public function testCreateShareUserNoValidShareWith() { - $share = $this->getMock('\OCP\Share\IShare'); + $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); $this->request @@ -625,6 +672,10 @@ class Share20OCSTest extends \Test\TestCase { $expected = new \OC_OCS_Result(null, 404, 'Please specify a valid user'); + $path->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $result = $this->ocs->createShare(); $this->assertEquals($expected->getMeta(), $result->getMeta()); @@ -632,9 +683,8 @@ class Share20OCSTest extends \Test\TestCase { } public function testCreateShareUser() { - $share = $this->getMock('\OCP\Share\IShare'); + $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); - $this->shareManager->method('createShare')->will($this->returnArgument(0)); $ocs = $this->getMockBuilder('OCA\Files_Sharing\API\Share20OCS') ->setConstructorArgs([ @@ -677,15 +727,26 @@ class Share20OCSTest extends \Test\TestCase { $this->userManager->method('userExists')->with('validUser')->willReturn(true); - $share->method('setNode')->with($path); - $share->method('setPermissions') - ->with( - \OCP\Constants::PERMISSION_ALL & - ~\OCP\Constants::PERMISSION_DELETE & - ~\OCP\Constants::PERMISSION_CREATE); - $share->method('setShareType')->with(\OCP\Share::SHARE_TYPE_USER); - $share->method('setSharedWith')->with('validUser'); - $share->method('setSharedBy')->with('currentUser'); + $path->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $path->expects($this->once()) + ->method('unlock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + + $this->shareManager->method('createShare') + ->with($this->callback(function (\OCP\Share\IShare $share) use ($path) { + return $share->getNode() === $path && + $share->getPermissions() === ( + \OCP\Constants::PERMISSION_ALL & + ~\OCP\Constants::PERMISSION_DELETE & + ~\OCP\Constants::PERMISSION_CREATE + ) && + $share->getShareType() === \OCP\Share::SHARE_TYPE_USER && + $share->getSharedWith() === 'validUser' && + $share->getSharedBy() === 'currentUser'; + })) + ->will($this->returnArgument(0)); $expected = new \OC_OCS_Result(); $result = $ocs->createShare(); @@ -695,7 +756,7 @@ class Share20OCSTest extends \Test\TestCase { } public function testCreateShareGroupNoValidShareWith() { - $share = $this->getMock('\OCP\Share\IShare'); + $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); $this->shareManager->method('createShare')->will($this->returnArgument(0)); @@ -727,6 +788,10 @@ class Share20OCSTest extends \Test\TestCase { $expected = new \OC_OCS_Result(null, 404, 'Please specify a valid user'); + $path->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $result = $this->ocs->createShare(); $this->assertEquals($expected->getMeta(), $result->getMeta()); @@ -734,9 +799,8 @@ class Share20OCSTest extends \Test\TestCase { } public function testCreateShareGroup() { - $share = $this->getMock('\OCP\Share\IShare'); + $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); - $this->shareManager->method('createShare')->will($this->returnArgument(0)); $ocs = $this->getMockBuilder('OCA\Files_Sharing\API\Share20OCS') ->setConstructorArgs([ @@ -783,11 +847,22 @@ class Share20OCSTest extends \Test\TestCase { ->method('allowGroupSharing') ->willReturn(true); - $share->method('setNode')->with($path); - $share->method('setPermissions')->with(\OCP\Constants::PERMISSION_ALL); - $share->method('setShareType')->with(\OCP\Share::SHARE_TYPE_GROUP); - $share->method('setSharedWith')->with('validGroup'); - $share->method('setSharedBy')->with('currentUser'); + $path->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $path->expects($this->once()) + ->method('unlock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + + $this->shareManager->method('createShare') + ->with($this->callback(function (\OCP\Share\IShare $share) use ($path) { + return $share->getNode() === $path && + $share->getPermissions() === \OCP\Constants::PERMISSION_ALL && + $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP && + $share->getSharedWith() === 'validGroup' && + $share->getSharedBy() === 'currentUser'; + })) + ->will($this->returnArgument(0)); $expected = new \OC_OCS_Result(); $result = $ocs->createShare(); @@ -797,7 +872,7 @@ class Share20OCSTest extends \Test\TestCase { } public function testCreateShareGroupNotAllowed() { - $share = $this->getMock('\OCP\Share\IShare'); + $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); $this->request @@ -832,9 +907,8 @@ class Share20OCSTest extends \Test\TestCase { ->method('allowGroupSharing') ->willReturn(false); - $share->method('setNode')->with($path); - $expected = new \OC_OCS_Result(null, 404, 'Group sharing is disabled by the administrator'); + $result = $this->ocs->createShare(); $this->assertEquals($expected->getMeta(), $result->getMeta()); @@ -1154,7 +1228,13 @@ class Share20OCSTest extends \Test\TestCase { } public function testUpdateShareCantAccess() { - $share = \OC::$server->getShareManager()->newShare(); + $node = $this->getMock('\OCP\Files\Folder'); + $share = $this->newShare(); + $share->setNode($node); + + $node->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); $this->shareManager->method('getShareById')->with('ocinternal:42')->willReturn($share); @@ -1166,10 +1246,16 @@ class Share20OCSTest extends \Test\TestCase { } public function testUpdateNoParametersLink() { - $share = \OC::$server->getShareManager()->newShare(); + $node = $this->getMock('\OCP\Files\Folder'); + $share = $this->newShare(); $share->setPermissions(\OCP\Constants::PERMISSION_ALL) ->setSharedBy($this->currentUser->getUID()) - ->setShareType(\OCP\Share::SHARE_TYPE_LINK); + ->setShareType(\OCP\Share::SHARE_TYPE_LINK) + ->setNode($node); + + $node->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); $this->shareManager->method('getShareById')->with('ocinternal:42')->willReturn($share); @@ -1181,10 +1267,16 @@ class Share20OCSTest extends \Test\TestCase { } public function testUpdateNoParametersOther() { - $share = \OC::$server->getShareManager()->newShare(); + $node = $this->getMock('\OCP\Files\Folder'); + $share = $this->newShare(); $share->setPermissions(\OCP\Constants::PERMISSION_ALL) ->setSharedBy($this->currentUser->getUID()) - ->setShareType(\OCP\Share::SHARE_TYPE_GROUP); + ->setShareType(\OCP\Share::SHARE_TYPE_GROUP) + ->setNode($node); + + $node->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); $this->shareManager->method('getShareById')->with('ocinternal:42')->willReturn($share); @@ -1198,13 +1290,22 @@ class Share20OCSTest extends \Test\TestCase { public function testUpdateLinkShareClear() { $ocs = $this->mockFormatShare(); - $share = \OC::$server->getShareManager()->newShare(); + $node = $this->getMock('\OCP\Files\Folder'); + $share = $this->newShare(); $share->setPermissions(\OCP\Constants::PERMISSION_ALL) ->setSharedBy($this->currentUser->getUID()) ->setShareType(\OCP\Share::SHARE_TYPE_LINK) ->setPassword('password') ->setExpirationDate(new \DateTime()) - ->setPermissions(\OCP\Constants::PERMISSION_ALL); + ->setPermissions(\OCP\Constants::PERMISSION_ALL) + ->setNode($node); + + $node->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $node->expects($this->once()) + ->method('unlock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); $this->request ->method('getParam') @@ -1364,13 +1465,22 @@ class Share20OCSTest extends \Test\TestCase { $date = new \DateTime('2000-01-01'); $date->setTime(0,0,0); - $share = \OC::$server->getShareManager()->newShare(); + $node = $this->getMock('\OCP\Files\File'); + $share = $this->newShare(); $share->setPermissions(\OCP\Constants::PERMISSION_ALL) ->setSharedBy($this->currentUser->getUID()) ->setShareType(\OCP\Share::SHARE_TYPE_LINK) ->setPassword('password') ->setExpirationDate($date) - ->setPermissions(\OCP\Constants::PERMISSION_ALL); + ->setPermissions(\OCP\Constants::PERMISSION_ALL) + ->setNode($node); + + $node->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $node->expects($this->once()) + ->method('unlock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); $this->request ->method('getParam') @@ -1398,13 +1508,15 @@ class Share20OCSTest extends \Test\TestCase { public function testUpdateLinkShareExpireDateDoesNotChangeOther() { $ocs = $this->mockFormatShare(); - $share = \OC::$server->getShareManager()->newShare(); + $node = $this->getMock('\OCP\Files\File'); + $share = $this->newShare(); $share->setPermissions(\OCP\Constants::PERMISSION_ALL) ->setSharedBy($this->currentUser->getUID()) ->setShareType(\OCP\Share::SHARE_TYPE_LINK) ->setPassword('password') ->setExpirationDate(new \DateTime()) - ->setPermissions(\OCP\Constants::PERMISSION_ALL); + ->setPermissions(\OCP\Constants::PERMISSION_ALL) + ->setNode($node); $this->request ->method('getParam') @@ -1412,6 +1524,13 @@ class Share20OCSTest extends \Test\TestCase { ['expireDate', null, '2010-12-23'], ])); + $node->expects($this->once()) + ->method('lock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $node->expects($this->once()) + ->method('unlock') + ->with(\OCP\Lock\ILockingProvider::LOCK_SHARED); + $this->shareManager->method('getShareById')->with('ocinternal:42')->willReturn($share); $this->shareManager->expects($this->once())->method('updateShare')->with( diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php index 2f3604e63cd..e7d5bb46258 100644 --- a/apps/files_sharing/tests/etagpropagation.php +++ b/apps/files_sharing/tests/etagpropagation.php @@ -192,7 +192,8 @@ class EtagPropagation extends PropagationTestCase { public function testOwnerWritesToSingleFileShare() { $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1); Filesystem::file_put_contents('/foo.txt', 'longer_bar'); - Filesystem::touch('/foo.txt', time() - 1); + $t = (int)Filesystem::filemtime('/foo.txt') - 1; + Filesystem::touch('/foo.txt', $t); $this->assertEtagsNotChanged([self::TEST_FILES_SHARING_API_USER4, self::TEST_FILES_SHARING_API_USER3]); $this->assertEtagsChanged([self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER2]); diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index c3c29f2297b..f5c1dcd979b 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -14,10 +14,15 @@ To prevent a user from running out of disk space, the ownCloud Deleted files app <types> <filesystem/> </types> + <namespace>Files_Trashbin</namespace> <dependencies> <owncloud min-version="9.1" max-version="9.1" /> </dependencies> <documentation> <user>user-trashbin</user> </documentation> + + <background-jobs> + <job>OCA\Files_Trashbin\BackgroundJob\ExpireTrash</job> + </background-jobs> </info> diff --git a/apps/files_trashbin/appinfo/install.php b/apps/files_trashbin/appinfo/install.php deleted file mode 100644 index 51b0bdf43c3..00000000000 --- a/apps/files_trashbin/appinfo/install.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -/** - * @author Victor Dubiniuk <dubiniuk@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/> - * - */ - - // Cron job for deleting expired trash items -\OC::$server->getJobList()->add('OCA\Files_Trashbin\BackgroundJob\ExpireTrash'); diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php index f0c95baeb71..cd839f0c2e0 100644 --- a/apps/files_trashbin/appinfo/update.php +++ b/apps/files_trashbin/appinfo/update.php @@ -39,6 +39,3 @@ if (version_compare($installedVersion, '0.6.4', '<')) { $config->setSystemValue('trashbin_retention_obligation', $newObligation); $config->deleteSystemValue('trashbin_auto_expire'); } - -// Cron job for deleting expired trash items -\OC::$server->getJobList()->add('OCA\Files_Trashbin\BackgroundJob\ExpireTrash'); diff --git a/apps/files_trashbin/l10n/pl.js b/apps/files_trashbin/l10n/pl.js index 78c8edea81d..50ddefb16ba 100644 --- a/apps/files_trashbin/l10n/pl.js +++ b/apps/files_trashbin/l10n/pl.js @@ -8,6 +8,7 @@ OC.L10N.register( "Delete" : "Usuń", "Delete permanently" : "Trwale usuń", "Error" : "Błąd", + "This operation is forbidden" : "Ta operacja jest niedozwolona", "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.", "restored" : "przywrócony", "No deleted files" : "Brak skasowanych plików", diff --git a/apps/files_trashbin/l10n/pl.json b/apps/files_trashbin/l10n/pl.json index 32c385bb319..fdd7d5f4202 100644 --- a/apps/files_trashbin/l10n/pl.json +++ b/apps/files_trashbin/l10n/pl.json @@ -6,6 +6,7 @@ "Delete" : "Usuń", "Delete permanently" : "Trwale usuń", "Error" : "Błąd", + "This operation is forbidden" : "Ta operacja jest niedozwolona", "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.", "restored" : "przywrócony", "No deleted files" : "Brak skasowanych plików", diff --git a/apps/files_trashbin/l10n/ro.js b/apps/files_trashbin/l10n/ro.js index 1c0df1c5157..1a0c1bcfeb4 100644 --- a/apps/files_trashbin/l10n/ro.js +++ b/apps/files_trashbin/l10n/ro.js @@ -3,13 +3,17 @@ OC.L10N.register( { "Couldn't delete %s permanently" : "Nu pot șterge %s permanent.", "Couldn't restore %s" : "Nu se poate recupera %s", - "Deleted files" : "Sterge fisierele", - "Restore" : "Restabilire", + "Deleted files" : "Fișiere șterse", + "Restore" : "Restaurare", "Delete" : "Șterge", "Delete permanently" : "Șterge permanent", "Error" : "Eroare", + "This operation is forbidden" : "Operațiunea este interzisă", + "This directory is unavailable, please check the logs or contact the administrator" : "Acest director nu este disponibil, te rugăm verifică logurile sau contactează un administrator", "restored" : "restaurat", "No deleted files" : "Nu sunt fișiere șterse", + "You will be able to recover deleted files from here" : "Vei putea restaura fișiere șterse de aici", + "No entries found in this folder" : "Niciun element găsit în acest director", "Select all" : "Selectează tot", "Name" : "Nume", "Deleted" : "A fost șters." diff --git a/apps/files_trashbin/l10n/ro.json b/apps/files_trashbin/l10n/ro.json index d7f01caca38..52e91c26377 100644 --- a/apps/files_trashbin/l10n/ro.json +++ b/apps/files_trashbin/l10n/ro.json @@ -1,13 +1,17 @@ { "translations": { "Couldn't delete %s permanently" : "Nu pot șterge %s permanent.", "Couldn't restore %s" : "Nu se poate recupera %s", - "Deleted files" : "Sterge fisierele", - "Restore" : "Restabilire", + "Deleted files" : "Fișiere șterse", + "Restore" : "Restaurare", "Delete" : "Șterge", "Delete permanently" : "Șterge permanent", "Error" : "Eroare", + "This operation is forbidden" : "Operațiunea este interzisă", + "This directory is unavailable, please check the logs or contact the administrator" : "Acest director nu este disponibil, te rugăm verifică logurile sau contactează un administrator", "restored" : "restaurat", "No deleted files" : "Nu sunt fișiere șterse", + "You will be able to recover deleted files from here" : "Vei putea restaura fișiere șterse de aici", + "No entries found in this folder" : "Niciun element găsit în acest director", "Select all" : "Selectează tot", "Name" : "Nume", "Deleted" : "A fost șters." diff --git a/apps/files_trashbin/appinfo/application.php b/apps/files_trashbin/lib/AppInfo/Application.php index 841c9d90f1b..841c9d90f1b 100644 --- a/apps/files_trashbin/appinfo/application.php +++ b/apps/files_trashbin/lib/AppInfo/Application.php diff --git a/apps/files_trashbin/lib/backgroundjob/expiretrash.php b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php index 8a4e2d41fec..8a4e2d41fec 100644 --- a/apps/files_trashbin/lib/backgroundjob/expiretrash.php +++ b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php diff --git a/apps/files_trashbin/lib/capabilities.php b/apps/files_trashbin/lib/Capabilities.php index 43daa8cfa47..43daa8cfa47 100644 --- a/apps/files_trashbin/lib/capabilities.php +++ b/apps/files_trashbin/lib/Capabilities.php diff --git a/apps/files_trashbin/command/cleanup.php b/apps/files_trashbin/lib/Command/CleanUp.php index cffe7f7d1dd..cffe7f7d1dd 100644 --- a/apps/files_trashbin/command/cleanup.php +++ b/apps/files_trashbin/lib/Command/CleanUp.php diff --git a/apps/files_trashbin/command/expire.php b/apps/files_trashbin/lib/Command/Expire.php index 9e0f58e12ce..9e0f58e12ce 100644 --- a/apps/files_trashbin/command/expire.php +++ b/apps/files_trashbin/lib/Command/Expire.php diff --git a/apps/files_trashbin/lib/exceptions/copyrecursiveexception.php b/apps/files_trashbin/lib/Exceptions/CopyRecursiveException.php index 8ebc8dfbfe1..8ebc8dfbfe1 100644 --- a/apps/files_trashbin/lib/exceptions/copyrecursiveexception.php +++ b/apps/files_trashbin/lib/Exceptions/CopyRecursiveException.php diff --git a/apps/files_trashbin/lib/expiration.php b/apps/files_trashbin/lib/Expiration.php index e5a37b88b49..e5a37b88b49 100644 --- a/apps/files_trashbin/lib/expiration.php +++ b/apps/files_trashbin/lib/Expiration.php diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/Helper.php index f56bbb12a91..815522a909e 100644 --- a/apps/files_trashbin/lib/helper.php +++ b/apps/files_trashbin/lib/Helper.php @@ -28,9 +28,9 @@ namespace OCA\Files_Trashbin; use OC\Files\FileInfo; use OCP\Constants; +use OCP\Files\Cache\ICacheEntry; -class Helper -{ +class Helper { /** * Retrieves the contents of a trash bin directory. * @@ -41,7 +41,7 @@ class Helper * @param bool $sortDescending true for descending sort, false otherwise * @return \OCP\Files\FileInfo[] */ - public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false){ + public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false) { $result = array(); $timestamp = null; @@ -51,57 +51,48 @@ class Helper throw new \Exception('Directory does not exists'); } - $dirContent = $view->opendir($dir); - if ($dirContent === false) { - return $result; - } - $mount = $view->getMount($dir); $storage = $mount->getStorage(); $absoluteDir = $view->getAbsolutePath($dir); $internalPath = $mount->getInternalPath($absoluteDir); - if (is_resource($dirContent)) { - $originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user); - while (($entryName = readdir($dirContent)) !== false) { - if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) { - $id = $entryName; - if ($dir === '' || $dir === '/') { - $size = $view->filesize($id); - $pathparts = pathinfo($entryName); - $timestamp = substr($pathparts['extension'], 1); - $id = $pathparts['filename']; + $originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user); + $dirContent = $storage->getCache()->getFolderContents($mount->getInternalPath($view->getAbsolutePath($dir))); + foreach ($dirContent as $entry) { + $entryName = $entry->getName(); + $id = $entry->getId(); + $name = $entryName; + if ($dir === '' || $dir === '/') { + $pathparts = pathinfo($entryName); + $timestamp = substr($pathparts['extension'], 1); + $name = $pathparts['filename']; - } else if ($timestamp === null) { - // for subfolders we need to calculate the timestamp only once - $size = $view->filesize($dir . '/' . $id); - $parts = explode('/', ltrim($dir, '/')); - $timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1); - } - $originalPath = ''; - if (isset($originalLocations[$id][$timestamp])) { - $originalPath = $originalLocations[$id][$timestamp]; - if (substr($originalPath, -1) === '/') { - $originalPath = substr($originalPath, 0, -1); - } - } - $i = array( - 'name' => $id, - 'mtime' => $timestamp, - 'mimetype' => $view->is_dir($dir . '/' . $entryName) ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($id), - 'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file', - 'directory' => ($dir === '/') ? '' : $dir, - 'size' => $size, - 'etag' => '', - 'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE - ); - if ($originalPath) { - $i['extraData'] = $originalPath.'/'.$id; - } - $result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount); + } else if ($timestamp === null) { + // for subfolders we need to calculate the timestamp only once + $parts = explode('/', ltrim($dir, '/')); + $timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1); + } + $originalPath = ''; + if (isset($originalLocations[$id][$timestamp])) { + $originalPath = $originalLocations[$id][$timestamp]; + if (substr($originalPath, -1) === '/') { + $originalPath = substr($originalPath, 0, -1); } } - closedir($dirContent); + $i = array( + 'name' => $name, + 'mtime' => $timestamp, + 'mimetype' => $entry->getMimeType(), + 'type' => $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file', + 'directory' => ($dir === '/') ? '' : $dir, + 'size' => $entry->getSize(), + 'etag' => '', + 'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE + ); + if ($originalPath) { + $i['extraData'] = $originalPath . '/' . $id; + } + $result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount); } if ($sortAttribute !== '') { @@ -112,6 +103,7 @@ class Helper /** * Format file infos for JSON + * * @param \OCP\Files\FileInfo[] $fileInfos file infos */ public static function formatFileInfos($fileInfos) { diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/Hooks.php index 89063bcb33e..89063bcb33e 100644 --- a/apps/files_trashbin/lib/hooks.php +++ b/apps/files_trashbin/lib/Hooks.php diff --git a/apps/files_trashbin/lib/storage.php b/apps/files_trashbin/lib/Storage.php index c4c523810ac..c4c523810ac 100644 --- a/apps/files_trashbin/lib/storage.php +++ b/apps/files_trashbin/lib/Storage.php diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 52692950a65..52692950a65 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php diff --git a/apps/files_trashbin/tests/backgroundjob/expiretrash.php b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php index c98a555c929..0d4d95ac298 100644 --- a/apps/files_trashbin/tests/backgroundjob/expiretrash.php +++ b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php @@ -19,11 +19,11 @@ * */ -namespace OCA\Files_Trashbin\Tests\BackgroundJob\ExpireTrash; +namespace OCA\Files_Trashbin\Tests\BackgroundJob; use \OCA\Files_Trashbin\BackgroundJob\ExpireTrash; -class ExpireTrash_Test extends \Test\TestCase { +class ExpireTrashTest extends \Test\TestCase { public function testConstructAndRun() { $backgroundJob = new ExpireTrash( $this->getMock('OCP\IUserManager'), diff --git a/apps/files_trashbin/tests/command/cleanuptest.php b/apps/files_trashbin/tests/Command/CleanUpTest.php index d71c4ecd85d..d71c4ecd85d 100644 --- a/apps/files_trashbin/tests/command/cleanuptest.php +++ b/apps/files_trashbin/tests/Command/CleanUpTest.php diff --git a/apps/files_trashbin/tests/command/expiretest.php b/apps/files_trashbin/tests/Command/ExpireTest.php index e481e29330f..e481e29330f 100644 --- a/apps/files_trashbin/tests/command/expiretest.php +++ b/apps/files_trashbin/tests/Command/ExpireTest.php diff --git a/apps/files_trashbin/tests/expiration.php b/apps/files_trashbin/tests/ExpirationTest.php index 420d255947e..246409e24f4 100644 --- a/apps/files_trashbin/tests/expiration.php +++ b/apps/files_trashbin/tests/ExpirationTest.php @@ -20,9 +20,10 @@ * */ -use \OCA\Files_Trashbin\Expiration; +use OCA\Files_Trashbin\Expiration; +use \OCA\Files_Trashbin\Tests; -class Expiration_Test extends \PHPUnit_Framework_TestCase { +class ExpirationTest extends \Test\TestCase { const SECONDS_PER_DAY = 86400; //60*60*24 const FAKE_TIME_NOW = 1000000; diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/StorageTest.php index 5c631770da3..1ba80caf183 100644 --- a/apps/files_trashbin/tests/storage.php +++ b/apps/files_trashbin/tests/StorageTest.php @@ -24,7 +24,7 @@ * */ -namespace OCA\Files_trashbin\Tests\Storage; +namespace OCA\Files_Trashbin\Tests; use OC\Files\Storage\Temporary; use OC\Files\Filesystem; @@ -34,9 +34,9 @@ use OC\Files\Filesystem; * * @group DB * - * @package OCA\Files_trashbin\Tests\Storage + * @package OCA\Files_Trashbin\Tests */ -class Storage extends \Test\TestCase { +class StorageTest extends \Test\TestCase { /** * @var string */ diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/TrashbinTest.php index 7087da37266..98d55020dce 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/TrashbinTest.php @@ -26,14 +26,14 @@ * */ -use OCA\Files_Trashbin; +use OCA\Files_Trashbin\Tests; /** * Class Test_Encryption * * @group DB */ -class Test_Trashbin extends \Test\TestCase { +class TrashbinTest extends \Test\TestCase { const TEST_TRASHBIN_USER1 = "test-trashbin-user1"; const TEST_TRASHBIN_USER2 = "test-trashbin-user2"; @@ -74,11 +74,11 @@ class Test_Trashbin extends \Test\TestCase { $config = \OC::$server->getConfig(); //configure trashbin - self::$rememberRetentionObligation = $config->getSystemValue('trashbin_retention_obligation', Files_Trashbin\Expiration::DEFAULT_RETENTION_OBLIGATION); + self::$rememberRetentionObligation = $config->getSystemValue('trashbin_retention_obligation', \OCA\Files_Trashbin\Expiration::DEFAULT_RETENTION_OBLIGATION); $config->setSystemValue('trashbin_retention_obligation', 'auto, 2'); // register hooks - Files_Trashbin\Trashbin::registerHooks(); + \OCA\Files_Trashbin\Trashbin::registerHooks(); // create test user self::loginHelper(self::TEST_TRASHBIN_USER2, true); @@ -675,7 +675,7 @@ class Test_Trashbin extends \Test\TestCase { // just a dummy class to make protected methods available for testing -class TrashbinForTesting extends Files_Trashbin\Trashbin { +class TrashbinForTesting extends \OCA\Files_Trashbin\Trashbin { /** * @param OCP\Files\FileInfo[] $files @@ -683,7 +683,7 @@ class TrashbinForTesting extends Files_Trashbin\Trashbin { */ public function dummyDeleteExpiredFiles($files, $limit) { // dummy value for $retention_obligation because it is not needed here - return parent::deleteExpiredFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $limit, 0); + return parent::deleteExpiredFiles($files, TrashbinTest::TEST_TRASHBIN_USER1, $limit, 0); } /** @@ -691,6 +691,6 @@ class TrashbinForTesting extends Files_Trashbin\Trashbin { * @param integer $availableSpace */ public function dummyDeleteFiles($files, $availableSpace) { - return parent::deleteFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $availableSpace); + return parent::deleteFiles($files, TrashbinTest::TEST_TRASHBIN_USER1, $availableSpace); } } diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml index ad0354a5101..03aa308bdb1 100644 --- a/apps/files_versions/appinfo/info.xml +++ b/apps/files_versions/appinfo/info.xml @@ -13,6 +13,7 @@ In addition to the expiry of versions, ownCloud’s versions app makes certain n <types> <filesystem/> </types> + <namespace>Files_Versions</namespace> <dependencies> <owncloud min-version="9.1" max-version="9.1" /> </dependencies> @@ -20,4 +21,8 @@ In addition to the expiry of versions, ownCloud’s versions app makes certain n <user>user-versions</user> </documentation> <default_enable/> + + <background-jobs> + <job>OCA\Files_Versions\BackgroundJob\ExpireVersions</job> + </background-jobs> </info> diff --git a/apps/files_versions/appinfo/install.php b/apps/files_versions/appinfo/install.php deleted file mode 100644 index 81ff6337aa0..00000000000 --- a/apps/files_versions/appinfo/install.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -/** - * @author Victor Dubiniuk <dubiniuk@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/> - * - */ - -// Cron job for deleting expired trash items -\OC::$server->getJobList()->add('OCA\Files_Versions\BackgroundJob\ExpireVersions'); diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php deleted file mode 100644 index 09ac6ce8a2f..00000000000 --- a/apps/files_versions/appinfo/update.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -/** - * @author Victor Dubiniuk <dubiniuk@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/> - * - */ - -// Cron job for deleting expired trash items -\OC::$server->getJobList()->add('OCA\Files_Versions\BackgroundJob\ExpireVersions'); diff --git a/apps/files_versions/l10n/ro.js b/apps/files_versions/l10n/ro.js index 815c04e6519..d3ccc1fe94a 100644 --- a/apps/files_versions/l10n/ro.js +++ b/apps/files_versions/l10n/ro.js @@ -1,9 +1,10 @@ OC.L10N.register( "files_versions", { - "Could not revert: %s" : "Nu a putut reveni: %s", + "Could not revert: %s" : "Nu s-a putut reveni: %s", "Versions" : "Versiuni", - "Restore" : "Restabilire", + "Failed to revert {file} to revision {timestamp}." : "S-a eșuat restaurarea fișierului {file} la revizia {timestamp}.", + "Restore" : "Restaurare", "No other versions available" : "Nu există alte versiuni disponibile", "More versions..." : "Mai multe versiuni..." }, diff --git a/apps/files_versions/l10n/ro.json b/apps/files_versions/l10n/ro.json index 78a4ecc4e7c..1926b6506cb 100644 --- a/apps/files_versions/l10n/ro.json +++ b/apps/files_versions/l10n/ro.json @@ -1,7 +1,8 @@ { "translations": { - "Could not revert: %s" : "Nu a putut reveni: %s", + "Could not revert: %s" : "Nu s-a putut reveni: %s", "Versions" : "Versiuni", - "Restore" : "Restabilire", + "Failed to revert {file} to revision {timestamp}." : "S-a eșuat restaurarea fișierului {file} la revizia {timestamp}.", + "Restore" : "Restaurare", "No other versions available" : "Nu există alte versiuni disponibile", "More versions..." : "Mai multe versiuni..." },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" diff --git a/apps/files_versions/appinfo/application.php b/apps/files_versions/lib/AppInfo/Application.php index b32cf54729d..b32cf54729d 100644 --- a/apps/files_versions/appinfo/application.php +++ b/apps/files_versions/lib/AppInfo/Application.php diff --git a/apps/files_versions/lib/backgroundjob/expireversions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php index 8e14e65b9a7..8e14e65b9a7 100644 --- a/apps/files_versions/lib/backgroundjob/expireversions.php +++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php diff --git a/apps/files_versions/lib/capabilities.php b/apps/files_versions/lib/Capabilities.php index 441b2adfba3..441b2adfba3 100644 --- a/apps/files_versions/lib/capabilities.php +++ b/apps/files_versions/lib/Capabilities.php diff --git a/apps/files_versions/command/cleanup.php b/apps/files_versions/lib/Command/CleanUp.php index 1abf62763b1..1abf62763b1 100644 --- a/apps/files_versions/command/cleanup.php +++ b/apps/files_versions/lib/Command/CleanUp.php diff --git a/apps/files_versions/command/expire.php b/apps/files_versions/lib/Command/Expire.php index b1f72980633..b1f72980633 100644 --- a/apps/files_versions/command/expire.php +++ b/apps/files_versions/lib/Command/Expire.php diff --git a/apps/files_versions/lib/expiration.php b/apps/files_versions/lib/Expiration.php index ffc7640e7f9..ffc7640e7f9 100644 --- a/apps/files_versions/lib/expiration.php +++ b/apps/files_versions/lib/Expiration.php diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/Hooks.php index beaf81c7471..beaf81c7471 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/Hooks.php diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/Storage.php index 3c23f2f730a..3c23f2f730a 100644 --- a/apps/files_versions/lib/storage.php +++ b/apps/files_versions/lib/Storage.php diff --git a/apps/files_versions/tests/command/cleanuptest.php b/apps/files_versions/tests/Command/CleanupTest.php index af217b18893..af217b18893 100644 --- a/apps/files_versions/tests/command/cleanuptest.php +++ b/apps/files_versions/tests/Command/CleanupTest.php diff --git a/apps/files_versions/tests/command/expiretest.php b/apps/files_versions/tests/Command/ExpireTest.php index f89ece82515..f89ece82515 100644 --- a/apps/files_versions/tests/command/expiretest.php +++ b/apps/files_versions/tests/Command/ExpireTest.php diff --git a/apps/files_versions/tests/expirationtest.php b/apps/files_versions/tests/ExpirationTest.php index 2dfff19f230..2486b9c85c8 100644 --- a/apps/files_versions/tests/expirationtest.php +++ b/apps/files_versions/tests/ExpirationTest.php @@ -24,7 +24,7 @@ namespace OCA\Files_Versions\Tests; use \OCA\Files_Versions\Expiration; -class Expiration_Test extends \Test\TestCase { +class ExpirationTest extends \Test\TestCase { const SECONDS_PER_DAY = 86400; //60*60*24 public function expirationData(){ diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/VersioningTest.php index b8e68cfadf7..354ff6ee5e9 100644 --- a/apps/files_versions/tests/versions.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -29,6 +29,8 @@ * */ +namespace OCA\Files_Versions\Tests; + require_once __DIR__ . '/../appinfo/app.php'; use OC\Files\Storage\Temporary; @@ -39,7 +41,7 @@ use OC\Files\Storage\Temporary; * * @group DB */ -class Test_Files_Versioning extends \Test\TestCase { +class VersioningTest extends \Test\TestCase { const TEST_VERSIONS_USER = 'test-versions-user'; const TEST_VERSIONS_USER2 = 'test-versions-user2'; diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml index 027f1ae039e..2aa0583ce4c 100644 --- a/apps/provisioning_api/appinfo/info.xml +++ b/apps/provisioning_api/appinfo/info.xml @@ -18,6 +18,7 @@ <admin>admin-provisioning-api</admin> </documentation> <version>0.5.0</version> + <namespace>Provisioning_API</namespace> <types> <prevent_group_restriction/> </types> diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php index 08411856e7e..00a362864e5 100644 --- a/apps/provisioning_api/appinfo/routes.php +++ b/apps/provisioning_api/appinfo/routes.php @@ -26,10 +26,13 @@ namespace OCA\Provisioning_API\AppInfo; +use OCA\Provisioning_API\Apps; +use OCA\Provisioning_API\Groups; +use OCA\Provisioning_API\Users; use OCP\API; // Users -$users = new \OCA\Provisioning_API\Users( +$users = new Users( \OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), @@ -41,6 +44,8 @@ API::register('post', '/cloud/users', [$users, 'addUser'], 'provisioning_api', A API::register('get', '/cloud/users/{userid}', [$users, 'getUser'], 'provisioning_api', API::USER_AUTH); API::register('put', '/cloud/users/{userid}', [$users, 'editUser'], 'provisioning_api', API::USER_AUTH); API::register('delete', '/cloud/users/{userid}', [$users, 'deleteUser'], 'provisioning_api', API::SUBADMIN_AUTH); +API::register('put', '/cloud/users/{userid}/enable', [$users, 'enableUser'], 'provisioning_api', API::SUBADMIN_AUTH); +API::register('put', '/cloud/users/{userid}/disable', [$users, 'disableUser'], 'provisioning_api', API::SUBADMIN_AUTH); API::register('get', '/cloud/users/{userid}/groups', [$users, 'getUsersGroups'], 'provisioning_api', API::USER_AUTH); API::register('post', '/cloud/users/{userid}/groups', [$users, 'addToGroup'], 'provisioning_api', API::SUBADMIN_AUTH); API::register('delete', '/cloud/users/{userid}/groups', [$users, 'removeFromGroup'], 'provisioning_api', API::SUBADMIN_AUTH); @@ -49,7 +54,7 @@ API::register('delete', '/cloud/users/{userid}/subadmins', [$users, 'removeSubAd API::register('get', '/cloud/users/{userid}/subadmins', [$users, 'getUserSubAdminGroups'], 'provisioning_api', API::ADMIN_AUTH); // Groups -$groups = new \OCA\Provisioning_API\Groups( +$groups = new Groups( \OC::$server->getGroupManager(), \OC::$server->getUserSession(), \OC::$server->getRequest() @@ -61,7 +66,7 @@ API::register('delete', '/cloud/groups/{groupid}', [$groups, 'deleteGroup'], 'pr API::register('get', '/cloud/groups/{groupid}/subadmins', [$groups, 'getSubAdminsOfGroup'], 'provisioning_api', API::ADMIN_AUTH); // Apps -$apps = new \OCA\Provisioning_API\Apps( +$apps = new Apps( \OC::$server->getAppManager(), \OC::$server->getOcsClient() ); diff --git a/apps/provisioning_api/lib/apps.php b/apps/provisioning_api/lib/Apps.php index f0079b8a8f3..f0079b8a8f3 100644 --- a/apps/provisioning_api/lib/apps.php +++ b/apps/provisioning_api/lib/Apps.php diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/Groups.php index 6784894dbc9..6784894dbc9 100644 --- a/apps/provisioning_api/lib/groups.php +++ b/apps/provisioning_api/lib/Groups.php diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/Users.php index 68c89e41f6f..64760497b61 100644 --- a/apps/provisioning_api/lib/users.php +++ b/apps/provisioning_api/lib/Users.php @@ -31,32 +31,36 @@ namespace OCA\Provisioning_API; use \OC_OCS_Result; use \OC_Helper; use OCP\Files\NotFoundException; +use OCP\IConfig; +use OCP\IGroupManager; use OCP\ILogger; +use OCP\IUserManager; +use OCP\IUserSession; class Users { - /** @var \OCP\IUserManager */ + /** @var IUserManager */ private $userManager; - /** @var \OCP\IConfig */ + /** @var IConfig */ private $config; - /** @var \OCP\IGroupManager */ + /** @var IGroupManager|\OC\Group\Manager */ // FIXME Requires a method that is not on the interface private $groupManager; - /** @var \OCP\IUserSession */ + /** @var IUserSession */ private $userSession; /** @var ILogger */ private $logger; /** - * @param \OCP\IUserManager $userManager - * @param \OCP\IConfig $config - * @param \OCP\IGroupManager $groupManager - * @param \OCP\IUserSession $userSession + * @param IUserManager $userManager + * @param IConfig $config + * @param IGroupManager $groupManager + * @param IUserSession $userSession * @param ILogger $logger */ - public function __construct(\OCP\IUserManager $userManager, - \OCP\IConfig $config, - \OCP\IGroupManager $groupManager, - \OCP\IUserSession $userSession, + public function __construct(IUserManager $userManager, + IConfig $config, + IGroupManager $groupManager, + IUserSession $userSession, ILogger $logger) { $this->userManager = $userManager; $this->config = $config; @@ -333,6 +337,50 @@ class Users { * @param array $parameters * @return OC_OCS_Result */ + public function disableUser($parameters) { + return $this->setEnabled($parameters, false); + } + + /** + * @param array $parameters + * @return OC_OCS_Result + */ + public function enableUser($parameters) { + return $this->setEnabled($parameters, true); + } + + /** + * @param array $parameters + * @param bool $value + * @return OC_OCS_Result + */ + private function setEnabled($parameters, $value) { + // Check if user is logged in + $currentLoggedInUser = $this->userSession->getUser(); + if ($currentLoggedInUser === null) { + return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED); + } + + $targetUser = $this->userManager->get($parameters['userid']); + if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) { + return new OC_OCS_Result(null, 101); + } + + // If not permitted + $subAdminManager = $this->groupManager->getSubAdmin(); + if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) { + return new OC_OCS_Result(null, 997); + } + + // enable/disable the user now + $targetUser->setEnabled($value); + return new OC_OCS_Result(null, 100); + } + + /** + * @param array $parameters + * @return OC_OCS_Result + */ public function getUsersGroups($parameters) { // Check if user is logged in $loggedInUser = $this->userSession->getUser(); diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/AppsTest.php index 260bb4d527e..7dc6ec8a371 100644 --- a/apps/provisioning_api/tests/appstest.php +++ b/apps/provisioning_api/tests/AppsTest.php @@ -25,6 +25,8 @@ */ namespace OCA\Provisioning_API\Tests; + + use OC\OCSClient; use OCA\Provisioning_API\Apps; use OCP\API; @@ -45,16 +47,19 @@ class AppsTest extends TestCase { private $api; /** @var IUserSession */ private $userSession; - /** @var OCSClient */ + /** @var OCSClient|\PHPUnit_Framework_MockObject_MockObject */ private $ocsClient; - public function setup() { - parent::setup(); + protected function setUp() { + parent::setUp(); + $this->appManager = \OC::$server->getAppManager(); $this->groupManager = \OC::$server->getGroupManager(); $this->userSession = \OC::$server->getUserSession(); - $this->ocsClient = $this->getMockBuilder('\OC\OCSClient') - ->disableOriginalConstructor()->getMock(); + $this->ocsClient = $this->getMockBuilder('OC\OCSClient') + ->disableOriginalConstructor() + ->getMock(); + $this->api = new Apps($this->appManager, $this->ocsClient); } diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/GroupsTest.php index 1262f45cb3c..5864d597136 100644 --- a/apps/provisioning_api/tests/groupstest.php +++ b/apps/provisioning_api/tests/GroupsTest.php @@ -25,6 +25,8 @@ namespace OCA\Provisioning_API\Tests; +use OCA\Provisioning_API\Groups; +use OCP\API; use OCP\IGroupManager; use OCP\IUserSession; use OCP\IRequest; @@ -38,20 +40,26 @@ class GroupsTest extends \Test\TestCase { protected $request; /** @var \OC\SubAdmin|\PHPUnit_Framework_MockObject_MockObject */ protected $subAdminManager; - /** @var \OCA\Provisioning_API\Groups */ + /** @var Groups */ protected $api; - protected function setup() { - $this->subAdminManager = $this->getMockBuilder('OC\SubAdmin')->disableOriginalConstructor()->getMock(); + protected function setUp() { + parent::setUp(); - $this->groupManager = $this->getMockBuilder('OC\Group\Manager')->disableOriginalConstructor()->getMock(); + $this->subAdminManager = $this->getMockBuilder('OC\SubAdmin') + ->disableOriginalConstructor() + ->getMock(); + + $this->groupManager = $this->getMockBuilder('OC\Group\Manager') + ->disableOriginalConstructor() + ->getMock(); $this->groupManager ->method('getSubAdmin') ->willReturn($this->subAdminManager); $this->userSession = $this->getMock('OCP\IUserSession'); $this->request = $this->getMock('OCP\IRequest'); - $this->api = new \OCA\Provisioning_API\Groups( + $this->api = new Groups( $this->groupManager, $this->userSession, $this->request @@ -129,6 +137,10 @@ class GroupsTest extends \Test\TestCase { /** * @dataProvider dataGetGroups + * + * @param string|null $search + * @param int|null $limit + * @param int|null $offset */ public function testGetGroups($search, $limit, $offset) { $this->request @@ -161,7 +173,7 @@ class GroupsTest extends \Test\TestCase { $this->assertInstanceOf('OC_OCS_Result', $result); $this->assertFalse($result->succeeded()); - $this->assertEquals(\OCP\API::RESPOND_UNAUTHORISED, $result->getStatusCode()); + $this->assertEquals(API::RESPOND_UNAUTHORISED, $result->getStatusCode()); } @@ -215,7 +227,7 @@ class GroupsTest extends \Test\TestCase { $this->assertInstanceOf('OC_OCS_Result', $result); $this->assertFalse($result->succeeded()); - $this->assertEquals(\OCP\API::RESPOND_UNAUTHORISED, $result->getStatusCode()); + $this->assertEquals(API::RESPOND_UNAUTHORISED, $result->getStatusCode()); } public function testGetGroupAsAdmin() { @@ -252,12 +264,12 @@ class GroupsTest extends \Test\TestCase { $this->asUser(); $result = $this->api->getGroup([ - 'groupid' => $this->getUniqueId() + 'groupid' => $this->getUniqueID() ]); $this->assertInstanceOf('OC_OCS_Result', $result); $this->assertFalse($result->succeeded()); - $this->assertEquals(\OCP\API::RESPOND_NOT_FOUND, $result->getStatusCode()); + $this->assertEquals(API::RESPOND_NOT_FOUND, $result->getStatusCode()); $this->assertEquals('The requested group could not be found', $result->getMeta()['message']); } diff --git a/apps/provisioning_api/tests/testcase.php b/apps/provisioning_api/tests/TestCase.php index 743c1c9c44b..743c1c9c44b 100644 --- a/apps/provisioning_api/tests/testcase.php +++ b/apps/provisioning_api/tests/TestCase.php diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/UsersTest.php index 020071bcfa1..264aede617f 100644 --- a/apps/provisioning_api/tests/userstest.php +++ b/apps/provisioning_api/tests/UsersTest.php @@ -58,24 +58,24 @@ class UsersTest extends OriginalTest { parent::tearDown(); } - protected function setup() { - parent::setup(); - - $this->userManager = $this->getMock('\OCP\IUserManager'); - $this->config = $this->getMock('\OCP\IConfig'); - $this->groupManager = $this->getMockBuilder('\OC\Group\Manager') - ->disableOriginalConstructor()->getMock(); - $this->userSession = $this->getMock('\OCP\IUserSession'); - $this->logger = $this->getMock('\OCP\ILogger'); - $this->api = $this->getMockBuilder('\OCA\Provisioning_API\Users') + protected function setUp() { + parent::setUp(); + + $this->userManager = $this->getMock('OCP\IUserManager'); + $this->config = $this->getMock('OCP\IConfig'); + $this->groupManager = $this->getMockBuilder('OC\Group\Manager') + ->disableOriginalConstructor() + ->getMock(); + $this->userSession = $this->getMock('OCP\IUserSession'); + $this->logger = $this->getMock('OCP\ILogger'); + $this->api = $this->getMockBuilder('OCA\Provisioning_API\Users') ->setConstructorArgs([ - $this->userManager, - $this->config, - $this->groupManager, - $this->userSession, - $this->logger, - ] - ) + $this->userManager, + $this->config, + $this->groupManager, + $this->userSession, + $this->logger, + ]) ->setMethods(['fillStorageInfo']) ->getMock(); } @@ -93,7 +93,7 @@ class UsersTest extends OriginalTest { public function testGetUsersAsAdmin() { $_GET['search'] = 'MyCustomSearch'; - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -125,7 +125,7 @@ class UsersTest extends OriginalTest { public function testGetUsersAsSubAdmin() { $_GET['search'] = 'MyCustomSearch'; - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -138,17 +138,17 @@ class UsersTest extends OriginalTest { ->expects($this->once()) ->method('isAdmin') ->will($this->returnValue(false)); - $firstGroup = $this->getMock('\OCP\IGroup'); + $firstGroup = $this->getMock('OCP\IGroup'); $firstGroup ->expects($this->once()) ->method('getGID') ->will($this->returnValue('FirstGroup')); - $secondGroup = $this->getMock('\OCP\IGroup'); + $secondGroup = $this->getMock('OCP\IGroup'); $secondGroup ->expects($this->once()) ->method('getGID') ->will($this->returnValue('SecondGroup')); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -181,7 +181,7 @@ class UsersTest extends OriginalTest { public function testGetUsersAsRegularUser() { $_GET['search'] = 'MyCustomSearch'; - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -194,7 +194,7 @@ class UsersTest extends OriginalTest { ->expects($this->once()) ->method('isAdmin') ->will($this->returnValue(false)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -221,7 +221,7 @@ class UsersTest extends OriginalTest { ->expects($this->once()) ->method('error') ->with('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']); - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -248,7 +248,7 @@ class UsersTest extends OriginalTest { ->method('userExists') ->with('NewUser') ->willReturn(false); - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -280,7 +280,7 @@ class UsersTest extends OriginalTest { ->method('userExists') ->with('NewUser') ->willReturn(false); - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -326,7 +326,7 @@ class UsersTest extends OriginalTest { ->expects($this->once()) ->method('info') ->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']); - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -354,7 +354,7 @@ class UsersTest extends OriginalTest { ->method('userExists') ->with('NewUser') ->willReturn(false); - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -373,13 +373,13 @@ class UsersTest extends OriginalTest { ->method('groupExists') ->with('ExistingGroup') ->willReturn(true); - $user = $this->getMock('\OCP\IUser'); + $user = $this->getMock('OCP\IUser'); $this->userManager ->expects($this->once()) ->method('createUser') ->with('NewUser', 'PasswordOfTheNewUser') ->willReturn($user); - $group = $this->getMock('\OCP\IGroup'); + $group = $this->getMock('OCP\IGroup'); $group ->expects($this->once()) ->method('addUser') @@ -418,7 +418,7 @@ class UsersTest extends OriginalTest { ->expects($this->once()) ->method('error') ->with('Failed addUser attempt with exception: User backend not found.', ['app' => 'ocs_api']); - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -440,7 +440,7 @@ class UsersTest extends OriginalTest { public function testAddUserAsRegularUser() { $_POST['userid'] = 'NewUser'; $_POST['password'] = 'PasswordOfTheNewUser'; - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -454,7 +454,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('regularUser') ->willReturn(false); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -474,7 +474,7 @@ class UsersTest extends OriginalTest { public function testAddUserAsSubAdminNoGroup() { $_POST['userid'] = 'NewUser'; $_POST['password'] = 'PasswordOfTheNewUser'; - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -488,7 +488,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('regularUser') ->willReturn(false); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -509,7 +509,7 @@ class UsersTest extends OriginalTest { $_POST['userid'] = 'NewUser'; $_POST['password'] = 'PasswordOfTheNewUser'; $_POST['groups'] = ['ExistingGroup']; - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -523,13 +523,13 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('regularUser') ->willReturn(false); - $existingGroup = $this->getMock('\OCP\IGroup'); + $existingGroup = $this->getMock('OCP\IGroup'); $this->groupManager ->expects($this->once()) ->method('get') ->with('ExistingGroup') ->willReturn($existingGroup); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -540,7 +540,7 @@ class UsersTest extends OriginalTest { ->expects($this->once()) ->method('isSubAdminOfGroup') ->with($loggedInUser, $existingGroup) - ->wilLReturn(false); + ->willReturn(false); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') @@ -565,7 +565,7 @@ class UsersTest extends OriginalTest { ->method('userExists') ->with('NewUser') ->willReturn(false); - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -587,14 +587,14 @@ class UsersTest extends OriginalTest { ['ExistingGroup2'] ) ->willReturn(true); - $user = $this->getMock('\OCP\IUser'); + $user = $this->getMock('OCP\IUser'); $this->userManager ->expects($this->once()) ->method('createUser') ->with('NewUser', 'PasswordOfTheNewUser') ->willReturn($user); - $existingGroup1 = $this->getMock('\OCP\IGroup'); - $existingGroup2 = $this->getMock('\OCP\IGroup'); + $existingGroup1 = $this->getMock('OCP\IGroup'); + $existingGroup2 = $this->getMock('OCP\IGroup'); $existingGroup1 ->expects($this->once()) ->method('addUser') @@ -624,7 +624,7 @@ class UsersTest extends OriginalTest { ['Added userid NewUser to group ExistingGroup1', ['app' => 'ocs_api']], ['Added userid NewUser to group ExistingGroup2', ['app' => 'ocs_api']] ); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $this->groupManager ->expects($this->once()) @@ -642,7 +642,7 @@ class UsersTest extends OriginalTest { [$loggedInUser, $existingGroup1], [$loggedInUser, $existingGroup2] ) - ->wilLReturn(true); + ->willReturn(true); $expected = new \OC_OCS_Result(null, 100); @@ -661,7 +661,7 @@ class UsersTest extends OriginalTest { } public function testGetUserTargetDoesNotExist() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -677,12 +677,12 @@ class UsersTest extends OriginalTest { } public function testGetUserAsAdmin() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') ->will($this->returnValue('admin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser->expects($this->once()) ->method('getEMailAddress') ->willReturn('demo@owncloud.org'); @@ -727,12 +727,12 @@ class UsersTest extends OriginalTest { } public function testGetUserAsSubAdminAndUserIsAccessible() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getEMailAddress') @@ -751,7 +751,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('subadmin') ->will($this->returnValue(false)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); $subAdminManager @@ -790,12 +790,12 @@ class UsersTest extends OriginalTest { } public function testGetUserAsSubAdminAndUserIsNotAccessible() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->exactly(2)) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -810,7 +810,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('subadmin') ->will($this->returnValue(false)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); $subAdminManager @@ -828,12 +828,12 @@ class UsersTest extends OriginalTest { } public function testGetUserAsSubAdminSelfLookup() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->exactly(2)) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -848,7 +848,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('subadmin') ->will($this->returnValue(false)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); $subAdminManager @@ -893,12 +893,12 @@ class UsersTest extends OriginalTest { } public function testEditUserRegularUserSelfEditChangeDisplayName() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('UserToEdit')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -918,12 +918,12 @@ class UsersTest extends OriginalTest { } public function testEditUserRegularUserSelfEditChangeEmailValid() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('UserToEdit')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -943,12 +943,12 @@ class UsersTest extends OriginalTest { } public function testEditUserRegularUserSelfEditChangeEmailInvalid() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('UserToEdit')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -964,12 +964,12 @@ class UsersTest extends OriginalTest { } public function testEditUserRegularUserSelfEditChangePassword() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('UserToEdit')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -989,12 +989,12 @@ class UsersTest extends OriginalTest { } public function testEditUserRegularUserSelfEditChangeQuota() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('UserToEdit')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1010,12 +1010,12 @@ class UsersTest extends OriginalTest { } public function testEditUserAdminUserSelfEditChangeValidQuota() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('UserToEdit')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser->expects($this->once()) ->method('setQuota') ->with('2.9 MB'); @@ -1039,12 +1039,12 @@ class UsersTest extends OriginalTest { } public function testEditUserAdminUserSelfEditChangeInvalidQuota() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('UserToEdit')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1065,12 +1065,12 @@ class UsersTest extends OriginalTest { } public function testEditUserAdminUserEditChangeValidQuota() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('admin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser->expects($this->once()) ->method('setQuota') ->with('2.9 MB'); @@ -1088,7 +1088,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('admin') ->will($this->returnValue(true)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); $this->groupManager @@ -1101,12 +1101,12 @@ class UsersTest extends OriginalTest { } public function testEditUserSubadminUserAccessible() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser->expects($this->once()) ->method('setQuota') ->with('2.9 MB'); @@ -1119,7 +1119,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('UserToEdit') ->will($this->returnValue($targetUser)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); $subAdminManager @@ -1137,12 +1137,12 @@ class UsersTest extends OriginalTest { } public function testEditUserSubadminUserInaccessible() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1152,7 +1152,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('UserToEdit') ->will($this->returnValue($targetUser)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); $subAdminManager @@ -1180,7 +1180,7 @@ class UsersTest extends OriginalTest { } public function testDeleteUserNotExistingUser() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') @@ -1200,12 +1200,12 @@ class UsersTest extends OriginalTest { } public function testDeleteUserSelf() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('UserToDelete')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1225,12 +1225,12 @@ class UsersTest extends OriginalTest { } public function testDeleteSuccessfulUserAsAdmin() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('admin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1259,12 +1259,12 @@ class UsersTest extends OriginalTest { } public function testDeleteUnsuccessfulUserAsAdmin() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('admin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1293,12 +1293,12 @@ class UsersTest extends OriginalTest { } public function testDeleteSuccessfulUserAsSubadmin() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1317,7 +1317,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('subadmin') ->will($this->returnValue(false)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -1338,12 +1338,12 @@ class UsersTest extends OriginalTest { } public function testDeleteUnsuccessfulUserAsSubadmin() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1362,7 +1362,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('subadmin') ->will($this->returnValue(false)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -1383,12 +1383,12 @@ class UsersTest extends OriginalTest { } public function testDeleteUserAsSubAdminAndUserIsNotAccessible() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1407,7 +1407,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('subadmin') ->will($this->returnValue(false)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -1434,7 +1434,7 @@ class UsersTest extends OriginalTest { } public function testGetUsersGroupsTargetUserNotExisting() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1445,12 +1445,12 @@ class UsersTest extends OriginalTest { } public function testGetUsersGroupsSelfTargetted() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') ->will($this->returnValue('UserToLookup')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1475,12 +1475,12 @@ class UsersTest extends OriginalTest { } public function testGetUsersGroupsForAdminUser() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->exactly(2)) ->method('getUID') ->will($this->returnValue('admin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1510,12 +1510,12 @@ class UsersTest extends OriginalTest { } public function testGetUsersGroupsForSubAdminUserAndUserIsAccessible() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->exactly(2)) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1534,7 +1534,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('subadmin') ->will($this->returnValue(false)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -1545,12 +1545,12 @@ class UsersTest extends OriginalTest { ->expects($this->once()) ->method('getSubAdmin') ->will($this->returnValue($subAdminManager)); - $group1 = $this->getMock('\OCP\IGroup'); + $group1 = $this->getMock('OCP\IGroup'); $group1 ->expects($this->any()) ->method('getGID') ->will($this->returnValue('Group1')); - $group2 = $this->getMock('\OCP\IGroup'); + $group2 = $this->getMock('OCP\IGroup'); $group2 ->expects($this->any()) ->method('getGID') @@ -1572,12 +1572,12 @@ class UsersTest extends OriginalTest { public function testGetUsersGroupsForSubAdminUserAndUserIsInaccessible() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->exactly(2)) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $targetUser ->expects($this->once()) ->method('getUID') @@ -1596,7 +1596,7 @@ class UsersTest extends OriginalTest { ->method('isAdmin') ->with('subadmin') ->will($this->returnValue(false)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -1630,7 +1630,7 @@ class UsersTest extends OriginalTest { public function testAddToGroupWithTargetGroupNotExisting() { $_POST['groupid'] = 'GroupToAddTo'; - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -1655,7 +1655,7 @@ class UsersTest extends OriginalTest { } public function testAddToGroupWithNoGroupSpecified() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -1677,12 +1677,12 @@ class UsersTest extends OriginalTest { public function testAddToGroupWithTargetUserNotExisting() { $_POST['groupid'] = 'GroupToAddTo'; - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') ->will($this->returnValue('admin')); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1705,7 +1705,7 @@ class UsersTest extends OriginalTest { public function testAddToGroupWithoutPermission() { $_POST['groupid'] = 'GroupToAddTo'; - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') @@ -1735,7 +1735,7 @@ class UsersTest extends OriginalTest { } public function testRemoveFromGroupWithNoTargetGroup() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1745,7 +1745,7 @@ class UsersTest extends OriginalTest { } public function testRemoveFromGroupWithNotExistingTargetGroup() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1761,8 +1761,8 @@ class UsersTest extends OriginalTest { } public function testRemoveFromGroupWithNotExistingTargetUser() { - $loggedInUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $loggedInUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1783,13 +1783,13 @@ class UsersTest extends OriginalTest { } public function testRemoveFromGroupWithoutPermission() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->once()) ->method('getUID') ->will($this->returnValue('unauthorizedUser')); - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1804,7 +1804,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('TargetUser') ->will($this->returnValue($targetUser)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $this->groupManager ->expects($this->once()) @@ -1821,13 +1821,13 @@ class UsersTest extends OriginalTest { } public function testRemoveFromGroupAsAdminFromAdmin() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('admin')); - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $targetGroup ->expects($this->once()) ->method('getGID') @@ -1846,7 +1846,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('admin') ->will($this->returnValue($targetUser)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $this->groupManager ->expects($this->once()) @@ -1863,13 +1863,13 @@ class UsersTest extends OriginalTest { } public function testRemoveFromGroupAsSubAdminFromSubAdmin() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('subadmin')); - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $targetGroup ->expects($this->any()) ->method('getGID') @@ -1888,7 +1888,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('subadmin') ->will($this->returnValue($targetUser)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -1915,13 +1915,13 @@ class UsersTest extends OriginalTest { } public function testRemoveFromGroupSuccessful() { - $loggedInUser = $this->getMock('\OCP\IUser'); + $loggedInUser = $this->getMock('OCP\IUser'); $loggedInUser ->expects($this->any()) ->method('getUID') ->will($this->returnValue('admin')); - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userSession ->expects($this->once()) ->method('getUser') @@ -1936,7 +1936,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('AnotherUser') ->will($this->returnValue($targetUser)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $this->groupManager ->expects($this->once()) @@ -1970,7 +1970,7 @@ class UsersTest extends OriginalTest { public function testAddSubAdminWithNotExistingTargetGroup() { $_POST['groupid'] = 'NotExistingGroup'; - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userManager ->expects($this->once()) ->method('get') @@ -1989,8 +1989,8 @@ class UsersTest extends OriginalTest { public function testAddSubAdminToAdminGroup() { $_POST['groupid'] = 'ADmiN'; - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userManager ->expects($this->once()) ->method('get') @@ -2009,8 +2009,8 @@ class UsersTest extends OriginalTest { public function testAddSubAdminTwice() { $_POST['groupid'] = 'TargetGroup'; - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userManager ->expects($this->once()) ->method('get') @@ -2021,7 +2021,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('TargetGroup') ->will($this->returnValue($targetGroup)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -2040,8 +2040,8 @@ class UsersTest extends OriginalTest { public function testAddSubAdminSuccessful() { $_POST['groupid'] = 'TargetGroup'; - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userManager ->expects($this->once()) ->method('get') @@ -2052,7 +2052,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('TargetGroup') ->will($this->returnValue($targetGroup)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -2076,8 +2076,8 @@ class UsersTest extends OriginalTest { public function testAddSubAdminUnsuccessful() { $_POST['groupid'] = 'TargetGroup'; - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userManager ->expects($this->once()) ->method('get') @@ -2088,7 +2088,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('TargetGroup') ->will($this->returnValue($targetGroup)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -2121,7 +2121,7 @@ class UsersTest extends OriginalTest { } public function testRemoveSubAdminNotExistingTargetGroup() { - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userManager ->expects($this->once()) ->method('get') @@ -2138,8 +2138,8 @@ class UsersTest extends OriginalTest { } public function testRemoveSubAdminFromNotASubadmin() { - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userManager ->expects($this->once()) ->method('get') @@ -2150,7 +2150,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('GroupToDeleteFrom') ->will($this->returnValue($targetGroup)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -2167,8 +2167,8 @@ class UsersTest extends OriginalTest { } public function testRemoveSubAdminSuccessful() { - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userManager ->expects($this->once()) ->method('get') @@ -2179,7 +2179,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('GroupToDeleteFrom') ->will($this->returnValue($targetGroup)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -2201,8 +2201,8 @@ class UsersTest extends OriginalTest { } public function testRemoveSubAdminUnsuccessful() { - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $this->userManager ->expects($this->once()) ->method('get') @@ -2213,7 +2213,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('GroupToDeleteFrom') ->will($this->returnValue($targetGroup)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -2246,8 +2246,8 @@ class UsersTest extends OriginalTest { } public function testGetUserSubAdminGroupsWithGroups() { - $targetUser = $this->getMock('\OCP\IUser'); - $targetGroup = $this->getMock('\OCP\IGroup'); + $targetUser = $this->getMock('OCP\IUser'); + $targetGroup = $this->getMock('OCP\IGroup'); $targetGroup ->expects($this->once()) ->method('getGID') @@ -2257,7 +2257,7 @@ class UsersTest extends OriginalTest { ->method('get') ->with('RequestedUser') ->will($this->returnValue($targetUser)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -2274,13 +2274,13 @@ class UsersTest extends OriginalTest { } public function testGetUserSubAdminGroupsWithoutGroups() { - $targetUser = $this->getMock('\OCP\IUser'); + $targetUser = $this->getMock('OCP\IUser'); $this->userManager ->expects($this->once()) ->method('get') ->with('RequestedUser') ->will($this->returnValue($targetUser)); - $subAdminManager = $this->getMockBuilder('\OC\Subadmin') + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) @@ -2295,4 +2295,60 @@ class UsersTest extends OriginalTest { $expected = new \OC_OCS_Result(null, 102, 'Unknown error occurred'); $this->assertEquals($expected, $this->api->getUserSubAdminGroups(['userid' => 'RequestedUser'])); } + + public function testEnableUser() { + $targetUser = $this->getMock('OCP\IUser'); + $targetUser->expects($this->once()) + ->method('setEnabled') + ->with(true); + $this->userManager + ->expects($this->once()) + ->method('get') + ->with('RequestedUser') + ->will($this->returnValue($targetUser)); + $loggedInUser = $this->getMock('OCP\IUser'); + $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->will($this->returnValue('admin')); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->will($this->returnValue($loggedInUser)); + $this->groupManager + ->expects($this->once()) + ->method('isAdmin') + ->will($this->returnValue(true)); + + $expected = new \OC_OCS_Result(null, 100); + $this->assertEquals($expected, $this->api->enableUser(['userid' => 'RequestedUser'])); + } + + public function testDisableUser() { + $targetUser = $this->getMock('OCP\IUser'); + $targetUser->expects($this->once()) + ->method('setEnabled') + ->with(false); + $this->userManager + ->expects($this->once()) + ->method('get') + ->with('RequestedUser') + ->will($this->returnValue($targetUser)); + $loggedInUser = $this->getMock('OCP\IUser'); + $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->will($this->returnValue('admin')); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->will($this->returnValue($loggedInUser)); + $this->groupManager + ->expects($this->once()) + ->method('isAdmin') + ->will($this->returnValue(true)); + + $expected = new \OC_OCS_Result(null, 100); + $this->assertEquals($expected, $this->api->disableUser(['userid' => 'RequestedUser'])); + } } diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml index 5df740f699e..b593b1134b1 100644 --- a/apps/systemtags/appinfo/info.xml +++ b/apps/systemtags/appinfo/info.xml @@ -11,6 +11,7 @@ <dependencies> <owncloud min-version="9.1" max-version="9.1" /> </dependencies> + <namespace>SystemTags</namespace> <types> <logging/> </types> diff --git a/apps/systemtags/l10n/cs_CZ.js b/apps/systemtags/l10n/cs_CZ.js index 6b163f27f1e..763335f74b2 100644 --- a/apps/systemtags/l10n/cs_CZ.js +++ b/apps/systemtags/l10n/cs_CZ.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Značky", + "Tagged files" : "Otagované soubory", + "Select tags to filter by" : "Vybrat tagy pro filtr", + "Please select tags to filter by" : "Vyberte prosím tagy pro filtrování", + "No files found for the selected tags" : "Nebyly nalezeny žádné soubory s vybranými tagy", "<strong>System tags</strong> for a file have been modified" : "<strong>Systémové tagy</strong> souboru byly upraveny", "You assigned system tag %3$s" : "Přidělili jste systémový tag %3$s", "%1$s assigned system tag %3$s" : "%1$s přiřadil systémový tag %3$s", @@ -18,11 +23,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s odebral systémový tag %3$s ze %2$s", "%s (not-assignable)" : "%s (nepřiřaditelný)", "%s (invisible)" : "%s (neviditelný)", - "Tags" : "Značky", - "Tagged files" : "Otagované soubory", - "Select tags to filter by" : "Vybrat tagy pro filtr", - "Please select tags to filter by" : "Vyberte prosím tagy pro filtrování", - "No files found for the selected tags" : "Nebyly nalezeny žádné soubory s vybranými tagy", "No files in here" : "Žádné soubory", "No entries found in this folder" : "V této složce nebylo nic nalezeno", "Name" : "Název", diff --git a/apps/systemtags/l10n/cs_CZ.json b/apps/systemtags/l10n/cs_CZ.json index b033e56d859..f5ba8bee780 100644 --- a/apps/systemtags/l10n/cs_CZ.json +++ b/apps/systemtags/l10n/cs_CZ.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Značky", + "Tagged files" : "Otagované soubory", + "Select tags to filter by" : "Vybrat tagy pro filtr", + "Please select tags to filter by" : "Vyberte prosím tagy pro filtrování", + "No files found for the selected tags" : "Nebyly nalezeny žádné soubory s vybranými tagy", "<strong>System tags</strong> for a file have been modified" : "<strong>Systémové tagy</strong> souboru byly upraveny", "You assigned system tag %3$s" : "Přidělili jste systémový tag %3$s", "%1$s assigned system tag %3$s" : "%1$s přiřadil systémový tag %3$s", @@ -16,11 +21,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s odebral systémový tag %3$s ze %2$s", "%s (not-assignable)" : "%s (nepřiřaditelný)", "%s (invisible)" : "%s (neviditelný)", - "Tags" : "Značky", - "Tagged files" : "Otagované soubory", - "Select tags to filter by" : "Vybrat tagy pro filtr", - "Please select tags to filter by" : "Vyberte prosím tagy pro filtrování", - "No files found for the selected tags" : "Nebyly nalezeny žádné soubory s vybranými tagy", "No files in here" : "Žádné soubory", "No entries found in this folder" : "V této složce nebylo nic nalezeno", "Name" : "Název", diff --git a/apps/systemtags/l10n/da.js b/apps/systemtags/l10n/da.js index 8d0273a7707..5c9e0f6b726 100644 --- a/apps/systemtags/l10n/da.js +++ b/apps/systemtags/l10n/da.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Mærker", + "Tagged files" : "Mærkede filer", + "Select tags to filter by" : "Vælg de mærker, der skal filtreres efter", + "Please select tags to filter by" : "Vælg de mærker, der skal filtreres efter", + "No files found for the selected tags" : "Der blev ikke fundet filer, som matcher de valgte mærker", "<strong>System tags</strong> for a file have been modified" : "En fils <strong>systemmærkning</strong> er blevet ændret", "%1$s assigned system tag %3$s" : "%1$s tilføjede et systemmærke %3$s", "%1$s unassigned system tag %3$s" : "%1$s fjernede systemmærke %3$s", @@ -10,11 +15,6 @@ OC.L10N.register( "%1$s assigned system tag %3$s to %2$s" : "%1$s tilføjede systemmærke %3$s til %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s fjernede systemmærket %3$s fra %2$s", "%s (invisible)" : "%s (usynlig)", - "Tags" : "Mærker", - "Tagged files" : "Mærkede filer", - "Select tags to filter by" : "Vælg de mærker, der skal filtreres efter", - "Please select tags to filter by" : "Vælg de mærker, der skal filtreres efter", - "No files found for the selected tags" : "Der blev ikke fundet filer, som matcher de valgte mærker", "No files in here" : "Her er ingen filer", "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe", "Name" : "Navn", diff --git a/apps/systemtags/l10n/da.json b/apps/systemtags/l10n/da.json index 1fdf24f6e51..108fb974eb0 100644 --- a/apps/systemtags/l10n/da.json +++ b/apps/systemtags/l10n/da.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Mærker", + "Tagged files" : "Mærkede filer", + "Select tags to filter by" : "Vælg de mærker, der skal filtreres efter", + "Please select tags to filter by" : "Vælg de mærker, der skal filtreres efter", + "No files found for the selected tags" : "Der blev ikke fundet filer, som matcher de valgte mærker", "<strong>System tags</strong> for a file have been modified" : "En fils <strong>systemmærkning</strong> er blevet ændret", "%1$s assigned system tag %3$s" : "%1$s tilføjede et systemmærke %3$s", "%1$s unassigned system tag %3$s" : "%1$s fjernede systemmærke %3$s", @@ -8,11 +13,6 @@ "%1$s assigned system tag %3$s to %2$s" : "%1$s tilføjede systemmærke %3$s til %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s fjernede systemmærket %3$s fra %2$s", "%s (invisible)" : "%s (usynlig)", - "Tags" : "Mærker", - "Tagged files" : "Mærkede filer", - "Select tags to filter by" : "Vælg de mærker, der skal filtreres efter", - "Please select tags to filter by" : "Vælg de mærker, der skal filtreres efter", - "No files found for the selected tags" : "Der blev ikke fundet filer, som matcher de valgte mærker", "No files in here" : "Her er ingen filer", "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe", "Name" : "Navn", diff --git a/apps/systemtags/l10n/de.js b/apps/systemtags/l10n/de.js index 7429a9585bc..a711863c905 100644 --- a/apps/systemtags/l10n/de.js +++ b/apps/systemtags/l10n/de.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Tags", + "Tagged files" : "Tags", + "Select tags to filter by" : "Wähle Tags die gefiltert werden sollen", + "Please select tags to filter by" : "Bitte wähle Tags die gefiltert werden sollen", + "No files found for the selected tags" : "Keine Dateien für die ausgewählten Tags gefunden", "<strong>System tags</strong> for a file have been modified" : "<strong>System-Tags</strong> für eine Datei sind geändert worden", "You assigned system tag %3$s" : "Du hast den System-Tag %3$s angebracht", "%1$s assigned system tag %3$s" : "%1$s hat System-Tag %3$s angebracht", @@ -18,11 +23,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s hat den System-Tag %3$s von %2$s entfernt", "%s (not-assignable)" : "%s (nicht anbringbar)", "%s (invisible)" : "%s (unsichtbar)", - "Tags" : "Tags", - "Tagged files" : "Tags", - "Select tags to filter by" : "Wähle Tags die gefiltert werden sollen", - "Please select tags to filter by" : "Bitte wähle Tags die gefiltert werden sollen", - "No files found for the selected tags" : "Keine Dateien für die ausgewählten Tags gefunden", "No files in here" : "Keine Dateien vorhanden", "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", "Name" : "Name", diff --git a/apps/systemtags/l10n/de.json b/apps/systemtags/l10n/de.json index 36646ba5f05..ea38da7a0b7 100644 --- a/apps/systemtags/l10n/de.json +++ b/apps/systemtags/l10n/de.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Tags", + "Tagged files" : "Tags", + "Select tags to filter by" : "Wähle Tags die gefiltert werden sollen", + "Please select tags to filter by" : "Bitte wähle Tags die gefiltert werden sollen", + "No files found for the selected tags" : "Keine Dateien für die ausgewählten Tags gefunden", "<strong>System tags</strong> for a file have been modified" : "<strong>System-Tags</strong> für eine Datei sind geändert worden", "You assigned system tag %3$s" : "Du hast den System-Tag %3$s angebracht", "%1$s assigned system tag %3$s" : "%1$s hat System-Tag %3$s angebracht", @@ -16,11 +21,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s hat den System-Tag %3$s von %2$s entfernt", "%s (not-assignable)" : "%s (nicht anbringbar)", "%s (invisible)" : "%s (unsichtbar)", - "Tags" : "Tags", - "Tagged files" : "Tags", - "Select tags to filter by" : "Wähle Tags die gefiltert werden sollen", - "Please select tags to filter by" : "Bitte wähle Tags die gefiltert werden sollen", - "No files found for the selected tags" : "Keine Dateien für die ausgewählten Tags gefunden", "No files in here" : "Keine Dateien vorhanden", "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", "Name" : "Name", diff --git a/apps/systemtags/l10n/de_DE.js b/apps/systemtags/l10n/de_DE.js index d44a663f46e..28bbf48b1a7 100644 --- a/apps/systemtags/l10n/de_DE.js +++ b/apps/systemtags/l10n/de_DE.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Tags", + "Tagged files" : "Tags", + "Select tags to filter by" : "Wählen Sie Tags die gefiltert werden sollen", + "Please select tags to filter by" : "Bitte wählen Sie Tags die gefiltert werden sollen", + "No files found for the selected tags" : "Keine Dateien für die ausgewählten Tags gefunden", "<strong>System tags</strong> for a file have been modified" : "<strong>System-Tags</strong> für eine Datei sind geändert worden", "You assigned system tag %3$s" : "Sie haben den System-Tag %3$s angebracht", "%1$s assigned system tag %3$s" : "%1$s hat System-Tag %3$s angebracht", @@ -18,11 +23,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s hat den System-Tag %3$s von %2$s entfernt", "%s (not-assignable)" : "%s (nicht anbringbar)", "%s (invisible)" : "%s (unsichtbar)", - "Tags" : "Tags", - "Tagged files" : "Tags", - "Select tags to filter by" : "Wählen Sie Tags die gefiltert werden sollen", - "Please select tags to filter by" : "Bitte wählen Sie Tags die gefiltert werden sollen", - "No files found for the selected tags" : "Keine Dateien für die ausgewählten Tags gefunden", "No files in here" : "Keine Dateien vorhanden", "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", "Name" : "Name", diff --git a/apps/systemtags/l10n/de_DE.json b/apps/systemtags/l10n/de_DE.json index 22df20c6fca..dacab53df53 100644 --- a/apps/systemtags/l10n/de_DE.json +++ b/apps/systemtags/l10n/de_DE.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Tags", + "Tagged files" : "Tags", + "Select tags to filter by" : "Wählen Sie Tags die gefiltert werden sollen", + "Please select tags to filter by" : "Bitte wählen Sie Tags die gefiltert werden sollen", + "No files found for the selected tags" : "Keine Dateien für die ausgewählten Tags gefunden", "<strong>System tags</strong> for a file have been modified" : "<strong>System-Tags</strong> für eine Datei sind geändert worden", "You assigned system tag %3$s" : "Sie haben den System-Tag %3$s angebracht", "%1$s assigned system tag %3$s" : "%1$s hat System-Tag %3$s angebracht", @@ -16,11 +21,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s hat den System-Tag %3$s von %2$s entfernt", "%s (not-assignable)" : "%s (nicht anbringbar)", "%s (invisible)" : "%s (unsichtbar)", - "Tags" : "Tags", - "Tagged files" : "Tags", - "Select tags to filter by" : "Wählen Sie Tags die gefiltert werden sollen", - "Please select tags to filter by" : "Bitte wählen Sie Tags die gefiltert werden sollen", - "No files found for the selected tags" : "Keine Dateien für die ausgewählten Tags gefunden", "No files in here" : "Keine Dateien vorhanden", "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", "Name" : "Name", diff --git a/apps/systemtags/l10n/el.js b/apps/systemtags/l10n/el.js index 54a89c389c9..52b8b95a839 100644 --- a/apps/systemtags/l10n/el.js +++ b/apps/systemtags/l10n/el.js @@ -1,8 +1,8 @@ OC.L10N.register( "systemtags", { - "<strong>System tags</strong> for a file have been modified" : "<strong>Οι ετικέτες συστήματος</strong> για ένα αρχείο έχουν τροποποιηθεί", "Tags" : "Ετικέτες", + "<strong>System tags</strong> for a file have been modified" : "<strong>Οι ετικέτες συστήματος</strong> για ένα αρχείο έχουν τροποποιηθεί", "No files in here" : "Δεν υπάρχουν αρχεία", "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", "Name" : "Όνομα", diff --git a/apps/systemtags/l10n/el.json b/apps/systemtags/l10n/el.json index c93616dcf6c..74814e605e6 100644 --- a/apps/systemtags/l10n/el.json +++ b/apps/systemtags/l10n/el.json @@ -1,6 +1,6 @@ { "translations": { - "<strong>System tags</strong> for a file have been modified" : "<strong>Οι ετικέτες συστήματος</strong> για ένα αρχείο έχουν τροποποιηθεί", "Tags" : "Ετικέτες", + "<strong>System tags</strong> for a file have been modified" : "<strong>Οι ετικέτες συστήματος</strong> για ένα αρχείο έχουν τροποποιηθεί", "No files in here" : "Δεν υπάρχουν αρχεία", "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", "Name" : "Όνομα", diff --git a/apps/systemtags/l10n/en_GB.js b/apps/systemtags/l10n/en_GB.js index a976d41772a..69ac64e5d0b 100644 --- a/apps/systemtags/l10n/en_GB.js +++ b/apps/systemtags/l10n/en_GB.js @@ -1,21 +1,28 @@ OC.L10N.register( "systemtags", { + "Tags" : "Tags", + "Tagged files" : "Tagged files", + "Select tags to filter by" : "Select tags to filter by", + "Please select tags to filter by" : "Please select tags to filter by", + "No files found for the selected tags" : "No files found for the selected tags", "<strong>System tags</strong> for a file have been modified" : "<strong>System tags</strong> for a file have been modified", + "You assigned system tag %3$s" : "You assigned system tag %3$s", "%1$s assigned system tag %3$s" : "%1$s assigned system tag %3$s", + "You unassigned system tag %3$s" : "You unassigned system tag %3$s", "%1$s unassigned system tag %3$s" : "%1$s unassigned system tag %3$s", + "You created system tag %2$s" : "You created system tag %2$s", "%1$s created system tag %2$s" : "%1$s created system tag %2$s", + "You deleted system tag %2$s" : "You deleted system tag %2$s", "%1$s deleted system tag %2$s" : "%1$s deleted system tag %2$s", + "You updated system tag %3$s to %2$s" : "You updated system tag %3$s to %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s updated system tag %3$s to %2$s", + "You assigned system tag %3$s to %2$s" : "You assigned system tag %3$s to %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s assigned system tag %3$s to %2$s", + "You unassigned system tag %3$s from %2$s" : "You unassigned system tag %3$s from %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s unassigned system tag %3$s from %2$s", "%s (not-assignable)" : "%s (not-assignable)", "%s (invisible)" : "%s (invisible)", - "Tags" : "Tags", - "Tagged files" : "Tagged files", - "Select tags to filter by" : "Select tags to filter by", - "Please select tags to filter by" : "Please select tags to filter by", - "No files found for the selected tags" : "No files found for the selected tags", "No files in here" : "No files in here", "No entries found in this folder" : "No entries found in this folder", "Name" : "Name", diff --git a/apps/systemtags/l10n/en_GB.json b/apps/systemtags/l10n/en_GB.json index 917cae24590..b8700a848bf 100644 --- a/apps/systemtags/l10n/en_GB.json +++ b/apps/systemtags/l10n/en_GB.json @@ -1,19 +1,26 @@ { "translations": { + "Tags" : "Tags", + "Tagged files" : "Tagged files", + "Select tags to filter by" : "Select tags to filter by", + "Please select tags to filter by" : "Please select tags to filter by", + "No files found for the selected tags" : "No files found for the selected tags", "<strong>System tags</strong> for a file have been modified" : "<strong>System tags</strong> for a file have been modified", + "You assigned system tag %3$s" : "You assigned system tag %3$s", "%1$s assigned system tag %3$s" : "%1$s assigned system tag %3$s", + "You unassigned system tag %3$s" : "You unassigned system tag %3$s", "%1$s unassigned system tag %3$s" : "%1$s unassigned system tag %3$s", + "You created system tag %2$s" : "You created system tag %2$s", "%1$s created system tag %2$s" : "%1$s created system tag %2$s", + "You deleted system tag %2$s" : "You deleted system tag %2$s", "%1$s deleted system tag %2$s" : "%1$s deleted system tag %2$s", + "You updated system tag %3$s to %2$s" : "You updated system tag %3$s to %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s updated system tag %3$s to %2$s", + "You assigned system tag %3$s to %2$s" : "You assigned system tag %3$s to %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s assigned system tag %3$s to %2$s", + "You unassigned system tag %3$s from %2$s" : "You unassigned system tag %3$s from %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s unassigned system tag %3$s from %2$s", "%s (not-assignable)" : "%s (not-assignable)", "%s (invisible)" : "%s (invisible)", - "Tags" : "Tags", - "Tagged files" : "Tagged files", - "Select tags to filter by" : "Select tags to filter by", - "Please select tags to filter by" : "Please select tags to filter by", - "No files found for the selected tags" : "No files found for the selected tags", "No files in here" : "No files in here", "No entries found in this folder" : "No entries found in this folder", "Name" : "Name", diff --git a/apps/systemtags/l10n/eo.js b/apps/systemtags/l10n/eo.js index db4659a3ea6..c54bab71d92 100644 --- a/apps/systemtags/l10n/eo.js +++ b/apps/systemtags/l10n/eo.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Etikedoj", + "Tagged files" : "Etikeditaj dosieroj", + "Select tags to filter by" : "Elekti etikedojn, per kiujn filtri", + "Please select tags to filter by" : "Bonvolu elekti etikedojn, per kiujn filtri", + "No files found for the selected tags" : "Neniu dosiero troviĝis por la elektitaj etikedoj", "<strong>System tags</strong> for a file have been modified" : "<strong>Sistemetikedoj</strong> por dosiero modifiĝis", "%1$s assigned system tag %3$s" : "%1$s atribuis sistemetikedon %3$s", "%1$s unassigned system tag %3$s" : "%1$s malatribuis sistemetikedon %3$s", @@ -11,11 +16,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s malatribuis sistemetikedon %3$s el %2$s", "%s (not-assignable)" : "%s (neatribuebla)", "%s (invisible)" : "%s (nevidebla)", - "Tags" : "Etikedoj", - "Tagged files" : "Etikeditaj dosieroj", - "Select tags to filter by" : "Elekti etikedojn, per kiujn filtri", - "Please select tags to filter by" : "Bonvolu elekti etikedojn, per kiujn filtri", - "No files found for the selected tags" : "Neniu dosiero troviĝis por la elektitaj etikedoj", "No files in here" : "Neniu dosiero estas ĉi tie", "No entries found in this folder" : "Neniu enigo troviĝis en ĉi tiu dosierujo", "Name" : "Nomo", diff --git a/apps/systemtags/l10n/eo.json b/apps/systemtags/l10n/eo.json index dba2f8b85ad..5adb00df52b 100644 --- a/apps/systemtags/l10n/eo.json +++ b/apps/systemtags/l10n/eo.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Etikedoj", + "Tagged files" : "Etikeditaj dosieroj", + "Select tags to filter by" : "Elekti etikedojn, per kiujn filtri", + "Please select tags to filter by" : "Bonvolu elekti etikedojn, per kiujn filtri", + "No files found for the selected tags" : "Neniu dosiero troviĝis por la elektitaj etikedoj", "<strong>System tags</strong> for a file have been modified" : "<strong>Sistemetikedoj</strong> por dosiero modifiĝis", "%1$s assigned system tag %3$s" : "%1$s atribuis sistemetikedon %3$s", "%1$s unassigned system tag %3$s" : "%1$s malatribuis sistemetikedon %3$s", @@ -9,11 +14,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s malatribuis sistemetikedon %3$s el %2$s", "%s (not-assignable)" : "%s (neatribuebla)", "%s (invisible)" : "%s (nevidebla)", - "Tags" : "Etikedoj", - "Tagged files" : "Etikeditaj dosieroj", - "Select tags to filter by" : "Elekti etikedojn, per kiujn filtri", - "Please select tags to filter by" : "Bonvolu elekti etikedojn, per kiujn filtri", - "No files found for the selected tags" : "Neniu dosiero troviĝis por la elektitaj etikedoj", "No files in here" : "Neniu dosiero estas ĉi tie", "No entries found in this folder" : "Neniu enigo troviĝis en ĉi tiu dosierujo", "Name" : "Nomo", diff --git a/apps/systemtags/l10n/es.js b/apps/systemtags/l10n/es.js index e0e6b73b596..95183d5c827 100644 --- a/apps/systemtags/l10n/es.js +++ b/apps/systemtags/l10n/es.js @@ -1,22 +1,28 @@ OC.L10N.register( "systemtags", { + "Tags" : "Etiquetas", + "Tagged files" : "Archivos etiquetados", + "Select tags to filter by" : "Seleccionar etiquetas por las que filtrar", + "Please select tags to filter by" : "Por favor, seleccione las etiquetas por las que desea filtrar", + "No files found for the selected tags" : "No se han encontrado archivos para las etiquetas seleccionadas", "<strong>System tags</strong> for a file have been modified" : "Se han modificado las <strong>etiquetas de sistema</strong> de un archivo", "You assigned system tag %3$s" : "Se asignó la etiqueta de sistema %3$s", "%1$s assigned system tag %3$s" : "%1$s asignó la etiqueta de sistema %3$s", + "You unassigned system tag %3$s" : "Desasignaste la etiqueta del sistema %3$s", "%1$s unassigned system tag %3$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s", + "You created system tag %2$s" : "Creaste la etiqueta del sistema %2$s", "%1$s created system tag %2$s" : "%1$s creó la etiqueta de sistema %2$s", + "You deleted system tag %2$s" : "Eliminaste la etiqueta del sistema %2$s", "%1$s deleted system tag %2$s" : "%1$s eliminó la etiqueta de sistema %2$s", + "You updated system tag %3$s to %2$s" : "Actualizaste la etiqueta del sistema de %3$s a %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta de sistema %3$s a %2$s", + "You assigned system tag %3$s to %2$s" : "Asignaste la etiqueta del sistema de %3$s a %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s asignó la etiqueta de sistema %3$s a %2$s", + "You unassigned system tag %3$s from %2$s" : "Desasignaste la etiqueta del sistema a %3$s de %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s de %2$s", "%s (not-assignable)" : "%s (no asignable)", "%s (invisible)" : "%s (invisible)", - "Tags" : "Etiquetas", - "Tagged files" : "Archivos etiquetados", - "Select tags to filter by" : "Seleccionar etiquetas por las que filtrar", - "Please select tags to filter by" : "Por favor, seleccione las etiquetas por las que desea filtrar", - "No files found for the selected tags" : "No se han encontrado archivos para las etiquetas seleccionadas", "No files in here" : "Aquí no hay archivos", "No entries found in this folder" : "No hay entradas en esta carpeta", "Name" : "Nombre", diff --git a/apps/systemtags/l10n/es.json b/apps/systemtags/l10n/es.json index 2e475e3e626..4bc5a63dd83 100644 --- a/apps/systemtags/l10n/es.json +++ b/apps/systemtags/l10n/es.json @@ -1,20 +1,26 @@ { "translations": { + "Tags" : "Etiquetas", + "Tagged files" : "Archivos etiquetados", + "Select tags to filter by" : "Seleccionar etiquetas por las que filtrar", + "Please select tags to filter by" : "Por favor, seleccione las etiquetas por las que desea filtrar", + "No files found for the selected tags" : "No se han encontrado archivos para las etiquetas seleccionadas", "<strong>System tags</strong> for a file have been modified" : "Se han modificado las <strong>etiquetas de sistema</strong> de un archivo", "You assigned system tag %3$s" : "Se asignó la etiqueta de sistema %3$s", "%1$s assigned system tag %3$s" : "%1$s asignó la etiqueta de sistema %3$s", + "You unassigned system tag %3$s" : "Desasignaste la etiqueta del sistema %3$s", "%1$s unassigned system tag %3$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s", + "You created system tag %2$s" : "Creaste la etiqueta del sistema %2$s", "%1$s created system tag %2$s" : "%1$s creó la etiqueta de sistema %2$s", + "You deleted system tag %2$s" : "Eliminaste la etiqueta del sistema %2$s", "%1$s deleted system tag %2$s" : "%1$s eliminó la etiqueta de sistema %2$s", + "You updated system tag %3$s to %2$s" : "Actualizaste la etiqueta del sistema de %3$s a %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta de sistema %3$s a %2$s", + "You assigned system tag %3$s to %2$s" : "Asignaste la etiqueta del sistema de %3$s a %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s asignó la etiqueta de sistema %3$s a %2$s", + "You unassigned system tag %3$s from %2$s" : "Desasignaste la etiqueta del sistema a %3$s de %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s de %2$s", "%s (not-assignable)" : "%s (no asignable)", "%s (invisible)" : "%s (invisible)", - "Tags" : "Etiquetas", - "Tagged files" : "Archivos etiquetados", - "Select tags to filter by" : "Seleccionar etiquetas por las que filtrar", - "Please select tags to filter by" : "Por favor, seleccione las etiquetas por las que desea filtrar", - "No files found for the selected tags" : "No se han encontrado archivos para las etiquetas seleccionadas", "No files in here" : "Aquí no hay archivos", "No entries found in this folder" : "No hay entradas en esta carpeta", "Name" : "Nombre", diff --git a/apps/systemtags/l10n/et_EE.js b/apps/systemtags/l10n/et_EE.js index 959965b9e2f..0bc585a4284 100644 --- a/apps/systemtags/l10n/et_EE.js +++ b/apps/systemtags/l10n/et_EE.js @@ -1,11 +1,11 @@ OC.L10N.register( "systemtags", { - "%s (not-assignable)" : "%s (pole määratav)", - "%s (invisible)" : "%s (nähtamatu)", "Tags" : "Sildid", "Tagged files" : "Sildistatud failid", "Select tags to filter by" : "Vali sildid, mille järgi filtreerida", + "%s (not-assignable)" : "%s (pole määratav)", + "%s (invisible)" : "%s (nähtamatu)", "No files in here" : "Siin ei ole faile", "No entries found in this folder" : "Selles kaustast ei leitud kirjeid", "Name" : "Nimi", diff --git a/apps/systemtags/l10n/et_EE.json b/apps/systemtags/l10n/et_EE.json index 48f91fbf529..51a1da71faf 100644 --- a/apps/systemtags/l10n/et_EE.json +++ b/apps/systemtags/l10n/et_EE.json @@ -1,9 +1,9 @@ { "translations": { - "%s (not-assignable)" : "%s (pole määratav)", - "%s (invisible)" : "%s (nähtamatu)", "Tags" : "Sildid", "Tagged files" : "Sildistatud failid", "Select tags to filter by" : "Vali sildid, mille järgi filtreerida", + "%s (not-assignable)" : "%s (pole määratav)", + "%s (invisible)" : "%s (nähtamatu)", "No files in here" : "Siin ei ole faile", "No entries found in this folder" : "Selles kaustast ei leitud kirjeid", "Name" : "Nimi", diff --git a/apps/systemtags/l10n/fi_FI.js b/apps/systemtags/l10n/fi_FI.js index bd9b003554c..7b0f2f82143 100644 --- a/apps/systemtags/l10n/fi_FI.js +++ b/apps/systemtags/l10n/fi_FI.js @@ -1,13 +1,13 @@ OC.L10N.register( "systemtags", { - "<strong>System tags</strong> for a file have been modified" : "Tiedoston <strong>järjestelmätunnisteita</strong> on muokattu", - "%s (invisible)" : "%s (näkymätön)", "Tags" : "Tunnisteet", "Tagged files" : "Tunnisteella merkityt tiedostot", "Select tags to filter by" : "Valitse suodatettavat tunnisteet", "Please select tags to filter by" : "Valitse suodatettavat tunnisteet", "No files found for the selected tags" : "Tiedostoja ei löytynyt valituilla tunnisteilla", + "<strong>System tags</strong> for a file have been modified" : "Tiedoston <strong>järjestelmätunnisteita</strong> on muokattu", + "%s (invisible)" : "%s (näkymätön)", "No files in here" : "Täällä ei ole tiedostoja", "No entries found in this folder" : "Ei kohteita tässä kansiossa", "Name" : "Nimi", diff --git a/apps/systemtags/l10n/fi_FI.json b/apps/systemtags/l10n/fi_FI.json index e624959c100..cac70e226b3 100644 --- a/apps/systemtags/l10n/fi_FI.json +++ b/apps/systemtags/l10n/fi_FI.json @@ -1,11 +1,11 @@ { "translations": { - "<strong>System tags</strong> for a file have been modified" : "Tiedoston <strong>järjestelmätunnisteita</strong> on muokattu", - "%s (invisible)" : "%s (näkymätön)", "Tags" : "Tunnisteet", "Tagged files" : "Tunnisteella merkityt tiedostot", "Select tags to filter by" : "Valitse suodatettavat tunnisteet", "Please select tags to filter by" : "Valitse suodatettavat tunnisteet", "No files found for the selected tags" : "Tiedostoja ei löytynyt valituilla tunnisteilla", + "<strong>System tags</strong> for a file have been modified" : "Tiedoston <strong>järjestelmätunnisteita</strong> on muokattu", + "%s (invisible)" : "%s (näkymätön)", "No files in here" : "Täällä ei ole tiedostoja", "No entries found in this folder" : "Ei kohteita tässä kansiossa", "Name" : "Nimi", diff --git a/apps/systemtags/l10n/fr.js b/apps/systemtags/l10n/fr.js index b0e8e3316db..7ee906c5eda 100644 --- a/apps/systemtags/l10n/fr.js +++ b/apps/systemtags/l10n/fr.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Étiquettes", + "Tagged files" : "Fichiers étiquetés", + "Select tags to filter by" : "Sélectionner les étiquettes par lesquelles filtrer", + "Please select tags to filter by" : "Veuillez sélectionner les étiquettes par lesquelles filtrer", + "No files found for the selected tags" : "Aucun fichier pour les étiquettes sélectionnées", "<strong>System tags</strong> for a file have been modified" : "<strong>Les étiquettes systèmes</strong> pour un fichier ont été modifiées", "You assigned system tag %3$s" : "Vous avez attribué l'étiquette système %3$s", "%1$s assigned system tag %3$s" : "%1$s a attribué l'étiquette système %3$s", @@ -18,11 +23,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s a retiré l'étiquette système %3$s à %2$s", "%s (not-assignable)" : "%s (non assignable)", "%s (invisible)" : "%s (invisible)", - "Tags" : "Étiquettes", - "Tagged files" : "Fichiers étiquetés", - "Select tags to filter by" : "Sélectionner les étiquettes par lesquelles filtrer", - "Please select tags to filter by" : "Veuillez sélectionner les étiquettes par lesquelles filtrer", - "No files found for the selected tags" : "Aucun fichier pour les étiquettes sélectionnées", "No files in here" : "Aucun fichier", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", diff --git a/apps/systemtags/l10n/fr.json b/apps/systemtags/l10n/fr.json index a7e2d3b3911..2591bd356b0 100644 --- a/apps/systemtags/l10n/fr.json +++ b/apps/systemtags/l10n/fr.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Étiquettes", + "Tagged files" : "Fichiers étiquetés", + "Select tags to filter by" : "Sélectionner les étiquettes par lesquelles filtrer", + "Please select tags to filter by" : "Veuillez sélectionner les étiquettes par lesquelles filtrer", + "No files found for the selected tags" : "Aucun fichier pour les étiquettes sélectionnées", "<strong>System tags</strong> for a file have been modified" : "<strong>Les étiquettes systèmes</strong> pour un fichier ont été modifiées", "You assigned system tag %3$s" : "Vous avez attribué l'étiquette système %3$s", "%1$s assigned system tag %3$s" : "%1$s a attribué l'étiquette système %3$s", @@ -16,11 +21,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s a retiré l'étiquette système %3$s à %2$s", "%s (not-assignable)" : "%s (non assignable)", "%s (invisible)" : "%s (invisible)", - "Tags" : "Étiquettes", - "Tagged files" : "Fichiers étiquetés", - "Select tags to filter by" : "Sélectionner les étiquettes par lesquelles filtrer", - "Please select tags to filter by" : "Veuillez sélectionner les étiquettes par lesquelles filtrer", - "No files found for the selected tags" : "Aucun fichier pour les étiquettes sélectionnées", "No files in here" : "Aucun fichier", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", diff --git a/apps/systemtags/l10n/he.js b/apps/systemtags/l10n/he.js index c67035ccf12..13a5a6040d0 100644 --- a/apps/systemtags/l10n/he.js +++ b/apps/systemtags/l10n/he.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "תגיות", + "Tagged files" : "קבצים שתויגו", + "Select tags to filter by" : "תגיות נבחרות מסוננות על ידי", + "Please select tags to filter by" : "יש לבחור תגיות שיסוננו על ידי", + "No files found for the selected tags" : "לא אותרו קבצים לתגיות הנבחרות", "<strong>System tags</strong> for a file have been modified" : "<strong>תגיות מערכת</strong> שהשתנו עבור קובץ", "%1$s assigned system tag %3$s" : "%1$s שייך/שייכה תגית מערכת %3$s", "%1$s unassigned system tag %3$s" : "%1$s הסיר/ה שיוך תגית מערכת %3$s", @@ -11,11 +16,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s הסיר/ה שיוך תגית מערכת %3$s מ- %2$s", "%s (not-assignable)" : "%s (לא ניתן לשיוך)", "%s (invisible)" : "%s (נסתר)", - "Tags" : "תגיות", - "Tagged files" : "קבצים שתויגו", - "Select tags to filter by" : "תגיות נבחרות מסוננות על ידי", - "Please select tags to filter by" : "יש לבחור תגיות שיסוננו על ידי", - "No files found for the selected tags" : "לא אותרו קבצים לתגיות הנבחרות", "No files in here" : "אין כאן קבצים", "No entries found in this folder" : "לא נמצאו כניסות לתיקייה זו", "Name" : "שם", diff --git a/apps/systemtags/l10n/he.json b/apps/systemtags/l10n/he.json index 73a7c7997c2..3aa1e7a87fd 100644 --- a/apps/systemtags/l10n/he.json +++ b/apps/systemtags/l10n/he.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "תגיות", + "Tagged files" : "קבצים שתויגו", + "Select tags to filter by" : "תגיות נבחרות מסוננות על ידי", + "Please select tags to filter by" : "יש לבחור תגיות שיסוננו על ידי", + "No files found for the selected tags" : "לא אותרו קבצים לתגיות הנבחרות", "<strong>System tags</strong> for a file have been modified" : "<strong>תגיות מערכת</strong> שהשתנו עבור קובץ", "%1$s assigned system tag %3$s" : "%1$s שייך/שייכה תגית מערכת %3$s", "%1$s unassigned system tag %3$s" : "%1$s הסיר/ה שיוך תגית מערכת %3$s", @@ -9,11 +14,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s הסיר/ה שיוך תגית מערכת %3$s מ- %2$s", "%s (not-assignable)" : "%s (לא ניתן לשיוך)", "%s (invisible)" : "%s (נסתר)", - "Tags" : "תגיות", - "Tagged files" : "קבצים שתויגו", - "Select tags to filter by" : "תגיות נבחרות מסוננות על ידי", - "Please select tags to filter by" : "יש לבחור תגיות שיסוננו על ידי", - "No files found for the selected tags" : "לא אותרו קבצים לתגיות הנבחרות", "No files in here" : "אין כאן קבצים", "No entries found in this folder" : "לא נמצאו כניסות לתיקייה זו", "Name" : "שם", diff --git a/apps/systemtags/l10n/hu_HU.js b/apps/systemtags/l10n/hu_HU.js index 20df1176d06..173b8ead188 100644 --- a/apps/systemtags/l10n/hu_HU.js +++ b/apps/systemtags/l10n/hu_HU.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Címkék", + "Tagged files" : "Címkézett fájlok", + "Select tags to filter by" : "Kiválasztott címkék a szűrő által:", + "Please select tags to filter by" : "Kéjük, válasszon ki címkét a szűréshez:", + "No files found for the selected tags" : "Nem található fájl a kiválasztott címkéhez.", "<strong>System tags</strong> for a file have been modified" : "A fájl <strong>rendszer címkéje</strong> módosítva lett", "You assigned system tag %3$s" : "%3$s rendszer címke hozzárendelve", "%1$s assigned system tag %3$s" : "%1$s hozzárendelte ezt a rendszer címkét: %3$s", @@ -18,11 +23,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s elvette ezt a rendszer címkét %3$s tőle: %2$s", "%s (not-assignable)" : "%s (nem hozzárendelhető)", "%s (invisible)" : "%s (láthatatlan)", - "Tags" : "Címkék", - "Tagged files" : "Címkézett fájlok", - "Select tags to filter by" : "Kiválasztott címkék a szűrő által:", - "Please select tags to filter by" : "Kéjük, válasszon ki címkét a szűréshez:", - "No files found for the selected tags" : "Nem található fájl a kiválasztott címkéhez.", "No files in here" : "Itt nincsenek fájlok", "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", "Name" : "Név", diff --git a/apps/systemtags/l10n/hu_HU.json b/apps/systemtags/l10n/hu_HU.json index 86430e42e33..6e26da1767b 100644 --- a/apps/systemtags/l10n/hu_HU.json +++ b/apps/systemtags/l10n/hu_HU.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Címkék", + "Tagged files" : "Címkézett fájlok", + "Select tags to filter by" : "Kiválasztott címkék a szűrő által:", + "Please select tags to filter by" : "Kéjük, válasszon ki címkét a szűréshez:", + "No files found for the selected tags" : "Nem található fájl a kiválasztott címkéhez.", "<strong>System tags</strong> for a file have been modified" : "A fájl <strong>rendszer címkéje</strong> módosítva lett", "You assigned system tag %3$s" : "%3$s rendszer címke hozzárendelve", "%1$s assigned system tag %3$s" : "%1$s hozzárendelte ezt a rendszer címkét: %3$s", @@ -16,11 +21,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s elvette ezt a rendszer címkét %3$s tőle: %2$s", "%s (not-assignable)" : "%s (nem hozzárendelhető)", "%s (invisible)" : "%s (láthatatlan)", - "Tags" : "Címkék", - "Tagged files" : "Címkézett fájlok", - "Select tags to filter by" : "Kiválasztott címkék a szűrő által:", - "Please select tags to filter by" : "Kéjük, válasszon ki címkét a szűréshez:", - "No files found for the selected tags" : "Nem található fájl a kiválasztott címkéhez.", "No files in here" : "Itt nincsenek fájlok", "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban", "Name" : "Név", diff --git a/apps/systemtags/l10n/is.js b/apps/systemtags/l10n/is.js index 778459025e0..bbabce076c4 100644 --- a/apps/systemtags/l10n/is.js +++ b/apps/systemtags/l10n/is.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Merki", + "Tagged files" : "Merktar skrár", + "Select tags to filter by" : "Veldu merki til að sía eftir", + "Please select tags to filter by" : "Veldu merki til að sía eftir", + "No files found for the selected tags" : "Engar skrár fundust með völdum merkjum", "<strong>System tags</strong> for a file have been modified" : "<strong>Kerfismerkjum</strong> á skrá hefur verið breytt", "%1$s assigned system tag %3$s" : "%1$s úthlutaði kerfismerki %3$s", "%1$s unassigned system tag %3$s" : "%1$s tók af úthlutun kerfismerkis %3$s", @@ -11,11 +16,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s tók kerfismerki %3$s af %2$s", "%s (not-assignable)" : "%s (ekki úthlutanlegt)", "%s (invisible)" : "%s (ósýnilegt)", - "Tags" : "Merki", - "Tagged files" : "Merktar skrár", - "Select tags to filter by" : "Veldu merki til að sía eftir", - "Please select tags to filter by" : "Veldu merki til að sía eftir", - "No files found for the selected tags" : "Engar skrár fundust með völdum merkjum", "No files in here" : "Engar skrár hér", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", "Name" : "Heiti", diff --git a/apps/systemtags/l10n/is.json b/apps/systemtags/l10n/is.json index ba26d227687..5a370136580 100644 --- a/apps/systemtags/l10n/is.json +++ b/apps/systemtags/l10n/is.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Merki", + "Tagged files" : "Merktar skrár", + "Select tags to filter by" : "Veldu merki til að sía eftir", + "Please select tags to filter by" : "Veldu merki til að sía eftir", + "No files found for the selected tags" : "Engar skrár fundust með völdum merkjum", "<strong>System tags</strong> for a file have been modified" : "<strong>Kerfismerkjum</strong> á skrá hefur verið breytt", "%1$s assigned system tag %3$s" : "%1$s úthlutaði kerfismerki %3$s", "%1$s unassigned system tag %3$s" : "%1$s tók af úthlutun kerfismerkis %3$s", @@ -9,11 +14,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s tók kerfismerki %3$s af %2$s", "%s (not-assignable)" : "%s (ekki úthlutanlegt)", "%s (invisible)" : "%s (ósýnilegt)", - "Tags" : "Merki", - "Tagged files" : "Merktar skrár", - "Select tags to filter by" : "Veldu merki til að sía eftir", - "Please select tags to filter by" : "Veldu merki til að sía eftir", - "No files found for the selected tags" : "Engar skrár fundust með völdum merkjum", "No files in here" : "Engar skrár hér", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", "Name" : "Heiti", diff --git a/apps/systemtags/l10n/it.js b/apps/systemtags/l10n/it.js index df15aaac42c..d4dab4e9ee8 100644 --- a/apps/systemtags/l10n/it.js +++ b/apps/systemtags/l10n/it.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Tag", + "Tagged files" : "File con tag", + "Select tags to filter by" : "Seleziona i tag per filtrare", + "Please select tags to filter by" : "Seleziona i tag per filtrare", + "No files found for the selected tags" : "Nessun file trovato per i tag selezionati", "<strong>System tags</strong> for a file have been modified" : "I <strong>tag di sistema</strong> per un file sono stati modificati", "You assigned system tag %3$s" : "Hai assegnato il tag di sistema %3$s", "%1$s assigned system tag %3$s" : "%1$s ha assegnato il tag di sistema %3$s", @@ -18,11 +23,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s ha rimosso il tag di sistema %3$s da %2$s", "%s (not-assignable)" : "%s (non assegnabile)", "%s (invisible)" : "%s (invisibile)", - "Tags" : "Tag", - "Tagged files" : "File con tag", - "Select tags to filter by" : "Seleziona i tag per filtrare", - "Please select tags to filter by" : "Seleziona i tag per filtrare", - "No files found for the selected tags" : "Nessun file trovato per i tag selezionati", "No files in here" : "Qui non c'è alcun file", "No entries found in this folder" : "Nessuna voce trovata in questa cartella", "Name" : "Nome", diff --git a/apps/systemtags/l10n/it.json b/apps/systemtags/l10n/it.json index 4cb712a3462..896df988962 100644 --- a/apps/systemtags/l10n/it.json +++ b/apps/systemtags/l10n/it.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Tag", + "Tagged files" : "File con tag", + "Select tags to filter by" : "Seleziona i tag per filtrare", + "Please select tags to filter by" : "Seleziona i tag per filtrare", + "No files found for the selected tags" : "Nessun file trovato per i tag selezionati", "<strong>System tags</strong> for a file have been modified" : "I <strong>tag di sistema</strong> per un file sono stati modificati", "You assigned system tag %3$s" : "Hai assegnato il tag di sistema %3$s", "%1$s assigned system tag %3$s" : "%1$s ha assegnato il tag di sistema %3$s", @@ -16,11 +21,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s ha rimosso il tag di sistema %3$s da %2$s", "%s (not-assignable)" : "%s (non assegnabile)", "%s (invisible)" : "%s (invisibile)", - "Tags" : "Tag", - "Tagged files" : "File con tag", - "Select tags to filter by" : "Seleziona i tag per filtrare", - "Please select tags to filter by" : "Seleziona i tag per filtrare", - "No files found for the selected tags" : "Nessun file trovato per i tag selezionati", "No files in here" : "Qui non c'è alcun file", "No entries found in this folder" : "Nessuna voce trovata in questa cartella", "Name" : "Nome", diff --git a/apps/systemtags/l10n/ja.js b/apps/systemtags/l10n/ja.js index 34fbf744043..125e2a434cb 100644 --- a/apps/systemtags/l10n/ja.js +++ b/apps/systemtags/l10n/ja.js @@ -1,21 +1,28 @@ OC.L10N.register( "systemtags", { + "Tags" : "タグ", + "Tagged files" : "タグ済ファイル", + "Select tags to filter by" : "フィルターするタグを選択してください", + "Please select tags to filter by" : "フィルターするタグを入力してください", + "No files found for the selected tags" : "そのタグに割りあてられているファイルはありません", "<strong>System tags</strong> for a file have been modified" : "ファイルの<strong>タグ</strong> が更新されています", + "You assigned system tag %3$s" : "%3$s タグを追加", "%1$s assigned system tag %3$s" : "%1$s が タグ %3$s を追加", + "You unassigned system tag %3$s" : "%3$s タグを解除", "%1$s unassigned system tag %3$s" : "%1$s が タグ %3$s を解除", + "You created system tag %2$s" : "%2$s タグを作成 ", "%1$s created system tag %2$s" : "%1$s が %2$s タグを作成 ", + "You deleted system tag %2$s" : "%2$s タグを削除", "%1$s deleted system tag %2$s" : "%1$s が %2$s タグを削除", + "You updated system tag %3$s to %2$s" : "タグを %3$s から %2$s に更新", "%1$s updated system tag %3$s to %2$s" : "%1$s が タグを %3$s から %2$s に更新", + "You assigned system tag %3$s to %2$s" : "%2$s に タグ %3$s を追加", "%1$s assigned system tag %3$s to %2$s" : "%1$s は、%2$s に タグ %3$s を追加", + "You unassigned system tag %3$s from %2$s" : "%2$s から タグ %3$s を解除", "%1$s unassigned system tag %3$s from %2$s" : "%1$s は%2$s から タグ %3$s を解除", "%s (not-assignable)" : "%s (追加できない)", "%s (invisible)" : "%s (不可視)", - "Tags" : "タグ", - "Tagged files" : "タグ済ファイル", - "Select tags to filter by" : "フィルターするタグを選択してください", - "Please select tags to filter by" : "フィルターするタグを入力してください", - "No files found for the selected tags" : "そのタグに割りあてられているファイルはありません", "No files in here" : "ファイルがありません", "No entries found in this folder" : "このフォルダーにはエントリーがありません", "Name" : "名前", diff --git a/apps/systemtags/l10n/ja.json b/apps/systemtags/l10n/ja.json index a36929163c3..0b4aff337ca 100644 --- a/apps/systemtags/l10n/ja.json +++ b/apps/systemtags/l10n/ja.json @@ -1,19 +1,26 @@ { "translations": { + "Tags" : "タグ", + "Tagged files" : "タグ済ファイル", + "Select tags to filter by" : "フィルターするタグを選択してください", + "Please select tags to filter by" : "フィルターするタグを入力してください", + "No files found for the selected tags" : "そのタグに割りあてられているファイルはありません", "<strong>System tags</strong> for a file have been modified" : "ファイルの<strong>タグ</strong> が更新されています", + "You assigned system tag %3$s" : "%3$s タグを追加", "%1$s assigned system tag %3$s" : "%1$s が タグ %3$s を追加", + "You unassigned system tag %3$s" : "%3$s タグを解除", "%1$s unassigned system tag %3$s" : "%1$s が タグ %3$s を解除", + "You created system tag %2$s" : "%2$s タグを作成 ", "%1$s created system tag %2$s" : "%1$s が %2$s タグを作成 ", + "You deleted system tag %2$s" : "%2$s タグを削除", "%1$s deleted system tag %2$s" : "%1$s が %2$s タグを削除", + "You updated system tag %3$s to %2$s" : "タグを %3$s から %2$s に更新", "%1$s updated system tag %3$s to %2$s" : "%1$s が タグを %3$s から %2$s に更新", + "You assigned system tag %3$s to %2$s" : "%2$s に タグ %3$s を追加", "%1$s assigned system tag %3$s to %2$s" : "%1$s は、%2$s に タグ %3$s を追加", + "You unassigned system tag %3$s from %2$s" : "%2$s から タグ %3$s を解除", "%1$s unassigned system tag %3$s from %2$s" : "%1$s は%2$s から タグ %3$s を解除", "%s (not-assignable)" : "%s (追加できない)", "%s (invisible)" : "%s (不可視)", - "Tags" : "タグ", - "Tagged files" : "タグ済ファイル", - "Select tags to filter by" : "フィルターするタグを選択してください", - "Please select tags to filter by" : "フィルターするタグを入力してください", - "No files found for the selected tags" : "そのタグに割りあてられているファイルはありません", "No files in here" : "ファイルがありません", "No entries found in this folder" : "このフォルダーにはエントリーがありません", "Name" : "名前", diff --git a/apps/systemtags/l10n/ko.js b/apps/systemtags/l10n/ko.js index 25a7f2eccb5..10eb1cf229e 100644 --- a/apps/systemtags/l10n/ko.js +++ b/apps/systemtags/l10n/ko.js @@ -2,6 +2,10 @@ OC.L10N.register( "systemtags", { "Tags" : "태그", + "Tagged files" : "태그 된 파일", + "Select tags to filter by" : "필터링 할 태그 선택", + "Please select tags to filter by" : "필터링 할 태그 선택", + "No files found for the selected tags" : "선택한 태그에 대한 파일을 찾을 수 없음", "No files in here" : "여기에 파일 없음", "No entries found in this folder" : "이 폴더에 항목 없음", "Name" : "이름", diff --git a/apps/systemtags/l10n/ko.json b/apps/systemtags/l10n/ko.json index af4d378f844..f5a9052168c 100644 --- a/apps/systemtags/l10n/ko.json +++ b/apps/systemtags/l10n/ko.json @@ -1,5 +1,9 @@ { "translations": { "Tags" : "태그", + "Tagged files" : "태그 된 파일", + "Select tags to filter by" : "필터링 할 태그 선택", + "Please select tags to filter by" : "필터링 할 태그 선택", + "No files found for the selected tags" : "선택한 태그에 대한 파일을 찾을 수 없음", "No files in here" : "여기에 파일 없음", "No entries found in this folder" : "이 폴더에 항목 없음", "Name" : "이름", diff --git a/apps/systemtags/l10n/nb_NO.js b/apps/systemtags/l10n/nb_NO.js index d84cd267c0d..aeecadc80fe 100644 --- a/apps/systemtags/l10n/nb_NO.js +++ b/apps/systemtags/l10n/nb_NO.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Merkelapper", + "Tagged files" : "Merkede filer", + "Select tags to filter by" : "Velg merkelapper å filtrere på", + "Please select tags to filter by" : "Vennligst velg merkelapper å filtrere på", + "No files found for the selected tags" : "Ingen filer funnet for de valgte merkelappene", "<strong>System tags</strong> for a file have been modified" : "<strong>System-merkelapper</strong> for en fil er endret", "%1$s assigned system tag %3$s" : "%1$s festet system-merkelapp %3$s", "%1$s unassigned system tag %3$s" : "%1$s fjernet system-merkelapp %3$s", @@ -11,11 +16,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s fjernet system-merkelapp %3$s fra %2$s", "%s (not-assignable)" : "%s (ikke-brukbar)", "%s (invisible)" : "%s (usynlig)", - "Tags" : "Merkelapper", - "Tagged files" : "Merkede filer", - "Select tags to filter by" : "Velg merkelapper å filtrere på", - "Please select tags to filter by" : "Vennligst velg merkelapper å filtrere på", - "No files found for the selected tags" : "Ingen filer funnet for de valgte merkelappene", "No files in here" : "Ingen filer her", "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen", "Name" : "Navn", diff --git a/apps/systemtags/l10n/nb_NO.json b/apps/systemtags/l10n/nb_NO.json index 367051f8a34..8431ea65616 100644 --- a/apps/systemtags/l10n/nb_NO.json +++ b/apps/systemtags/l10n/nb_NO.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Merkelapper", + "Tagged files" : "Merkede filer", + "Select tags to filter by" : "Velg merkelapper å filtrere på", + "Please select tags to filter by" : "Vennligst velg merkelapper å filtrere på", + "No files found for the selected tags" : "Ingen filer funnet for de valgte merkelappene", "<strong>System tags</strong> for a file have been modified" : "<strong>System-merkelapper</strong> for en fil er endret", "%1$s assigned system tag %3$s" : "%1$s festet system-merkelapp %3$s", "%1$s unassigned system tag %3$s" : "%1$s fjernet system-merkelapp %3$s", @@ -9,11 +14,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s fjernet system-merkelapp %3$s fra %2$s", "%s (not-assignable)" : "%s (ikke-brukbar)", "%s (invisible)" : "%s (usynlig)", - "Tags" : "Merkelapper", - "Tagged files" : "Merkede filer", - "Select tags to filter by" : "Velg merkelapper å filtrere på", - "Please select tags to filter by" : "Vennligst velg merkelapper å filtrere på", - "No files found for the selected tags" : "Ingen filer funnet for de valgte merkelappene", "No files in here" : "Ingen filer her", "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen", "Name" : "Navn", diff --git a/apps/systemtags/l10n/nl.js b/apps/systemtags/l10n/nl.js index 4ccd217e803..f8c98435abc 100644 --- a/apps/systemtags/l10n/nl.js +++ b/apps/systemtags/l10n/nl.js @@ -1,21 +1,28 @@ OC.L10N.register( "systemtags", { + "Tags" : "Tags", + "Tagged files" : "Getagde bestanden", + "Select tags to filter by" : "Selecteer tags om op te filteren", + "Please select tags to filter by" : "Selecteer tags om op te filteren", + "No files found for the selected tags" : "Geen bestanden gevonden voor de geselecteerde tags", "<strong>System tags</strong> for a file have been modified" : "<strong>Systeem tags</strong> voor een bestand zijn gewijzigd", + "You assigned system tag %3$s" : "Je wees systeem tag %3$s toe", "%1$s assigned system tag %3$s" : "%1$s wees systeem tag %3$s toe", + "You unassigned system tag %3$s" : "Je maakte toewijzing systeem tag %3$s ongedaan", "%1$s unassigned system tag %3$s" : "%1$s verwijderde systeem tag %3$s", + "You created system tag %2$s" : "Je creëerde systeem tag %2$s", "%1$s created system tag %2$s" : "%1$s creëerde systeem tag %2$s", + "You deleted system tag %2$s" : "Je verwijderde systeem tag %2$s", "%1$s deleted system tag %2$s" : "%1$s verwijderde systeem tag %2$s van het systeem", + "You updated system tag %3$s to %2$s" : "U werkte systeemtag %3$s bij naar %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s hernoemde systeem tag %3$s naar %2$s", + "You assigned system tag %3$s to %2$s" : "Je wees systeem tag %3$s aan %2$s toe", "%1$s assigned system tag %3$s to %2$s" : "%1$s wees systeem tag %3$s aan %2$s toe", + "You unassigned system tag %3$s from %2$s" : "Je maakte toewijzing systeem tag %3$s van %2$s ongedaan", "%1$s unassigned system tag %3$s from %2$s" : "%1$s verwijderde systeem tag %3$s van %2$s", "%s (not-assignable)" : "%s (niet toewijsbaar)", "%s (invisible)" : "%s (onzichtbaar)", - "Tags" : "Tags", - "Tagged files" : "Getagde bestanden", - "Select tags to filter by" : "Selecteer tags om op te filteren", - "Please select tags to filter by" : "Selecteer tags om op te filteren", - "No files found for the selected tags" : "Geen bestanden gevonden voor de geselecteerde tags", "No files in here" : "Hier geen bestanden", "No entries found in this folder" : "Niets gevonden in deze map", "Name" : "Naam", diff --git a/apps/systemtags/l10n/nl.json b/apps/systemtags/l10n/nl.json index b81cdf33685..0803a5a19f0 100644 --- a/apps/systemtags/l10n/nl.json +++ b/apps/systemtags/l10n/nl.json @@ -1,19 +1,26 @@ { "translations": { + "Tags" : "Tags", + "Tagged files" : "Getagde bestanden", + "Select tags to filter by" : "Selecteer tags om op te filteren", + "Please select tags to filter by" : "Selecteer tags om op te filteren", + "No files found for the selected tags" : "Geen bestanden gevonden voor de geselecteerde tags", "<strong>System tags</strong> for a file have been modified" : "<strong>Systeem tags</strong> voor een bestand zijn gewijzigd", + "You assigned system tag %3$s" : "Je wees systeem tag %3$s toe", "%1$s assigned system tag %3$s" : "%1$s wees systeem tag %3$s toe", + "You unassigned system tag %3$s" : "Je maakte toewijzing systeem tag %3$s ongedaan", "%1$s unassigned system tag %3$s" : "%1$s verwijderde systeem tag %3$s", + "You created system tag %2$s" : "Je creëerde systeem tag %2$s", "%1$s created system tag %2$s" : "%1$s creëerde systeem tag %2$s", + "You deleted system tag %2$s" : "Je verwijderde systeem tag %2$s", "%1$s deleted system tag %2$s" : "%1$s verwijderde systeem tag %2$s van het systeem", + "You updated system tag %3$s to %2$s" : "U werkte systeemtag %3$s bij naar %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s hernoemde systeem tag %3$s naar %2$s", + "You assigned system tag %3$s to %2$s" : "Je wees systeem tag %3$s aan %2$s toe", "%1$s assigned system tag %3$s to %2$s" : "%1$s wees systeem tag %3$s aan %2$s toe", + "You unassigned system tag %3$s from %2$s" : "Je maakte toewijzing systeem tag %3$s van %2$s ongedaan", "%1$s unassigned system tag %3$s from %2$s" : "%1$s verwijderde systeem tag %3$s van %2$s", "%s (not-assignable)" : "%s (niet toewijsbaar)", "%s (invisible)" : "%s (onzichtbaar)", - "Tags" : "Tags", - "Tagged files" : "Getagde bestanden", - "Select tags to filter by" : "Selecteer tags om op te filteren", - "Please select tags to filter by" : "Selecteer tags om op te filteren", - "No files found for the selected tags" : "Geen bestanden gevonden voor de geselecteerde tags", "No files in here" : "Hier geen bestanden", "No entries found in this folder" : "Niets gevonden in deze map", "Name" : "Naam", diff --git a/apps/systemtags/l10n/oc.js b/apps/systemtags/l10n/oc.js index 9864eefb7ab..cd891a0c3a3 100644 --- a/apps/systemtags/l10n/oc.js +++ b/apps/systemtags/l10n/oc.js @@ -1,8 +1,8 @@ OC.L10N.register( "systemtags", { - "%s (invisible)" : "%s (invisible)", "Tags" : "Etiquetas", + "%s (invisible)" : "%s (invisible)", "No files in here" : "Pas cap de fichièr aicí", "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr", "Name" : "Nom", diff --git a/apps/systemtags/l10n/oc.json b/apps/systemtags/l10n/oc.json index 372953b0e97..c9521db3579 100644 --- a/apps/systemtags/l10n/oc.json +++ b/apps/systemtags/l10n/oc.json @@ -1,6 +1,6 @@ { "translations": { - "%s (invisible)" : "%s (invisible)", "Tags" : "Etiquetas", + "%s (invisible)" : "%s (invisible)", "No files in here" : "Pas cap de fichièr aicí", "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr", "Name" : "Nom", diff --git a/apps/systemtags/l10n/pl.js b/apps/systemtags/l10n/pl.js index 6089dad7704..1b665ee4f36 100644 --- a/apps/systemtags/l10n/pl.js +++ b/apps/systemtags/l10n/pl.js @@ -1,6 +1,9 @@ OC.L10N.register( "systemtags", { + "Tags" : "Etykiety", + "Tagged files" : "Otagowane pliki", + "No files found for the selected tags" : "Nie znaleziono plików dla wybranych etykiet", "<strong>System tags</strong> for a file have been modified" : "<strong>System etykiet</strong> dla pliku został zmieniony", "%1$s assigned system tag %3$s" : "%1$s przypisywalny system etykiet%3$s", "%1$s unassigned system tag %3$s" : "%1$s nieprzypisany system etykiet%3$s", @@ -11,9 +14,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s nieprzypisany system etykiet %3$s z %2$s", "%s (not-assignable)" : "%s (nieprzypisalny)", "%s (invisible)" : "%s (niewidoczny)", - "Tags" : "Etykiety", - "Tagged files" : "Otagowane pliki", - "No files found for the selected tags" : "Nie znaleziono plików dla wybranych etykiet", "No files in here" : "Brak plików", "No entries found in this folder" : "Brak wpisów w tym folderze", "Name" : "Nazwa", diff --git a/apps/systemtags/l10n/pl.json b/apps/systemtags/l10n/pl.json index 8005083201e..781d4539f5a 100644 --- a/apps/systemtags/l10n/pl.json +++ b/apps/systemtags/l10n/pl.json @@ -1,4 +1,7 @@ { "translations": { + "Tags" : "Etykiety", + "Tagged files" : "Otagowane pliki", + "No files found for the selected tags" : "Nie znaleziono plików dla wybranych etykiet", "<strong>System tags</strong> for a file have been modified" : "<strong>System etykiet</strong> dla pliku został zmieniony", "%1$s assigned system tag %3$s" : "%1$s przypisywalny system etykiet%3$s", "%1$s unassigned system tag %3$s" : "%1$s nieprzypisany system etykiet%3$s", @@ -9,9 +12,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s nieprzypisany system etykiet %3$s z %2$s", "%s (not-assignable)" : "%s (nieprzypisalny)", "%s (invisible)" : "%s (niewidoczny)", - "Tags" : "Etykiety", - "Tagged files" : "Otagowane pliki", - "No files found for the selected tags" : "Nie znaleziono plików dla wybranych etykiet", "No files in here" : "Brak plików", "No entries found in this folder" : "Brak wpisów w tym folderze", "Name" : "Nazwa", diff --git a/apps/systemtags/l10n/pt_BR.js b/apps/systemtags/l10n/pt_BR.js index fadca06e387..a66e437a17a 100644 --- a/apps/systemtags/l10n/pt_BR.js +++ b/apps/systemtags/l10n/pt_BR.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Etiquetas", + "Tagged files" : "Arquivos etiquetados", + "Select tags to filter by" : "Selecionar etiquetas para filtrar por", + "Please select tags to filter by" : "Por favor selecione etiquetas para filtrar por", + "No files found for the selected tags" : "Não há arquivos encontrados para as etiquetas selecionadas", "<strong>System tags</strong> for a file have been modified" : "<strong>As etiquetas do sistema</strong> para um arquivo foram modificadas", "You assigned system tag %3$s" : "Você atribuiu uma etiqueta ao sistema %3$s", "%1$s assigned system tag %3$s" : "%1$s etiqueta de sistema atribuída %3$s", @@ -18,11 +23,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s etiqueta de sistema não atribuída %3$s de %2$s", "%s (not-assignable)" : "%s (intransferível)", "%s (invisible)" : "%s (invisivel)", - "Tags" : "Etiquetas", - "Tagged files" : "Arquivos etiquetados", - "Select tags to filter by" : "Selecionar etiquetas para filtrar por", - "Please select tags to filter by" : "Por favor selecione etiquetas para filtrar por", - "No files found for the selected tags" : "Não há arquivos encontrados para as etiquetas selecionadas", "No files in here" : "Nenhum arquivo aqui", "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", "Name" : "Nome", diff --git a/apps/systemtags/l10n/pt_BR.json b/apps/systemtags/l10n/pt_BR.json index 61b702ac530..270216ef0ac 100644 --- a/apps/systemtags/l10n/pt_BR.json +++ b/apps/systemtags/l10n/pt_BR.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Etiquetas", + "Tagged files" : "Arquivos etiquetados", + "Select tags to filter by" : "Selecionar etiquetas para filtrar por", + "Please select tags to filter by" : "Por favor selecione etiquetas para filtrar por", + "No files found for the selected tags" : "Não há arquivos encontrados para as etiquetas selecionadas", "<strong>System tags</strong> for a file have been modified" : "<strong>As etiquetas do sistema</strong> para um arquivo foram modificadas", "You assigned system tag %3$s" : "Você atribuiu uma etiqueta ao sistema %3$s", "%1$s assigned system tag %3$s" : "%1$s etiqueta de sistema atribuída %3$s", @@ -16,11 +21,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s etiqueta de sistema não atribuída %3$s de %2$s", "%s (not-assignable)" : "%s (intransferível)", "%s (invisible)" : "%s (invisivel)", - "Tags" : "Etiquetas", - "Tagged files" : "Arquivos etiquetados", - "Select tags to filter by" : "Selecionar etiquetas para filtrar por", - "Please select tags to filter by" : "Por favor selecione etiquetas para filtrar por", - "No files found for the selected tags" : "Não há arquivos encontrados para as etiquetas selecionadas", "No files in here" : "Nenhum arquivo aqui", "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", "Name" : "Nome", diff --git a/apps/systemtags/l10n/pt_PT.js b/apps/systemtags/l10n/pt_PT.js index 505a3ed46aa..da277cef515 100644 --- a/apps/systemtags/l10n/pt_PT.js +++ b/apps/systemtags/l10n/pt_PT.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Etiquetas", + "Tagged files" : "Ficheiros etiquetados", + "Select tags to filter by" : "Selecionar etiquetas para filtrar", + "Please select tags to filter by" : "Selecione etiquetas para filtrar", + "No files found for the selected tags" : "Nenhum ficheiro encontrado com as etiquetas selecionadas", "<strong>System tags</strong> for a file have been modified" : "<strong>Etiquetas do sistema</strong> para um ficheiro foram alteradas", "%1$s assigned system tag %3$s" : "%1$s recebeu a etiqueta %3$s", "%1$s unassigned system tag %3$s" : "%1$s perdeu a etiqueta %3$s", @@ -11,11 +16,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s retirou a etiqueta %3$s a %2$s", "%s (not-assignable)" : "%s (não atribuível)", "%s (invisible)" : "%s (invisível)", - "Tags" : "Etiquetas", - "Tagged files" : "Ficheiros etiquetados", - "Select tags to filter by" : "Selecionar etiquetas para filtrar", - "Please select tags to filter by" : "Selecione etiquetas para filtrar", - "No files found for the selected tags" : "Nenhum ficheiro encontrado com as etiquetas selecionadas", "No files in here" : "Nenhuns ficheiros aqui", "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", "Name" : "Nome", diff --git a/apps/systemtags/l10n/pt_PT.json b/apps/systemtags/l10n/pt_PT.json index 8ce8f10f2d7..90f7064bc26 100644 --- a/apps/systemtags/l10n/pt_PT.json +++ b/apps/systemtags/l10n/pt_PT.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Etiquetas", + "Tagged files" : "Ficheiros etiquetados", + "Select tags to filter by" : "Selecionar etiquetas para filtrar", + "Please select tags to filter by" : "Selecione etiquetas para filtrar", + "No files found for the selected tags" : "Nenhum ficheiro encontrado com as etiquetas selecionadas", "<strong>System tags</strong> for a file have been modified" : "<strong>Etiquetas do sistema</strong> para um ficheiro foram alteradas", "%1$s assigned system tag %3$s" : "%1$s recebeu a etiqueta %3$s", "%1$s unassigned system tag %3$s" : "%1$s perdeu a etiqueta %3$s", @@ -9,11 +14,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s retirou a etiqueta %3$s a %2$s", "%s (not-assignable)" : "%s (não atribuível)", "%s (invisible)" : "%s (invisível)", - "Tags" : "Etiquetas", - "Tagged files" : "Ficheiros etiquetados", - "Select tags to filter by" : "Selecionar etiquetas para filtrar", - "Please select tags to filter by" : "Selecione etiquetas para filtrar", - "No files found for the selected tags" : "Nenhum ficheiro encontrado com as etiquetas selecionadas", "No files in here" : "Nenhuns ficheiros aqui", "No entries found in this folder" : "Não foram encontradas entradas nesta pasta", "Name" : "Nome", diff --git a/apps/systemtags/l10n/ro.js b/apps/systemtags/l10n/ro.js index 17e8642d353..42bdbfef600 100644 --- a/apps/systemtags/l10n/ro.js +++ b/apps/systemtags/l10n/ro.js @@ -2,6 +2,29 @@ OC.L10N.register( "systemtags", { "Tags" : "Cuvinte cheie", + "Tagged files" : "Fișiere etichetate", + "Select tags to filter by" : "Alege etichete după care să filtrezi", + "Please select tags to filter by" : "Te rugăm selectează etichete după care să filtrezi", + "No files found for the selected tags" : "Nu au fost găsite fișiere care să corespundă etichetelor alese", + "<strong>System tags</strong> for a file have been modified" : "<strong>Etichete de siste</strong> pentru un fișier au fost modificate", + "You assigned system tag %3$s" : "Ai alocat eticheta de sistem %3$s", + "%1$s assigned system tag %3$s" : "%1$s a alocat eticheta de sistem %3$s", + "You unassigned system tag %3$s" : "Ai înlăturat eticheta de sistem %3$s", + "%1$s unassigned system tag %3$s" : "%1$s a înlăturat eticheta de sistem %3$s", + "You created system tag %2$s" : "Ai creat eticheta de sistem %2$s", + "%1$s created system tag %2$s" : "%1$s a creat eticheta de sistem %2$s", + "You deleted system tag %2$s" : "Ai șters eticheta de sistem %2$s", + "%1$s deleted system tag %2$s" : "%1$s a șters eticheta de sistem %2$s", + "You updated system tag %3$s to %2$s" : "Ai actualizat eticheta de sistem %3$s la %2$s", + "%1$s updated system tag %3$s to %2$s" : "%1$s a actualizat eticheta de sistem %3$s la %2$s", + "You assigned system tag %3$s to %2$s" : "Ai atribuit eticheta de sistem %3$s la %2$s", + "%1$s assigned system tag %3$s to %2$s" : "%1$s a atribuit eticheta de sistem %3$s la %2$s", + "You unassigned system tag %3$s from %2$s" : "Ai înlăturat eticheta de sistem %3$s de la %2$s", + "%1$s unassigned system tag %3$s from %2$s" : "%1$s a înlăturat eticheta de sistem %3$s de la %2$s", + "%s (not-assignable)" : "%s (nu este atribuibil)", + "%s (invisible)" : "%s (invizibil)", + "No files in here" : "Niciun fișier aici", + "No entries found in this folder" : "Niciun element găsit în acest director", "Name" : "Nume", "Size" : "Mărime", "Modified" : "Modificat" diff --git a/apps/systemtags/l10n/ro.json b/apps/systemtags/l10n/ro.json index 2ce71c85a8e..cf5f378c44e 100644 --- a/apps/systemtags/l10n/ro.json +++ b/apps/systemtags/l10n/ro.json @@ -1,5 +1,28 @@ { "translations": { "Tags" : "Cuvinte cheie", + "Tagged files" : "Fișiere etichetate", + "Select tags to filter by" : "Alege etichete după care să filtrezi", + "Please select tags to filter by" : "Te rugăm selectează etichete după care să filtrezi", + "No files found for the selected tags" : "Nu au fost găsite fișiere care să corespundă etichetelor alese", + "<strong>System tags</strong> for a file have been modified" : "<strong>Etichete de siste</strong> pentru un fișier au fost modificate", + "You assigned system tag %3$s" : "Ai alocat eticheta de sistem %3$s", + "%1$s assigned system tag %3$s" : "%1$s a alocat eticheta de sistem %3$s", + "You unassigned system tag %3$s" : "Ai înlăturat eticheta de sistem %3$s", + "%1$s unassigned system tag %3$s" : "%1$s a înlăturat eticheta de sistem %3$s", + "You created system tag %2$s" : "Ai creat eticheta de sistem %2$s", + "%1$s created system tag %2$s" : "%1$s a creat eticheta de sistem %2$s", + "You deleted system tag %2$s" : "Ai șters eticheta de sistem %2$s", + "%1$s deleted system tag %2$s" : "%1$s a șters eticheta de sistem %2$s", + "You updated system tag %3$s to %2$s" : "Ai actualizat eticheta de sistem %3$s la %2$s", + "%1$s updated system tag %3$s to %2$s" : "%1$s a actualizat eticheta de sistem %3$s la %2$s", + "You assigned system tag %3$s to %2$s" : "Ai atribuit eticheta de sistem %3$s la %2$s", + "%1$s assigned system tag %3$s to %2$s" : "%1$s a atribuit eticheta de sistem %3$s la %2$s", + "You unassigned system tag %3$s from %2$s" : "Ai înlăturat eticheta de sistem %3$s de la %2$s", + "%1$s unassigned system tag %3$s from %2$s" : "%1$s a înlăturat eticheta de sistem %3$s de la %2$s", + "%s (not-assignable)" : "%s (nu este atribuibil)", + "%s (invisible)" : "%s (invizibil)", + "No files in here" : "Niciun fișier aici", + "No entries found in this folder" : "Niciun element găsit în acest director", "Name" : "Nume", "Size" : "Mărime", "Modified" : "Modificat" diff --git a/apps/systemtags/l10n/ru.js b/apps/systemtags/l10n/ru.js index 633ca03b13e..23080dbf5eb 100644 --- a/apps/systemtags/l10n/ru.js +++ b/apps/systemtags/l10n/ru.js @@ -1,21 +1,28 @@ OC.L10N.register( "systemtags", { + "Tags" : "Метки", + "Tagged files" : "Файлы с метками", + "Select tags to filter by" : "Выберите метки для фильтра", + "Please select tags to filter by" : "Выберите метки для фильтра", + "No files found for the selected tags" : "Для выбранных меток фалов не найдено", "<strong>System tags</strong> for a file have been modified" : "<strong>Системные метки</strong> файла были изменены", + "You assigned system tag %3$s" : "Вы назначили системный тег %3$s", "%1$s assigned system tag %3$s" : "%1$s назначил системную метку %3$s", + "You unassigned system tag %3$s" : "Вы отменили системный тег %3$s", "%1$s unassigned system tag %3$s" : "%1$s отсоединил системную метку %3$s", + "You created system tag %2$s" : "Вы создали системный тег %2$s", "%1$s created system tag %2$s" : "%1$s создал системную метку %2$s", + "You deleted system tag %2$s" : "Вы удалили системный тег %2$s", "%1$s deleted system tag %2$s" : "%1$s удалил системную метку %2$s", + "You updated system tag %3$s to %2$s" : "Вы обновили системный тег %3$s на %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s обновил системную метку %3$s для %2$s", + "You assigned system tag %3$s to %2$s" : "Вы назначили системный тег %3$s на %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s назначил системную метку %3$s для %2$s", + "You unassigned system tag %3$s from %2$s" : "Вы назначили системный тег %3$s из %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s отсоединил системную метку %3$s для %2$s", "%s (not-assignable)" : "%s (неназначаемые)", "%s (invisible)" : "%s (невидимые)", - "Tags" : "Метки", - "Tagged files" : "Файлы с метками", - "Select tags to filter by" : "Выберите метки для фильтра", - "Please select tags to filter by" : "Выберите метки для фильтра", - "No files found for the selected tags" : "Для выбранных меток фалов не найдено", "No files in here" : "Здесь нет файлов", "No entries found in this folder" : "Нет элементов в этом каталоге", "Name" : "Наименование контакта", diff --git a/apps/systemtags/l10n/ru.json b/apps/systemtags/l10n/ru.json index 14eb6c3d157..e7e42366aaf 100644 --- a/apps/systemtags/l10n/ru.json +++ b/apps/systemtags/l10n/ru.json @@ -1,19 +1,26 @@ { "translations": { + "Tags" : "Метки", + "Tagged files" : "Файлы с метками", + "Select tags to filter by" : "Выберите метки для фильтра", + "Please select tags to filter by" : "Выберите метки для фильтра", + "No files found for the selected tags" : "Для выбранных меток фалов не найдено", "<strong>System tags</strong> for a file have been modified" : "<strong>Системные метки</strong> файла были изменены", + "You assigned system tag %3$s" : "Вы назначили системный тег %3$s", "%1$s assigned system tag %3$s" : "%1$s назначил системную метку %3$s", + "You unassigned system tag %3$s" : "Вы отменили системный тег %3$s", "%1$s unassigned system tag %3$s" : "%1$s отсоединил системную метку %3$s", + "You created system tag %2$s" : "Вы создали системный тег %2$s", "%1$s created system tag %2$s" : "%1$s создал системную метку %2$s", + "You deleted system tag %2$s" : "Вы удалили системный тег %2$s", "%1$s deleted system tag %2$s" : "%1$s удалил системную метку %2$s", + "You updated system tag %3$s to %2$s" : "Вы обновили системный тег %3$s на %2$s", "%1$s updated system tag %3$s to %2$s" : "%1$s обновил системную метку %3$s для %2$s", + "You assigned system tag %3$s to %2$s" : "Вы назначили системный тег %3$s на %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s назначил системную метку %3$s для %2$s", + "You unassigned system tag %3$s from %2$s" : "Вы назначили системный тег %3$s из %2$s", "%1$s unassigned system tag %3$s from %2$s" : "%1$s отсоединил системную метку %3$s для %2$s", "%s (not-assignable)" : "%s (неназначаемые)", "%s (invisible)" : "%s (невидимые)", - "Tags" : "Метки", - "Tagged files" : "Файлы с метками", - "Select tags to filter by" : "Выберите метки для фильтра", - "Please select tags to filter by" : "Выберите метки для фильтра", - "No files found for the selected tags" : "Для выбранных меток фалов не найдено", "No files in here" : "Здесь нет файлов", "No entries found in this folder" : "Нет элементов в этом каталоге", "Name" : "Наименование контакта", diff --git a/apps/systemtags/l10n/sl.js b/apps/systemtags/l10n/sl.js index 87469d3fbd1..cd67abe627c 100644 --- a/apps/systemtags/l10n/sl.js +++ b/apps/systemtags/l10n/sl.js @@ -1,21 +1,28 @@ OC.L10N.register( "systemtags", { + "Tags" : "Oznake", + "Tagged files" : "Označene datoteke", + "Select tags to filter by" : "Izbor oznak za filtriranje", + "Please select tags to filter by" : "Izbor oznak za filtriranje", + "No files found for the selected tags" : "Na izbrane oznake ni najdenih datotek", "<strong>System tags</strong> for a file have been modified" : "<strong>Sistemske oznake</strong> datoteke so bile spremenjene", + "You assigned system tag %3$s" : "Dodelili ste sistemsko oznako %3$s", "%1$s assigned system tag %3$s" : "Uporabnik %1$s je dodelil sistemsko oznako %3$s", + "You unassigned system tag %3$s" : "Odstranili ste sistemsko oznako %3$s", "%1$s unassigned system tag %3$s" : "Uporabnik %1$s je odstranil sistemsko oznako %3$s", + "You created system tag %2$s" : "Ustvarili ste sistemsko oznako %2$s", "%1$s created system tag %2$s" : "Uporabnik %1$s je ustvaril sistemsko oznako %2$s", + "You deleted system tag %2$s" : "Izbrisali ste sistemsko oznako %2$s", "%1$s deleted system tag %2$s" : "Uporabnik %1$s je izbrisal sistemsko oznako %2$s", + "You updated system tag %3$s to %2$s" : "Posodobili ste sistemsko oznako %3$s v %2$s", "%1$s updated system tag %3$s to %2$s" : "Uporabnik %1$s je posodobil sistemsko oznako %3$s za %2$s", + "You assigned system tag %3$s to %2$s" : "Dodelili ste sistemsko oznako %3$s za %2$s", "%1$s assigned system tag %3$s to %2$s" : "Uporabnik %1$s je dodelil sistemsko oznako %3$s za %2$s", + "You unassigned system tag %3$s from %2$s" : "Odstranili ste sistemsko oznako %3$s od %2$s", "%1$s unassigned system tag %3$s from %2$s" : "Uporabnik %1$s je prevzel sistemsko oznako %3$s od %2$s", "%s (not-assignable)" : "%s (nedodeljivo)", "%s (invisible)" : "%s (nevidno)", - "Tags" : "Oznake", - "Tagged files" : "Označene datoteke", - "Select tags to filter by" : "Izbor oznak za filtriranje", - "Please select tags to filter by" : "Izbor oznak za filtriranje", - "No files found for the selected tags" : "Na izbrane oznake ni najdenih datotek", "No files in here" : "V mapi ni datotek", "No entries found in this folder" : "V tej mapi ni najdenih predmetov.", "Name" : "Ime", diff --git a/apps/systemtags/l10n/sl.json b/apps/systemtags/l10n/sl.json index b768a391c17..e90a925ee36 100644 --- a/apps/systemtags/l10n/sl.json +++ b/apps/systemtags/l10n/sl.json @@ -1,19 +1,26 @@ { "translations": { + "Tags" : "Oznake", + "Tagged files" : "Označene datoteke", + "Select tags to filter by" : "Izbor oznak za filtriranje", + "Please select tags to filter by" : "Izbor oznak za filtriranje", + "No files found for the selected tags" : "Na izbrane oznake ni najdenih datotek", "<strong>System tags</strong> for a file have been modified" : "<strong>Sistemske oznake</strong> datoteke so bile spremenjene", + "You assigned system tag %3$s" : "Dodelili ste sistemsko oznako %3$s", "%1$s assigned system tag %3$s" : "Uporabnik %1$s je dodelil sistemsko oznako %3$s", + "You unassigned system tag %3$s" : "Odstranili ste sistemsko oznako %3$s", "%1$s unassigned system tag %3$s" : "Uporabnik %1$s je odstranil sistemsko oznako %3$s", + "You created system tag %2$s" : "Ustvarili ste sistemsko oznako %2$s", "%1$s created system tag %2$s" : "Uporabnik %1$s je ustvaril sistemsko oznako %2$s", + "You deleted system tag %2$s" : "Izbrisali ste sistemsko oznako %2$s", "%1$s deleted system tag %2$s" : "Uporabnik %1$s je izbrisal sistemsko oznako %2$s", + "You updated system tag %3$s to %2$s" : "Posodobili ste sistemsko oznako %3$s v %2$s", "%1$s updated system tag %3$s to %2$s" : "Uporabnik %1$s je posodobil sistemsko oznako %3$s za %2$s", + "You assigned system tag %3$s to %2$s" : "Dodelili ste sistemsko oznako %3$s za %2$s", "%1$s assigned system tag %3$s to %2$s" : "Uporabnik %1$s je dodelil sistemsko oznako %3$s za %2$s", + "You unassigned system tag %3$s from %2$s" : "Odstranili ste sistemsko oznako %3$s od %2$s", "%1$s unassigned system tag %3$s from %2$s" : "Uporabnik %1$s je prevzel sistemsko oznako %3$s od %2$s", "%s (not-assignable)" : "%s (nedodeljivo)", "%s (invisible)" : "%s (nevidno)", - "Tags" : "Oznake", - "Tagged files" : "Označene datoteke", - "Select tags to filter by" : "Izbor oznak za filtriranje", - "Please select tags to filter by" : "Izbor oznak za filtriranje", - "No files found for the selected tags" : "Na izbrane oznake ni najdenih datotek", "No files in here" : "V mapi ni datotek", "No entries found in this folder" : "V tej mapi ni najdenih predmetov.", "Name" : "Ime", diff --git a/apps/systemtags/l10n/sq.js b/apps/systemtags/l10n/sq.js index c5741c81506..f7773feed9e 100644 --- a/apps/systemtags/l10n/sq.js +++ b/apps/systemtags/l10n/sq.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Etiketa", + "Tagged files" : "Kartela të etiketuara", + "Select tags to filter by" : "Përzgjidhni etiketa sipas të cilat të bëhet filtrimi", + "Please select tags to filter by" : "Ju lutemi, përzgjidhni etiketa sipas të cilat të bëhet filtrimi", + "No files found for the selected tags" : "S’u gjetën kartela për etiketat e përzgjedhura", "<strong>System tags</strong> for a file have been modified" : "U ndryshyan <strong>etiketa sistemi</strong>për një kartelë", "You assigned system tag %3$s" : "Caktuat etiketën e sistemit %3$s", "%1$s assigned system tag %3$s" : "%1$s caktoi etiketën e sistemit %3$s", @@ -18,11 +23,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s hoqi prej %2$s etiketën e sistemit %3$s", "%s (not-assignable)" : "%s (e pacaktushme)", "%s (invisible)" : "%s (e padukshme)", - "Tags" : "Etiketa", - "Tagged files" : "Kartela të etiketuara", - "Select tags to filter by" : "Përzgjidhni etiketa sipas të cilat të bëhet filtrimi", - "Please select tags to filter by" : "Ju lutemi, përzgjidhni etiketa sipas të cilat të bëhet filtrimi", - "No files found for the selected tags" : "S’u gjetën kartela për etiketat e përzgjedhura", "No files in here" : "S’ka kartela këtu", "No entries found in this folder" : "S’u gjetën zëra në këtë dosje", "Name" : "Emër", diff --git a/apps/systemtags/l10n/sq.json b/apps/systemtags/l10n/sq.json index 66704860cc1..122b4e96ca3 100644 --- a/apps/systemtags/l10n/sq.json +++ b/apps/systemtags/l10n/sq.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Etiketa", + "Tagged files" : "Kartela të etiketuara", + "Select tags to filter by" : "Përzgjidhni etiketa sipas të cilat të bëhet filtrimi", + "Please select tags to filter by" : "Ju lutemi, përzgjidhni etiketa sipas të cilat të bëhet filtrimi", + "No files found for the selected tags" : "S’u gjetën kartela për etiketat e përzgjedhura", "<strong>System tags</strong> for a file have been modified" : "U ndryshyan <strong>etiketa sistemi</strong>për një kartelë", "You assigned system tag %3$s" : "Caktuat etiketën e sistemit %3$s", "%1$s assigned system tag %3$s" : "%1$s caktoi etiketën e sistemit %3$s", @@ -16,11 +21,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s hoqi prej %2$s etiketën e sistemit %3$s", "%s (not-assignable)" : "%s (e pacaktushme)", "%s (invisible)" : "%s (e padukshme)", - "Tags" : "Etiketa", - "Tagged files" : "Kartela të etiketuara", - "Select tags to filter by" : "Përzgjidhni etiketa sipas të cilat të bëhet filtrimi", - "Please select tags to filter by" : "Ju lutemi, përzgjidhni etiketa sipas të cilat të bëhet filtrimi", - "No files found for the selected tags" : "S’u gjetën kartela për etiketat e përzgjedhura", "No files in here" : "S’ka kartela këtu", "No entries found in this folder" : "S’u gjetën zëra në këtë dosje", "Name" : "Emër", diff --git a/apps/systemtags/l10n/sr.js b/apps/systemtags/l10n/sr.js index 55bb5698821..d4a5abdf3ed 100644 --- a/apps/systemtags/l10n/sr.js +++ b/apps/systemtags/l10n/sr.js @@ -1,6 +1,8 @@ OC.L10N.register( "systemtags", { + "Tags" : "Ознаке", + "Tagged files" : "Означени фајлови", "<strong>System tags</strong> for a file have been modified" : "<strong>Системске ознаке</strong> за фајл су измењене", "%1$s assigned system tag %3$s" : "%1$s додели системску ознаку %3$s", "%1$s created system tag %2$s" : "%1$s направи системску ознаку %2$s", @@ -9,8 +11,6 @@ OC.L10N.register( "%1$s assigned system tag %3$s to %2$s" : "%1$s додели системску ознаку %3$s на %2$s", "%s (not-assignable)" : "%s (недодељива)", "%s (invisible)" : "%s (невидљива)", - "Tags" : "Ознаке", - "Tagged files" : "Означени фајлови", "No files in here" : "Овде нема фајлова", "No entries found in this folder" : "Нема ничега у овој фасцикли", "Name" : "назив", diff --git a/apps/systemtags/l10n/sr.json b/apps/systemtags/l10n/sr.json index 38aee4880f7..d4a5bd1cd9a 100644 --- a/apps/systemtags/l10n/sr.json +++ b/apps/systemtags/l10n/sr.json @@ -1,4 +1,6 @@ { "translations": { + "Tags" : "Ознаке", + "Tagged files" : "Означени фајлови", "<strong>System tags</strong> for a file have been modified" : "<strong>Системске ознаке</strong> за фајл су измењене", "%1$s assigned system tag %3$s" : "%1$s додели системску ознаку %3$s", "%1$s created system tag %2$s" : "%1$s направи системску ознаку %2$s", @@ -7,8 +9,6 @@ "%1$s assigned system tag %3$s to %2$s" : "%1$s додели системску ознаку %3$s на %2$s", "%s (not-assignable)" : "%s (недодељива)", "%s (invisible)" : "%s (невидљива)", - "Tags" : "Ознаке", - "Tagged files" : "Означени фајлови", "No files in here" : "Овде нема фајлова", "No entries found in this folder" : "Нема ничега у овој фасцикли", "Name" : "назив", diff --git a/apps/systemtags/l10n/sv.js b/apps/systemtags/l10n/sv.js index a863140c937..2f341d356b4 100644 --- a/apps/systemtags/l10n/sv.js +++ b/apps/systemtags/l10n/sv.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Taggar", + "Tagged files" : "Taggade filer", + "Select tags to filter by" : "Välj taggar att filtrera med", + "Please select tags to filter by" : "Vänligen välj taggar att filtrera med", + "No files found for the selected tags" : "Inga filer hittade för de valda taggarna", "<strong>System tags</strong> for a file have been modified" : "<strong>Systemtaggar</strong> för en fil har blivit ändrade", "%1$s assigned system tag %3$s" : "%1$s blev tilldelad systemtagg %3$s", "%1$s unassigned system tag %3$s" : "%1$s unassigned system tag %3$s", @@ -9,11 +14,6 @@ OC.L10N.register( "%1$s updated system tag %3$s to %2$s" : "%1$s uppdaterade systemtagg %3$s till %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s tilldelade systemtagg %3$s till %2$s", "%s (invisible)" : "%s (osynlig)", - "Tags" : "Taggar", - "Tagged files" : "Taggade filer", - "Select tags to filter by" : "Välj taggar att filtrera med", - "Please select tags to filter by" : "Vänligen välj taggar att filtrera med", - "No files found for the selected tags" : "Inga filer hittade för de valda taggarna", "No files in here" : "Inga filer kunde hittas", "No entries found in this folder" : "nga Filer hittades i denna mapp", "Name" : "Namn", diff --git a/apps/systemtags/l10n/sv.json b/apps/systemtags/l10n/sv.json index 51fcc044848..3add77a5336 100644 --- a/apps/systemtags/l10n/sv.json +++ b/apps/systemtags/l10n/sv.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Taggar", + "Tagged files" : "Taggade filer", + "Select tags to filter by" : "Välj taggar att filtrera med", + "Please select tags to filter by" : "Vänligen välj taggar att filtrera med", + "No files found for the selected tags" : "Inga filer hittade för de valda taggarna", "<strong>System tags</strong> for a file have been modified" : "<strong>Systemtaggar</strong> för en fil har blivit ändrade", "%1$s assigned system tag %3$s" : "%1$s blev tilldelad systemtagg %3$s", "%1$s unassigned system tag %3$s" : "%1$s unassigned system tag %3$s", @@ -7,11 +12,6 @@ "%1$s updated system tag %3$s to %2$s" : "%1$s uppdaterade systemtagg %3$s till %2$s", "%1$s assigned system tag %3$s to %2$s" : "%1$s tilldelade systemtagg %3$s till %2$s", "%s (invisible)" : "%s (osynlig)", - "Tags" : "Taggar", - "Tagged files" : "Taggade filer", - "Select tags to filter by" : "Välj taggar att filtrera med", - "Please select tags to filter by" : "Vänligen välj taggar att filtrera med", - "No files found for the selected tags" : "Inga filer hittade för de valda taggarna", "No files in here" : "Inga filer kunde hittas", "No entries found in this folder" : "nga Filer hittades i denna mapp", "Name" : "Namn", diff --git a/apps/systemtags/l10n/th_TH.js b/apps/systemtags/l10n/th_TH.js index 33c17e07ce6..b0712f32051 100644 --- a/apps/systemtags/l10n/th_TH.js +++ b/apps/systemtags/l10n/th_TH.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "ป้ายกำกับ", + "Tagged files" : "ไฟล์ที่ติดแท็ก", + "Select tags to filter by" : "เลือกแท็กเพื่อกรองโดย", + "Please select tags to filter by" : "กรุณาเลือกแท็กเพื่อกรองโดย", + "No files found for the selected tags" : "ไม่พบไฟล์แท็กที่เลือก", "<strong>System tags</strong> for a file have been modified" : "<strong>แท็กระบบ</strong> สำหรับไฟล์ที่ได้รับการแก้ไข", "You assigned system tag %3$s" : "คุณได้กำหนดแท็กระบบ %3$s แล้ว", "%1$s assigned system tag %3$s" : "%1$s ได้ถูกกำหนดแท็กระบบ %3$s", @@ -18,11 +23,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s ไม่ได้ถูกกำหนดแท็กระบบ %3$s เป็น %2$s", "%s (not-assignable)" : "%s (ไม่สามารถกำหนดได้)", "%s (invisible)" : "%s (มองไม่เห็น)", - "Tags" : "ป้ายกำกับ", - "Tagged files" : "ไฟล์ที่ติดแท็ก", - "Select tags to filter by" : "เลือกแท็กเพื่อกรองโดย", - "Please select tags to filter by" : "กรุณาเลือกแท็กเพื่อกรองโดย", - "No files found for the selected tags" : "ไม่พบไฟล์แท็กที่เลือก", "No files in here" : "ไม่มีไฟล์ที่นี่", "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", "Name" : "ชื่อ", diff --git a/apps/systemtags/l10n/th_TH.json b/apps/systemtags/l10n/th_TH.json index f05dd00dde1..ddefa10e6f6 100644 --- a/apps/systemtags/l10n/th_TH.json +++ b/apps/systemtags/l10n/th_TH.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "ป้ายกำกับ", + "Tagged files" : "ไฟล์ที่ติดแท็ก", + "Select tags to filter by" : "เลือกแท็กเพื่อกรองโดย", + "Please select tags to filter by" : "กรุณาเลือกแท็กเพื่อกรองโดย", + "No files found for the selected tags" : "ไม่พบไฟล์แท็กที่เลือก", "<strong>System tags</strong> for a file have been modified" : "<strong>แท็กระบบ</strong> สำหรับไฟล์ที่ได้รับการแก้ไข", "You assigned system tag %3$s" : "คุณได้กำหนดแท็กระบบ %3$s แล้ว", "%1$s assigned system tag %3$s" : "%1$s ได้ถูกกำหนดแท็กระบบ %3$s", @@ -16,11 +21,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s ไม่ได้ถูกกำหนดแท็กระบบ %3$s เป็น %2$s", "%s (not-assignable)" : "%s (ไม่สามารถกำหนดได้)", "%s (invisible)" : "%s (มองไม่เห็น)", - "Tags" : "ป้ายกำกับ", - "Tagged files" : "ไฟล์ที่ติดแท็ก", - "Select tags to filter by" : "เลือกแท็กเพื่อกรองโดย", - "Please select tags to filter by" : "กรุณาเลือกแท็กเพื่อกรองโดย", - "No files found for the selected tags" : "ไม่พบไฟล์แท็กที่เลือก", "No files in here" : "ไม่มีไฟล์ที่นี่", "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้", "Name" : "ชื่อ", diff --git a/apps/systemtags/l10n/tr.js b/apps/systemtags/l10n/tr.js index 2356ac42584..a2f91dc69d4 100644 --- a/apps/systemtags/l10n/tr.js +++ b/apps/systemtags/l10n/tr.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "Etiketler", + "Tagged files" : "Etiketli dosyalar", + "Select tags to filter by" : "Filtrelemek için etiketleri seçin", + "Please select tags to filter by" : "Filtrelemek için etiketleri seçin", + "No files found for the selected tags" : "Seçilen etiketler ile ilgili dosya bulunamadı", "<strong>System tags</strong> for a file have been modified" : "Bir dosya için <strong>sistem etiketleri</strong> değiştirildi", "%1$s assigned system tag %3$s" : "%1$s, %3$s sistem etiketini atadı", "%1$s unassigned system tag %3$s" : "%1$s, %3$s sistem etiket atamasını kaldırdı", @@ -11,11 +16,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s, %3$s sistem etiketinin %2$s atamasını kaldırdı", "%s (not-assignable)" : "%s (atanamaz)", "%s (invisible)" : "%s (gizli)", - "Tags" : "Etiketler", - "Tagged files" : "Etiketli dosyalar", - "Select tags to filter by" : "Filtrelemek için etiketleri seçin", - "Please select tags to filter by" : "Filtrelemek için etiketleri seçin", - "No files found for the selected tags" : "Seçilen etiketler ile ilgili dosya bulunamadı", "No files in here" : "Burada hiç dosya yok", "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı", "Name" : "Ad", diff --git a/apps/systemtags/l10n/tr.json b/apps/systemtags/l10n/tr.json index b85c64ab0b3..fed4afaa130 100644 --- a/apps/systemtags/l10n/tr.json +++ b/apps/systemtags/l10n/tr.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "Etiketler", + "Tagged files" : "Etiketli dosyalar", + "Select tags to filter by" : "Filtrelemek için etiketleri seçin", + "Please select tags to filter by" : "Filtrelemek için etiketleri seçin", + "No files found for the selected tags" : "Seçilen etiketler ile ilgili dosya bulunamadı", "<strong>System tags</strong> for a file have been modified" : "Bir dosya için <strong>sistem etiketleri</strong> değiştirildi", "%1$s assigned system tag %3$s" : "%1$s, %3$s sistem etiketini atadı", "%1$s unassigned system tag %3$s" : "%1$s, %3$s sistem etiket atamasını kaldırdı", @@ -9,11 +14,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s, %3$s sistem etiketinin %2$s atamasını kaldırdı", "%s (not-assignable)" : "%s (atanamaz)", "%s (invisible)" : "%s (gizli)", - "Tags" : "Etiketler", - "Tagged files" : "Etiketli dosyalar", - "Select tags to filter by" : "Filtrelemek için etiketleri seçin", - "Please select tags to filter by" : "Filtrelemek için etiketleri seçin", - "No files found for the selected tags" : "Seçilen etiketler ile ilgili dosya bulunamadı", "No files in here" : "Burada hiç dosya yok", "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı", "Name" : "Ad", diff --git a/apps/systemtags/l10n/zh_CN.js b/apps/systemtags/l10n/zh_CN.js index d00d9ccb879..cc83347bf01 100644 --- a/apps/systemtags/l10n/zh_CN.js +++ b/apps/systemtags/l10n/zh_CN.js @@ -1,6 +1,11 @@ OC.L10N.register( "systemtags", { + "Tags" : "标签", + "Tagged files" : "标签文件", + "Select tags to filter by" : "选择标签来筛选", + "Please select tags to filter by" : "请选择标签来筛选", + "No files found for the selected tags" : "该标签下没有任何文件", "<strong>System tags</strong> for a file have been modified" : "已更改的文件的<strong>系统标签</strong> ", "%1$s assigned system tag %3$s" : "%1$s 分配了系统标签 %3$s", "%1$s unassigned system tag %3$s" : "%1$s 取消分配了系统标签 %3$s", @@ -11,11 +16,6 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s 取消分配系统标签 %3$s 从 %2$s", "%s (not-assignable)" : "%s (不可分配)", "%s (invisible)" : "%s (不可见)", - "Tags" : "标签", - "Tagged files" : "标签文件", - "Select tags to filter by" : "选择标签来筛选", - "Please select tags to filter by" : "请选择标签来筛选", - "No files found for the selected tags" : "该标签下没有任何文件", "No files in here" : "无文件", "No entries found in this folder" : "此文件夹中无项目", "Name" : "名称", diff --git a/apps/systemtags/l10n/zh_CN.json b/apps/systemtags/l10n/zh_CN.json index 72e53695dd8..d20c4c72469 100644 --- a/apps/systemtags/l10n/zh_CN.json +++ b/apps/systemtags/l10n/zh_CN.json @@ -1,4 +1,9 @@ { "translations": { + "Tags" : "标签", + "Tagged files" : "标签文件", + "Select tags to filter by" : "选择标签来筛选", + "Please select tags to filter by" : "请选择标签来筛选", + "No files found for the selected tags" : "该标签下没有任何文件", "<strong>System tags</strong> for a file have been modified" : "已更改的文件的<strong>系统标签</strong> ", "%1$s assigned system tag %3$s" : "%1$s 分配了系统标签 %3$s", "%1$s unassigned system tag %3$s" : "%1$s 取消分配了系统标签 %3$s", @@ -9,11 +14,6 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s 取消分配系统标签 %3$s 从 %2$s", "%s (not-assignable)" : "%s (不可分配)", "%s (invisible)" : "%s (不可见)", - "Tags" : "标签", - "Tagged files" : "标签文件", - "Select tags to filter by" : "选择标签来筛选", - "Please select tags to filter by" : "请选择标签来筛选", - "No files found for the selected tags" : "该标签下没有任何文件", "No files in here" : "无文件", "No entries found in this folder" : "此文件夹中无项目", "Name" : "名称", diff --git a/apps/systemtags/activity/extension.php b/apps/systemtags/lib/Activity/Extension.php index 8c101a6f550..8c101a6f550 100644 --- a/apps/systemtags/activity/extension.php +++ b/apps/systemtags/lib/Activity/Extension.php diff --git a/apps/systemtags/activity/listener.php b/apps/systemtags/lib/Activity/Listener.php index 9b6597119c6..9b6597119c6 100644 --- a/apps/systemtags/activity/listener.php +++ b/apps/systemtags/lib/Activity/Listener.php diff --git a/apps/testing/config.php b/apps/testing/lib/Config.php index d1cb021581d..d1cb021581d 100644 --- a/apps/testing/config.php +++ b/apps/testing/lib/Config.php diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml index 9fbfa8e96b5..5d7a647fd03 100644 --- a/apps/updatenotification/appinfo/info.xml +++ b/apps/updatenotification/appinfo/info.xml @@ -6,6 +6,7 @@ <licence>AGPL</licence> <author>Lukas Reschke</author> <version>0.2.0</version> + <namespace>UpdateNotification</namespace> <default_enable/> <dependencies> <owncloud min-version="9.1" max-version="9.1" /> diff --git a/apps/updatenotification/appinfo/routes.php b/apps/updatenotification/appinfo/routes.php index 9021d381b1b..a8890afc59f 100644 --- a/apps/updatenotification/appinfo/routes.php +++ b/apps/updatenotification/appinfo/routes.php @@ -19,7 +19,7 @@ * */ -namespace OCA\UpdateNotification\AppInfo; +use OCA\UpdateNotification\AppInfo\Application; $application = new Application(); $application->registerRoutes($this, ['routes' => [ diff --git a/apps/updatenotification/l10n/cs_CZ.js b/apps/updatenotification/l10n/cs_CZ.js index 82364d60e69..9122b20c8c2 100644 --- a/apps/updatenotification/l10n/cs_CZ.js +++ b/apps/updatenotification/l10n/cs_CZ.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Aktualizovat kanál", "{version} is available. Get more information on how to update." : "Je dostupná {version}. Přečtěte si více informací jak aktualizovat.", + "Updated channel" : "Aktualizovat kanál", "Updater" : "Automatické aktualizace", "A new version is available: %s" : "Je dostupná nová verze: %s", "Open updater" : "Otevřít program aktualizací", diff --git a/apps/updatenotification/l10n/cs_CZ.json b/apps/updatenotification/l10n/cs_CZ.json index 5621045e4e2..6e7a9890bdc 100644 --- a/apps/updatenotification/l10n/cs_CZ.json +++ b/apps/updatenotification/l10n/cs_CZ.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Aktualizovat kanál", "{version} is available. Get more information on how to update." : "Je dostupná {version}. Přečtěte si více informací jak aktualizovat.", + "Updated channel" : "Aktualizovat kanál", "Updater" : "Automatické aktualizace", "A new version is available: %s" : "Je dostupná nová verze: %s", "Open updater" : "Otevřít program aktualizací", diff --git a/apps/updatenotification/l10n/da.js b/apps/updatenotification/l10n/da.js index 530b18ec29c..fdfe2ed00d7 100644 --- a/apps/updatenotification/l10n/da.js +++ b/apps/updatenotification/l10n/da.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Kanal opdateret", "{version} is available. Get more information on how to update." : "{version} er tilgængelig. Få mere information om hvordan du opdaterer.", + "Updated channel" : "Kanal opdateret", "Updater" : "Updater", "A new version is available: %s" : "Der er en ny version tligængelig: %s", "Open updater" : "Åbn for opdatering", diff --git a/apps/updatenotification/l10n/da.json b/apps/updatenotification/l10n/da.json index 7f9dd1888bc..bdb5b4aa2e8 100644 --- a/apps/updatenotification/l10n/da.json +++ b/apps/updatenotification/l10n/da.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Kanal opdateret", "{version} is available. Get more information on how to update." : "{version} er tilgængelig. Få mere information om hvordan du opdaterer.", + "Updated channel" : "Kanal opdateret", "Updater" : "Updater", "A new version is available: %s" : "Der er en ny version tligængelig: %s", "Open updater" : "Åbn for opdatering", diff --git a/apps/updatenotification/l10n/de.js b/apps/updatenotification/l10n/de.js index 6b940024e18..b90fcaf2c6c 100644 --- a/apps/updatenotification/l10n/de.js +++ b/apps/updatenotification/l10n/de.js @@ -1,14 +1,14 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Aktualisierter Kanal", "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", + "Updated channel" : "Aktualisierter Kanal", "Updater" : "Updater", "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", "Open updater" : "Updater aufrufen", "Your version is up to date." : "Deine Version ist aktuell.", "Checked on %s" : "Geprüft auf %s", "Update channel:" : "Update-Kanal:", - "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kannst immer auf eine neuere Version updaten / experimentelle Version, aber kein Downgrade auf eine stabilere Version durchführen." + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kannst immer auf eine neuere Version / experimentellen Kanal updaten, aber kein Downgrade auf einen stabileren Kanal durchführen." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/de.json b/apps/updatenotification/l10n/de.json index 05965dbcb68..59c3717ee0b 100644 --- a/apps/updatenotification/l10n/de.json +++ b/apps/updatenotification/l10n/de.json @@ -1,12 +1,12 @@ { "translations": { - "Updated channel" : "Aktualisierter Kanal", "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", + "Updated channel" : "Aktualisierter Kanal", "Updater" : "Updater", "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", "Open updater" : "Updater aufrufen", "Your version is up to date." : "Deine Version ist aktuell.", "Checked on %s" : "Geprüft auf %s", "Update channel:" : "Update-Kanal:", - "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kannst immer auf eine neuere Version updaten / experimentelle Version, aber kein Downgrade auf eine stabilere Version durchführen." + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kannst immer auf eine neuere Version / experimentellen Kanal updaten, aber kein Downgrade auf einen stabileren Kanal durchführen." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/de_DE.js b/apps/updatenotification/l10n/de_DE.js index 4d06cae7060..d12d77d6474 100644 --- a/apps/updatenotification/l10n/de_DE.js +++ b/apps/updatenotification/l10n/de_DE.js @@ -1,14 +1,14 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Aktualisierter Kanal", "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", + "Updated channel" : "Aktualisierter Kanal", "Updater" : "Updater", "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", "Open updater" : "Updater aufrufen", "Your version is up to date." : "Die neuste Version ist installiert.", "Checked on %s" : "Überprüft auf %s", "Update channel:" : "Update-Kanal:", - "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Sie können immer auf eine neuere Version updaten / experimentelle Version, aber kein Downgrade auf eine stabilere Version durchführen." + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Sie können immer auf eine neuere Version / experimentellen Kanal updaten, aber kein Downgrade auf einen stabileren Kanal durchführen." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/de_DE.json b/apps/updatenotification/l10n/de_DE.json index ea4f0dd8807..20c5a866991 100644 --- a/apps/updatenotification/l10n/de_DE.json +++ b/apps/updatenotification/l10n/de_DE.json @@ -1,12 +1,12 @@ { "translations": { - "Updated channel" : "Aktualisierter Kanal", "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", + "Updated channel" : "Aktualisierter Kanal", "Updater" : "Updater", "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", "Open updater" : "Updater aufrufen", "Your version is up to date." : "Die neuste Version ist installiert.", "Checked on %s" : "Überprüft auf %s", "Update channel:" : "Update-Kanal:", - "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Sie können immer auf eine neuere Version updaten / experimentelle Version, aber kein Downgrade auf eine stabilere Version durchführen." + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Sie können immer auf eine neuere Version / experimentellen Kanal updaten, aber kein Downgrade auf einen stabileren Kanal durchführen." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/el.js b/apps/updatenotification/l10n/el.js index 4852da01df9..d85492c5d53 100644 --- a/apps/updatenotification/l10n/el.js +++ b/apps/updatenotification/l10n/el.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Ενημερωμένο κανάλι", "{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.", + "Updated channel" : "Ενημερωμένο κανάλι", "Updater" : "Εφαρμογή Ενημέρωσης", "A new version is available: %s" : "Μία νέα έκδοση είναι διαθέσιμη: %s", "Open updater" : "Άνοιγμα εφαρμογής ενημέρωσης", diff --git a/apps/updatenotification/l10n/el.json b/apps/updatenotification/l10n/el.json index 0eff5d2857a..c97c44f5c90 100644 --- a/apps/updatenotification/l10n/el.json +++ b/apps/updatenotification/l10n/el.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Ενημερωμένο κανάλι", "{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.", + "Updated channel" : "Ενημερωμένο κανάλι", "Updater" : "Εφαρμογή Ενημέρωσης", "A new version is available: %s" : "Μία νέα έκδοση είναι διαθέσιμη: %s", "Open updater" : "Άνοιγμα εφαρμογής ενημέρωσης", diff --git a/apps/updatenotification/l10n/en_GB.js b/apps/updatenotification/l10n/en_GB.js index 34e8956692c..a9b2d2d1a29 100644 --- a/apps/updatenotification/l10n/en_GB.js +++ b/apps/updatenotification/l10n/en_GB.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Updated channel", "{version} is available. Get more information on how to update." : "{version} is available. Get more information on how to update.", + "Updated channel" : "Updated channel", "Updater" : "Updater", "A new version is available: %s" : "A new version is available: %s", "Open updater" : "Open updater", diff --git a/apps/updatenotification/l10n/en_GB.json b/apps/updatenotification/l10n/en_GB.json index 03fbd8f7f84..62989608902 100644 --- a/apps/updatenotification/l10n/en_GB.json +++ b/apps/updatenotification/l10n/en_GB.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Updated channel", "{version} is available. Get more information on how to update." : "{version} is available. Get more information on how to update.", + "Updated channel" : "Updated channel", "Updater" : "Updater", "A new version is available: %s" : "A new version is available: %s", "Open updater" : "Open updater", diff --git a/apps/updatenotification/l10n/es.js b/apps/updatenotification/l10n/es.js index 3922e49a7ff..2dc16b3c517 100644 --- a/apps/updatenotification/l10n/es.js +++ b/apps/updatenotification/l10n/es.js @@ -1,14 +1,14 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Canal actualizado", "{version} is available. Get more information on how to update." : "{version} está disponible. Obtenga más información sobre cómo actualizar.", + "Updated channel" : "Canal actualizado", "Updater" : "Actualizador", "A new version is available: %s" : "Hay una nueva versión disponible: %s", "Open updater" : "Abrir el actualizador", "Your version is up to date." : "Su versión está actualizada.", "Checked on %s" : "Revisado el %s", "Update channel:" : "Canal de actualización: ", - "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás regresar a un canal más estable." + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás volver a un canal más estable." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/es.json b/apps/updatenotification/l10n/es.json index a72d2d84e8a..dd49fc5e8a1 100644 --- a/apps/updatenotification/l10n/es.json +++ b/apps/updatenotification/l10n/es.json @@ -1,12 +1,12 @@ { "translations": { - "Updated channel" : "Canal actualizado", "{version} is available. Get more information on how to update." : "{version} está disponible. Obtenga más información sobre cómo actualizar.", + "Updated channel" : "Canal actualizado", "Updater" : "Actualizador", "A new version is available: %s" : "Hay una nueva versión disponible: %s", "Open updater" : "Abrir el actualizador", "Your version is up to date." : "Su versión está actualizada.", "Checked on %s" : "Revisado el %s", "Update channel:" : "Canal de actualización: ", - "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás regresar a un canal más estable." + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás volver a un canal más estable." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/et_EE.js b/apps/updatenotification/l10n/et_EE.js index e22082ff92e..0007ee1fd04 100644 --- a/apps/updatenotification/l10n/et_EE.js +++ b/apps/updatenotification/l10n/et_EE.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Uuendatud kanal", "{version} is available. Get more information on how to update." : "{version} on saadaval. Vaata lisainfot uuendamise kohta.", + "Updated channel" : "Uuendatud kanal", "Updater" : "Uuendaja", "A new version is available: %s" : "Saadaval on uus versioon: %s", "Open updater" : "Ava uuendaja", diff --git a/apps/updatenotification/l10n/et_EE.json b/apps/updatenotification/l10n/et_EE.json index 9ab8d224a7c..64003ef5901 100644 --- a/apps/updatenotification/l10n/et_EE.json +++ b/apps/updatenotification/l10n/et_EE.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Uuendatud kanal", "{version} is available. Get more information on how to update." : "{version} on saadaval. Vaata lisainfot uuendamise kohta.", + "Updated channel" : "Uuendatud kanal", "Updater" : "Uuendaja", "A new version is available: %s" : "Saadaval on uus versioon: %s", "Open updater" : "Ava uuendaja", diff --git a/apps/updatenotification/l10n/fi_FI.js b/apps/updatenotification/l10n/fi_FI.js index 811f4cf83e8..f5fa3d2b7b6 100644 --- a/apps/updatenotification/l10n/fi_FI.js +++ b/apps/updatenotification/l10n/fi_FI.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Päivitetty kanava", "{version} is available. Get more information on how to update." : "{version} on saatavilla. Tarjolla on lisätietoja päivittämisestä.", + "Updated channel" : "Päivitetty kanava", "Updater" : "Päivitysohjelma", "A new version is available: %s" : "Uusi versio on saatavilla: %s", "Open updater" : "Avaa päivitysohjelma", diff --git a/apps/updatenotification/l10n/fi_FI.json b/apps/updatenotification/l10n/fi_FI.json index 0a475e17ba7..f3aa34be1e5 100644 --- a/apps/updatenotification/l10n/fi_FI.json +++ b/apps/updatenotification/l10n/fi_FI.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Päivitetty kanava", "{version} is available. Get more information on how to update." : "{version} on saatavilla. Tarjolla on lisätietoja päivittämisestä.", + "Updated channel" : "Päivitetty kanava", "Updater" : "Päivitysohjelma", "A new version is available: %s" : "Uusi versio on saatavilla: %s", "Open updater" : "Avaa päivitysohjelma", diff --git a/apps/updatenotification/l10n/fr.js b/apps/updatenotification/l10n/fr.js index 54bd598911c..dd6fdb75fe8 100644 --- a/apps/updatenotification/l10n/fr.js +++ b/apps/updatenotification/l10n/fr.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Canal à jour", "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations sur comment mettre à jour.", + "Updated channel" : "Canal à jour", "Updater" : "Mises à jour", "A new version is available: %s" : "Une nouvelle version est disponible : %s", "Open updater" : "Ouvrir le système de mise à jour", diff --git a/apps/updatenotification/l10n/fr.json b/apps/updatenotification/l10n/fr.json index 4e1b10fedb9..345a7a7c3d1 100644 --- a/apps/updatenotification/l10n/fr.json +++ b/apps/updatenotification/l10n/fr.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Canal à jour", "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations sur comment mettre à jour.", + "Updated channel" : "Canal à jour", "Updater" : "Mises à jour", "A new version is available: %s" : "Une nouvelle version est disponible : %s", "Open updater" : "Ouvrir le système de mise à jour", diff --git a/apps/updatenotification/l10n/he.js b/apps/updatenotification/l10n/he.js index 17d99402ff3..01261f351e4 100644 --- a/apps/updatenotification/l10n/he.js +++ b/apps/updatenotification/l10n/he.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "ערוץ מעודכן", "{version} is available. Get more information on how to update." : "{version} זמינה. ניתן לקבל מידע נוסף על איך לעדכן.", + "Updated channel" : "ערוץ מעודכן", "Updater" : "מעדכן", "A new version is available: %s" : "קיימת גרסה מעודכנת: %s", "Open updater" : "פתיחת מעדכן", diff --git a/apps/updatenotification/l10n/he.json b/apps/updatenotification/l10n/he.json index 1b69499318c..bd5a2290dab 100644 --- a/apps/updatenotification/l10n/he.json +++ b/apps/updatenotification/l10n/he.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "ערוץ מעודכן", "{version} is available. Get more information on how to update." : "{version} זמינה. ניתן לקבל מידע נוסף על איך לעדכן.", + "Updated channel" : "ערוץ מעודכן", "Updater" : "מעדכן", "A new version is available: %s" : "קיימת גרסה מעודכנת: %s", "Open updater" : "פתיחת מעדכן", diff --git a/apps/updatenotification/l10n/hu_HU.js b/apps/updatenotification/l10n/hu_HU.js index 9fe551f060e..1df38a6746f 100644 --- a/apps/updatenotification/l10n/hu_HU.js +++ b/apps/updatenotification/l10n/hu_HU.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Frissített csatorna", "{version} is available. Get more information on how to update." : "{version} rendelkezésre áll. További információ a frissítéshez.", + "Updated channel" : "Frissített csatorna", "Updater" : "Frissítéskezelő", "A new version is available: %s" : "Új verzió érhető el: %s", "Open updater" : "Frissítő megnyitása", diff --git a/apps/updatenotification/l10n/hu_HU.json b/apps/updatenotification/l10n/hu_HU.json index 13c37924428..eb953669ab1 100644 --- a/apps/updatenotification/l10n/hu_HU.json +++ b/apps/updatenotification/l10n/hu_HU.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Frissített csatorna", "{version} is available. Get more information on how to update." : "{version} rendelkezésre áll. További információ a frissítéshez.", + "Updated channel" : "Frissített csatorna", "Updater" : "Frissítéskezelő", "A new version is available: %s" : "Új verzió érhető el: %s", "Open updater" : "Frissítő megnyitása", diff --git a/apps/updatenotification/l10n/is.js b/apps/updatenotification/l10n/is.js index 2ae1bc55db7..a2bd2757d97 100644 --- a/apps/updatenotification/l10n/is.js +++ b/apps/updatenotification/l10n/is.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Uppfærði rás", "{version} is available. Get more information on how to update." : "{version} er í boði. Fáðu frekari upplýsingar um hvernig á að uppfæra.", + "Updated channel" : "Uppfærði rás", "Updater" : "Uppfærslustýring", "A new version is available: %s" : "Ný útgáfa er tiltæk: %s", "Open updater" : "Opna uppfærslustýringu", diff --git a/apps/updatenotification/l10n/is.json b/apps/updatenotification/l10n/is.json index 8b5be024f4e..45df407065f 100644 --- a/apps/updatenotification/l10n/is.json +++ b/apps/updatenotification/l10n/is.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Uppfærði rás", "{version} is available. Get more information on how to update." : "{version} er í boði. Fáðu frekari upplýsingar um hvernig á að uppfæra.", + "Updated channel" : "Uppfærði rás", "Updater" : "Uppfærslustýring", "A new version is available: %s" : "Ný útgáfa er tiltæk: %s", "Open updater" : "Opna uppfærslustýringu", diff --git a/apps/updatenotification/l10n/it.js b/apps/updatenotification/l10n/it.js index 7fb3d153b9a..f0f24ef0168 100644 --- a/apps/updatenotification/l10n/it.js +++ b/apps/updatenotification/l10n/it.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Canale di aggiornamento", "{version} is available. Get more information on how to update." : "{version} è disponibile. Ottieni ulteriori informazioni su come eseguire l'aggiornamento.", + "Updated channel" : "Canale di aggiornamento", "Updater" : "Strumento di aggiornamento", "A new version is available: %s" : "Una nuova versione è disponibile: %s", "Open updater" : "Apri lo strumento di aggiornamento", diff --git a/apps/updatenotification/l10n/it.json b/apps/updatenotification/l10n/it.json index 18c4b7e0d1d..eca0fe6ecf1 100644 --- a/apps/updatenotification/l10n/it.json +++ b/apps/updatenotification/l10n/it.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Canale di aggiornamento", "{version} is available. Get more information on how to update." : "{version} è disponibile. Ottieni ulteriori informazioni su come eseguire l'aggiornamento.", + "Updated channel" : "Canale di aggiornamento", "Updater" : "Strumento di aggiornamento", "A new version is available: %s" : "Una nuova versione è disponibile: %s", "Open updater" : "Apri lo strumento di aggiornamento", diff --git a/apps/updatenotification/l10n/ja.js b/apps/updatenotification/l10n/ja.js index c5a9ff90dc3..4d8d8a17b98 100644 --- a/apps/updatenotification/l10n/ja.js +++ b/apps/updatenotification/l10n/ja.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "アップデートチャンネル", "{version} is available. Get more information on how to update." : "{version} が利用可能です。アップデート方法について詳細情報を確認してください。", + "Updated channel" : "アップデートチャンネル", "Updater" : "アップデート", "A new version is available: %s" : "新しいバージョンが利用可能: %s", "Open updater" : "アップデーターを開く", diff --git a/apps/updatenotification/l10n/ja.json b/apps/updatenotification/l10n/ja.json index 8b4a8eea34c..0c4a690baf2 100644 --- a/apps/updatenotification/l10n/ja.json +++ b/apps/updatenotification/l10n/ja.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "アップデートチャンネル", "{version} is available. Get more information on how to update." : "{version} が利用可能です。アップデート方法について詳細情報を確認してください。", + "Updated channel" : "アップデートチャンネル", "Updater" : "アップデート", "A new version is available: %s" : "新しいバージョンが利用可能: %s", "Open updater" : "アップデーターを開く", diff --git a/apps/updatenotification/l10n/ko.js b/apps/updatenotification/l10n/ko.js index 2025731fbf3..cc225791380 100644 --- a/apps/updatenotification/l10n/ko.js +++ b/apps/updatenotification/l10n/ko.js @@ -2,6 +2,7 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version}을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 알아보십시오.", + "Updated channel" : "업데이트 된 채널", "Updater" : "업데이터", "A new version is available: %s" : "새 버전을 사용할 수 있습니다: %s", "Open updater" : "업데이터 열기", diff --git a/apps/updatenotification/l10n/ko.json b/apps/updatenotification/l10n/ko.json index 1794dd919d0..a2e0474a0e3 100644 --- a/apps/updatenotification/l10n/ko.json +++ b/apps/updatenotification/l10n/ko.json @@ -1,5 +1,6 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version}을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 알아보십시오.", + "Updated channel" : "업데이트 된 채널", "Updater" : "업데이터", "A new version is available: %s" : "새 버전을 사용할 수 있습니다: %s", "Open updater" : "업데이터 열기", diff --git a/apps/updatenotification/l10n/nb_NO.js b/apps/updatenotification/l10n/nb_NO.js index 62d5121a3a0..f551c8fcfee 100644 --- a/apps/updatenotification/l10n/nb_NO.js +++ b/apps/updatenotification/l10n/nb_NO.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Oppdaterte kanal", "{version} is available. Get more information on how to update." : "{version} er tilgjengelig. Få mer informasjon om å oppdatere.", + "Updated channel" : "Oppdaterte kanal", "Updater" : "Oppdaterer", "A new version is available: %s" : "En ny versjon er tilgjengelig: %s", "Open updater" : "Åpne oppdaterer", diff --git a/apps/updatenotification/l10n/nb_NO.json b/apps/updatenotification/l10n/nb_NO.json index 75e9c830208..300bfc69ddd 100644 --- a/apps/updatenotification/l10n/nb_NO.json +++ b/apps/updatenotification/l10n/nb_NO.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Oppdaterte kanal", "{version} is available. Get more information on how to update." : "{version} er tilgjengelig. Få mer informasjon om å oppdatere.", + "Updated channel" : "Oppdaterte kanal", "Updater" : "Oppdaterer", "A new version is available: %s" : "En ny versjon er tilgjengelig: %s", "Open updater" : "Åpne oppdaterer", diff --git a/apps/updatenotification/l10n/nl.js b/apps/updatenotification/l10n/nl.js index 9d7c830775f..d7bc20bcfea 100644 --- a/apps/updatenotification/l10n/nl.js +++ b/apps/updatenotification/l10n/nl.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Bijgewerkt kanaal", "{version} is available. Get more information on how to update." : "{version} is beschikbaar. Meer informatie over het bijwerken.", + "Updated channel" : "Bijgewerkt kanaal", "Updater" : "Updater", "A new version is available: %s" : "Er is een nieuwe versie beschikbaar: %s", "Open updater" : "Open updater", diff --git a/apps/updatenotification/l10n/nl.json b/apps/updatenotification/l10n/nl.json index 564d890bd85..caecfa275f5 100644 --- a/apps/updatenotification/l10n/nl.json +++ b/apps/updatenotification/l10n/nl.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Bijgewerkt kanaal", "{version} is available. Get more information on how to update." : "{version} is beschikbaar. Meer informatie over het bijwerken.", + "Updated channel" : "Bijgewerkt kanaal", "Updater" : "Updater", "A new version is available: %s" : "Er is een nieuwe versie beschikbaar: %s", "Open updater" : "Open updater", diff --git a/apps/updatenotification/l10n/oc.js b/apps/updatenotification/l10n/oc.js index ce7931c17f9..e1e930ba805 100644 --- a/apps/updatenotification/l10n/oc.js +++ b/apps/updatenotification/l10n/oc.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Canal mes a jorn", "{version} is available. Get more information on how to update." : "La version {version} es disponibla. Obtenètz mai d'informacions a prepaus d'aquesta mesa a jorn.", + "Updated channel" : "Canal mes a jorn", "Update channel:" : "Canal de mesa a jorn :", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Podètz a tot moment metre a jorn cap a una version mai recenta o un canal experimental. Pasmens, poiretz pas jamai tornar a un canal mai estable." }, diff --git a/apps/updatenotification/l10n/oc.json b/apps/updatenotification/l10n/oc.json index 8478036242b..16c52460813 100644 --- a/apps/updatenotification/l10n/oc.json +++ b/apps/updatenotification/l10n/oc.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Canal mes a jorn", "{version} is available. Get more information on how to update." : "La version {version} es disponibla. Obtenètz mai d'informacions a prepaus d'aquesta mesa a jorn.", + "Updated channel" : "Canal mes a jorn", "Update channel:" : "Canal de mesa a jorn :", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Podètz a tot moment metre a jorn cap a una version mai recenta o un canal experimental. Pasmens, poiretz pas jamai tornar a un canal mai estable." },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/updatenotification/l10n/pl.js b/apps/updatenotification/l10n/pl.js index 3439aae077a..6551d0808e3 100644 --- a/apps/updatenotification/l10n/pl.js +++ b/apps/updatenotification/l10n/pl.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Zaktualizowano kanał", "{version} is available. Get more information on how to update." : "Wersja {version} jest dostępna. Dowiedz się jak zaktualizować.", + "Updated channel" : "Zaktualizowano kanał", "Updater" : "Aktualizator", "A new version is available: %s" : "Dostępna jest nowa wersja: %s", "Open updater" : "Otwórz aktualizator", diff --git a/apps/updatenotification/l10n/pl.json b/apps/updatenotification/l10n/pl.json index f866a42188a..fd859feae11 100644 --- a/apps/updatenotification/l10n/pl.json +++ b/apps/updatenotification/l10n/pl.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Zaktualizowano kanał", "{version} is available. Get more information on how to update." : "Wersja {version} jest dostępna. Dowiedz się jak zaktualizować.", + "Updated channel" : "Zaktualizowano kanał", "Updater" : "Aktualizator", "A new version is available: %s" : "Dostępna jest nowa wersja: %s", "Open updater" : "Otwórz aktualizator", diff --git a/apps/updatenotification/l10n/pt_BR.js b/apps/updatenotification/l10n/pt_BR.js index 4ee77e8745c..a3231a8ec0a 100644 --- a/apps/updatenotification/l10n/pt_BR.js +++ b/apps/updatenotification/l10n/pt_BR.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Canal atualizado", "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informações sobre como atualizar.", + "Updated channel" : "Canal atualizado", "Updater" : "Atualizador", "A new version is available: %s" : "Uma nova versão está disponível: %s", "Open updater" : "Abrir o atualizador", diff --git a/apps/updatenotification/l10n/pt_BR.json b/apps/updatenotification/l10n/pt_BR.json index 43763f7448f..ad17b44040d 100644 --- a/apps/updatenotification/l10n/pt_BR.json +++ b/apps/updatenotification/l10n/pt_BR.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Canal atualizado", "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informações sobre como atualizar.", + "Updated channel" : "Canal atualizado", "Updater" : "Atualizador", "A new version is available: %s" : "Uma nova versão está disponível: %s", "Open updater" : "Abrir o atualizador", diff --git a/apps/updatenotification/l10n/pt_PT.js b/apps/updatenotification/l10n/pt_PT.js index 7bcc1a720dc..fa889f90190 100644 --- a/apps/updatenotification/l10n/pt_PT.js +++ b/apps/updatenotification/l10n/pt_PT.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Actualizar canal", "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informação sobre como atualizar.", + "Updated channel" : "Actualizar canal", "Updater" : "actualizar", "A new version is available: %s" : "Está disponível uma nova versão: %s", "Open updater" : "Abrir atualizador", diff --git a/apps/updatenotification/l10n/pt_PT.json b/apps/updatenotification/l10n/pt_PT.json index dd7e6760dcf..d46b032a83f 100644 --- a/apps/updatenotification/l10n/pt_PT.json +++ b/apps/updatenotification/l10n/pt_PT.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Actualizar canal", "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informação sobre como atualizar.", + "Updated channel" : "Actualizar canal", "Updater" : "actualizar", "A new version is available: %s" : "Está disponível uma nova versão: %s", "Open updater" : "Abrir atualizador", diff --git a/apps/updatenotification/l10n/ro.js b/apps/updatenotification/l10n/ro.js new file mode 100644 index 00000000000..465de73c9f4 --- /dev/null +++ b/apps/updatenotification/l10n/ro.js @@ -0,0 +1,14 @@ +OC.L10N.register( + "updatenotification", + { + "{version} is available. Get more information on how to update." : "{version} este disponibil. Află mai multe informații despre cum să faci o actualizare.", + "Updated channel" : "Canal actualizat", + "Updater" : "Unealtă pentru actualizare", + "A new version is available: %s" : "O nouă versiune este disponibilă: %s", + "Open updater" : "Deschide unealta pentru actualizare", + "Your version is up to date." : "Versiunea curentă este la zi.", + "Checked on %s" : "Verificat la %s", + "Update channel:" : "Canal pentru actualizări:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Poți mereu să faci o actualizare către o versiune nouă / o versiune dintr-un canal experimental. Dar nu te poți niciodată întoarce la un canal de distribuție stabil." +}, +"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/updatenotification/l10n/ro.json b/apps/updatenotification/l10n/ro.json new file mode 100644 index 00000000000..56a8c48d3bc --- /dev/null +++ b/apps/updatenotification/l10n/ro.json @@ -0,0 +1,12 @@ +{ "translations": { + "{version} is available. Get more information on how to update." : "{version} este disponibil. Află mai multe informații despre cum să faci o actualizare.", + "Updated channel" : "Canal actualizat", + "Updater" : "Unealtă pentru actualizare", + "A new version is available: %s" : "O nouă versiune este disponibilă: %s", + "Open updater" : "Deschide unealta pentru actualizare", + "Your version is up to date." : "Versiunea curentă este la zi.", + "Checked on %s" : "Verificat la %s", + "Update channel:" : "Canal pentru actualizări:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Poți mereu să faci o actualizare către o versiune nouă / o versiune dintr-un canal experimental. Dar nu te poți niciodată întoarce la un canal de distribuție stabil." +},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" +}
\ No newline at end of file diff --git a/apps/updatenotification/l10n/ru.js b/apps/updatenotification/l10n/ru.js index ae10ea5a821..0513fd6aa62 100644 --- a/apps/updatenotification/l10n/ru.js +++ b/apps/updatenotification/l10n/ru.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Обновленный канал", "{version} is available. Get more information on how to update." : "Доступна версия {version}. Получить дополнительную информацию о порядке обновления.", + "Updated channel" : "Обновленный канал", "Updater" : "Обновление", "A new version is available: %s" : "Доступна новая версия: %s", "Open updater" : "Открыть окно обновления", diff --git a/apps/updatenotification/l10n/ru.json b/apps/updatenotification/l10n/ru.json index 7d71a5c43e7..7d52dae12ab 100644 --- a/apps/updatenotification/l10n/ru.json +++ b/apps/updatenotification/l10n/ru.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Обновленный канал", "{version} is available. Get more information on how to update." : "Доступна версия {version}. Получить дополнительную информацию о порядке обновления.", + "Updated channel" : "Обновленный канал", "Updater" : "Обновление", "A new version is available: %s" : "Доступна новая версия: %s", "Open updater" : "Открыть окно обновления", diff --git a/apps/updatenotification/l10n/sl.js b/apps/updatenotification/l10n/sl.js index 7e0e1d354a0..502ed2cf41f 100644 --- a/apps/updatenotification/l10n/sl.js +++ b/apps/updatenotification/l10n/sl.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Posodobljen kanal", "{version} is available. Get more information on how to update." : "Na voljo je nova različica {version}. Na voljo je več podrobnosti o nadgradnji.", + "Updated channel" : "Posodobljen kanal", "Updater" : "Posodabljalnik", "A new version is available: %s" : "Na voljo je nova različica: %s", "Open updater" : "Odpri posodabljalnik", diff --git a/apps/updatenotification/l10n/sl.json b/apps/updatenotification/l10n/sl.json index 9143b08e3e9..961f1b90fe2 100644 --- a/apps/updatenotification/l10n/sl.json +++ b/apps/updatenotification/l10n/sl.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Posodobljen kanal", "{version} is available. Get more information on how to update." : "Na voljo je nova različica {version}. Na voljo je več podrobnosti o nadgradnji.", + "Updated channel" : "Posodobljen kanal", "Updater" : "Posodabljalnik", "A new version is available: %s" : "Na voljo je nova različica: %s", "Open updater" : "Odpri posodabljalnik", diff --git a/apps/updatenotification/l10n/sq.js b/apps/updatenotification/l10n/sq.js index dbbbc70fdbe..904ea0a3c0c 100644 --- a/apps/updatenotification/l10n/sq.js +++ b/apps/updatenotification/l10n/sq.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Kanali u përditësua", "{version} is available. Get more information on how to update." : "Është gati {version}. Merrni më tepër informacion se si ta përditësoni.", + "Updated channel" : "Kanali u përditësua", "Updater" : "Përditësues", "A new version is available: %s" : "Ka gati një version të ri: %s", "Open updater" : "Hapni përditësuesin", diff --git a/apps/updatenotification/l10n/sq.json b/apps/updatenotification/l10n/sq.json index 4706aad0899..87f29a83a13 100644 --- a/apps/updatenotification/l10n/sq.json +++ b/apps/updatenotification/l10n/sq.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Kanali u përditësua", "{version} is available. Get more information on how to update." : "Është gati {version}. Merrni më tepër informacion se si ta përditësoni.", + "Updated channel" : "Kanali u përditësua", "Updater" : "Përditësues", "A new version is available: %s" : "Ka gati një version të ri: %s", "Open updater" : "Hapni përditësuesin", diff --git a/apps/updatenotification/l10n/sr.js b/apps/updatenotification/l10n/sr.js index c051974f5da..de9cb470268 100644 --- a/apps/updatenotification/l10n/sr.js +++ b/apps/updatenotification/l10n/sr.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Канал ажуриран", "{version} is available. Get more information on how to update." : "Верзија {version} је доступна. Сазнајте како да ажурирате.", + "Updated channel" : "Канал ажуриран", "Updater" : "Ажурирање", "A new version is available: %s" : "Доступна је нова верзија: %s", "Open updater" : "Отвори ажурирање", diff --git a/apps/updatenotification/l10n/sr.json b/apps/updatenotification/l10n/sr.json index c33fbd7574e..90ec0169399 100644 --- a/apps/updatenotification/l10n/sr.json +++ b/apps/updatenotification/l10n/sr.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Канал ажуриран", "{version} is available. Get more information on how to update." : "Верзија {version} је доступна. Сазнајте како да ажурирате.", + "Updated channel" : "Канал ажуриран", "Updater" : "Ажурирање", "A new version is available: %s" : "Доступна је нова верзија: %s", "Open updater" : "Отвори ажурирање", diff --git a/apps/updatenotification/l10n/sv.js b/apps/updatenotification/l10n/sv.js index ed2bf1ddb16..45cf8e2476f 100644 --- a/apps/updatenotification/l10n/sv.js +++ b/apps/updatenotification/l10n/sv.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Uppdaterad kanal", "{version} is available. Get more information on how to update." : "{version} är tillgänglig. Få mer information om hur du uppdaterar.", + "Updated channel" : "Uppdaterad kanal", "Updater" : "Uppdaterare", "A new version is available: %s" : "En ny version är tillgänglig: %s", "Open updater" : "Öppna uppdateraren", diff --git a/apps/updatenotification/l10n/sv.json b/apps/updatenotification/l10n/sv.json index 4c3ec1d3ed4..d52684ecf31 100644 --- a/apps/updatenotification/l10n/sv.json +++ b/apps/updatenotification/l10n/sv.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Uppdaterad kanal", "{version} is available. Get more information on how to update." : "{version} är tillgänglig. Få mer information om hur du uppdaterar.", + "Updated channel" : "Uppdaterad kanal", "Updater" : "Uppdaterare", "A new version is available: %s" : "En ny version är tillgänglig: %s", "Open updater" : "Öppna uppdateraren", diff --git a/apps/updatenotification/l10n/th_TH.js b/apps/updatenotification/l10n/th_TH.js index 47b4ec18606..25265693d52 100644 --- a/apps/updatenotification/l10n/th_TH.js +++ b/apps/updatenotification/l10n/th_TH.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "ปรับปรุงรูปแบบการอัพเดทเรียบร้อยแล้ว", "{version} is available. Get more information on how to update." : "มีรุ่นใหม่ {version} สามารถใช้ได้ รับข้อมูลเพิ่มเติมเกี่ยวกับวิธีการอัพเดท", + "Updated channel" : "ปรับปรุงรูปแบบการอัพเดทเรียบร้อยแล้ว", "Updater" : "อัพเดท", "A new version is available: %s" : "มีรุ่นใหม่ที่สามารถใช่ได้: %s", "Open updater" : "เปิดตัวอัพเดท", diff --git a/apps/updatenotification/l10n/th_TH.json b/apps/updatenotification/l10n/th_TH.json index 05579d9f4a7..c94c88f2413 100644 --- a/apps/updatenotification/l10n/th_TH.json +++ b/apps/updatenotification/l10n/th_TH.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "ปรับปรุงรูปแบบการอัพเดทเรียบร้อยแล้ว", "{version} is available. Get more information on how to update." : "มีรุ่นใหม่ {version} สามารถใช้ได้ รับข้อมูลเพิ่มเติมเกี่ยวกับวิธีการอัพเดท", + "Updated channel" : "ปรับปรุงรูปแบบการอัพเดทเรียบร้อยแล้ว", "Updater" : "อัพเดท", "A new version is available: %s" : "มีรุ่นใหม่ที่สามารถใช่ได้: %s", "Open updater" : "เปิดตัวอัพเดท", diff --git a/apps/updatenotification/l10n/tr.js b/apps/updatenotification/l10n/tr.js index 036cedb6fb6..aa4ec123f96 100644 --- a/apps/updatenotification/l10n/tr.js +++ b/apps/updatenotification/l10n/tr.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "Kanal güncellendi", "{version} is available. Get more information on how to update." : "Sürüm {version} hazır. Nasıl güncelleyeceğinizle ilgili daha fazla bilgi alın.", + "Updated channel" : "Kanal güncellendi", "Updater" : "Güncelleyici", "A new version is available: %s" : "Yeni bir sürüm mevcut: %s", "Open updater" : "Güncelleyiciyi aç", diff --git a/apps/updatenotification/l10n/tr.json b/apps/updatenotification/l10n/tr.json index a7523e3472b..6c1514e659a 100644 --- a/apps/updatenotification/l10n/tr.json +++ b/apps/updatenotification/l10n/tr.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "Kanal güncellendi", "{version} is available. Get more information on how to update." : "Sürüm {version} hazır. Nasıl güncelleyeceğinizle ilgili daha fazla bilgi alın.", + "Updated channel" : "Kanal güncellendi", "Updater" : "Güncelleyici", "A new version is available: %s" : "Yeni bir sürüm mevcut: %s", "Open updater" : "Güncelleyiciyi aç", diff --git a/apps/updatenotification/l10n/zh_CN.js b/apps/updatenotification/l10n/zh_CN.js index 45acd3ec97b..3c18f5981a3 100644 --- a/apps/updatenotification/l10n/zh_CN.js +++ b/apps/updatenotification/l10n/zh_CN.js @@ -1,8 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updated channel" : "更新通道", "{version} is available. Get more information on how to update." : "新版本 {version} 已可以使用。获取更多升级相关信息。", + "Updated channel" : "更新通道", "Updater" : "更新管理器", "A new version is available: %s" : "有可用的新版本： %s", "Open updater" : "打开更新管理器", diff --git a/apps/updatenotification/l10n/zh_CN.json b/apps/updatenotification/l10n/zh_CN.json index 10764103dc9..47bba0c492b 100644 --- a/apps/updatenotification/l10n/zh_CN.json +++ b/apps/updatenotification/l10n/zh_CN.json @@ -1,6 +1,6 @@ { "translations": { - "Updated channel" : "更新通道", "{version} is available. Get more information on how to update." : "新版本 {version} 已可以使用。获取更多升级相关信息。", + "Updated channel" : "更新通道", "Updater" : "更新管理器", "A new version is available: %s" : "有可用的新版本： %s", "Open updater" : "打开更新管理器", diff --git a/apps/updatenotification/appinfo/application.php b/apps/updatenotification/lib/AppInfo/Application.php index 08ff4abf766..08ff4abf766 100644 --- a/apps/updatenotification/appinfo/application.php +++ b/apps/updatenotification/lib/AppInfo/Application.php diff --git a/apps/updatenotification/controller/admincontroller.php b/apps/updatenotification/lib/Controller/AdminController.php index 5dbcc685809..5dbcc685809 100644 --- a/apps/updatenotification/controller/admincontroller.php +++ b/apps/updatenotification/lib/Controller/AdminController.php diff --git a/apps/updatenotification/lib/resettokenbackgroundjob.php b/apps/updatenotification/lib/ResetTokenBackgroundJob.php index 61bd9fc0490..61bd9fc0490 100644 --- a/apps/updatenotification/lib/resettokenbackgroundjob.php +++ b/apps/updatenotification/lib/ResetTokenBackgroundJob.php diff --git a/apps/updatenotification/lib/updatechecker.php b/apps/updatenotification/lib/UpdateChecker.php index bf653c23b8f..bf653c23b8f 100644 --- a/apps/updatenotification/lib/updatechecker.php +++ b/apps/updatenotification/lib/UpdateChecker.php diff --git a/apps/updatenotification/tests/controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php index d8fc2dd335c..d8fc2dd335c 100644 --- a/apps/updatenotification/tests/controller/AdminControllerTest.php +++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml index a1bb8a47687..b84a33f75a4 100644 --- a/apps/user_ldap/appinfo/info.xml +++ b/apps/user_ldap/appinfo/info.xml @@ -20,4 +20,9 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce <lib>ldap</lib> <owncloud min-version="9.1" max-version="9.1" /> </dependencies> + + <background-jobs> + <job>OCA\user_ldap\lib\Jobs</job> + <job>\OCA\User_LDAP\Jobs\CleanUp</job> + </background-jobs> </info> diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php index 49c8f808ef3..71112682526 100644 --- a/apps/user_ldap/appinfo/install.php +++ b/apps/user_ldap/appinfo/install.php @@ -24,6 +24,3 @@ $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet'); if($state === 'doSet') { OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); } - -OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs'); -OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp'); diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php deleted file mode 100644 index 82f3e86bd33..00000000000 --- a/apps/user_ldap/appinfo/update.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php -/** - * @author Joas Schilling <nickvergessen@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> - * - * @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/> - * - */ - -OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs'); -OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp'); diff --git a/apps/user_ldap/l10n/ast.js b/apps/user_ldap/l10n/ast.js index 5bdc52e47ae..9f7b3e66934 100644 --- a/apps/user_ldap/l10n/ast.js +++ b/apps/user_ldap/l10n/ast.js @@ -46,7 +46,6 @@ OC.L10N.register( "You can specify Base DN for users and groups in the Advanced tab" : "Pues especificar el DN base pa usuarios y grupos na llingüeta Avanzáu", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automátiques de LDAP. Meyor pa grandes configuraciones, pero rique mayor conocimientu de LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Inxerta manualmente los filtros de LDAP (recomendáu pa direutorios llargos)", - "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.", "Saving" : "Guardando", "Back" : "Atrás", diff --git a/apps/user_ldap/l10n/ast.json b/apps/user_ldap/l10n/ast.json index 934065b7a4b..7b097287bb7 100644 --- a/apps/user_ldap/l10n/ast.json +++ b/apps/user_ldap/l10n/ast.json @@ -44,7 +44,6 @@ "You can specify Base DN for users and groups in the Advanced tab" : "Pues especificar el DN base pa usuarios y grupos na llingüeta Avanzáu", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automátiques de LDAP. Meyor pa grandes configuraciones, pero rique mayor conocimientu de LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Inxerta manualmente los filtros de LDAP (recomendáu pa direutorios llargos)", - "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.", "Saving" : "Guardando", "Back" : "Atrás", diff --git a/apps/user_ldap/l10n/bg_BG.js b/apps/user_ldap/l10n/bg_BG.js index 3ba3f25bd16..80ca296043f 100644 --- a/apps/user_ldap/l10n/bg_BG.js +++ b/apps/user_ldap/l10n/bg_BG.js @@ -48,7 +48,6 @@ OC.L10N.register( "You can specify Base DN for users and groups in the Advanced tab" : "Можеш да настроиш Base DN за отделни потребители и групи в разделителя Допълнителни.", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избягва автоматични LDAP заявки. По-добра опция за големи инсталации, но изисква LDAP познания.", "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)", - "Limit %s access to users meeting these criteria:" : "Ограничи достъпа на %s до потребители покриващи следните критерии:", "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.", "Saving" : "Записване", "Back" : "Назад", diff --git a/apps/user_ldap/l10n/bg_BG.json b/apps/user_ldap/l10n/bg_BG.json index 1360e0cec1e..ab7ed7c5c6a 100644 --- a/apps/user_ldap/l10n/bg_BG.json +++ b/apps/user_ldap/l10n/bg_BG.json @@ -46,7 +46,6 @@ "You can specify Base DN for users and groups in the Advanced tab" : "Можеш да настроиш Base DN за отделни потребители и групи в разделителя Допълнителни.", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избягва автоматични LDAP заявки. По-добра опция за големи инсталации, но изисква LDAP познания.", "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)", - "Limit %s access to users meeting these criteria:" : "Ограничи достъпа на %s до потребители покриващи следните критерии:", "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.", "Saving" : "Записване", "Back" : "Назад", diff --git a/apps/user_ldap/l10n/bn_BD.js b/apps/user_ldap/l10n/bn_BD.js index e7d34692f74..c74a22160e6 100644 --- a/apps/user_ldap/l10n/bn_BD.js +++ b/apps/user_ldap/l10n/bn_BD.js @@ -43,7 +43,6 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।", "One Base DN per line" : "লাইনপ্রতি একটি Base DN", "You can specify Base DN for users and groups in the Advanced tab" : "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।", - "Limit %s access to users meeting these criteria:" : "%s এ প্রবেশাধিকার এই শর্তধারী ব্যবহারকারীর মাঝে সীমিত রাখ:", "The filter specifies which LDAP users shall have access to the %s instance." : "এই ফিল্টারটি কোন কোন LDAP ব্যবহারকারী %s সার্ভারে প্রবেশ করবেন তা বাছাই করে।", "Back" : "পেছনে যাও", "Continue" : "চালিয়ে যাও", diff --git a/apps/user_ldap/l10n/bn_BD.json b/apps/user_ldap/l10n/bn_BD.json index e9b7cd0146a..68883909add 100644 --- a/apps/user_ldap/l10n/bn_BD.json +++ b/apps/user_ldap/l10n/bn_BD.json @@ -41,7 +41,6 @@ "For anonymous access, leave DN and Password empty." : "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।", "One Base DN per line" : "লাইনপ্রতি একটি Base DN", "You can specify Base DN for users and groups in the Advanced tab" : "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।", - "Limit %s access to users meeting these criteria:" : "%s এ প্রবেশাধিকার এই শর্তধারী ব্যবহারকারীর মাঝে সীমিত রাখ:", "The filter specifies which LDAP users shall have access to the %s instance." : "এই ফিল্টারটি কোন কোন LDAP ব্যবহারকারী %s সার্ভারে প্রবেশ করবেন তা বাছাই করে।", "Back" : "পেছনে যাও", "Continue" : "চালিয়ে যাও", diff --git a/apps/user_ldap/l10n/ca.js b/apps/user_ldap/l10n/ca.js index ea01350ec2f..599128b8901 100644 --- a/apps/user_ldap/l10n/ca.js +++ b/apps/user_ldap/l10n/ca.js @@ -43,7 +43,6 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "Per un accés anònim, deixeu la DN i la contrasenya en blanc.", "One Base DN per line" : "Una DN Base per línia", "You can specify Base DN for users and groups in the Advanced tab" : "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat", - "Limit %s access to users meeting these criteria:" : "Limita l'accés a %s usuaris que compleixin amb aquest criteri:", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s", "Back" : "Enrera", "Continue" : "Continua", diff --git a/apps/user_ldap/l10n/ca.json b/apps/user_ldap/l10n/ca.json index 62c842123e6..3ea4e5b4ac5 100644 --- a/apps/user_ldap/l10n/ca.json +++ b/apps/user_ldap/l10n/ca.json @@ -41,7 +41,6 @@ "For anonymous access, leave DN and Password empty." : "Per un accés anònim, deixeu la DN i la contrasenya en blanc.", "One Base DN per line" : "Una DN Base per línia", "You can specify Base DN for users and groups in the Advanced tab" : "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat", - "Limit %s access to users meeting these criteria:" : "Limita l'accés a %s usuaris que compleixin amb aquest criteri:", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s", "Back" : "Enrera", "Continue" : "Continua", diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js index 8f261c39af0..0392c27f2b4 100644 --- a/apps/user_ldap/l10n/cs_CZ.js +++ b/apps/user_ldap/l10n/cs_CZ.js @@ -96,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)", - "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:", + "%s access is limited to users meeting these criteria:" : "Přístup pro %s je omezen na uživatele odpovídající těmto kritériím:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Nejčastější třídy objektů pro uživatele jsou organizationalPerson, person, user a inetOrgPerson. Pokud si nejste jisti které třídy objektů zvolit, obraťte se na svého adresářového správce.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.", "Verify settings and count users" : "Ověřit nastavení a spočítat uživatele", diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json index 0dec48d25d0..4bf061691c2 100644 --- a/apps/user_ldap/l10n/cs_CZ.json +++ b/apps/user_ldap/l10n/cs_CZ.json @@ -94,7 +94,7 @@ "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)", - "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:", + "%s access is limited to users meeting these criteria:" : "Přístup pro %s je omezen na uživatele odpovídající těmto kritériím:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Nejčastější třídy objektů pro uživatele jsou organizationalPerson, person, user a inetOrgPerson. Pokud si nejste jisti které třídy objektů zvolit, obraťte se na svého adresářového správce.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.", "Verify settings and count users" : "Ověřit nastavení a spočítat uživatele", diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js index 055fe44d504..439e7f74415 100644 --- a/apps/user_ldap/l10n/da.js +++ b/apps/user_ldap/l10n/da.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Undgår automatiske LDAP-forespørgsler. Bedre på større opsætninger, men kræver en del LDAP-kendskab.", "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)", - "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "De fleste gængse objektklasser for brugere er organizationalPerson, person, user og inetOrgPerson. Hvis du ikker er sikker på hvilken objektklasse, der skal vælges, så tal med administratoren af dit katalog.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.", "Verify settings and count users" : "Kontrollér indstillinger og optalte brugere", diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json index c3d2ba6abbf..2d0a93cc20c 100644 --- a/apps/user_ldap/l10n/da.json +++ b/apps/user_ldap/l10n/da.json @@ -93,7 +93,6 @@ "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Undgår automatiske LDAP-forespørgsler. Bedre på større opsætninger, men kræver en del LDAP-kendskab.", "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)", - "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "De fleste gængse objektklasser for brugere er organizationalPerson, person, user og inetOrgPerson. Hvis du ikker er sikker på hvilken objektklasse, der skal vælges, så tal med administratoren af dit katalog.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.", "Verify settings and count users" : "Kontrollér indstillinger og optalte brugere", diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js index 051d24c5066..7a60a8ec18e 100644 --- a/apps/user_ldap/l10n/de.js +++ b/apps/user_ldap/l10n/de.js @@ -96,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Base DN testen", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)", - "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:", + "%s access is limited to users meeting these criteria:" : "%s-Zugriff ist auf Benutzer, die den folgenden Kriterien entsprechen, beschränkt:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Die häufigsten Objektklassen für Benutzer sind organizationalPerson, person, user und inetOrgPerson. Wenn Sie nicht sicher, welche Objektklasse Sie wählen sollen, fragen Sie bitte Ihren Verzeichnis-Admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.", "Verify settings and count users" : "Einstellungen überprüfen und Benutzer zählen", diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json index 353ea1c6fda..9631cab94ac 100644 --- a/apps/user_ldap/l10n/de.json +++ b/apps/user_ldap/l10n/de.json @@ -94,7 +94,7 @@ "Test Base DN" : "Base DN testen", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)", - "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:", + "%s access is limited to users meeting these criteria:" : "%s-Zugriff ist auf Benutzer, die den folgenden Kriterien entsprechen, beschränkt:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Die häufigsten Objektklassen für Benutzer sind organizationalPerson, person, user und inetOrgPerson. Wenn Sie nicht sicher, welche Objektklasse Sie wählen sollen, fragen Sie bitte Ihren Verzeichnis-Admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.", "Verify settings and count users" : "Einstellungen überprüfen und Benutzer zählen", diff --git a/apps/user_ldap/l10n/de_AT.js b/apps/user_ldap/l10n/de_AT.js index 1c13871cd0f..47e19c3eda3 100644 --- a/apps/user_ldap/l10n/de_AT.js +++ b/apps/user_ldap/l10n/de_AT.js @@ -37,7 +37,6 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "Für anonymen Zugriff DN und Passwort frei lassen.", "One Base DN per line" : "Ein Basis DN per Zeile", "You can specify Base DN for users and groups in the Advanced tab" : "Basis DN für User und Gruppen können im Fortgeschritten-Tab festgelegt werden", - "Limit %s access to users meeting these criteria:" : "Zugang auf %s für User die diese Kriterien erfüllen limitieren:", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter spezifiziert welche LDAP User Zugang zu %s haben.", "Back" : "Zurück", "Continue" : "Weiter", diff --git a/apps/user_ldap/l10n/de_AT.json b/apps/user_ldap/l10n/de_AT.json index f26797280bf..93c59ba9279 100644 --- a/apps/user_ldap/l10n/de_AT.json +++ b/apps/user_ldap/l10n/de_AT.json @@ -35,7 +35,6 @@ "For anonymous access, leave DN and Password empty." : "Für anonymen Zugriff DN und Passwort frei lassen.", "One Base DN per line" : "Ein Basis DN per Zeile", "You can specify Base DN for users and groups in the Advanced tab" : "Basis DN für User und Gruppen können im Fortgeschritten-Tab festgelegt werden", - "Limit %s access to users meeting these criteria:" : "Zugang auf %s für User die diese Kriterien erfüllen limitieren:", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter spezifiziert welche LDAP User Zugang zu %s haben.", "Back" : "Zurück", "Continue" : "Weiter", diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index 08f69982fa1..8e617a1735b 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -96,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Base DN testen", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)", - "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:", + "%s access is limited to users meeting these criteria:" : "%s-Zugriff ist auf Benutzer, die den folgenden Kriterien entsprechen, beschränkt:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Die häufigsten Objektklassen für Benutzer sind organizationalPerson, person, user und inetOrgPerson. Wenn Sie nicht sicher, welche Objektklasse Sie wählen sollen, fragen Sie bitte Ihren Verzeichnis-Admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.", "Verify settings and count users" : "Einstellungen überprüfen und Benutzer zählen", diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index 92a3deccbc3..5ed4af8ef3a 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -94,7 +94,7 @@ "Test Base DN" : "Base DN testen", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)", - "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:", + "%s access is limited to users meeting these criteria:" : "%s-Zugriff ist auf Benutzer, die den folgenden Kriterien entsprechen, beschränkt:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Die häufigsten Objektklassen für Benutzer sind organizationalPerson, person, user und inetOrgPerson. Wenn Sie nicht sicher, welche Objektklasse Sie wählen sollen, fragen Sie bitte Ihren Verzeichnis-Admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.", "Verify settings and count users" : "Einstellungen überprüfen und Benutzer zählen", diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js index 7ea629e673d..ddaef597993 100644 --- a/apps/user_ldap/l10n/el.js +++ b/apps/user_ldap/l10n/el.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "Δοκιμή ", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Αποφυγή αυτόματων αιτημάτων LDAP. Προτιμότερο για μεγαλύτερες εγκαταστάσεις, αλλά απαιτεί κάποιες γνώσεις LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)", - "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Οι πιο συνηθισμένες κλάσεις αντικειμένων για τους χρήστες είναι οι organizationalPerson, person, user, και inetOrgPerson. Εάν δεν είσαστε σίγουροι πιο κλάση να επιλέξετε, παρακαλώ συμβουλευτείτε τον διαχειριστή του καταλόγου σας.", "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.", "Verify settings and count users" : "Επαλήθευση ρυθμίσεων και καταμέτρηση χρηστών", diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json index 338b0b8bad9..566f04d6166 100644 --- a/apps/user_ldap/l10n/el.json +++ b/apps/user_ldap/l10n/el.json @@ -93,7 +93,6 @@ "Test Base DN" : "Δοκιμή ", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Αποφυγή αυτόματων αιτημάτων LDAP. Προτιμότερο για μεγαλύτερες εγκαταστάσεις, αλλά απαιτεί κάποιες γνώσεις LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)", - "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Οι πιο συνηθισμένες κλάσεις αντικειμένων για τους χρήστες είναι οι organizationalPerson, person, user, και inetOrgPerson. Εάν δεν είσαστε σίγουροι πιο κλάση να επιλέξετε, παρακαλώ συμβουλευτείτε τον διαχειριστή του καταλόγου σας.", "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.", "Verify settings and count users" : "Επαλήθευση ρυθμίσεων και καταμέτρηση χρηστών", diff --git a/apps/user_ldap/l10n/en@pirate.js b/apps/user_ldap/l10n/en@pirate.js deleted file mode 100644 index 0670deb5fbc..00000000000 --- a/apps/user_ldap/l10n/en@pirate.js +++ /dev/null @@ -1,6 +0,0 @@ -OC.L10N.register( - "user_ldap", - { - "Password" : "Passcode" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/en@pirate.json b/apps/user_ldap/l10n/en@pirate.json deleted file mode 100644 index 6f74658eb82..00000000000 --- a/apps/user_ldap/l10n/en@pirate.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "translations": { - "Password" : "Passcode" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js index 702de9a8de6..44de36d6d81 100644 --- a/apps/user_ldap/l10n/en_GB.js +++ b/apps/user_ldap/l10n/en_GB.js @@ -13,6 +13,7 @@ OC.L10N.register( " Could not set configuration %s" : " Could not set configuration %s", "Action does not exist" : "Action does not exist", "The Base DN appears to be wrong" : "The Base DN appears to be wrong", + "Testing configuration…" : "Testing configuration…", "Configuration incorrect" : "Configuration incorrect", "Configuration incomplete" : "Configuration incomplete", "Configuration OK" : "Configuration OK", @@ -95,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.", "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)", - "Limit %s access to users meeting these criteria:" : "Limit %s access to users meeting these criteria:", + "%s access is limited to users meeting these criteria:" : "%s access is limited to users meeting these criteria:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.", "Verify settings and count users" : "Verify settings and count users", diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json index 13ea62e76d8..04d6a199c6f 100644 --- a/apps/user_ldap/l10n/en_GB.json +++ b/apps/user_ldap/l10n/en_GB.json @@ -11,6 +11,7 @@ " Could not set configuration %s" : " Could not set configuration %s", "Action does not exist" : "Action does not exist", "The Base DN appears to be wrong" : "The Base DN appears to be wrong", + "Testing configuration…" : "Testing configuration…", "Configuration incorrect" : "Configuration incorrect", "Configuration incomplete" : "Configuration incomplete", "Configuration OK" : "Configuration OK", @@ -93,7 +94,7 @@ "Test Base DN" : "Test Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.", "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)", - "Limit %s access to users meeting these criteria:" : "Limit %s access to users meeting these criteria:", + "%s access is limited to users meeting these criteria:" : "%s access is limited to users meeting these criteria:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.", "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.", "Verify settings and count users" : "Verify settings and count users", diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js index 9503830a911..bb1a3d824b0 100644 --- a/apps/user_ldap/l10n/es.js +++ b/apps/user_ldap/l10n/es.js @@ -96,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Probar Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automáticas al LDAP. Mejor para grandes configuraciones, pero requiere cierto conocimiento de LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)", - "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:", + "%s access is limited to users meeting these criteria:" : "Acceso limitado a %s a los usuarios que cumplan estos criterios:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro de qué objeto de clase seleccionar, por favor, consulte con su administrador de directorio. ", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.", "Verify settings and count users" : "Verificar configuración y contar usuarios", diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json index 528afb920da..9c1f5046254 100644 --- a/apps/user_ldap/l10n/es.json +++ b/apps/user_ldap/l10n/es.json @@ -94,7 +94,7 @@ "Test Base DN" : "Probar Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automáticas al LDAP. Mejor para grandes configuraciones, pero requiere cierto conocimiento de LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)", - "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:", + "%s access is limited to users meeting these criteria:" : "Acceso limitado a %s a los usuarios que cumplan estos criterios:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro de qué objeto de clase seleccionar, por favor, consulte con su administrador de directorio. ", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.", "Verify settings and count users" : "Verificar configuración y contar usuarios", diff --git a/apps/user_ldap/l10n/es_AR.js b/apps/user_ldap/l10n/es_AR.js index e56510323ee..432ecb14563 100644 --- a/apps/user_ldap/l10n/es_AR.js +++ b/apps/user_ldap/l10n/es_AR.js @@ -39,7 +39,6 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "Para acceso anónimo, dejá DN y contraseña vacíos.", "One Base DN per line" : "Una DN base por línea", "You can specify Base DN for users and groups in the Advanced tab" : "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"", - "Limit %s access to users meeting these criteria:" : "Limitar acceso %s a los usuarios que cumplen con este criterio:", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.", "Back" : "Volver", "Continue" : "Continuar", diff --git a/apps/user_ldap/l10n/es_AR.json b/apps/user_ldap/l10n/es_AR.json index f62e717dede..4bff068b53b 100644 --- a/apps/user_ldap/l10n/es_AR.json +++ b/apps/user_ldap/l10n/es_AR.json @@ -37,7 +37,6 @@ "For anonymous access, leave DN and Password empty." : "Para acceso anónimo, dejá DN y contraseña vacíos.", "One Base DN per line" : "Una DN base por línea", "You can specify Base DN for users and groups in the Advanced tab" : "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"", - "Limit %s access to users meeting these criteria:" : "Limitar acceso %s a los usuarios que cumplen con este criterio:", "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.", "Back" : "Volver", "Continue" : "Continuar", diff --git a/apps/user_ldap/l10n/et_EE.js b/apps/user_ldap/l10n/et_EE.js index b583bbca3d9..db5a03ea01e 100644 --- a/apps/user_ldap/l10n/et_EE.js +++ b/apps/user_ldap/l10n/et_EE.js @@ -72,7 +72,6 @@ OC.L10N.register( "Test Base DN" : "Testi Baas DN-i", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Väldib automaatseid LDAP päringuid, Parem suurematele saitidele, aga nõuab mõningaid teadmisi LDAP kohta.", "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)", - "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.", "Saving" : "Salvestamine", "Back" : "Tagasi", diff --git a/apps/user_ldap/l10n/et_EE.json b/apps/user_ldap/l10n/et_EE.json index d0ebc171777..df36865c108 100644 --- a/apps/user_ldap/l10n/et_EE.json +++ b/apps/user_ldap/l10n/et_EE.json @@ -70,7 +70,6 @@ "Test Base DN" : "Testi Baas DN-i", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Väldib automaatseid LDAP päringuid, Parem suurematele saitidele, aga nõuab mõningaid teadmisi LDAP kohta.", "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)", - "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.", "Saving" : "Salvestamine", "Back" : "Tagasi", diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js index 410b626745c..8822a9a1886 100644 --- a/apps/user_ldap/l10n/eu.js +++ b/apps/user_ldap/l10n/eu.js @@ -71,7 +71,6 @@ OC.L10N.register( "Detect Base DN" : "Anteman Oinarrizko DN", "Test Base DN" : "Egiaztatu Oinarrizko DN", "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)", - "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.", "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP erabiltzailek izango duten sarrera %s instantziara:", "Verify settings and count users" : "Egiaztatu ezarpetak eta zenbatu erabiltzaileak", "Saving" : "Gordetzen", diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json index f0599392c50..ecb1c211ba7 100644 --- a/apps/user_ldap/l10n/eu.json +++ b/apps/user_ldap/l10n/eu.json @@ -69,7 +69,6 @@ "Detect Base DN" : "Anteman Oinarrizko DN", "Test Base DN" : "Egiaztatu Oinarrizko DN", "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)", - "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.", "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du ze LDAP erabiltzailek izango duten sarrera %s instantziara:", "Verify settings and count users" : "Egiaztatu ezarpetak eta zenbatu erabiltzaileak", "Saving" : "Gordetzen", diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js index 60aec9f0a65..89f258bd750 100644 --- a/apps/user_ldap/l10n/fr.js +++ b/apps/user_ldap/l10n/fr.js @@ -96,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Tester le DN de base", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite les requêtes LDAP automatiques. Mieux pour les installations de grande ampleur, mais demande des connaissances en LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Saisir les filtres LDAP manuellement (recommandé pour les annuaires de grande ampleur)", - "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :", + "%s access is limited to users meeting these criteria:" : "L'accès à %s est limité aux utilisateurs validant ces critères :", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Les classes d'objets fréquentes pour les utilisateurs sont : organizationalPerson, person, user et inetOrgPerson. Si vous n'êtes pas sûr de la classe à utiliser, demandez à l'administrateur de l'annuaire.", "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP auront accès à l'instance %s.", "Verify settings and count users" : "Vérifier les paramètres et compter les utilisateurs", diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json index 35258c3a1b3..f5f0c2f6082 100644 --- a/apps/user_ldap/l10n/fr.json +++ b/apps/user_ldap/l10n/fr.json @@ -94,7 +94,7 @@ "Test Base DN" : "Tester le DN de base", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite les requêtes LDAP automatiques. Mieux pour les installations de grande ampleur, mais demande des connaissances en LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Saisir les filtres LDAP manuellement (recommandé pour les annuaires de grande ampleur)", - "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :", + "%s access is limited to users meeting these criteria:" : "L'accès à %s est limité aux utilisateurs validant ces critères :", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Les classes d'objets fréquentes pour les utilisateurs sont : organizationalPerson, person, user et inetOrgPerson. Si vous n'êtes pas sûr de la classe à utiliser, demandez à l'administrateur de l'annuaire.", "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP auront accès à l'instance %s.", "Verify settings and count users" : "Vérifier les paramètres et compter les utilisateurs", diff --git a/apps/user_ldap/l10n/gl.js b/apps/user_ldap/l10n/gl.js index ea7aa9674fe..3fb58be9ef7 100644 --- a/apps/user_ldap/l10n/gl.js +++ b/apps/user_ldap/l10n/gl.js @@ -94,7 +94,6 @@ OC.L10N.register( "Test Base DN" : "Probar o DN base", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita as peticións LDAP automáticas. E o mellor para as configuracións máis grandes, mais require algúns coñecementos de LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Introduza manualmente os filtros LDAP (recomendado para directorios grandes)", - "Limit %s access to users meeting these criteria:" : "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "As clases de obxecto máis comúns para os usuarios son «organizationalPerson», «person», «user» e «inetOrgPerson». Se non está seguro de que clase de obxecto ten que seleccionar, consulte co administrador de directorios.", "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.", "Verify settings and count users" : "Verificar os axustes e contar os usuarios", diff --git a/apps/user_ldap/l10n/gl.json b/apps/user_ldap/l10n/gl.json index 53c96103238..f199983d540 100644 --- a/apps/user_ldap/l10n/gl.json +++ b/apps/user_ldap/l10n/gl.json @@ -92,7 +92,6 @@ "Test Base DN" : "Probar o DN base", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita as peticións LDAP automáticas. E o mellor para as configuracións máis grandes, mais require algúns coñecementos de LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Introduza manualmente os filtros LDAP (recomendado para directorios grandes)", - "Limit %s access to users meeting these criteria:" : "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "As clases de obxecto máis comúns para os usuarios son «organizationalPerson», «person», «user» e «inetOrgPerson». Se non está seguro de que clase de obxecto ten que seleccionar, consulte co administrador de directorios.", "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.", "Verify settings and count users" : "Verificar os axustes e contar os usuarios", diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js index 29b07f0de05..385132a0b58 100644 --- a/apps/user_ldap/l10n/he.js +++ b/apps/user_ldap/l10n/he.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "בדיקת DN בסיסי", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "נמנע מבקשות אוטומטיות של LDAP. מועדף עבור התקנות גדולות, אבל מחייב ידע מסויים של LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "הכנסת מסנני LDAP ידנית (מומלץ עבוק תיקיות גדולות)", - "Limit %s access to users meeting these criteria:" : "מגביל כניסות %s למשתמשים אשר עומדים בתנאים אלו:", "The filter specifies which LDAP users shall have access to the %s instance." : "הסינון קובע לאיזו משתמשי LDAP תהיה יכולת כניסה למקרה %s.", "Verify settings and count users" : "מאמת הגדרות וסופר משתמשים", "Saving" : "שמירה", diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json index d5db48f2285..44e94a58702 100644 --- a/apps/user_ldap/l10n/he.json +++ b/apps/user_ldap/l10n/he.json @@ -93,7 +93,6 @@ "Test Base DN" : "בדיקת DN בסיסי", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "נמנע מבקשות אוטומטיות של LDAP. מועדף עבור התקנות גדולות, אבל מחייב ידע מסויים של LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "הכנסת מסנני LDAP ידנית (מומלץ עבוק תיקיות גדולות)", - "Limit %s access to users meeting these criteria:" : "מגביל כניסות %s למשתמשים אשר עומדים בתנאים אלו:", "The filter specifies which LDAP users shall have access to the %s instance." : "הסינון קובע לאיזו משתמשי LDAP תהיה יכולת כניסה למקרה %s.", "Verify settings and count users" : "מאמת הגדרות וסופר משתמשים", "Saving" : "שמירה", diff --git a/apps/user_ldap/l10n/hu_HU.js b/apps/user_ldap/l10n/hu_HU.js index 36fdcad3806..b80aa4366cf 100644 --- a/apps/user_ldap/l10n/hu_HU.js +++ b/apps/user_ldap/l10n/hu_HU.js @@ -44,7 +44,6 @@ OC.L10N.register( "One Base DN per line" : "Soronként egy DN-gyökér", "You can specify Base DN for users and groups in the Advanced tab" : "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára", "Manually enter LDAP filters (recommended for large directories)" : "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)", - "Limit %s access to users meeting these criteria:" : "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:", "The filter specifies which LDAP users shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.", "Saving" : "Mentés", "Back" : "Vissza", diff --git a/apps/user_ldap/l10n/hu_HU.json b/apps/user_ldap/l10n/hu_HU.json index 14f16217ee3..afbbdbb787b 100644 --- a/apps/user_ldap/l10n/hu_HU.json +++ b/apps/user_ldap/l10n/hu_HU.json @@ -42,7 +42,6 @@ "One Base DN per line" : "Soronként egy DN-gyökér", "You can specify Base DN for users and groups in the Advanced tab" : "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára", "Manually enter LDAP filters (recommended for large directories)" : "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)", - "Limit %s access to users meeting these criteria:" : "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:", "The filter specifies which LDAP users shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.", "Saving" : "Mentés", "Back" : "Vissza", diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js index 282b1a8181d..50cc22344bb 100644 --- a/apps/user_ldap/l10n/id.js +++ b/apps/user_ldap/l10n/id.js @@ -94,7 +94,6 @@ OC.L10N.register( "Test Base DN" : "Uji Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Mencegah permintaan LDAP otomatis. Berguna untuk setelan yang lebih besar, tapi memerlukan beberapa pengetahuan LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)", - "Limit %s access to users meeting these criteria:" : "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Kelas obyek yang umum untuk pengguna adalah organizationalPerson, person, user, dan inetOrgPerson. Jika Anda tidak yakin kelas obyek mana yang akan dipilih, silakan konsultasi dengan admin direktori Anda.", "The filter specifies which LDAP users shall have access to the %s instance." : "Penyaring menentukan pengguna LDAP mana yang memiliki akses ke %s.", "Verify settings and count users" : "Verifikasi setelan dan jumlah pengguna", diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json index 556c5fd6970..25ae0f2c6fe 100644 --- a/apps/user_ldap/l10n/id.json +++ b/apps/user_ldap/l10n/id.json @@ -92,7 +92,6 @@ "Test Base DN" : "Uji Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Mencegah permintaan LDAP otomatis. Berguna untuk setelan yang lebih besar, tapi memerlukan beberapa pengetahuan LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)", - "Limit %s access to users meeting these criteria:" : "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Kelas obyek yang umum untuk pengguna adalah organizationalPerson, person, user, dan inetOrgPerson. Jika Anda tidak yakin kelas obyek mana yang akan dipilih, silakan konsultasi dengan admin direktori Anda.", "The filter specifies which LDAP users shall have access to the %s instance." : "Penyaring menentukan pengguna LDAP mana yang memiliki akses ke %s.", "Verify settings and count users" : "Verifikasi setelan dan jumlah pengguna", diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js index 98e71008d28..f8d7de1b1fd 100644 --- a/apps/user_ldap/l10n/it.js +++ b/apps/user_ldap/l10n/it.js @@ -96,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Rileva DN base", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Impedisce le richieste LDAP automatiche. Meglio per installazioni più grandi, ma richiede una certa conoscenza di LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Digita manualmente i filtri LDAP (consigliato per directory grandi)", - "Limit %s access to users meeting these criteria:" : "Limita l'accesso a %s ai gruppi che verificano questi criteri:", + "%s access is limited to users meeting these criteria:" : "L'accesso a %s è limitato agli utenti che verificano questi criteri:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Le classi di oggetti più comuni per gli utenti sono organizationalPerson, person, user, e inetOrgPerson. Se non sei sicuro su quale classe di oggetti selezionare, consulta l'amministratore della tua directory.", "The filter specifies which LDAP users shall have access to the %s instance." : "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.", "Verify settings and count users" : "Verifica le impostazioni e conta gli utenti", diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json index 7be99ae859a..2076ed193a8 100644 --- a/apps/user_ldap/l10n/it.json +++ b/apps/user_ldap/l10n/it.json @@ -94,7 +94,7 @@ "Test Base DN" : "Rileva DN base", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Impedisce le richieste LDAP automatiche. Meglio per installazioni più grandi, ma richiede una certa conoscenza di LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Digita manualmente i filtri LDAP (consigliato per directory grandi)", - "Limit %s access to users meeting these criteria:" : "Limita l'accesso a %s ai gruppi che verificano questi criteri:", + "%s access is limited to users meeting these criteria:" : "L'accesso a %s è limitato agli utenti che verificano questi criteri:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Le classi di oggetti più comuni per gli utenti sono organizationalPerson, person, user, e inetOrgPerson. Se non sei sicuro su quale classe di oggetti selezionare, consulta l'amministratore della tua directory.", "The filter specifies which LDAP users shall have access to the %s instance." : "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.", "Verify settings and count users" : "Verifica le impostazioni e conta gli utenti", diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js index 90d0ddb56b0..97c5eaa73f7 100644 --- a/apps/user_ldap/l10n/ja.js +++ b/apps/user_ldap/l10n/ja.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "ベースDN をテスト", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動的なLDAP問合せを停止します。大規模な設定には適していますが、LDAPの知識が必要になります。", "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)", - "Limit %s access to users meeting these criteria:" : "以下のフィルターに適合するユーザーのみ %s へアクセスを許可:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "ユーザーの最も一般的なオブジェクトクラスは、organizationalPerson, person, user と inetOrgPerson です。もし、どのオブジェクトを選択すれば良いか分からない場合は、ディレクトリ管理者に相談してください。", "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。", "Verify settings and count users" : "設定を検証し、ユーザーを数える", diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json index 3ce515079ae..9674e7ca899 100644 --- a/apps/user_ldap/l10n/ja.json +++ b/apps/user_ldap/l10n/ja.json @@ -93,7 +93,6 @@ "Test Base DN" : "ベースDN をテスト", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動的なLDAP問合せを停止します。大規模な設定には適していますが、LDAPの知識が必要になります。", "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)", - "Limit %s access to users meeting these criteria:" : "以下のフィルターに適合するユーザーのみ %s へアクセスを許可:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "ユーザーの最も一般的なオブジェクトクラスは、organizationalPerson, person, user と inetOrgPerson です。もし、どのオブジェクトを選択すれば良いか分からない場合は、ディレクトリ管理者に相談してください。", "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。", "Verify settings and count users" : "設定を検証し、ユーザーを数える", diff --git a/apps/user_ldap/l10n/ko.js b/apps/user_ldap/l10n/ko.js index 74720e4fe83..d9191be1196 100644 --- a/apps/user_ldap/l10n/ko.js +++ b/apps/user_ldap/l10n/ko.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "기본 DN 시험", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "자동 LDAP 요청을 줄입니다. 대형 사이트에서 유용하지만 LDAP에 관한 지식이 필요합니다.", "Manually enter LDAP filters (recommended for large directories)" : "수동으로 LDAP 필터 입력(대형 사이트에 추천)", - "Limit %s access to users meeting these criteria:" : "다음 조건을 만족하는 사용자만 %s 접근 허용:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "일반적인 객체 클래스는 organizationalPerson, person, user, inetOrgPerson입니다. 어떤 객체 클래스를 사용해야 할 지 모르겠으면 디렉터리 서비스 관리자에게 연락하십시오.", "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.", "Verify settings and count users" : "설정을 확인하고 사용자 수 계산", diff --git a/apps/user_ldap/l10n/ko.json b/apps/user_ldap/l10n/ko.json index c71cede0ba2..611085979f1 100644 --- a/apps/user_ldap/l10n/ko.json +++ b/apps/user_ldap/l10n/ko.json @@ -93,7 +93,6 @@ "Test Base DN" : "기본 DN 시험", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "자동 LDAP 요청을 줄입니다. 대형 사이트에서 유용하지만 LDAP에 관한 지식이 필요합니다.", "Manually enter LDAP filters (recommended for large directories)" : "수동으로 LDAP 필터 입력(대형 사이트에 추천)", - "Limit %s access to users meeting these criteria:" : "다음 조건을 만족하는 사용자만 %s 접근 허용:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "일반적인 객체 클래스는 organizationalPerson, person, user, inetOrgPerson입니다. 어떤 객체 클래스를 사용해야 할 지 모르겠으면 디렉터리 서비스 관리자에게 연락하십시오.", "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.", "Verify settings and count users" : "설정을 확인하고 사용자 수 계산", diff --git a/apps/user_ldap/l10n/nb_NO.js b/apps/user_ldap/l10n/nb_NO.js index 1c81b36de70..8758cebd5e1 100644 --- a/apps/user_ldap/l10n/nb_NO.js +++ b/apps/user_ldap/l10n/nb_NO.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "Test basis-DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Unngår automatiske LDAP-forespørsler. Bedre for store oppsett men krever litt LDAP-kunnskap.", "Manually enter LDAP filters (recommended for large directories)" : "Legg inn LDAP-filtre manuelt (anbefalt for store kataloger)", - "Limit %s access to users meeting these criteria:" : "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "De mest vanlige objektklassene for brukere er organizationalPerson, person, user og inetOrgPerson. Kontakt katalogadministratoren hvis du er usikker på hvilken objektklasse du skal velge.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.", "Verify settings and count users" : "Sjekk innstillinger og tell brukere", diff --git a/apps/user_ldap/l10n/nb_NO.json b/apps/user_ldap/l10n/nb_NO.json index 1d5ab6fa71f..13b44fca320 100644 --- a/apps/user_ldap/l10n/nb_NO.json +++ b/apps/user_ldap/l10n/nb_NO.json @@ -93,7 +93,6 @@ "Test Base DN" : "Test basis-DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Unngår automatiske LDAP-forespørsler. Bedre for store oppsett men krever litt LDAP-kunnskap.", "Manually enter LDAP filters (recommended for large directories)" : "Legg inn LDAP-filtre manuelt (anbefalt for store kataloger)", - "Limit %s access to users meeting these criteria:" : "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "De mest vanlige objektklassene for brukere er organizationalPerson, person, user og inetOrgPerson. Kontakt katalogadministratoren hvis du er usikker på hvilken objektklasse du skal velge.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.", "Verify settings and count users" : "Sjekk innstillinger og tell brukere", diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js index 75a70c81528..f25d4be8bbc 100644 --- a/apps/user_ldap/l10n/nl.js +++ b/apps/user_ldap/l10n/nl.js @@ -13,6 +13,7 @@ OC.L10N.register( " Could not set configuration %s" : "Kon configuratie %s niet instellen", "Action does not exist" : "Actie bestaat niet", "The Base DN appears to be wrong" : "De Basis DN lijkt onjuist", + "Testing configuration…" : "Testen van de configuratie…", "Configuration incorrect" : "Configuratie onjuist", "Configuration incomplete" : "Configuratie incompleet", "Configuration OK" : "Configuratie OK", @@ -95,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Testen basis DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Voorkom automatische LDAP opvragingen. Weliswaar beter voor grote installaties, maar vergt LDAP kennis.", "Manually enter LDAP filters (recommended for large directories)" : "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)", - "Limit %s access to users meeting these criteria:" : "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:", + "%s access is limited to users meeting these criteria:" : "%s toegang is beperkt tot gebruikers die voldoen aan deze criteria:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "De meest gebruikeliujke objectklassen voor gebruikers zijn organizationalPerson, persoon, gebruiker, en inetOrgPerson. Als u niet zeker weet welke objectklasse moet worden geselecteerd, raadpleeg dan uw directorybeheerder.", "The filter specifies which LDAP users shall have access to the %s instance." : "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.", "Verify settings and count users" : "Verifiëren instellingen en tellen gebruikers", diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json index fd39a10d54f..0781d7dc33f 100644 --- a/apps/user_ldap/l10n/nl.json +++ b/apps/user_ldap/l10n/nl.json @@ -11,6 +11,7 @@ " Could not set configuration %s" : "Kon configuratie %s niet instellen", "Action does not exist" : "Actie bestaat niet", "The Base DN appears to be wrong" : "De Basis DN lijkt onjuist", + "Testing configuration…" : "Testen van de configuratie…", "Configuration incorrect" : "Configuratie onjuist", "Configuration incomplete" : "Configuratie incompleet", "Configuration OK" : "Configuratie OK", @@ -93,7 +94,7 @@ "Test Base DN" : "Testen basis DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Voorkom automatische LDAP opvragingen. Weliswaar beter voor grote installaties, maar vergt LDAP kennis.", "Manually enter LDAP filters (recommended for large directories)" : "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)", - "Limit %s access to users meeting these criteria:" : "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:", + "%s access is limited to users meeting these criteria:" : "%s toegang is beperkt tot gebruikers die voldoen aan deze criteria:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "De meest gebruikeliujke objectklassen voor gebruikers zijn organizationalPerson, persoon, gebruiker, en inetOrgPerson. Als u niet zeker weet welke objectklasse moet worden geselecteerd, raadpleeg dan uw directorybeheerder.", "The filter specifies which LDAP users shall have access to the %s instance." : "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.", "Verify settings and count users" : "Verifiëren instellingen en tellen gebruikers", diff --git a/apps/user_ldap/l10n/oc.js b/apps/user_ldap/l10n/oc.js index 77cb592e402..4a06d436198 100644 --- a/apps/user_ldap/l10n/oc.js +++ b/apps/user_ldap/l10n/oc.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "Testar lo DN de basa", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita las requèstas LDAP automaticas. Melhor per las installacions de grand ample, mas demanda de coneissenças en LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Sasir los filtres LDAP manualament (recomandat pels annuaris de grand ample)", - "Limit %s access to users meeting these criteria:" : "Limitar l'accès a %s als utilizaires que respèctan aquestes critèris :", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Las classas d'objèctes frequentas pels utilizaires son : organizationalPerson, person, user e inetOrgPerson. Se sètz pas segur de la classa d'utilizar, demandatz a l'administrator de l'annuari.", "The filter specifies which LDAP users shall have access to the %s instance." : "Lo filtre especifica quins utilizaires LDAP auràn accès a l'instància %s.", "Verify settings and count users" : "Verificar los paramètres e comptar los utilizaires", diff --git a/apps/user_ldap/l10n/oc.json b/apps/user_ldap/l10n/oc.json index aa8d2b41861..ed63543180a 100644 --- a/apps/user_ldap/l10n/oc.json +++ b/apps/user_ldap/l10n/oc.json @@ -93,7 +93,6 @@ "Test Base DN" : "Testar lo DN de basa", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita las requèstas LDAP automaticas. Melhor per las installacions de grand ample, mas demanda de coneissenças en LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Sasir los filtres LDAP manualament (recomandat pels annuaris de grand ample)", - "Limit %s access to users meeting these criteria:" : "Limitar l'accès a %s als utilizaires que respèctan aquestes critèris :", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Las classas d'objèctes frequentas pels utilizaires son : organizationalPerson, person, user e inetOrgPerson. Se sètz pas segur de la classa d'utilizar, demandatz a l'administrator de l'annuari.", "The filter specifies which LDAP users shall have access to the %s instance." : "Lo filtre especifica quins utilizaires LDAP auràn accès a l'instància %s.", "Verify settings and count users" : "Verificar los paramètres e comptar los utilizaires", diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js index f72ab777835..7a22b20bb17 100644 --- a/apps/user_ldap/l10n/pl.js +++ b/apps/user_ldap/l10n/pl.js @@ -73,7 +73,6 @@ OC.L10N.register( "You can specify Base DN for users and groups in the Advanced tab" : "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zapobiega automatycznym zapytaniom LDAP. Lepsze dla większych instalacji, lecz wymaga pewnej wiedzy o LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ręcznie wprowadzaj filtry LDAP (zalecane dla dużych katalogów)", - "Limit %s access to users meeting these criteria:" : "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.", "Saving" : "Zapisuję", "Back" : "Wróć", diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json index 6b9e7119cdc..f051f4d4805 100644 --- a/apps/user_ldap/l10n/pl.json +++ b/apps/user_ldap/l10n/pl.json @@ -71,7 +71,6 @@ "You can specify Base DN for users and groups in the Advanced tab" : "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zapobiega automatycznym zapytaniom LDAP. Lepsze dla większych instalacji, lecz wymaga pewnej wiedzy o LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ręcznie wprowadzaj filtry LDAP (zalecane dla dużych katalogów)", - "Limit %s access to users meeting these criteria:" : "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.", "Saving" : "Zapisuję", "Back" : "Wróć", diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js index dfe18d59f58..3674a7788fb 100644 --- a/apps/user_ldap/l10n/pt_BR.js +++ b/apps/user_ldap/l10n/pt_BR.js @@ -96,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Teste Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita pedidos LDAP automáticos. Melhor para configurações maiores, mas requer algum conhecimento LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)", - "Limit %s access to users meeting these criteria:" : "Limitar o acesso %s para usuários que satisfazem esses critérios:", + "%s access is limited to users meeting these criteria:" : "%s o acesso está limitado aos usuários que atentam a esse critério:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "As classes de objetos mais comuns para os usuários são organizationalPerson, pessoa, usuário e inetOrgPerson. Se você não tem certeza de qual classe de objeto selecionar, por favor, consulte o seu administrador do diretório.", "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.", "Verify settings and count users" : "Verificar configurações e contas de usuários", diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json index 45d31cbee71..4d2ba5444c2 100644 --- a/apps/user_ldap/l10n/pt_BR.json +++ b/apps/user_ldap/l10n/pt_BR.json @@ -94,7 +94,7 @@ "Test Base DN" : "Teste Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita pedidos LDAP automáticos. Melhor para configurações maiores, mas requer algum conhecimento LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)", - "Limit %s access to users meeting these criteria:" : "Limitar o acesso %s para usuários que satisfazem esses critérios:", + "%s access is limited to users meeting these criteria:" : "%s o acesso está limitado aos usuários que atentam a esse critério:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "As classes de objetos mais comuns para os usuários são organizationalPerson, pessoa, usuário e inetOrgPerson. Se você não tem certeza de qual classe de objeto selecionar, por favor, consulte o seu administrador do diretório.", "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.", "Verify settings and count users" : "Verificar configurações e contas de usuários", diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js index 31985b0c988..1703765f975 100644 --- a/apps/user_ldap/l10n/pt_PT.js +++ b/apps/user_ldap/l10n/pt_PT.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "Testar Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita pedidos LDAP automáticos. Melhor para grandes configurações, mas requer conhecimentos LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Introduzir filtros LDAP manualmente (recomendado para directórios grandes)", - "Limit %s access to users meeting these criteria:" : "Limitar o acesso a %s de utilizadores com estes critérios:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Os objectos mais comuns para utilizadores são <em>organizationalPerson, person, user, and inetOrgPerson</em>. Se não tem a certeza de que classe de objecto deverá seleccionar, por favor, contacte o administrador do Directório.", "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais utilizadores do LDAP devem ter acesso à instância %s.", "Verify settings and count users" : "Verificar definições e contar utilizadores", diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json index 0c85d67bee0..d96f415480a 100644 --- a/apps/user_ldap/l10n/pt_PT.json +++ b/apps/user_ldap/l10n/pt_PT.json @@ -93,7 +93,6 @@ "Test Base DN" : "Testar Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita pedidos LDAP automáticos. Melhor para grandes configurações, mas requer conhecimentos LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Introduzir filtros LDAP manualmente (recomendado para directórios grandes)", - "Limit %s access to users meeting these criteria:" : "Limitar o acesso a %s de utilizadores com estes critérios:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Os objectos mais comuns para utilizadores são <em>organizationalPerson, person, user, and inetOrgPerson</em>. Se não tem a certeza de que classe de objecto deverá seleccionar, por favor, contacte o administrador do Directório.", "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais utilizadores do LDAP devem ter acesso à instância %s.", "Verify settings and count users" : "Verificar definições e contar utilizadores", diff --git a/apps/user_ldap/l10n/ro.js b/apps/user_ldap/l10n/ro.js index cb3a126fe6f..292deb7ec63 100644 --- a/apps/user_ldap/l10n/ro.js +++ b/apps/user_ldap/l10n/ro.js @@ -7,7 +7,9 @@ OC.L10N.register( "No action specified" : "Nu este specificata nici o acţiune ", "No configuration specified" : "Nu este specificata nici o configurare ", "No data specified" : "Nici o dată specificată", + " Could not set configuration %s" : "Nu a putut fi setată configurația %s", "Action does not exist" : "Acțiunea nu există", + "Testing configuration…" : "Se testează configurația...", "Configuration incorrect" : "Configuraţie incorecta ", "Configuration incomplete" : "Configuraţie incompleta ", "Configuration OK" : "Configuraţie valida", diff --git a/apps/user_ldap/l10n/ro.json b/apps/user_ldap/l10n/ro.json index c84722f88ba..1992542fd88 100644 --- a/apps/user_ldap/l10n/ro.json +++ b/apps/user_ldap/l10n/ro.json @@ -5,7 +5,9 @@ "No action specified" : "Nu este specificata nici o acţiune ", "No configuration specified" : "Nu este specificata nici o configurare ", "No data specified" : "Nici o dată specificată", + " Could not set configuration %s" : "Nu a putut fi setată configurația %s", "Action does not exist" : "Acțiunea nu există", + "Testing configuration…" : "Se testează configurația...", "Configuration incorrect" : "Configuraţie incorecta ", "Configuration incomplete" : "Configuraţie incompleta ", "Configuration OK" : "Configuraţie valida", diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js index f3928b80999..2b0cecaab6a 100644 --- a/apps/user_ldap/l10n/ru.js +++ b/apps/user_ldap/l10n/ru.js @@ -13,6 +13,7 @@ OC.L10N.register( " Could not set configuration %s" : "Невозможно создать конфигурацию %s", "Action does not exist" : "Действия не существует", "The Base DN appears to be wrong" : "База поиска DN по всей видимости указана неправильно", + "Testing configuration…" : "Проверка конфигурации...", "Configuration incorrect" : "Конфигурация некорректна", "Configuration incomplete" : "Конфигурация не завершена", "Configuration OK" : "Конфигурация в порядке", @@ -95,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Проверить базу поиска DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)", - "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:", + "%s access is limited to users meeting these criteria:" : "%s доступ ограничен для пользователей, отвечающих следующим критериям:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Наиболее частые классы объектов для пользователей organizationalPerson, person, user и inetOrgPerson. Если вы не уверены какой класс объектов выбрать, пожалуйста обратитесь к администратору.", "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.", "Verify settings and count users" : "Проверить настройки и пересчитать пользователей", diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json index 5dbaca39353..fc9cc081787 100644 --- a/apps/user_ldap/l10n/ru.json +++ b/apps/user_ldap/l10n/ru.json @@ -11,6 +11,7 @@ " Could not set configuration %s" : "Невозможно создать конфигурацию %s", "Action does not exist" : "Действия не существует", "The Base DN appears to be wrong" : "База поиска DN по всей видимости указана неправильно", + "Testing configuration…" : "Проверка конфигурации...", "Configuration incorrect" : "Конфигурация некорректна", "Configuration incomplete" : "Конфигурация не завершена", "Configuration OK" : "Конфигурация в порядке", @@ -93,7 +94,7 @@ "Test Base DN" : "Проверить базу поиска DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегает отправки автоматических запросов LDAP. Эта опция подходит для крупных проектов, но требует некоторых знаний LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)", - "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:", + "%s access is limited to users meeting these criteria:" : "%s доступ ограничен для пользователей, отвечающих следующим критериям:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Наиболее частые классы объектов для пользователей organizationalPerson, person, user и inetOrgPerson. Если вы не уверены какой класс объектов выбрать, пожалуйста обратитесь к администратору.", "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.", "Verify settings and count users" : "Проверить настройки и пересчитать пользователей", diff --git a/apps/user_ldap/l10n/sk_SK.js b/apps/user_ldap/l10n/sk_SK.js index 6eca3c2735b..8b3c00f7f26 100644 --- a/apps/user_ldap/l10n/sk_SK.js +++ b/apps/user_ldap/l10n/sk_SK.js @@ -94,7 +94,6 @@ OC.L10N.register( "Test Base DN" : "Otestovať základnú DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Bráni automatickým LDAP požiadavkám. Výhodné pre objemné nastavenia ale vyžaduje si dobrú znalosť o LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)", - "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Najčastejšie triedy objektov pre používateľov sú organizationalPerson, user a inetOrgPerson. Ak si nie ste istí, ktoré triedy máte zvoliť, obráťte sa na správcu LDAP.", "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.", "Verify settings and count users" : "Overiť nastavenia a spočítať používateľov", diff --git a/apps/user_ldap/l10n/sk_SK.json b/apps/user_ldap/l10n/sk_SK.json index ca7275af8e6..5deecf4d664 100644 --- a/apps/user_ldap/l10n/sk_SK.json +++ b/apps/user_ldap/l10n/sk_SK.json @@ -92,7 +92,6 @@ "Test Base DN" : "Otestovať základnú DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Bráni automatickým LDAP požiadavkám. Výhodné pre objemné nastavenia ale vyžaduje si dobrú znalosť o LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)", - "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Najčastejšie triedy objektov pre používateľov sú organizationalPerson, user a inetOrgPerson. Ak si nie ste istí, ktoré triedy máte zvoliť, obráťte sa na správcu LDAP.", "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.", "Verify settings and count users" : "Overiť nastavenia a spočítať používateľov", diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js index 6a8e8e5f273..752c578192f 100644 --- a/apps/user_ldap/l10n/sl.js +++ b/apps/user_ldap/l10n/sl.js @@ -13,24 +13,40 @@ OC.L10N.register( " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s", "Action does not exist" : "Dejanje ne obstaja", "The Base DN appears to be wrong" : "Enoznačno ime (DN) podatkovne zbirke je napačno", + "Testing configuration…" : "Poteka preizkušanje nastavitev ...", "Configuration incorrect" : "Nastavitev ni ustrezna", "Configuration incomplete" : "Nastavitev je nepopolna", "Configuration OK" : "Nastavitev je ustrezna", "Select groups" : "Izberi skupine", "Select object classes" : "Izbor razredov predmeta", "Please check the credentials, they seem to be wrong." : "Preverite poverila! Najverjetneje so napačna.", + "Please specify the port, it could not be auto-detected." : "Določiti je treba ustrezna vrata, ker jih ni mogoče samodejno zaznati.", "Base DN could not be auto-detected, please revise credentials, host and port." : "Osnovnega enoznačnega imena (DN) ni mogoče samodejno zaznati. Preverite poverila ter nastavitve gostitelja in vrat.", "Could not detect Base DN, please enter it manually." : "Ni mogoče zaznati osnovnega enoznačnega imena (DN). Vnesti ga bo treba ročno.", "{nthServer}. Server" : "{nthServer}. strežnik", "No object found in the given Base DN. Please revise." : "Ni najdenega predmeta v osnovnem enoznačnem imenu (DN). Preverite nastavitve.", "More than 1,000 directory entries available." : "Na voljo je več kot 1000 vnosov imenika", + " entries available within the provided Base DN" : "vnosi, ki so na voljo znotraj razpoložljivega osnovnega enoznačnega imena (Base DN)", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Prišlo je do napake. Preverite osnovno enoznačno ime, nastavitve povezave in poverila.", "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" : "Potrdi brisanje", "Mappings cleared successfully!" : "Preslikave so uspešno počiščene!", "Error while clearing the mappings." : "Napaka pri čiščenju preslikav.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Brezimne vezave niso dovoljene. Navedeno mora biti uporabniško enoznačno ime (DN) in geslo.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Napaka opravila LDAP: brezimne povezave morda niso dovoljene.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Shranjevanje je spodletelo. Prepričajte se, da je dostop do podatkovne zbirke omogočen. Pred nadaljevanjem je treba stran osvežiti.", + "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Preklop načina omogoči samodejne poizvedbe LDAP. Glede na velikost je lahko opravilo dolgotrajno. Ali res želite preklopiti način?", "Mode switch" : "Preklop načina", "Select attributes" : "Izbor atributov", + "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Uporabnika ni mogoče najti. Preverite atribute prijave in uporabniško ime. Učinkovit filter (za kopiranje overitve ukazne vrstice): <br/>", "User found and settings verified." : "Uporabnik je najden in nastavitve so overjene.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Nastavitve so overjene, najden pa je le en uporabnik. Le prvi se bo lahko prijavil. Priporočljivo je navesti ožji filter.", + "An unspecified error occurred. Please check the settings and the log." : "Prišlo je do nedoločene napake. Preveriti je treba dnevnik in nastavitve.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Filter iskanja ni veljaven. Najverjetneje je to zaradi napake skladnje, kot je neustrezno ali neskladno uporabljen oklepaj. Preverite vpis.", + "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Prišlo je do napake povezave z LDAP / AD. Preverite podatke o gostitelju, vratih in poverilih.", + "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Manjka držalo %uid. Zamenjano bo z uporabniškim imenom pri poizvedbah LDAP / AD.", + "Please provide a login name to test against" : "Vpisati je treba uporabniško ime za preizkus", + "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Skupina je onemogočena, ker na strežniku ni omogočena podpora atributu memberOf.", "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"], "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.", @@ -52,9 +68,11 @@ OC.L10N.register( "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", "Verify settings and count groups" : "Preveri nastavitve in preštej skupine", + "When logging in, %s will find the user based on the following attributes:" : "Pri prijavi bodo prek %s najdeni uporabniki na osnovi navedenih atributov:", "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:", "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.", "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:", + "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Dovoli prijavo z atributom elektronskega naslova. Dovoljena bosta naslova Mail and mailPrimaryAddress.", "Other Attributes:" : "Drugi atributi:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"", "Test Loginname" : "Preizkusi prijavno ime", @@ -62,6 +80,8 @@ OC.L10N.register( "1. Server" : "1. strežnik", "%s. Server:" : "%s. strežnik:", "Add a new and blank configuration" : "In nova, privzeta nastavitev", + "Copy current configuration into new directory binding" : "Kopiraj trenutne nastavitve v vezi nove mape.", + "Delete the current configuration" : "Izbriši trenutne nastavitve", "Host" : "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Port" : "Vrata", @@ -72,10 +92,12 @@ OC.L10N.register( "For anonymous access, leave DN and Password empty." : "Za brezimni dostop naj bosta polji imena in gesla prazni.", "One Base DN per line" : "Eno osnovno enolično ime na vrstico", "You can specify Base DN for users and groups in the Advanced tab" : "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.", + "Detect Base DN" : "Zaznava osnovnega enoznačnega imena (DN)", + "Test Base DN" : "Preizkus osnovnega enoznačnega imena (DN)", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Preusmeri samodejne zahteve LDAP. Nastavitev je priporočljiva za obsežnejše namestitve, vendar zahteva nekaj znanja o delu z LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).", - "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.", + "Verify settings and count users" : "Preveri nastavitve in preštej uporabnike", "Saving" : "Poteka shranjevanje ...", "Back" : "Nazaj", "Continue" : "Nadaljuj", @@ -99,6 +121,7 @@ OC.L10N.register( "Directory Settings" : "Nastavitve mape", "User Display Name Field" : "Polje za uporabnikovo prikazano ime", "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena uporabnika.", + "2nd User Display Name Field" : "Polje 2. prikaznega imena uporabnika", "Base User Tree" : "Osnovno uporabniško drevo", "One User Base DN per line" : "Eno osnovno uporabniško ime na vrstico", "User Search Attributes" : "Uporabnikovi atributi iskanja", @@ -109,6 +132,7 @@ OC.L10N.register( "One Group Base DN per line" : "Eno osnovno ime skupine na vrstico", "Group Search Attributes" : "Skupinski atributi iskanja", "Group-Member association" : "Povezava član-skupina", + "Dynamic Group Member URL" : "Naslov URL člana dinamična skupine", "Nested Groups" : "Gnezdene skupine", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Možnost omogoča podporo skupinam, ki vključujejo skupine. Deluje je, če atribut članstva skupine vsebuje enolično ime (DN).", "Paging chunksize" : "Velikost odvoda za razbremenitev delovnega pomnilnik", diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json index f4622c44fa7..8268aebb993 100644 --- a/apps/user_ldap/l10n/sl.json +++ b/apps/user_ldap/l10n/sl.json @@ -11,24 +11,40 @@ " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s", "Action does not exist" : "Dejanje ne obstaja", "The Base DN appears to be wrong" : "Enoznačno ime (DN) podatkovne zbirke je napačno", + "Testing configuration…" : "Poteka preizkušanje nastavitev ...", "Configuration incorrect" : "Nastavitev ni ustrezna", "Configuration incomplete" : "Nastavitev je nepopolna", "Configuration OK" : "Nastavitev je ustrezna", "Select groups" : "Izberi skupine", "Select object classes" : "Izbor razredov predmeta", "Please check the credentials, they seem to be wrong." : "Preverite poverila! Najverjetneje so napačna.", + "Please specify the port, it could not be auto-detected." : "Določiti je treba ustrezna vrata, ker jih ni mogoče samodejno zaznati.", "Base DN could not be auto-detected, please revise credentials, host and port." : "Osnovnega enoznačnega imena (DN) ni mogoče samodejno zaznati. Preverite poverila ter nastavitve gostitelja in vrat.", "Could not detect Base DN, please enter it manually." : "Ni mogoče zaznati osnovnega enoznačnega imena (DN). Vnesti ga bo treba ročno.", "{nthServer}. Server" : "{nthServer}. strežnik", "No object found in the given Base DN. Please revise." : "Ni najdenega predmeta v osnovnem enoznačnem imenu (DN). Preverite nastavitve.", "More than 1,000 directory entries available." : "Na voljo je več kot 1000 vnosov imenika", + " entries available within the provided Base DN" : "vnosi, ki so na voljo znotraj razpoložljivega osnovnega enoznačnega imena (Base DN)", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Prišlo je do napake. Preverite osnovno enoznačno ime, nastavitve povezave in poverila.", "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" : "Potrdi brisanje", "Mappings cleared successfully!" : "Preslikave so uspešno počiščene!", "Error while clearing the mappings." : "Napaka pri čiščenju preslikav.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Brezimne vezave niso dovoljene. Navedeno mora biti uporabniško enoznačno ime (DN) in geslo.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Napaka opravila LDAP: brezimne povezave morda niso dovoljene.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Shranjevanje je spodletelo. Prepričajte se, da je dostop do podatkovne zbirke omogočen. Pred nadaljevanjem je treba stran osvežiti.", + "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Preklop načina omogoči samodejne poizvedbe LDAP. Glede na velikost je lahko opravilo dolgotrajno. Ali res želite preklopiti način?", "Mode switch" : "Preklop načina", "Select attributes" : "Izbor atributov", + "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Uporabnika ni mogoče najti. Preverite atribute prijave in uporabniško ime. Učinkovit filter (za kopiranje overitve ukazne vrstice): <br/>", "User found and settings verified." : "Uporabnik je najden in nastavitve so overjene.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Nastavitve so overjene, najden pa je le en uporabnik. Le prvi se bo lahko prijavil. Priporočljivo je navesti ožji filter.", + "An unspecified error occurred. Please check the settings and the log." : "Prišlo je do nedoločene napake. Preveriti je treba dnevnik in nastavitve.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Filter iskanja ni veljaven. Najverjetneje je to zaradi napake skladnje, kot je neustrezno ali neskladno uporabljen oklepaj. Preverite vpis.", + "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Prišlo je do napake povezave z LDAP / AD. Preverite podatke o gostitelju, vratih in poverilih.", + "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Manjka držalo %uid. Zamenjano bo z uporabniškim imenom pri poizvedbah LDAP / AD.", + "Please provide a login name to test against" : "Vpisati je treba uporabniško ime za preizkus", + "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Skupina je onemogočena, ker na strežniku ni omogočena podpora atributu memberOf.", "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"], "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.", @@ -50,9 +66,11 @@ "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", "Verify settings and count groups" : "Preveri nastavitve in preštej skupine", + "When logging in, %s will find the user based on the following attributes:" : "Pri prijavi bodo prek %s najdeni uporabniki na osnovi navedenih atributov:", "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:", "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.", "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:", + "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Dovoli prijavo z atributom elektronskega naslova. Dovoljena bosta naslova Mail and mailPrimaryAddress.", "Other Attributes:" : "Drugi atributi:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"", "Test Loginname" : "Preizkusi prijavno ime", @@ -60,6 +78,8 @@ "1. Server" : "1. strežnik", "%s. Server:" : "%s. strežnik:", "Add a new and blank configuration" : "In nova, privzeta nastavitev", + "Copy current configuration into new directory binding" : "Kopiraj trenutne nastavitve v vezi nove mape.", + "Delete the current configuration" : "Izbriši trenutne nastavitve", "Host" : "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Port" : "Vrata", @@ -70,10 +90,12 @@ "For anonymous access, leave DN and Password empty." : "Za brezimni dostop naj bosta polji imena in gesla prazni.", "One Base DN per line" : "Eno osnovno enolično ime na vrstico", "You can specify Base DN for users and groups in the Advanced tab" : "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.", + "Detect Base DN" : "Zaznava osnovnega enoznačnega imena (DN)", + "Test Base DN" : "Preizkus osnovnega enoznačnega imena (DN)", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Preusmeri samodejne zahteve LDAP. Nastavitev je priporočljiva za obsežnejše namestitve, vendar zahteva nekaj znanja o delu z LDAP.", "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).", - "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.", + "Verify settings and count users" : "Preveri nastavitve in preštej uporabnike", "Saving" : "Poteka shranjevanje ...", "Back" : "Nazaj", "Continue" : "Nadaljuj", @@ -97,6 +119,7 @@ "Directory Settings" : "Nastavitve mape", "User Display Name Field" : "Polje za uporabnikovo prikazano ime", "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena uporabnika.", + "2nd User Display Name Field" : "Polje 2. prikaznega imena uporabnika", "Base User Tree" : "Osnovno uporabniško drevo", "One User Base DN per line" : "Eno osnovno uporabniško ime na vrstico", "User Search Attributes" : "Uporabnikovi atributi iskanja", @@ -107,6 +130,7 @@ "One Group Base DN per line" : "Eno osnovno ime skupine na vrstico", "Group Search Attributes" : "Skupinski atributi iskanja", "Group-Member association" : "Povezava član-skupina", + "Dynamic Group Member URL" : "Naslov URL člana dinamična skupine", "Nested Groups" : "Gnezdene skupine", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Možnost omogoča podporo skupinam, ki vključujejo skupine. Deluje je, če atribut članstva skupine vsebuje enolično ime (DN).", "Paging chunksize" : "Velikost odvoda za razbremenitev delovnega pomnilnik", diff --git a/apps/user_ldap/l10n/sq.js b/apps/user_ldap/l10n/sq.js index 965b8bc38db..9d1b3e4110d 100644 --- a/apps/user_ldap/l10n/sq.js +++ b/apps/user_ldap/l10n/sq.js @@ -96,7 +96,7 @@ OC.L10N.register( "Test Base DN" : "Testo DN Bazë", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Shmang kërkesa LDAP automatike. Më e përshtatshme për instalime më të mëdha, por lyp ca dije rreth LDAP-it.", "Manually enter LDAP filters (recommended for large directories)" : "Jepni filtra LDAP dorazi (e këshilluar për drejtori të mëdha)", - "Limit %s access to users meeting these criteria:" : "Kufizo hyrje %s vetëm për përdorues që plotësojnë këtë kusht:", + "%s access is limited to users meeting these criteria:" : "Hyrja për %s u rezervohet përdoruesve që plotësojnë këto kushte:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Klasat më të rëndomta objektesh për përdoruesit janë organizationalPerson, person, user, dhe inetOrgPerson. Nëse s’jeni i sigurt cilën klasë objekti të përzgjidhni, ju lutemi, lidhuni me përgjegjësin e drejtorisë suaj.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtri përcakton se cilët përdorues LDAP do të kenë hyrje te instanca %s.", "Verify settings and count users" : "Verifiko rregullimet dhe numëro përdoruesit", diff --git a/apps/user_ldap/l10n/sq.json b/apps/user_ldap/l10n/sq.json index 09ff2ce39d0..ee8f696710f 100644 --- a/apps/user_ldap/l10n/sq.json +++ b/apps/user_ldap/l10n/sq.json @@ -94,7 +94,7 @@ "Test Base DN" : "Testo DN Bazë", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Shmang kërkesa LDAP automatike. Më e përshtatshme për instalime më të mëdha, por lyp ca dije rreth LDAP-it.", "Manually enter LDAP filters (recommended for large directories)" : "Jepni filtra LDAP dorazi (e këshilluar për drejtori të mëdha)", - "Limit %s access to users meeting these criteria:" : "Kufizo hyrje %s vetëm për përdorues që plotësojnë këtë kusht:", + "%s access is limited to users meeting these criteria:" : "Hyrja për %s u rezervohet përdoruesve që plotësojnë këto kushte:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Klasat më të rëndomta objektesh për përdoruesit janë organizationalPerson, person, user, dhe inetOrgPerson. Nëse s’jeni i sigurt cilën klasë objekti të përzgjidhni, ju lutemi, lidhuni me përgjegjësin e drejtorisë suaj.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtri përcakton se cilët përdorues LDAP do të kenë hyrje te instanca %s.", "Verify settings and count users" : "Verifiko rregullimet dhe numëro përdoruesit", diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js index eb3ee924b7a..09ea5dd3c0c 100644 --- a/apps/user_ldap/l10n/sr.js +++ b/apps/user_ldap/l10n/sr.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "Тестирај базни ДН", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегава аутоматске LDAP захтеве. Боље за веће поставке, али тражи мало више познавања LDAP-а.", "Manually enter LDAP filters (recommended for large directories)" : "Унесите ручно LDAP филтере (препоручено за велике директоријуме)", - "Limit %s access to users meeting these criteria:" : "Ограничи %s приступа за кориснике који испуњавају ове критеријуме:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Најчешће класе објеката за кориснике су organizationalPerson, person, user и inetOrgPerson. Ако нисте сигурни шта да изаберете, питајте администратора именика.", "The filter specifies which LDAP users shall have access to the %s instance." : "Филтер одређује који ЛДАП корисници ће имати приступ на %s.", "Verify settings and count users" : "Провери поставке и преброј кориснике", diff --git a/apps/user_ldap/l10n/sr.json b/apps/user_ldap/l10n/sr.json index 233df2f4e34..eae15bf7a2a 100644 --- a/apps/user_ldap/l10n/sr.json +++ b/apps/user_ldap/l10n/sr.json @@ -93,7 +93,6 @@ "Test Base DN" : "Тестирај базни ДН", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегава аутоматске LDAP захтеве. Боље за веће поставке, али тражи мало више познавања LDAP-а.", "Manually enter LDAP filters (recommended for large directories)" : "Унесите ручно LDAP филтере (препоручено за велике директоријуме)", - "Limit %s access to users meeting these criteria:" : "Ограничи %s приступа за кориснике који испуњавају ове критеријуме:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Најчешће класе објеката за кориснике су organizationalPerson, person, user и inetOrgPerson. Ако нисте сигурни шта да изаберете, питајте администратора именика.", "The filter specifies which LDAP users shall have access to the %s instance." : "Филтер одређује који ЛДАП корисници ће имати приступ на %s.", "Verify settings and count users" : "Провери поставке и преброј кориснике", diff --git a/apps/user_ldap/l10n/sv.js b/apps/user_ldap/l10n/sv.js index 8ccc9fdb5b5..a672d12a4d8 100644 --- a/apps/user_ldap/l10n/sv.js +++ b/apps/user_ldap/l10n/sv.js @@ -13,6 +13,7 @@ OC.L10N.register( " Could not set configuration %s" : "Kunde inte sätta inställning %s", "Action does not exist" : "Funktion existerar ej", "The Base DN appears to be wrong" : "Den grundläggande DN verkar vara fel", + "Testing configuration…" : "Testar konfiguration...", "Configuration incorrect" : "Felaktig konfiguration", "Configuration incomplete" : "Konfigurationen är ej komplett", "Configuration OK" : "Konfigurationen är OK", @@ -70,7 +71,6 @@ OC.L10N.register( "You can specify Base DN for users and groups in the Advanced tab" : "Du kan ange start-DN för användare och grupper under fliken Avancerat", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Undviker automatiska LDAP-förfrågningar. Bättre för större installationer, men kräver en del LDAP-kunskap.", "Manually enter LDAP filters (recommended for large directories)" : "Ange LDAP-filter manuellt (rekommenderat för stora kataloger)", - "Limit %s access to users meeting these criteria:" : "Begränsa %s tillgång till användare som uppfyller dessa kriterier:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans", "Saving" : "Sparar", "Back" : "Tillbaka", diff --git a/apps/user_ldap/l10n/sv.json b/apps/user_ldap/l10n/sv.json index 9ed20fbeda0..9ff3c4fbacc 100644 --- a/apps/user_ldap/l10n/sv.json +++ b/apps/user_ldap/l10n/sv.json @@ -11,6 +11,7 @@ " Could not set configuration %s" : "Kunde inte sätta inställning %s", "Action does not exist" : "Funktion existerar ej", "The Base DN appears to be wrong" : "Den grundläggande DN verkar vara fel", + "Testing configuration…" : "Testar konfiguration...", "Configuration incorrect" : "Felaktig konfiguration", "Configuration incomplete" : "Konfigurationen är ej komplett", "Configuration OK" : "Konfigurationen är OK", @@ -68,7 +69,6 @@ "You can specify Base DN for users and groups in the Advanced tab" : "Du kan ange start-DN för användare och grupper under fliken Avancerat", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Undviker automatiska LDAP-förfrågningar. Bättre för större installationer, men kräver en del LDAP-kunskap.", "Manually enter LDAP filters (recommended for large directories)" : "Ange LDAP-filter manuellt (rekommenderat för stora kataloger)", - "Limit %s access to users meeting these criteria:" : "Begränsa %s tillgång till användare som uppfyller dessa kriterier:", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans", "Saving" : "Sparar", "Back" : "Tillbaka", diff --git a/apps/user_ldap/l10n/th_TH.js b/apps/user_ldap/l10n/th_TH.js index 1d063a3a7df..9384b242cef 100644 --- a/apps/user_ldap/l10n/th_TH.js +++ b/apps/user_ldap/l10n/th_TH.js @@ -96,7 +96,6 @@ OC.L10N.register( "Test Base DN" : "ทดสอบ Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "หลีกเลี่ยงการร้องขอ LDAP อัตโนมัติ ดีกว่าสำหรับการตั้งค่าที่มากกว่า แต่ต้องมีความรู้เรื่อง LDAP", "Manually enter LDAP filters (recommended for large directories)" : "ป้อนตัวกรอง LDAP ด้วยตนเอง (แนะนำสำหรับไดเรกทอรีขนาดใหญ่)", - "Limit %s access to users meeting these criteria:" : "จำกัด %s ให้เข้าถึงผู้ใช้ที่อยู่ในเงื่อนไขเหล่านี้:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "คลาสวัตถุที่พบมากที่สุดสำหรับผู้ใช้มี organizationalPerson, person, user และ inetOrgPerson หากคุณไม่แน่ใจว่าต้องเลือกคลาสวัตถุตัวไหนโปรดปรึกษาผู้ดูแลระบบไดเรกทอรีของคุณ", "The filter specifies which LDAP users shall have access to the %s instance." : "ระบุตัวกรองที่ผู้ใช้ LDAP จะมีการเข้าถึง %s", "Verify settings and count users" : "ตรวจสอบการตั้งค่าและการนับจำนวนผู้ใช้", diff --git a/apps/user_ldap/l10n/th_TH.json b/apps/user_ldap/l10n/th_TH.json index 47f2d8979ec..4945c90c106 100644 --- a/apps/user_ldap/l10n/th_TH.json +++ b/apps/user_ldap/l10n/th_TH.json @@ -94,7 +94,6 @@ "Test Base DN" : "ทดสอบ Base DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "หลีกเลี่ยงการร้องขอ LDAP อัตโนมัติ ดีกว่าสำหรับการตั้งค่าที่มากกว่า แต่ต้องมีความรู้เรื่อง LDAP", "Manually enter LDAP filters (recommended for large directories)" : "ป้อนตัวกรอง LDAP ด้วยตนเอง (แนะนำสำหรับไดเรกทอรีขนาดใหญ่)", - "Limit %s access to users meeting these criteria:" : "จำกัด %s ให้เข้าถึงผู้ใช้ที่อยู่ในเงื่อนไขเหล่านี้:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "คลาสวัตถุที่พบมากที่สุดสำหรับผู้ใช้มี organizationalPerson, person, user และ inetOrgPerson หากคุณไม่แน่ใจว่าต้องเลือกคลาสวัตถุตัวไหนโปรดปรึกษาผู้ดูแลระบบไดเรกทอรีของคุณ", "The filter specifies which LDAP users shall have access to the %s instance." : "ระบุตัวกรองที่ผู้ใช้ LDAP จะมีการเข้าถึง %s", "Verify settings and count users" : "ตรวจสอบการตั้งค่าและการนับจำนวนผู้ใช้", diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js index 709a9c46ffd..5daf34cc58e 100644 --- a/apps/user_ldap/l10n/tr.js +++ b/apps/user_ldap/l10n/tr.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "Base DN'i Sına", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Otomatik LDAP isteklerinden kaçın. Büyük kurulumlar için daha iyi ancak LDAP bilgisi gerektirir.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)", - "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Kullanıcılar için en çok ortak nesne sınıfları organizationalPerson, person, user ve inetOrgPerson sınıflarıdır. Hangi nesne sınıfını seçeceğinizden emin değilseniz lütfen dizin yöneticinize danışın.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.", "Verify settings and count users" : "Ayarları doğrula ve kullanıcıları say", diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json index 6c34f8a5c20..183ab05a12e 100644 --- a/apps/user_ldap/l10n/tr.json +++ b/apps/user_ldap/l10n/tr.json @@ -93,7 +93,6 @@ "Test Base DN" : "Base DN'i Sına", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Otomatik LDAP isteklerinden kaçın. Büyük kurulumlar için daha iyi ancak LDAP bilgisi gerektirir.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)", - "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Kullanıcılar için en çok ortak nesne sınıfları organizationalPerson, person, user ve inetOrgPerson sınıflarıdır. Hangi nesne sınıfını seçeceğinizden emin değilseniz lütfen dizin yöneticinize danışın.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.", "Verify settings and count users" : "Ayarları doğrula ve kullanıcıları say", diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js index fe2b587fec5..7bc2fbe8a39 100644 --- a/apps/user_ldap/l10n/uk.js +++ b/apps/user_ldap/l10n/uk.js @@ -58,7 +58,6 @@ OC.L10N.register( "You can specify Base DN for users and groups in the Advanced tab" : "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Уникати автоматичні запити LDAP. Краще для великих установок, але вимагає деякого LDAP знання.", "Manually enter LDAP filters (recommended for large directories)" : "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)", - "Limit %s access to users meeting these criteria:" : "Обмежити %s доступ до користувачів, що відповідають цим критеріям:", "The filter specifies which LDAP users shall have access to the %s instance." : "Фільтр визначає, які користувачі LDAP повинні мати доступ до примірника %s.", "Saving" : "Збереження", "Back" : "Назад", diff --git a/apps/user_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json index b43de37ab36..056dcd1917a 100644 --- a/apps/user_ldap/l10n/uk.json +++ b/apps/user_ldap/l10n/uk.json @@ -56,7 +56,6 @@ "You can specify Base DN for users and groups in the Advanced tab" : "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Уникати автоматичні запити LDAP. Краще для великих установок, але вимагає деякого LDAP знання.", "Manually enter LDAP filters (recommended for large directories)" : "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)", - "Limit %s access to users meeting these criteria:" : "Обмежити %s доступ до користувачів, що відповідають цим критеріям:", "The filter specifies which LDAP users shall have access to the %s instance." : "Фільтр визначає, які користувачі LDAP повинні мати доступ до примірника %s.", "Saving" : "Збереження", "Back" : "Назад", diff --git a/apps/user_ldap/l10n/zh_CN.js b/apps/user_ldap/l10n/zh_CN.js index 88b79f691d0..c1ec8f49ef3 100644 --- a/apps/user_ldap/l10n/zh_CN.js +++ b/apps/user_ldap/l10n/zh_CN.js @@ -95,7 +95,6 @@ OC.L10N.register( "Test Base DN" : "测试基础DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "避免自动LDAP请求。用于更精确的设置，但需要一些LDAP知识。", "Manually enter LDAP filters (recommended for large directories)" : "手动输入LDAP筛选条件(建议用于大型目录)", - "Limit %s access to users meeting these criteria:" : "限制%s访问符合这些标准：", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "对于用户最常用的对象类为organizationalPerson，person，user和inetOrgPerson。如果你不确定选择哪些对象类，请咨询您的目录管理员。", "The filter specifies which LDAP users shall have access to the %s instance." : "该筛选条件指定哪些LDAP用户有权访问%s的实例。", "Verify settings and count users" : "验证设置和统计用户", diff --git a/apps/user_ldap/l10n/zh_CN.json b/apps/user_ldap/l10n/zh_CN.json index 7a6b2d5dd42..eecbc35d4d5 100644 --- a/apps/user_ldap/l10n/zh_CN.json +++ b/apps/user_ldap/l10n/zh_CN.json @@ -93,7 +93,6 @@ "Test Base DN" : "测试基础DN", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "避免自动LDAP请求。用于更精确的设置，但需要一些LDAP知识。", "Manually enter LDAP filters (recommended for large directories)" : "手动输入LDAP筛选条件(建议用于大型目录)", - "Limit %s access to users meeting these criteria:" : "限制%s访问符合这些标准：", "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "对于用户最常用的对象类为organizationalPerson，person，user和inetOrgPerson。如果你不确定选择哪些对象类，请咨询您的目录管理员。", "The filter specifies which LDAP users shall have access to the %s instance." : "该筛选条件指定哪些LDAP用户有权访问%s的实例。", "Verify settings and count users" : "验证设置和统计用户", diff --git a/apps/user_ldap/l10n/zh_TW.js b/apps/user_ldap/l10n/zh_TW.js index 77bd5ab1258..1197595d485 100644 --- a/apps/user_ldap/l10n/zh_TW.js +++ b/apps/user_ldap/l10n/zh_TW.js @@ -85,7 +85,6 @@ OC.L10N.register( "Detect Base DN" : "偵測 Base DN", "Test Base DN" : "測試 Base DN", "Manually enter LDAP filters (recommended for large directories)" : "手動輸入 LDAP篩選器 (建議在大型的資料環境)", - "Limit %s access to users meeting these criteria:" : "當遇到以下標準時，限制%s存取使用者:", "The filter specifies which LDAP users shall have access to the %s instance." : "篩選起指定哪些LDAP的使用者應該擁有存取%s的權限", "Verify settings and count users" : "驗證設定並計算使用者數", "Saving" : "儲存", diff --git a/apps/user_ldap/l10n/zh_TW.json b/apps/user_ldap/l10n/zh_TW.json index abbd1d65071..11a9cadfd29 100644 --- a/apps/user_ldap/l10n/zh_TW.json +++ b/apps/user_ldap/l10n/zh_TW.json @@ -83,7 +83,6 @@ "Detect Base DN" : "偵測 Base DN", "Test Base DN" : "測試 Base DN", "Manually enter LDAP filters (recommended for large directories)" : "手動輸入 LDAP篩選器 (建議在大型的資料環境)", - "Limit %s access to users meeting these criteria:" : "當遇到以下標準時，限制%s存取使用者:", "The filter specifies which LDAP users shall have access to the %s instance." : "篩選起指定哪些LDAP的使用者應該擁有存取%s的權限", "Verify settings and count users" : "驗證設定並計算使用者數", "Saving" : "儲存", diff --git a/apps/user_ldap/templates/part.wizard-userfilter.php b/apps/user_ldap/templates/part.wizard-userfilter.php index 4c04d4372f7..076db93a91a 100644 --- a/apps/user_ldap/templates/part.wizard-userfilter.php +++ b/apps/user_ldap/templates/part.wizard-userfilter.php @@ -1,7 +1,7 @@ <fieldset id="ldapWizard2"> <div> <p> - <?php p($l->t('Limit %s access to users meeting these criteria:', $theme->getName()));?> + <?php p($l->t('%s access is limited to users meeting these criteria:', $theme->getName()));?> </p> <p> <label for="ldap_userfilter_objectclass"> diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 224cf5c9a35..d6b345faf4b 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -419,11 +419,11 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn * compared with OC_USER_BACKEND_CREATE_USER etc. */ public function implementsActions($actions) { - return (bool)((\OC_User_Backend::CHECK_PASSWORD - | \OC_User_Backend::GET_HOME - | \OC_User_Backend::GET_DISPLAYNAME - | \OC_User_Backend::PROVIDE_AVATAR - | \OC_User_Backend::COUNT_USERS) + return (bool)((\OC\User\Backend::CHECK_PASSWORD + | \OC\User\Backend::GET_HOME + | \OC\User\Backend::GET_DISPLAYNAME + | \OC\User\Backend::PROVIDE_AVATAR + | \OC\User\Backend::COUNT_USERS) & $actions); } |