diff options
602 files changed, 3186 insertions, 3499 deletions
diff --git a/3rdparty b/3rdparty -Subproject a8699fbb8505278c23b74f123236b77bbe1aec0 +Subproject 35a8125ac1dc2325da8da5529f50b3881e1b240 diff --git a/README.md b/README.md index adf8999f565..63ba04031b0 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,14 @@ [](https://ci.owncloud.org/job/server-master-linux/) [](https://scrutinizer-ci.com/g/owncloud/core/) +[](https://codecov.io/github/owncloud/core?branch=master) [](https://codeclimate.com/github/owncloud/core) [](https://scan.coverity.com/projects/owncloud-core) [](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16) [](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0) + + **[ownCloud](http://ownCloud.org) gives you freedom and control over your own data. A personal cloud which runs on your own server.** diff --git a/apps/comments/l10n/cs_CZ.js b/apps/comments/l10n/cs_CZ.js index 1b4e03102d4..73190bcb567 100644 --- a/apps/comments/l10n/cs_CZ.js +++ b/apps/comments/l10n/cs_CZ.js @@ -2,9 +2,9 @@ OC.L10N.register( "comments", { "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů", - "You commented" : "Okomentoval jste", + "You commented" : "Okomentoval(a) jsi", "%1$s commented" : "%1$s okomentován", - "You commented on %2$s" : "Okomentoval jste %2$s", + "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ář...", diff --git a/apps/comments/l10n/cs_CZ.json b/apps/comments/l10n/cs_CZ.json index 5ca994542bf..ca6f727bb0f 100644 --- a/apps/comments/l10n/cs_CZ.json +++ b/apps/comments/l10n/cs_CZ.json @@ -1,8 +1,8 @@ { "translations": { "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů", - "You commented" : "Okomentoval jste", + "You commented" : "Okomentoval(a) jsi", "%1$s commented" : "%1$s okomentován", - "You commented on %2$s" : "Okomentoval jste %2$s", + "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ář...", diff --git a/apps/comments/l10n/da.js b/apps/comments/l10n/da.js index 60574894c35..5725a7b57c6 100644 --- a/apps/comments/l10n/da.js +++ b/apps/comments/l10n/da.js @@ -1,8 +1,23 @@ OC.L10N.register( "comments", { + "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> til filer", + "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]", + "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" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/da.json b/apps/comments/l10n/da.json index 7524d5675ba..a7b12851157 100644 --- a/apps/comments/l10n/da.json +++ b/apps/comments/l10n/da.json @@ -1,6 +1,21 @@ { "translations": { + "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> til filer", + "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]", + "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" },"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 8d02960fd60..424ae79e10e 100644 --- a/apps/comments/l10n/de_DE.js +++ b/apps/comments/l10n/de_DE.js @@ -4,6 +4,7 @@ OC.L10N.register( "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien", "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...", diff --git a/apps/comments/l10n/de_DE.json b/apps/comments/l10n/de_DE.json index 28b45f670b3..4fd810c7006 100644 --- a/apps/comments/l10n/de_DE.json +++ b/apps/comments/l10n/de_DE.json @@ -2,6 +2,7 @@ "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien", "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...", diff --git a/apps/comments/l10n/el.js b/apps/comments/l10n/el.js index ea0442757a3..1ca7886fdc5 100644 --- a/apps/comments/l10n/el.js +++ b/apps/comments/l10n/el.js @@ -1,14 +1,23 @@ OC.L10N.register( "comments", { + "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία", + "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]" : "[Διαγραφή χρήστη]", + "No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια", "More comments..." : "Περισσότερα σχόλια...", "Save" : "Αποθήκευση", + "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}", + "{count} unread comments" : "{count} μη αναγνωσμένα σχόλια", "Comment" : "Σχόλιο" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/el.json b/apps/comments/l10n/el.json index 157445191a4..234f6b79045 100644 --- a/apps/comments/l10n/el.json +++ b/apps/comments/l10n/el.json @@ -1,12 +1,21 @@ { "translations": { + "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία", + "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]" : "[Διαγραφή χρήστη]", + "No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια", "More comments..." : "Περισσότερα σχόλια...", "Save" : "Αποθήκευση", + "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}", + "{count} unread comments" : "{count} μη αναγνωσμένα σχόλια", "Comment" : "Σχόλιο" },"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 23716ca5757..02e45762e09 100644 --- a/apps/comments/l10n/es.js +++ b/apps/comments/l10n/es.js @@ -2,7 +2,9 @@ OC.L10N.register( "comments", { "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos", + "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...", diff --git a/apps/comments/l10n/es.json b/apps/comments/l10n/es.json index cc3e1781299..232fea3a18b 100644 --- a/apps/comments/l10n/es.json +++ b/apps/comments/l10n/es.json @@ -1,6 +1,8 @@ { "translations": { "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos", + "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...", diff --git a/apps/comments/l10n/fil.js b/apps/comments/l10n/fil.js new file mode 100644 index 00000000000..e3734cb6ceb --- /dev/null +++ b/apps/comments/l10n/fil.js @@ -0,0 +1,6 @@ +OC.L10N.register( + "comments", + { + "Cancel" : "I-cancel" +}, +"nplurals=2; plural=(n > 1);"); diff --git a/apps/comments/l10n/fil.json b/apps/comments/l10n/fil.json new file mode 100644 index 00000000000..a368f5adea8 --- /dev/null +++ b/apps/comments/l10n/fil.json @@ -0,0 +1,4 @@ +{ "translations": { + "Cancel" : "I-cancel" +},"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 d168c0658db..eb9faf55e1a 100644 --- a/apps/comments/l10n/nl.js +++ b/apps/comments/l10n/nl.js @@ -2,7 +2,9 @@ OC.L10N.register( "comments", { "<strong>Comments</strong> for files" : "<strong>Reacties</strong> voor bestanden", + "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...", diff --git a/apps/comments/l10n/nl.json b/apps/comments/l10n/nl.json index 74050c7f816..d2a811207f6 100644 --- a/apps/comments/l10n/nl.json +++ b/apps/comments/l10n/nl.json @@ -1,6 +1,8 @@ { "translations": { "<strong>Comments</strong> for files" : "<strong>Reacties</strong> voor bestanden", + "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...", diff --git a/apps/comments/l10n/pt_BR.js b/apps/comments/l10n/pt_BR.js index d7f61e4f161..9d143822a99 100644 --- a/apps/comments/l10n/pt_BR.js +++ b/apps/comments/l10n/pt_BR.js @@ -2,7 +2,9 @@ OC.L10N.register( "comments", { "<strong>Comments</strong> for files" : "<strong>Comentários</strong> por arquivos", + "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...", diff --git a/apps/comments/l10n/pt_BR.json b/apps/comments/l10n/pt_BR.json index 728a7e458ce..10b32799a54 100644 --- a/apps/comments/l10n/pt_BR.json +++ b/apps/comments/l10n/pt_BR.json @@ -1,6 +1,8 @@ { "translations": { "<strong>Comments</strong> for files" : "<strong>Comentários</strong> por arquivos", + "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...", diff --git a/apps/comments/l10n/sl.js b/apps/comments/l10n/sl.js index 331382f4f5b..79d8fc8e977 100644 --- a/apps/comments/l10n/sl.js +++ b/apps/comments/l10n/sl.js @@ -2,7 +2,9 @@ OC.L10N.register( "comments", { "<strong>Comments</strong> for files" : "<strong>Opombe</strong> datotek", + "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 ...", diff --git a/apps/comments/l10n/sl.json b/apps/comments/l10n/sl.json index 54f77cfe571..1e71acbec39 100644 --- a/apps/comments/l10n/sl.json +++ b/apps/comments/l10n/sl.json @@ -1,6 +1,8 @@ { "translations": { "<strong>Comments</strong> for files" : "<strong>Opombe</strong> datotek", + "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 ...", diff --git a/apps/comments/l10n/sv.js b/apps/comments/l10n/sv.js index db3cfe589ae..6c3b17555bc 100644 --- a/apps/comments/l10n/sv.js +++ b/apps/comments/l10n/sv.js @@ -2,7 +2,9 @@ OC.L10N.register( "comments", { "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> till filer", + "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", diff --git a/apps/comments/l10n/sv.json b/apps/comments/l10n/sv.json index 7547cfe69e2..6b2e9b7b71d 100644 --- a/apps/comments/l10n/sv.json +++ b/apps/comments/l10n/sv.json @@ -1,6 +1,8 @@ { "translations": { "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> till filer", + "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", diff --git a/apps/comments/l10n/tr.js b/apps/comments/l10n/tr.js index d098f212de6..ff5bbca4081 100644 --- a/apps/comments/l10n/tr.js +++ b/apps/comments/l10n/tr.js @@ -1,21 +1,23 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files" : "Dosyalar için <strong>Yorumlar</strong>", + "<strong>Comments</strong> for files" : "Dosyalar için <strong>yorumlar</strong>", + "You commented" : "Yorum yaptınız", "%1$s commented" : "%1$s yorumlanmış", - "%1$s commented on %2$s" : "%1$s yorumlanmış %2$s", + "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 silin", + "Type in a new comment..." : "Yeni bir yorum yazın...", + "Delete comment" : "Yorumu sil", "Post" : "Gönder", "Cancel" : "İptal", - "Edit comment" : "Yorumu düzenleyin", + "Edit comment" : "Yorumu düzenle", "[Deleted user]" : "[Silinmiş kullanıcı]", "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ış yorumlar", + "Allowed characters {count} of {max}" : "İzin verilen karakterler {count}/{max}", + "{count} unread comments" : "{count} okunmamış yorum", "Comment" : "Yorum" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/comments/l10n/tr.json b/apps/comments/l10n/tr.json index 8b644c82ee1..724670c53ae 100644 --- a/apps/comments/l10n/tr.json +++ b/apps/comments/l10n/tr.json @@ -1,19 +1,21 @@ { "translations": { - "<strong>Comments</strong> for files" : "Dosyalar için <strong>Yorumlar</strong>", + "<strong>Comments</strong> for files" : "Dosyalar için <strong>yorumlar</strong>", + "You commented" : "Yorum yaptınız", "%1$s commented" : "%1$s yorumlanmış", - "%1$s commented on %2$s" : "%1$s yorumlanmış %2$s", + "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 silin", + "Type in a new comment..." : "Yeni bir yorum yazın...", + "Delete comment" : "Yorumu sil", "Post" : "Gönder", "Cancel" : "İptal", - "Edit comment" : "Yorumu düzenleyin", + "Edit comment" : "Yorumu düzenle", "[Deleted user]" : "[Silinmiş kullanıcı]", "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ış yorumlar", + "Allowed characters {count} of {max}" : "İzin verilen karakterler {count}/{max}", + "{count} unread comments" : "{count} okunmamış yorum", "Comment" : "Yorum" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/zh_TW.js b/apps/comments/l10n/zh_TW.js index 65cddd342ca..41c0dd4b0f2 100644 --- a/apps/comments/l10n/zh_TW.js +++ b/apps/comments/l10n/zh_TW.js @@ -1,7 +1,23 @@ OC.L10N.register( "comments", { + "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>", + "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" : "取消", - "Save" : "儲存" + "Edit comment" : "編輯留言", + "[Deleted user]" : "[已刪除的使用者]", + "No other comments available" : "沒有其他留言", + "More comments..." : "更多留言…", + "Save" : "儲存", + "Allowed characters {count} of {max}" : "已輸入 {count} / 長度限制 {max}", + "{count} unread comments" : "{count} 則未讀留言", + "Comment" : "留言" }, "nplurals=1; plural=0;"); diff --git a/apps/comments/l10n/zh_TW.json b/apps/comments/l10n/zh_TW.json index 4da0032a014..7fe1b0fb1fa 100644 --- a/apps/comments/l10n/zh_TW.json +++ b/apps/comments/l10n/zh_TW.json @@ -1,5 +1,21 @@ { "translations": { + "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>", + "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" : "取消", - "Save" : "儲存" + "Edit comment" : "編輯留言", + "[Deleted user]" : "[已刪除的使用者]", + "No other comments available" : "沒有其他留言", + "More comments..." : "更多留言…", + "Save" : "儲存", + "Allowed characters {count} of {max}" : "已輸入 {count} / 長度限制 {max}", + "{count} unread comments" : "{count} 則未讀留言", + "Comment" : "留言" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/dav/appinfo/database.xml b/apps/dav/appinfo/database.xml index b0a7ad4f2a8..71dec639064 100644 --- a/apps/dav/appinfo/database.xml +++ b/apps/dav/appinfo/database.xml @@ -31,18 +31,22 @@ CREATE TABLE addressbooks ( <field> <name>principaluri</name> <type>text</type> + <length>255</length> </field> <field> <name>displayname</name> <type>text</type> + <length>255</length> </field> <field> <name>uri</name> <type>text</type> + <length>255</length> </field> <field> <name>description</name> <type>text</type> + <length>255</length> </field> <field> <name>synctoken</name> @@ -102,6 +106,7 @@ CREATE TABLE cards ( <field> <name>uri</name> <type>text</type> + <length>255</length> </field> <field> <name>lastmodified</name> @@ -150,6 +155,7 @@ CREATE TABLE addressbookchanges ( <field> <name>uri</name> <type>text</type> + <length>255</length> </field> <field> <name>synctoken</name> @@ -219,6 +225,7 @@ CREATE TABLE calendarobjects ( <field> <name>uri</name> <type>text</type> + <length>255</length> </field> <field> <name>calendarid</name> @@ -246,6 +253,7 @@ CREATE TABLE calendarobjects ( <field> <name>componenttype</name> <type>text</type> + <length>8</length> </field> <field> <name>firstoccurence</name> @@ -260,6 +268,7 @@ CREATE TABLE calendarobjects ( <field> <name>uid</name> <type>text</type> + <length>255</length> </field> <index> <name>calobjects_index</name> @@ -304,14 +313,17 @@ CREATE TABLE calendarobjects ( <field> <name>principaluri</name> <type>text</type> + <length>255</length> </field> <field> <name>displayname</name> <type>text</type> + <length>255</length> </field> <field> <name>uri</name> <type>text</type> + <length>255</length> </field> <field> <name>synctoken</name> @@ -323,6 +335,7 @@ CREATE TABLE calendarobjects ( <field> <name>description</name> <type>text</type> + <length>255</length> </field> <field> <name>calendarorder</name> @@ -342,6 +355,7 @@ CREATE TABLE calendarobjects ( <field> <name>components</name> <type>text</type> + <length>20</length> </field> <field> <name>transparent</name> @@ -387,6 +401,7 @@ CREATE TABLE calendarobjects ( <field> <name>uri</name> <type>text</type> + <length>255</length> </field> <field> <name>synctoken</name> @@ -456,10 +471,12 @@ CREATE TABLE calendarobjects ( <field> <name>principaluri</name> <type>text</type> + <length>255</length> </field> <field> <name>source</name> <type>text</type> + <length>255</length> </field> <field> <name>displayname</name> @@ -541,6 +558,7 @@ CREATE TABLE calendarobjects ( <field> <name>principaluri</name> <type>text</type> + <length>255</length> </field> <field> <name>calendardata</name> @@ -549,6 +567,7 @@ CREATE TABLE calendarobjects ( <field> <name>uri</name> <type>text</type> + <length>255</length> </field> <field> <name>lastmodified</name> @@ -658,10 +677,12 @@ CREATE TABLE calendarobjects ( <field> <name>principaluri</name> <type>text</type> + <length>255</length> </field> <field> <name>type</name> <type>text</type> + <length>255</length> </field> <field> <name>access</name> diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index 82d0f7cf8a1..a8e7df6e8e2 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -5,22 +5,11 @@ <description>ownCloud WebDAV endpoint</description> <licence>AGPL</licence> <author>owncloud.org</author> - <version>0.2.2</version> + <version>0.2.3</version> <default_enable/> <types> <filesystem/> </types> - <remote> - <files>appinfo/v1/webdav.php</files> - <webdav>appinfo/v1/webdav.php</webdav> - <dav>appinfo/v2/remote.php</dav> - <!-- carddav endpoints as used before ownCloud 9.0 --> - <contacts>appinfo/v1/carddav.php</contacts> - <carddav>appinfo/v1/carddav.php</carddav> - <!-- caldav endpoints as used before ownCloud 9.0 --> - <calendar>appinfo/v1/caldav.php</calendar> - <caldav>appinfo/v1/caldav.php</caldav> - </remote> <public> <webdav>appinfo/v1/publicwebdav.php</webdav> </public> diff --git a/apps/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php index b0ee264aac3..558a8238666 100644 --- a/apps/dav/appinfo/v1/publicwebdav.php +++ b/apps/dav/appinfo/v1/publicwebdav.php @@ -32,7 +32,7 @@ OC_App::loadApps($RUNTIME_APPTYPES); OC_Util::obEnd(); // Backends -$authBackend = new OCA\DAV\Connector\PublicAuth(\OC::$server->getConfig()); +$authBackend = new OCA\DAV\Connector\PublicAuth(\OC::$server->getConfig(), \OC::$server->getRequest()); $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory( \OC::$server->getConfig(), diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/caldav/caldavbackend.php index 5f82db10b39..f0f236de3ff 100644 --- a/apps/dav/lib/caldav/caldavbackend.php +++ b/apps/dav/lib/caldav/caldavbackend.php @@ -705,7 +705,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription * * This default may well be good enough for personal use, and calendars * that aren't very large. But if you anticipate high usage, big calendars - * or high loads, you are strongly adviced to optimize certain paths. + * or high loads, you are strongly advised to optimize certain paths. * * The best way to do so is override this method and to optimize * specifically for 'common filters'. @@ -1299,7 +1299,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription } if ($componentType === 'VEVENT' && $component->DTSTART) { $firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp(); - // Finding the last occurence is a bit harder + // Finding the last occurrence is a bit harder if (!isset($component->RRULE)) { if (isset($component->DTEND)) { $lastOccurence = $component->DTEND->getDateTime()->getTimeStamp(); diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php index 650623225e3..28d5ed1ae99 100644 --- a/apps/dav/lib/carddav/carddavbackend.php +++ b/apps/dav/lib/carddav/carddavbackend.php @@ -99,6 +99,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { * @return array */ function getAddressBooksForUser($principalUri) { + $principalUriOriginal = $principalUri; $principalUri = $this->convertPrincipal($principalUri, true); $query = $this->db->getQueryBuilder(); $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken']) @@ -122,7 +123,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { $result->closeCursor(); // query for shared calendars - $principals = $this->principalBackend->getGroupMembership($principalUri, true); + $principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true); $principals[]= $principalUri; $query = $this->db->getQueryBuilder(); @@ -391,7 +392,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { } /** - * Returns a specfic card. + * Returns a specific card. * * The same set of properties must be returned as with getCards. The only * exception is that 'carddata' is absolutely required. diff --git a/apps/dav/lib/connector/publicauth.php b/apps/dav/lib/connector/publicauth.php index f069a214fe8..0d75a4db493 100644 --- a/apps/dav/lib/connector/publicauth.php +++ b/apps/dav/lib/connector/publicauth.php @@ -26,6 +26,9 @@ namespace OCA\DAV\Connector; +use OCP\IConfig; +use OCP\IRequest; + class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic { /** @@ -36,10 +39,18 @@ class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic { private $share; /** + * @var IRequest + */ + private $request; + + /** * @param \OCP\IConfig $config + * @param IRequest $request */ - public function __construct($config) { + public function __construct(IConfig $config, + IRequest $request) { $this->config = $config; + $this->request = $request; } /** @@ -52,6 +63,7 @@ class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic { * @param string $password * * @return bool + * @throws \Sabre\DAV\Exception\NotAuthenticated */ protected function validateUserPass($username, $password) { $linkItem = \OCP\Share::getShareByToken($username, false); @@ -92,6 +104,12 @@ class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic { && \OC::$server->getSession()->get('public_link_authenticated') === $linkItem['id']) { return true; } else { + if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) { + // do not re-authenticate over ajax, use dummy auth name to prevent browser popup + http_response_code(401); + header('WWW-Authenticate', 'DummyBasic real="ownCloud"'); + throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls'); + } return false; } } else if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_REMOTE) { diff --git a/apps/dav/lib/connector/sabre/filesplugin.php b/apps/dav/lib/connector/sabre/filesplugin.php index fb2af554c68..8b54291793a 100644 --- a/apps/dav/lib/connector/sabre/filesplugin.php +++ b/apps/dav/lib/connector/sabre/filesplugin.php @@ -45,6 +45,7 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin { const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id'; const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid'; const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions'; + const SHARE_PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}share-permissions'; const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL'; const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size'; const GETETAG_PROPERTYNAME = '{DAV:}getetag'; @@ -116,6 +117,7 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin { $server->protectedProperties[] = self::FILEID_PROPERTYNAME; $server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME; $server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME; + $server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME; $server->protectedProperties[] = self::SIZE_PROPERTYNAME; $server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME; $server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME; @@ -245,6 +247,10 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin { return $perms; }); + $propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node) { + return $node->getSharePermissions(); + }); + $propFind->handle(self::GETETAG_PROPERTYNAME, function() use ($node) { return $node->getETag(); }); diff --git a/apps/dav/lib/connector/sabre/lockplugin.php b/apps/dav/lib/connector/sabre/lockplugin.php index ff4e1dc01bb..66da39a57c8 100644 --- a/apps/dav/lib/connector/sabre/lockplugin.php +++ b/apps/dav/lib/connector/sabre/lockplugin.php @@ -49,7 +49,7 @@ class LockPlugin extends ServerPlugin { } public function getLock(RequestInterface $request) { - // we cant listen on 'beforeMethod:PUT' due to order of operations with setting up the tree + // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree // so instead we limit ourselves to the PUT method manually if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) { return; diff --git a/apps/dav/lib/connector/sabre/node.php b/apps/dav/lib/connector/sabre/node.php index 95a5f0a8749..9867fe66cd3 100644 --- a/apps/dav/lib/connector/sabre/node.php +++ b/apps/dav/lib/connector/sabre/node.php @@ -30,6 +30,7 @@ namespace OCA\DAV\Connector\Sabre; +use OC\Files\Mount\MoveableMount; use OCA\DAV\Connector\Sabre\Exception\InvalidPath; @@ -214,6 +215,55 @@ abstract class Node implements \Sabre\DAV\INode { } /** + * @return int + */ + public function getSharePermissions() { + $storage = $this->info->getStorage(); + + $path = $this->info->getInternalPath(); + + if ($storage->instanceOfStorage('\OC\Files\Storage\Shared')) { + /** @var \OC\Files\Storage\Shared $storage */ + $permissions = (int)$storage->getShare()['permissions']; + } else { + $permissions = $storage->getPermissions($path); + } + + /* + * We can always share non moveable mount points with DELETE and UPDATE + * Eventually we need to do this properly + */ + $mountpoint = $this->info->getMountPoint(); + if (!($mountpoint instanceof MoveableMount)) { + $mountpointpath = $mountpoint->getMountPoint(); + if (substr($mountpointpath, -1) === '/') { + $mountpointpath = substr($mountpointpath, 0, -1); + } + + if ($mountpointpath === $this->info->getPath()) { + $permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE; + } + } + + /* + * Without sharing permissions there are also no other permissions + */ + if (!($permissions & \OCP\Constants::PERMISSION_SHARE) || + !($permissions & \OCP\Constants::PERMISSION_READ)) { + return 0; + } + + /* + * Files can't have create or delete permissions + */ + if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) { + $permissions &= ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE); + } + + return $permissions; + } + + /** * @return string */ public function getDavPermissions() { diff --git a/apps/dav/lib/connector/sabre/objecttree.php b/apps/dav/lib/connector/sabre/objecttree.php index 505a42d4746..f38dfe679c7 100644 --- a/apps/dav/lib/connector/sabre/objecttree.php +++ b/apps/dav/lib/connector/sabre/objecttree.php @@ -102,9 +102,11 @@ class ObjectTree extends \Sabre\DAV\Tree { * Returns the INode object for the requested path * * @param string $path - * @throws \Sabre\DAV\Exception\ServiceUnavailable - * @throws \Sabre\DAV\Exception\NotFound * @return \Sabre\DAV\INode + * @throws InvalidPath + * @throws \Sabre\DAV\Exception\Locked + * @throws \Sabre\DAV\Exception\NotFound + * @throws \Sabre\DAV\Exception\ServiceUnavailable */ public function getNodeForPath($path) { if (!$this->fileView) { diff --git a/apps/dav/lib/connector/sabre/serverfactory.php b/apps/dav/lib/connector/sabre/serverfactory.php index 8158db3e92a..cab7a85d19f 100644 --- a/apps/dav/lib/connector/sabre/serverfactory.php +++ b/apps/dav/lib/connector/sabre/serverfactory.php @@ -26,6 +26,7 @@ namespace OCA\DAV\Connector\Sabre; +use OCA\DAV\Files\BrowserErrorPagePlugin; use OCP\Files\Mount\IMountManager; use OCP\IConfig; use OCP\IDBConnection; @@ -115,6 +116,10 @@ class ServerFactory { $server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin()); } + if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) { + $server->addPlugin(new BrowserErrorPagePlugin()); + } + // wait with registering these until auth is handled and the filesystem is setup $server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) { // ensure the skeleton is copied diff --git a/apps/dav/lib/files/browsererrorpageplugin.php b/apps/dav/lib/files/browsererrorpageplugin.php new file mode 100644 index 00000000000..37a4166efef --- /dev/null +++ b/apps/dav/lib/files/browsererrorpageplugin.php @@ -0,0 +1,116 @@ +<?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/> + * + */ + +namespace OCA\DAV\Files; + +use OC\AppFramework\Http\Request; +use OC_Template; +use OCP\IRequest; +use Sabre\DAV\Exception; +use Sabre\DAV\Server; +use Sabre\DAV\ServerPlugin; + +class BrowserErrorPagePlugin extends ServerPlugin { + + /** @var Server */ + private $server; + + /** + * This initializes the plugin. + * + * This function is called by Sabre\DAV\Server, after + * addPlugin is called. + * + * This method should set up the required event subscriptions. + * + * @param Server $server + * @return void + */ + function initialize(Server $server) { + $this->server = $server; + $server->on('exception', array($this, 'logException'), 1000); + } + + /** + * @param IRequest $request + * @return bool + */ + public static function isBrowserRequest(IRequest $request) { + if ($request->getMethod() !== 'GET') { + return false; + } + return $request->isUserAgent([ + Request::USER_AGENT_IE, + Request::USER_AGENT_MS_EDGE, + Request::USER_AGENT_CHROME, + Request::USER_AGENT_FIREFOX, + Request::USER_AGENT_SAFARI, + ]); + } + + /** + * @param \Exception $ex + */ + public function logException(\Exception $ex) { + if ($ex instanceof Exception) { + $httpCode = $ex->getHTTPCode(); + $headers = $ex->getHTTPHeaders($this->server); + } else { + $httpCode = 500; + $headers = []; + } + $this->server->httpResponse->addHeaders($headers); + $this->server->httpResponse->setStatus($httpCode); + $body = $this->generateBody($ex); + $this->server->httpResponse->setBody($body); + $this->sendResponse(); + } + + /** + * @codeCoverageIgnore + * @param \Exception $ex + * @param int $httpCode + * @return bool|string + */ + public function generateBody(\Exception $exception) { + $request = \OC::$server->getRequest(); + $content = new OC_Template('dav', 'exception', 'guest'); + $content->assign('title', $this->server->httpResponse->getStatusText()); + $content->assign('message', $exception->getMessage()); + $content->assign('errorClass', get_class($exception)); + $content->assign('errorMsg', $exception->getMessage()); + $content->assign('errorCode', $exception->getCode()); + $content->assign('file', $exception->getFile()); + $content->assign('line', $exception->getLine()); + $content->assign('trace', $exception->getTraceAsString()); + $content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false)); + $content->assign('remoteAddr', $request->getRemoteAddress()); + $content->assign('requestID', $request->getId()); + return $content->fetchPage(); + } + + /* + * @codeCoverageIgnore + */ + public function sendResponse() { + $this->server->sapi->sendResponse($this->server->httpResponse); + } +} diff --git a/apps/dav/lib/server.php b/apps/dav/lib/server.php index e74292282a7..5336c82dfb8 100644 --- a/apps/dav/lib/server.php +++ b/apps/dav/lib/server.php @@ -30,6 +30,7 @@ use OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin; use OCA\DAV\Connector\Sabre\DavAclPlugin; use OCA\DAV\Connector\Sabre\DummyGetResponsePlugin; use OCA\DAV\Connector\Sabre\FilesPlugin; +use OCA\DAV\Files\BrowserErrorPagePlugin; use OCA\DAV\Files\CustomPropertiesBackend; use OCP\IRequest; use OCP\SabrePluginEvent; @@ -119,6 +120,10 @@ class Server { $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin()); } + if (BrowserErrorPagePlugin::isBrowserRequest($request)) { + $this->server->addPlugin(new BrowserErrorPagePlugin()); + } + // wait with registering these until auth is handled and the filesystem is setup $this->server->on('beforeMethod', function () { // custom properties plugin must be the last one diff --git a/apps/dav/templates/exception.php b/apps/dav/templates/exception.php new file mode 100644 index 00000000000..01c4eea4b5a --- /dev/null +++ b/apps/dav/templates/exception.php @@ -0,0 +1,30 @@ +<?php + /** @var array $_ */ + /** @var OC_L10N $l */ + +style('core', ['styles', 'header']); +?> +<span class="error error-wide"> + <h2><strong><?php p($_['title']) ?></strong></h2> + <p><?php p($_['message']) ?></p> + <br> + + <h2><strong><?php p($l->t('Technical details')) ?></strong></h2> + <ul> + <li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li> + <li><?php p($l->t('Request ID: %s', $_['requestID'])) ?></li> + <?php if($_['debugMode']): ?> + <li><?php p($l->t('Type: %s', $_['errorClass'])) ?></li> + <li><?php p($l->t('Code: %s', $_['errorCode'])) ?></li> + <li><?php p($l->t('Message: %s', $_['errorMsg'])) ?></li> + <li><?php p($l->t('File: %s', $_['file'])) ?></li> + <li><?php p($l->t('Line: %s', $_['line'])) ?></li> + <?php endif; ?> + </ul> + + <?php if($_['debugMode']): ?> + <br /> + <h2><strong><?php p($l->t('Trace')) ?></strong></h2> + <pre><?php p($_['trace']) ?></pre> + <?php endif; ?> +</span> diff --git a/apps/dav/tests/unit/connector/sabre/filesplugin.php b/apps/dav/tests/unit/connector/sabre/filesplugin.php index 0a790ec6fc9..e88066a12da 100644 --- a/apps/dav/tests/unit/connector/sabre/filesplugin.php +++ b/apps/dav/tests/unit/connector/sabre/filesplugin.php @@ -366,7 +366,7 @@ class FilesPlugin extends \Test\TestCase { * |-text.txt * |-test.txt * - * FolderA is an incomming shared folder and there are no delete permissions. + * FolderA is an incoming shared folder and there are no delete permissions. * Thus moving /FolderA/test.txt to /test.txt should fail already on that check * * @expectedException \Sabre\DAV\Exception\Forbidden diff --git a/apps/dav/tests/unit/connector/sabre/node.php b/apps/dav/tests/unit/connector/sabre/node.php index 8c92c2f063c..cde8e746dc3 100644 --- a/apps/dav/tests/unit/connector/sabre/node.php +++ b/apps/dav/tests/unit/connector/sabre/node.php @@ -63,4 +63,68 @@ class Node extends \Test\TestCase { $node = new \OCA\DAV\Connector\Sabre\File($view, $info); $this->assertEquals($expected, $node->getDavPermissions()); } + + public function sharePermissionsProvider() { + return [ + [\OCP\Files\FileInfo::TYPE_FILE, 1, 0], + [\OCP\Files\FileInfo::TYPE_FILE, 3, 0], + [\OCP\Files\FileInfo::TYPE_FILE, 5, 0], + [\OCP\Files\FileInfo::TYPE_FILE, 7, 0], + [\OCP\Files\FileInfo::TYPE_FILE, 9, 0], + [\OCP\Files\FileInfo::TYPE_FILE, 11, 0], + [\OCP\Files\FileInfo::TYPE_FILE, 13, 0], + [\OCP\Files\FileInfo::TYPE_FILE, 15, 0], + [\OCP\Files\FileInfo::TYPE_FILE, 17, 17], + [\OCP\Files\FileInfo::TYPE_FILE, 19, 19], + [\OCP\Files\FileInfo::TYPE_FILE, 21, 17], + [\OCP\Files\FileInfo::TYPE_FILE, 23, 19], + [\OCP\Files\FileInfo::TYPE_FILE, 25, 17], + [\OCP\Files\FileInfo::TYPE_FILE, 27, 19], + [\OCP\Files\FileInfo::TYPE_FILE, 29, 17], + [\OCP\Files\FileInfo::TYPE_FILE, 30, 0], + [\OCP\Files\FileInfo::TYPE_FILE, 31, 19], + [\OCP\Files\FileInfo::TYPE_FOLDER, 1, 0], + [\OCP\Files\FileInfo::TYPE_FOLDER, 3, 0], + [\OCP\Files\FileInfo::TYPE_FOLDER, 5, 0], + [\OCP\Files\FileInfo::TYPE_FOLDER, 7, 0], + [\OCP\Files\FileInfo::TYPE_FOLDER, 9, 0], + [\OCP\Files\FileInfo::TYPE_FOLDER, 11, 0], + [\OCP\Files\FileInfo::TYPE_FOLDER, 13, 0], + [\OCP\Files\FileInfo::TYPE_FOLDER, 15, 0], + [\OCP\Files\FileInfo::TYPE_FOLDER, 17, 17], + [\OCP\Files\FileInfo::TYPE_FOLDER, 19, 19], + [\OCP\Files\FileInfo::TYPE_FOLDER, 21, 21], + [\OCP\Files\FileInfo::TYPE_FOLDER, 23, 23], + [\OCP\Files\FileInfo::TYPE_FOLDER, 25, 25], + [\OCP\Files\FileInfo::TYPE_FOLDER, 27, 27], + [\OCP\Files\FileInfo::TYPE_FOLDER, 29, 29], + [\OCP\Files\FileInfo::TYPE_FOLDER, 30, 0], + [\OCP\Files\FileInfo::TYPE_FOLDER, 31, 31], + ]; + } + + /** + * @dataProvider sharePermissionsProvider + */ + public function testSharePermissions($type, $permissions, $expected) { + $storage = $this->getMock('\OCP\Files\Storage'); + $storage->method('getPermissions')->willReturn($permissions); + + $mountpoint = $this->getMock('\OCP\Files\Mount\IMountPoint'); + $mountpoint->method('getMountPoint')->willReturn('myPath'); + + $info = $this->getMockBuilder('\OC\Files\FileInfo') + ->disableOriginalConstructor() + ->setMethods(['getStorage', 'getType', 'getMountPoint']) + ->getMock(); + + $info->method('getStorage')->willReturn($storage); + $info->method('getType')->willReturn($type); + $info->method('getMountPoint')->willReturn($mountpoint); + + $view = $this->getMock('\OC\Files\View'); + + $node = new \OCA\DAV\Connector\Sabre\File($view, $info); + $this->assertEquals($expected, $node->getSharePermissions()); + } } diff --git a/apps/dav/tests/unit/dav/browsererrorpageplugintest.php b/apps/dav/tests/unit/dav/browsererrorpageplugintest.php new file mode 100644 index 00000000000..aeae0e1b152 --- /dev/null +++ b/apps/dav/tests/unit/dav/browsererrorpageplugintest.php @@ -0,0 +1,57 @@ +<?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/> + * + */ +namespace OCA\DAV\Tests\Unit\DAV; + +use OCA\DAV\Files\BrowserErrorPagePlugin; +use PHPUnit_Framework_MockObject_MockObject; +use Sabre\DAV\Exception\NotFound; + +class BrowserErrorPagePluginTest extends \Test\TestCase { + + /** + * @dataProvider providesExceptions + * @param $expectedCode + * @param $exception + */ + public function test($expectedCode, $exception) { + /** @var BrowserErrorPagePlugin | PHPUnit_Framework_MockObject_MockObject $plugin */ + $plugin = $this->getMockBuilder('OCA\DAV\Files\BrowserErrorPagePlugin')->setMethods(['sendResponse', 'generateBody'])->getMock(); + $plugin->expects($this->once())->method('generateBody')->willReturn(':boom:'); + $plugin->expects($this->once())->method('sendResponse'); + /** @var \Sabre\DAV\Server | PHPUnit_Framework_MockObject_MockObject $server */ + $server = $this->getMockBuilder('Sabre\DAV\Server')->disableOriginalConstructor()->getMock(); + $server->expects($this->once())->method('on'); + $httpResponse = $this->getMockBuilder('Sabre\HTTP\Response')->disableOriginalConstructor()->getMock(); + $httpResponse->expects($this->once())->method('addHeaders'); + $httpResponse->expects($this->once())->method('setStatus')->with($expectedCode); + $httpResponse->expects($this->once())->method('setBody')->with(':boom:'); + $server->httpResponse = $httpResponse; + $plugin->initialize($server); + $plugin->logException($exception); + } + + public function providesExceptions() { + return [ + [ 404, new NotFound()], + [ 500, new \RuntimeException()], + ]; + } +} diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js index b5ca0a29e0c..feb14d80d22 100644 --- a/apps/encryption/l10n/da.js +++ b/apps/encryption/l10n/da.js @@ -25,6 +25,8 @@ OC.L10N.register( "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.", "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar", + "Bad Signature" : "Ugyldig signatur", + "Missing Signature" : "Signatur mangler", "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.", @@ -32,6 +34,8 @@ OC.L10N.register( "The share will expire on %s." : "Delingen vil udløbe om %s.", "Cheers!" : "Hej!", "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hejsa,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>", + "Encrypt the home storage" : "Krypter hjemmelageret", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ved at slå denne valgmulighed til krypteres alle filer i hovedlageret, ellers vil kun filer på eksternt lager blive krypteret", "Enable recovery key" : "Aktivér gendannelsesnøgle", "Disable recovery key" : "Deaktivér gendannelsesnøgle", "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." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.", diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json index 1ead926ca7c..ea9630eadeb 100644 --- a/apps/encryption/l10n/da.json +++ b/apps/encryption/l10n/da.json @@ -23,6 +23,8 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.", "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar", + "Bad Signature" : "Ugyldig signatur", + "Missing Signature" : "Signatur mangler", "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.", @@ -30,6 +32,8 @@ "The share will expire on %s." : "Delingen vil udløbe om %s.", "Cheers!" : "Hej!", "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hejsa,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>", + "Encrypt the home storage" : "Krypter hjemmelageret", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ved at slå denne valgmulighed til krypteres alle filer i hovedlageret, ellers vil kun filer på eksternt lager blive krypteret", "Enable recovery key" : "Aktivér gendannelsesnøgle", "Disable recovery key" : "Deaktivér gendannelsesnøgle", "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." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.", diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js index 1bc7dfa9e63..7de37a22979 100644 --- a/apps/encryption/l10n/de_DE.js +++ b/apps/encryption/l10n/de_DE.js @@ -30,9 +30,12 @@ OC.L10N.register( "one-time password for server-side-encryption" : "Einmalpasswort für Serverseitige Verschlüsselung", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", + "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Interface an, gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'ownCloud-Basisverschlüsselungsmodul' und aktualisieren Sie dort ihr Verschlüsselungspasswort indem Sie das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingeben.\n\n", "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.", "Cheers!" : "Noch einen schönen Tag!", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hey,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melden Sie sich im Web-Interface an, gehe Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'ownCloud-Basisverschlüsselungsmodul' und aktualisieren Sie dort Ihr Verschlüsselungspasswort indem Sie das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingeben.<br><br>", "Encrypt the home storage" : "Benutzerverzeichnis verschlüsslen", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt", "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren", "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren", "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." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.", diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json index 5fceba49c2b..b0e10256362 100644 --- a/apps/encryption/l10n/de_DE.json +++ b/apps/encryption/l10n/de_DE.json @@ -28,9 +28,12 @@ "one-time password for server-side-encryption" : "Einmalpasswort für Serverseitige Verschlüsselung", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", + "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Interface an, gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'ownCloud-Basisverschlüsselungsmodul' und aktualisieren Sie dort ihr Verschlüsselungspasswort indem Sie das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingeben.\n\n", "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.", "Cheers!" : "Noch einen schönen Tag!", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hey,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melden Sie sich im Web-Interface an, gehe Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'ownCloud-Basisverschlüsselungsmodul' und aktualisieren Sie dort Ihr Verschlüsselungspasswort indem Sie das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingeben.<br><br>", "Encrypt the home storage" : "Benutzerverzeichnis verschlüsslen", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt", "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren", "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren", "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." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.", diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js index 12514c29bba..bf051fc446e 100644 --- a/apps/encryption/l10n/sl.js +++ b/apps/encryption/l10n/sl.js @@ -23,11 +23,14 @@ OC.L10N.register( "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.", "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", "Bad Signature" : "Neustrezen podpis", "Missing Signature" : "Manjkajoč podpis", + "one-time password for server-side-encryption" : "enkratno geslo za šifriranje na strani strežnika", "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.", "The share will expire on %s." : "Povezava souporabe bo potekla %s.", "Cheers!" : "Na zdravje!", + "Encrypt the home storage" : "Šifriraj domačo shrambo", "Enable recovery key" : "Omogoči obnovitev gesla", "Disable recovery key" : "Onemogoči obnovitev gesla", "Recovery key password" : "Ključ za obnovitev gesla", @@ -37,6 +40,7 @@ OC.L10N.register( "New recovery key password" : "Novi ključ za obnovitev gesla", "Repeat new recovery key password" : "Ponovi novi ključ za obnovitev gesla", "Change Password" : "Spremeni geslo", + "ownCloud basic encryption module" : "Osnovno šifriranje z ownCloud", "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.", "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:", " If you don't remember your old password you can ask your administrator to recover your files." : "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema.", diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json index c6811b7240f..14dc8f66144 100644 --- a/apps/encryption/l10n/sl.json +++ b/apps/encryption/l10n/sl.json @@ -21,11 +21,14 @@ "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.", "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", "Bad Signature" : "Neustrezen podpis", "Missing Signature" : "Manjkajoč podpis", + "one-time password for server-side-encryption" : "enkratno geslo za šifriranje na strani strežnika", "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.", "The share will expire on %s." : "Povezava souporabe bo potekla %s.", "Cheers!" : "Na zdravje!", + "Encrypt the home storage" : "Šifriraj domačo shrambo", "Enable recovery key" : "Omogoči obnovitev gesla", "Disable recovery key" : "Onemogoči obnovitev gesla", "Recovery key password" : "Ključ za obnovitev gesla", @@ -35,6 +38,7 @@ "New recovery key password" : "Novi ključ za obnovitev gesla", "Repeat new recovery key password" : "Ponovi novi ključ za obnovitev gesla", "Change Password" : "Spremeni geslo", + "ownCloud basic encryption module" : "Osnovno šifriranje z ownCloud", "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.", "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:", " If you don't remember your old password you can ask your administrator to recover your files." : "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema.", diff --git a/apps/federatedfilesharing/l10n/da.js b/apps/federatedfilesharing/l10n/da.js index 2490457841a..0b113d6ae4f 100644 --- a/apps/federatedfilesharing/l10n/da.js +++ b/apps/federatedfilesharing/l10n/da.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Invalid Federated Cloud ID" : "Ugyldigt Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Der skete en fejl ved deling af %s, objektet er allerede delt med %s", + "Not allowed to create a federated share with the same user" : "Det er ikke tilladt at danne et datafællesskab med samme bruger", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling af %s mislykkedes - kunne ikke finde %s. Måske er serveren ikke tilgængelig i øjeblikket." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/da.json b/apps/federatedfilesharing/l10n/da.json index 6f05283a1a0..3f4e82b0528 100644 --- a/apps/federatedfilesharing/l10n/da.json +++ b/apps/federatedfilesharing/l10n/da.json @@ -1,6 +1,7 @@ { "translations": { "Invalid Federated Cloud ID" : "Ugyldigt Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Der skete en fejl ved deling af %s, objektet er allerede delt med %s", + "Not allowed to create a federated share with the same user" : "Det er ikke tilladt at danne et datafællesskab med samme bruger", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling af %s mislykkedes - kunne ikke finde %s. Måske er serveren ikke tilgængelig i øjeblikket." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/tr.js b/apps/federatedfilesharing/l10n/tr.js index 123271c5e6b..c0e9f843271 100644 --- a/apps/federatedfilesharing/l10n/tr.js +++ b/apps/federatedfilesharing/l10n/tr.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Invalid Federated Cloud ID" : "Geçersiz Birleşmiş Bulut Kimliği", "Sharing %s failed, because this item is already shared with %s" : "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu", + "Not allowed to create a federated share with the same user" : "Aynı kullanıcı ile bir birleşmiş paylaşım oluşturulamaz", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s paylaşımı başarısız. %s bulunamadı veya sunucu şu anda ulaşılamıyor olabilir." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federatedfilesharing/l10n/tr.json b/apps/federatedfilesharing/l10n/tr.json index c81393bc30d..dc9bd7a8f46 100644 --- a/apps/federatedfilesharing/l10n/tr.json +++ b/apps/federatedfilesharing/l10n/tr.json @@ -1,6 +1,7 @@ { "translations": { "Invalid Federated Cloud ID" : "Geçersiz Birleşmiş Bulut Kimliği", "Sharing %s failed, because this item is already shared with %s" : "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu", + "Not allowed to create a federated share with the same user" : "Aynı kullanıcı ile bir birleşmiş paylaşım oluşturulamaz", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s paylaşımı başarısız. %s bulunamadı veya sunucu şu anda ulaşılamıyor olabilir." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/da.js b/apps/federation/l10n/da.js new file mode 100644 index 00000000000..fec000d8c0f --- /dev/null +++ b/apps/federation/l10n/da.js @@ -0,0 +1,15 @@ +OC.L10N.register( + "federation", + { + "Server added to the list of trusted ownClouds" : "Serveren er føjet til listen over sikre ownCloud servere", + "Server is already in the list of trusted servers." : "Serveren står allerede på listen over sikre servere", + "No ownCloud server found" : "Fandt ikke nogen ownCloud server", + "Could not add server" : "Kunne ikke tilføje server", + "Federation" : "Datafællesskab", + "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 datafællesskab giver dig mulighed for at forbinde til andre ownCloud-installationer, som du har tillid til, for at udveksle brugerkataloger. Dette vil f.eks. blive anvendt til at udfylde eksterne brugernavne automatisk ved deling af data", + "Add server automatically once a federated share was created successfully" : "Tilføj serveren automatisk, når et datafællesskab er oprettet ", + "Trusted ownCloud Servers" : "ownCloud servere der er tillid til", + "+ Add ownCloud server" : "+ Tilføj ownCloud server", + "ownCloud Server" : "ownCloud server" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/da.json b/apps/federation/l10n/da.json new file mode 100644 index 00000000000..3532e6acc26 --- /dev/null +++ b/apps/federation/l10n/da.json @@ -0,0 +1,13 @@ +{ "translations": { + "Server added to the list of trusted ownClouds" : "Serveren er føjet til listen over sikre ownCloud servere", + "Server is already in the list of trusted servers." : "Serveren står allerede på listen over sikre servere", + "No ownCloud server found" : "Fandt ikke nogen ownCloud server", + "Could not add server" : "Kunne ikke tilføje server", + "Federation" : "Datafællesskab", + "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 datafællesskab giver dig mulighed for at forbinde til andre ownCloud-installationer, som du har tillid til, for at udveksle brugerkataloger. Dette vil f.eks. blive anvendt til at udfylde eksterne brugernavne automatisk ved deling af data", + "Add server automatically once a federated share was created successfully" : "Tilføj serveren automatisk, når et datafællesskab er oprettet ", + "Trusted ownCloud Servers" : "ownCloud servere der er tillid til", + "+ Add ownCloud server" : "+ Tilføj ownCloud server", + "ownCloud Server" : "ownCloud server" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/federation/l10n/el.js b/apps/federation/l10n/el.js index 63e2f8a04cf..b4404d94043 100644 --- a/apps/federation/l10n/el.js +++ b/apps/federation/l10n/el.js @@ -1,6 +1,8 @@ OC.L10N.register( "federation", { + "Server added to the list of trusted ownClouds" : "Ο διακομιστής προστέθηκε στην λίστα των έμπιστων ownCloud", + "Server is already in the list of trusted servers." : "Ο διακομιστής περιλαμβάνεται ήδη στην λίστα των έμπιστων ownCloud", "No ownCloud server found" : "Δεν βρέθηκε διακομιστής ownCloud", "Could not add server" : "Αδυναμία προσθήκης διακομιστή", "ownCloud Server" : "Διακομιστής ownCloud" diff --git a/apps/federation/l10n/el.json b/apps/federation/l10n/el.json index 5a8efb5aea1..887b731cad0 100644 --- a/apps/federation/l10n/el.json +++ b/apps/federation/l10n/el.json @@ -1,4 +1,6 @@ { "translations": { + "Server added to the list of trusted ownClouds" : "Ο διακομιστής προστέθηκε στην λίστα των έμπιστων ownCloud", + "Server is already in the list of trusted servers." : "Ο διακομιστής περιλαμβάνεται ήδη στην λίστα των έμπιστων ownCloud", "No ownCloud server found" : "Δεν βρέθηκε διακομιστής ownCloud", "Could not add server" : "Αδυναμία προσθήκης διακομιστή", "ownCloud Server" : "Διακομιστής ownCloud" diff --git a/apps/federation/l10n/tr.js b/apps/federation/l10n/tr.js index af299744a92..71e76bdec98 100644 --- a/apps/federation/l10n/tr.js +++ b/apps/federation/l10n/tr.js @@ -5,8 +5,11 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Sunucu zaten güvenilen sunucu listesine eklenmiş.", "No ownCloud server found" : "Hiçbir ownCloud sunucusu bulunamadı", "Could not add server" : "Sunucu eklenemedi", + "Federation" : "Birleşim", + "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 Birleşimi, kullanıcı dizin değişimi yapmak için diğer güvenilir ownCloud'larla bağlanmanızı sağlar. Örneğin, birleşmiş paylaşım için hatici kullanıcıları otomatik doldurmak için kullanılacaktır.", + "Add server automatically once a federated share was created successfully" : "Birleşmiş bir paylaşım başarıyla eklenildiğinde sunucuyu otomatik olarak ekle", "Trusted ownCloud Servers" : "Güvenilen ownCloud Sunucuları", - "+ Add ownCloud server" : "ownCloud sunucusu ekle", + "+ Add ownCloud server" : "+ ownCloud sunucusu ekle", "ownCloud Server" : "ownCloud Sunucusu" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/tr.json b/apps/federation/l10n/tr.json index 2ed13eca58e..68f7b38218b 100644 --- a/apps/federation/l10n/tr.json +++ b/apps/federation/l10n/tr.json @@ -3,8 +3,11 @@ "Server is already in the list of trusted servers." : "Sunucu zaten güvenilen sunucu listesine eklenmiş.", "No ownCloud server found" : "Hiçbir ownCloud sunucusu bulunamadı", "Could not add server" : "Sunucu eklenemedi", + "Federation" : "Birleşim", + "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 Birleşimi, kullanıcı dizin değişimi yapmak için diğer güvenilir ownCloud'larla bağlanmanızı sağlar. Örneğin, birleşmiş paylaşım için hatici kullanıcıları otomatik doldurmak için kullanılacaktır.", + "Add server automatically once a federated share was created successfully" : "Birleşmiş bir paylaşım başarıyla eklenildiğinde sunucuyu otomatik olarak ekle", "Trusted ownCloud Servers" : "Güvenilen ownCloud Sunucuları", - "+ Add ownCloud server" : "ownCloud sunucusu ekle", + "+ Add ownCloud server" : "+ ownCloud sunucusu ekle", "ownCloud Server" : "ownCloud Sunucusu" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index 94360786ac3..174531bdfcc 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -34,7 +34,7 @@ 'id' => 'files_index', 'order' => 0, 'href' => $urlGenerator->linkToRoute('files.view.index'), - 'icon' => \OCP\Util::imagePath('core', 'places/files.svg'), + 'icon' => $urlGenerator->imagePath('core', 'places/files.svg'), 'name' => $l->t('Files'), ]; }); diff --git a/apps/files/appinfo/register_command.php b/apps/files/appinfo/register_command.php index e77087a229a..dad78186c62 100644 --- a/apps/files/appinfo/register_command.php +++ b/apps/files/appinfo/register_command.php @@ -24,8 +24,9 @@ $dbConnection = \OC::$server->getDatabaseConnection(); $userManager = OC::$server->getUserManager(); $shareManager = \OC::$server->getShareManager(); +$mountManager = \OC::$server->getMountManager(); /** @var Symfony\Component\Console\Application $application */ $application->add(new OCA\Files\Command\Scan($userManager)); $application->add(new OCA\Files\Command\DeleteOrphanedFiles($dbConnection)); -$application->add(new OCA\Files\Command\TransferOwnership($userManager, $shareManager)); +$application->add(new OCA\Files\Command\TransferOwnership($userManager, $shareManager, $mountManager)); diff --git a/apps/files/command/transferownership.php b/apps/files/command/transferownership.php index 3674727b167..6bf2fae6bdf 100644 --- a/apps/files/command/transferownership.php +++ b/apps/files/command/transferownership.php @@ -24,7 +24,7 @@ namespace OCA\Files\Command; use OC\Files\Filesystem; use OC\Files\View; use OCP\Files\FileInfo; -use OCP\Files\Folder; +use OCP\Files\Mount\IMountManager; use OCP\IUserManager; use OCP\Share\IManager; use OCP\Share\IShare; @@ -42,6 +42,9 @@ class TransferOwnership extends Command { /** @var IManager */ private $shareManager; + /** @var IMountManager */ + private $mountManager; + /** @var FileInfo[] */ private $allFiles = []; @@ -60,9 +63,10 @@ class TransferOwnership extends Command { /** @var string */ private $finalTarget; - public function __construct(IUserManager $userManager, IManager $shareManager) { + public function __construct(IUserManager $userManager, IManager $shareManager, IMountManager $mountManager) { $this->userManager = $userManager; $this->shareManager = $shareManager; + $this->mountManager = $mountManager; parent::__construct(); } @@ -206,6 +210,11 @@ class TransferOwnership extends Command { foreach($this->shares as $share) { if ($share->getSharedWith() === $this->destinationUser) { + // Unmount the shares before deleting, so we don't try to get the storage later on. + $shareMountPoint = $this->mountManager->find('/' . $this->destinationUser . '/files' . $share->getTarget()); + if ($shareMountPoint) { + $this->mountManager->removeMount($shareMountPoint->getMountPoint()); + } $this->shareManager->deleteShare($share); } else { if ($share->getShareOwner() === $this->sourceUser) { diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 842ec4aac73..0c4d41b65f9 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2280,12 +2280,14 @@ this.$el.find('#filestable thead th').addClass('hidden'); this.$el.find('#emptycontent').addClass('hidden'); $('#searchresults').addClass('filter-empty'); + $('#searchresults .emptycontent').addClass('emptycontent-search'); if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) { this.$el.find('.nofilterresults').removeClass('hidden'). find('p').text(t('files', "No entries in this folder match '{filter}'", {filter:this._filter}, null, {'escape': false})); } } else { $('#searchresults').removeClass('filter-empty'); + $('#searchresults .emptycontent').removeClass('emptycontent-search'); this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty); if (!this.$el.find('.mask').exists()) { this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty); diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js index 536b5cdf935..453e2b8fc58 100644 --- a/apps/files/l10n/cs_CZ.js +++ b/apps/files/l10n/cs_CZ.js @@ -106,7 +106,7 @@ OC.L10N.register( "Missing permissions to edit from here." : "Pro úpravy v aktuálním náhledu chybí oprávnění.", "Settings" : "Nastavení", "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 k vašim Souborům přes WebDAV</a>", + "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!", diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json index da4fb78b53b..6e6bcfbe23d 100644 --- a/apps/files/l10n/cs_CZ.json +++ b/apps/files/l10n/cs_CZ.json @@ -104,7 +104,7 @@ "Missing permissions to edit from here." : "Pro úpravy v aktuálním náhledu chybí oprávnění.", "Settings" : "Nastavení", "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 k vašim Souborům přes WebDAV</a>", + "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!", diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js index 4140968615a..02e0610c24a 100644 --- a/apps/files/l10n/da.js +++ b/apps/files/l10n/da.js @@ -28,6 +28,7 @@ OC.L10N.register( "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.", "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", @@ -35,13 +36,15 @@ OC.L10N.register( "Rename" : "Omdøb", "Delete" : "Slet", "Disconnect storage" : "Frakobl lager", - "Unshare" : "Fjern deling", + "Unshare" : "Ophæv deling", "Details" : "Detaljer", "Select" : "Vælg", "Pending" : "Afventer", "Unable to determine date" : "Kan ikke fastslå datoen", "This operation is forbidden" : "Denne operation er forbudt", "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren", + "Could not move \"{file}\", target exists" : "Kunne ikke flytte \"{file}\" - der findes allerede en fil med dette navn", + "Could not move \"{file}\"" : "Kunne ikke flytte \"{file}\"", "No entries in this folder match '{filter}'" : "Der er ingen poster i denne mappe, der matcher '{filter}'", "Name" : "Navn", "Size" : "Størrelse", @@ -90,6 +93,7 @@ OC.L10N.register( "Maximum upload size" : "Maksimal upload-størrelse", "max. possible: " : "max. mulige: ", "Save" : "Gem", + "Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted", "Settings" : "Indstillinger", "WebDAV" : "WebDAV", "Cancel upload" : "Fortryd upload", diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json index 8f445197f08..5a9a14c414a 100644 --- a/apps/files/l10n/da.json +++ b/apps/files/l10n/da.json @@ -26,6 +26,7 @@ "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.", "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", @@ -33,13 +34,15 @@ "Rename" : "Omdøb", "Delete" : "Slet", "Disconnect storage" : "Frakobl lager", - "Unshare" : "Fjern deling", + "Unshare" : "Ophæv deling", "Details" : "Detaljer", "Select" : "Vælg", "Pending" : "Afventer", "Unable to determine date" : "Kan ikke fastslå datoen", "This operation is forbidden" : "Denne operation er forbudt", "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren", + "Could not move \"{file}\", target exists" : "Kunne ikke flytte \"{file}\" - der findes allerede en fil med dette navn", + "Could not move \"{file}\"" : "Kunne ikke flytte \"{file}\"", "No entries in this folder match '{filter}'" : "Der er ingen poster i denne mappe, der matcher '{filter}'", "Name" : "Navn", "Size" : "Størrelse", @@ -88,6 +91,7 @@ "Maximum upload size" : "Maksimal upload-størrelse", "max. possible: " : "max. mulige: ", "Save" : "Gem", + "Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted", "Settings" : "Indstillinger", "WebDAV" : "WebDAV", "Cancel upload" : "Fortryd upload", diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index cacf45af388..40c9d78ba2a 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -106,6 +106,7 @@ OC.L10N.register( "Missing permissions to edit from here." : "Fehlende Berechtigungen um von hier aus zu bearbeiten.", "Settings" : "Einstellungen", "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!", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 7f325e8d966..4f471d3a09b 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -104,6 +104,7 @@ "Missing permissions to edit from here." : "Fehlende Berechtigungen um von hier aus zu bearbeiten.", "Settings" : "Einstellungen", "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!", diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 9505896a9c1..d9543f39893 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -106,6 +106,7 @@ OC.L10N.register( "Missing permissions to edit from here." : "Fehlende Berechtigungen um von hier aus zu bearbeiten.", "Settings" : "Einstellungen", "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!", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index 82d568bc3a8..1dc7f9989ad 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -104,6 +104,7 @@ "Missing permissions to edit from here." : "Fehlende Berechtigungen um von hier aus zu bearbeiten.", "Settings" : "Einstellungen", "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!", diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index 79f0e955d28..51114b98999 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -106,6 +106,7 @@ OC.L10N.register( "Missing permissions to edit from here." : "Faltan permisos para poder editar desde aquí.", "Settings" : "Ajustes", "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.", diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index 4281aa2ca2f..eee5fcfced9 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -104,6 +104,7 @@ "Missing permissions to edit from here." : "Faltan permisos para poder editar desde aquí.", "Settings" : "Ajustes", "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.", diff --git a/apps/files/l10n/fil.js b/apps/files/l10n/fil.js index a1506749021..7ba73b69562 100644 --- a/apps/files/l10n/fil.js +++ b/apps/files/l10n/fil.js @@ -1,6 +1,11 @@ OC.L10N.register( "files", { - "New folder" : "Bagong folder" + "Unknown error" : "Hindi kilalang error", + "Close" : "Isara", + "Download" : "I-download", + "Details" : "Mga Detalye", + "New folder" : "Bagong folder", + "Upload" : "Mag-upload" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files/l10n/fil.json b/apps/files/l10n/fil.json index 5639f695982..0873377d19b 100644 --- a/apps/files/l10n/fil.json +++ b/apps/files/l10n/fil.json @@ -1,4 +1,9 @@ { "translations": { - "New folder" : "Bagong folder" + "Unknown error" : "Hindi kilalang error", + "Close" : "Isara", + "Download" : "I-download", + "Details" : "Mga Detalye", + "New folder" : "Bagong folder", + "Upload" : "Mag-upload" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js index f8c6ea1e648..b1b83d36c29 100644 --- a/apps/files/l10n/nb_NO.js +++ b/apps/files/l10n/nb_NO.js @@ -39,7 +39,7 @@ OC.L10N.register( "Unshare" : "Avslutt deling", "Details" : "Detaljer", "Select" : "Velg", - "Pending" : "Ventende", + "Pending" : "Venter", "Unable to determine date" : "Kan ikke fastslå datoen", "This operation is forbidden" : "Operasjonen er forbudt", "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappen er utilgjengelig. Sjekk loggene eller kontakt administrator", diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json index 1b70fa87ad9..fc0958dce74 100644 --- a/apps/files/l10n/nb_NO.json +++ b/apps/files/l10n/nb_NO.json @@ -37,7 +37,7 @@ "Unshare" : "Avslutt deling", "Details" : "Detaljer", "Select" : "Velg", - "Pending" : "Ventende", + "Pending" : "Venter", "Unable to determine date" : "Kan ikke fastslå datoen", "This operation is forbidden" : "Operasjonen er forbudt", "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappen er utilgjengelig. Sjekk loggene eller kontakt administrator", diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index bcf2209103d..45f435806bc 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -105,6 +105,7 @@ OC.L10N.register( "Missing permissions to edit from here." : "Ontbrekende rechten om vanaf hier te bewerken.", "Settings" : "Instellingen", "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!", diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index 615bdce44cd..1c0990e3394 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -103,6 +103,7 @@ "Missing permissions to edit from here." : "Ontbrekende rechten om vanaf hier te bewerken.", "Settings" : "Instellingen", "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!", diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index cdc6476d149..fa05c516166 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -106,6 +106,7 @@ OC.L10N.register( "Missing permissions to edit from here." : "Faltando permissões para editar a partir daqui.", "Settings" : "Configurações", "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!", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index 15fa9627250..eb2426495eb 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -104,6 +104,7 @@ "Missing permissions to edit from here." : "Faltando permissões para editar a partir daqui.", "Settings" : "Configurações", "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!", diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js index 54beb47fbdb..be0457c9b9a 100644 --- a/apps/files/l10n/sl.js +++ b/apps/files/l10n/sl.js @@ -106,6 +106,7 @@ OC.L10N.register( "Missing permissions to edit from here." : "Ni ustreznih dovoljenj za urejanje na tej ravni.", "Settings" : "Nastavitve", "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!", diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json index 621c8385dab..4f2cf82b46b 100644 --- a/apps/files/l10n/sl.json +++ b/apps/files/l10n/sl.json @@ -104,6 +104,7 @@ "Missing permissions to edit from here." : "Ni ustreznih dovoljenj za urejanje na tej ravni.", "Settings" : "Nastavitve", "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!", diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js index d05c51f05ce..d5b7a5bfe36 100644 --- a/apps/files/l10n/tr.js +++ b/apps/files/l10n/tr.js @@ -28,6 +28,7 @@ OC.L10N.register( "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ı.", "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", @@ -105,6 +106,7 @@ OC.L10N.register( "Missing permissions to edit from here." : "Buradan düzenleme için eksik yetki.", "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!", diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json index 1755166faff..1be304f7c3b 100644 --- a/apps/files/l10n/tr.json +++ b/apps/files/l10n/tr.json @@ -26,6 +26,7 @@ "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ı.", "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", @@ -103,6 +104,7 @@ "Missing permissions to edit from here." : "Buradan düzenleme için eksik yetki.", "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!", diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js index 9ae73b2195d..3d51a9a5133 100644 --- a/apps/files/l10n/zh_TW.js +++ b/apps/files/l10n/zh_TW.js @@ -28,6 +28,7 @@ OC.L10N.register( "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." : "無法從伺服器取回結果", "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳", "Actions" : "動作", @@ -105,6 +106,7 @@ OC.L10N.register( "Missing permissions to edit from here." : "您沒有在此編輯的權限", "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!" : "在您的裝置中同步或上傳一些內容", diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json index 1187ffa9c24..0c70aab817c 100644 --- a/apps/files/l10n/zh_TW.json +++ b/apps/files/l10n/zh_TW.json @@ -26,6 +26,7 @@ "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." : "無法從伺服器取回結果", "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳", "Actions" : "動作", @@ -103,6 +104,7 @@ "Missing permissions to edit from here." : "您沒有在此編輯的權限", "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!" : "在您的裝置中同步或上傳一些內容", diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index c96c0cb97b9..9338b8d3ee7 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -12,8 +12,8 @@ } td.mountPoint, td.backend { width:160px; } -#externalStorage td>img.action { visibility:hidden; padding-top:7px; } -#externalStorage tr:hover>td>img.action { visibility:visible; cursor:pointer; } +#externalStorage td>img { padding-top:7px; opacity: 0.5; } +#externalStorage td>img:hover { padding-top:7px; cursor:pointer; opacity: 1; } #addMountPoint>td { border:none; } #addMountPoint>td.applicable { visibility:hidden; } #addMountPoint>td.hidden { visibility:hidden; } diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js index 33d2ea104be..118ec17d246 100644 --- a/apps/files_external/js/statusmanager.js +++ b/apps/files_external/js/statusmanager.js @@ -497,7 +497,7 @@ OCA.External.StatusManager.Utils = { if (folder instanceof $) { trFolder = folder; } else { - // cant use here FileList.findFileEl(OCA.External.StatusManager.Utils.jqSelEscape(folder)); return incorrect instance of filelist + // can't use here FileList.findFileEl(OCA.External.StatusManager.Utils.jqSelEscape(folder)); return incorrect instance of filelist trFolder = $('#fileList tr[data-file=\"' + OCA.External.StatusManager.Utils.jqSelEscape(folder) + '\"]'); } trFolder.removeClass('externalErroredRow').removeClass('externalDisabledRow'); diff --git a/apps/files_external/l10n/ar.js b/apps/files_external/l10n/ar.js index b7ecd7404d2..0b910092ece 100644 --- a/apps/files_external/l10n/ar.js +++ b/apps/files_external/l10n/ar.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Personal" : "شخصي", "System" : "النظام", - "Never" : "أبدا", "Saved" : "حفظ", "Username" : "إسم المستخدم", "Password" : "كلمة السر", diff --git a/apps/files_external/l10n/ar.json b/apps/files_external/l10n/ar.json index 37a3ee2d8f7..2f5d8db94ea 100644 --- a/apps/files_external/l10n/ar.json +++ b/apps/files_external/l10n/ar.json @@ -1,7 +1,6 @@ { "translations": { "Personal" : "شخصي", "System" : "النظام", - "Never" : "أبدا", "Saved" : "حفظ", "Username" : "إسم المستخدم", "Password" : "كلمة السر", diff --git a/apps/files_external/l10n/ca.js b/apps/files_external/l10n/ca.js index 794409671e5..12e493c6484 100644 --- a/apps/files_external/l10n/ca.js +++ b/apps/files_external/l10n/ca.js @@ -13,11 +13,6 @@ OC.L10N.register( "Access granted" : "S'ha concedit l'accés", "Generate keys" : "Generar claus", "Error generating key pair" : "Error en generar el parell de claus", - "Enable encryption" : "Habilitar xifrat", - "Enable previews" : "Habilitar vistes prèvies", - "Check for changes" : "Comproveu si hi ha canvis", - "Never" : "Mai", - "Once every direct access" : "Un cop cada accés directe", "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.", "(group)" : "(grup)", "Saved" : "Desat", diff --git a/apps/files_external/l10n/ca.json b/apps/files_external/l10n/ca.json index 633cf9ba54a..a580bdb2980 100644 --- a/apps/files_external/l10n/ca.json +++ b/apps/files_external/l10n/ca.json @@ -11,11 +11,6 @@ "Access granted" : "S'ha concedit l'accés", "Generate keys" : "Generar claus", "Error generating key pair" : "Error en generar el parell de claus", - "Enable encryption" : "Habilitar xifrat", - "Enable previews" : "Habilitar vistes prèvies", - "Check for changes" : "Comproveu si hi ha canvis", - "Never" : "Mai", - "Once every direct access" : "Un cop cada accés directe", "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.", "(group)" : "(grup)", "Saved" : "Desat", diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js index 8e7afc609e4..3be3adf4245 100644 --- a/apps/files_external/l10n/cs_CZ.js +++ b/apps/files_external/l10n/cs_CZ.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Chyba nastavení OAuth2", "Generate keys" : "Vytvořit klíče", "Error generating key pair" : "Chyba při vytváření páru klíčů", - "Enable encryption" : "Povolit šifrování", - "Enable previews" : "Povolit náhledy", - "Enable sharing" : "Povolit sdílení", - "Check for changes" : "Zkontrolovat změny", - "Never" : "Nikdy", - "Once every direct access" : "Jednou pro každý přímý přístup", "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.", "(group)" : "(skupina)", "Admin defined" : "Nastaveno administrátorem", diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json index ee12b0e098a..d1dacc28367 100644 --- a/apps/files_external/l10n/cs_CZ.json +++ b/apps/files_external/l10n/cs_CZ.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Chyba nastavení OAuth2", "Generate keys" : "Vytvořit klíče", "Error generating key pair" : "Chyba při vytváření páru klíčů", - "Enable encryption" : "Povolit šifrování", - "Enable previews" : "Povolit náhledy", - "Enable sharing" : "Povolit sdílení", - "Check for changes" : "Zkontrolovat změny", - "Never" : "Nikdy", - "Once every direct access" : "Jednou pro každý přímý přístup", "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.", "(group)" : "(skupina)", "Admin defined" : "Nastaveno administrátorem", diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js index 59e32a55fe6..035b1b64610 100644 --- a/apps/files_external/l10n/da.js +++ b/apps/files_external/l10n/da.js @@ -16,6 +16,9 @@ OC.L10N.register( "Not permitted to use authentication mechanism \"%s\"" : "Ikke tilladt at bruge autorisation mekanismen \"%s\"", "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre", "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme", + "Insufficient data: %s" : "Utilstrækkelige data: %s", + "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Lageret med id \"%i\" kan ikke redigeres af bruger", "Personal" : "Personligt", "System" : "System", "Grant access" : "Godkend adgang", @@ -24,14 +27,11 @@ OC.L10N.register( "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2", "Generate keys" : "Opret nøgler.", "Error generating key pair" : "Fejl under oprettelse af nøglepar", - "Enable encryption" : "Slå kryptering til", - "Enable previews" : "Slå forhåndsvisninger til", - "Check for changes" : "Tjek for ændringer", - "Never" : "Aldrig", - "Once every direct access" : "Kun ved hver direkte tilgang", "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.", "(group)" : "(gruppe)", + "Admin defined" : "Bestemt af administrator", "Saved" : "Gemt", + "Empty response from the server" : "Svar fra serveren uden data", "Username" : "Brugernavn", "Password" : "Kodeord", "Save" : "Gem", diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json index ae50904a225..a530850b3c8 100644 --- a/apps/files_external/l10n/da.json +++ b/apps/files_external/l10n/da.json @@ -14,6 +14,9 @@ "Not permitted to use authentication mechanism \"%s\"" : "Ikke tilladt at bruge autorisation mekanismen \"%s\"", "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre", "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme", + "Insufficient data: %s" : "Utilstrækkelige data: %s", + "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Lageret med id \"%i\" kan ikke redigeres af bruger", "Personal" : "Personligt", "System" : "System", "Grant access" : "Godkend adgang", @@ -22,14 +25,11 @@ "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2", "Generate keys" : "Opret nøgler.", "Error generating key pair" : "Fejl under oprettelse af nøglepar", - "Enable encryption" : "Slå kryptering til", - "Enable previews" : "Slå forhåndsvisninger til", - "Check for changes" : "Tjek for ændringer", - "Never" : "Aldrig", - "Once every direct access" : "Kun ved hver direkte tilgang", "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.", "(group)" : "(gruppe)", + "Admin defined" : "Bestemt af administrator", "Saved" : "Gemt", + "Empty response from the server" : "Svar fra serveren uden data", "Username" : "Brugernavn", "Password" : "Kodeord", "Save" : "Gem", diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js index a082b8c63aa..096b350d339 100644 --- a/apps/files_external/l10n/de.js +++ b/apps/files_external/l10n/de.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", - "Enable encryption" : "Verschlüsselung aktivieren", - "Enable previews" : "Vorschau aktivieren", - "Enable sharing" : "Freigaben einschalten", - "Check for changes" : "Auf Änderungen überprüfen", - "Never" : "Nie", - "Once every direct access" : "Einmal bei jedem Direktzugriff", "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Admin defined" : "Administrator festlegen", @@ -44,7 +38,7 @@ OC.L10N.register( "There was an error with message: " : "Es ist ein Fehler mit folgender Meldung aufgetreten:", "External mount error" : "Fehler beim einbinden des externen Speichers", "external-storage" : "Externer Speicher", - "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Es konnte keine Liste der Windows Netzlaufwerk erstellt werden: leer Antwort vom Server", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Es konnte keine Liste der Windows-Netzlaufwerke erstellt werden: leer Antwort vom Server", "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Einige der konfigurierten externen Bereitstellungspunkte sind nicht angeschlossen. Bitte klicke auf die roten Zeile(n) für weitere Informationen", "Please enter the credentials for the {mount} mount" : "Bitte gib die Anmeldeinformationen für den {mount} externen Bereitstellungspunkt ein", "Username" : "Benutzername", diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json index 6157cb12fc3..15d2c5c1a27 100644 --- a/apps/files_external/l10n/de.json +++ b/apps/files_external/l10n/de.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", - "Enable encryption" : "Verschlüsselung aktivieren", - "Enable previews" : "Vorschau aktivieren", - "Enable sharing" : "Freigaben einschalten", - "Check for changes" : "Auf Änderungen überprüfen", - "Never" : "Nie", - "Once every direct access" : "Einmal bei jedem Direktzugriff", "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Admin defined" : "Administrator festlegen", @@ -42,7 +36,7 @@ "There was an error with message: " : "Es ist ein Fehler mit folgender Meldung aufgetreten:", "External mount error" : "Fehler beim einbinden des externen Speichers", "external-storage" : "Externer Speicher", - "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Es konnte keine Liste der Windows Netzlaufwerk erstellt werden: leer Antwort vom Server", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Es konnte keine Liste der Windows-Netzlaufwerke erstellt werden: leer Antwort vom Server", "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Einige der konfigurierten externen Bereitstellungspunkte sind nicht angeschlossen. Bitte klicke auf die roten Zeile(n) für weitere Informationen", "Please enter the credentials for the {mount} mount" : "Bitte gib die Anmeldeinformationen für den {mount} externen Bereitstellungspunkt ein", "Username" : "Benutzername", diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index cbe2f98d6b8..330c0c16cae 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -27,21 +27,19 @@ OC.L10N.register( "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", - "Enable encryption" : "Verschlüsselung aktivieren", - "Enable previews" : "Vorschau aktivieren", - "Enable sharing" : "Teilen aktivieren", - "Check for changes" : "Auf Änderungen überprüfen", - "Never" : "Nie", - "Once every direct access" : "Einmal bei jedem Direktzugriff", "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Admin defined" : "Administrator definiert", "Saved" : "Gespeichert", "Empty response from the server" : "Leere Antwort vom Server erhalten", + "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte melden Sie sich ab und wieder an, damit Sie von diesem Endpunkt zugreifen können.", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen aus dem ownCloud -Server gelesen werden: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Konnte die Liste von externen Speichern nicht laden: {type}", "There was an error with message: " : "Ein Fehler ist aufgetreten:", "External mount error" : "Externer Einhängefehler", "external-storage" : "externer Speicher", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Es konnte keine Liste der Windows-Netzlaufwerke erstellt werden: leer Antwort vom Server", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Einige der konfigurierten externen Bereitstellungspunkte sind nicht angeschlossen. Bitte klicke Sie auf die roten Zeile(n) für weitere Informationen", "Please enter the credentials for the {mount} mount" : "Bitte geben Sie die Zugangsdaten für den {mount} Speicher an", "Username" : "Benutzername", "Password" : "Passwort", @@ -61,6 +59,7 @@ OC.L10N.register( "Client secret" : "Geheime Zeichenkette des Client", "OpenStack" : "Freihand", "Tenant name" : "Name des Mieters", + "Identity endpoint URL" : "Identität Endpunkt-URL", "Rackspace" : "Rackspace", "API key" : "API-Schlüssel", "Username and password" : "Benutzername und Passwort", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index a4e3d1f7306..b800510dcf0 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -25,21 +25,19 @@ "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", - "Enable encryption" : "Verschlüsselung aktivieren", - "Enable previews" : "Vorschau aktivieren", - "Enable sharing" : "Teilen aktivieren", - "Check for changes" : "Auf Änderungen überprüfen", - "Never" : "Nie", - "Once every direct access" : "Einmal bei jedem Direktzugriff", "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Admin defined" : "Administrator definiert", "Saved" : "Gespeichert", "Empty response from the server" : "Leere Antwort vom Server erhalten", + "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte melden Sie sich ab und wieder an, damit Sie von diesem Endpunkt zugreifen können.", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen aus dem ownCloud -Server gelesen werden: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Konnte die Liste von externen Speichern nicht laden: {type}", "There was an error with message: " : "Ein Fehler ist aufgetreten:", "External mount error" : "Externer Einhängefehler", "external-storage" : "externer Speicher", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Es konnte keine Liste der Windows-Netzlaufwerke erstellt werden: leer Antwort vom Server", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Einige der konfigurierten externen Bereitstellungspunkte sind nicht angeschlossen. Bitte klicke Sie auf die roten Zeile(n) für weitere Informationen", "Please enter the credentials for the {mount} mount" : "Bitte geben Sie die Zugangsdaten für den {mount} Speicher an", "Username" : "Benutzername", "Password" : "Passwort", @@ -59,6 +57,7 @@ "Client secret" : "Geheime Zeichenkette des Client", "OpenStack" : "Freihand", "Tenant name" : "Name des Mieters", + "Identity endpoint URL" : "Identität Endpunkt-URL", "Rackspace" : "Rackspace", "API key" : "API-Schlüssel", "Username and password" : "Benutzername und Passwort", diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js index b1e09dfad18..5df4fb9d676 100644 --- a/apps/files_external/l10n/el.js +++ b/apps/files_external/l10n/el.js @@ -26,11 +26,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2", "Generate keys" : "Δημιουργία κλειδιών", "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών", - "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης", - "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων", - "Check for changes" : "Έλεγχος για αλλαγές", - "Never" : "Ποτέ", - "Once every direct access" : "Σε κάθε απευθείας πρόσβαση", "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.", "(group)" : "(ομάδα)", "Saved" : "Αποθηκεύτηκαν", diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json index 01c0dadc171..81cc6730be0 100644 --- a/apps/files_external/l10n/el.json +++ b/apps/files_external/l10n/el.json @@ -24,11 +24,6 @@ "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2", "Generate keys" : "Δημιουργία κλειδιών", "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών", - "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης", - "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων", - "Check for changes" : "Έλεγχος για αλλαγές", - "Never" : "Ποτέ", - "Once every direct access" : "Σε κάθε απευθείας πρόσβαση", "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.", "(group)" : "(ομάδα)", "Saved" : "Αποθηκεύτηκαν", diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js index 7a8d221b26a..fe8a7b1c933 100644 --- a/apps/files_external/l10n/en_GB.js +++ b/apps/files_external/l10n/en_GB.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Error configuring OAuth2", "Generate keys" : "Generate keys", "Error generating key pair" : "Error generating key pair", - "Enable encryption" : "Enable encryption", - "Enable previews" : "Enable previews", - "Enable sharing" : "Enable sharing", - "Check for changes" : "Check for changes", - "Never" : "Never", - "Once every direct access" : "Once every direct access", "All users. Type to select user or group." : "All users. Type to select user or group.", "(group)" : "(group)", "Admin defined" : "Admin defined", diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json index 107f769d624..9be5ad83fb0 100644 --- a/apps/files_external/l10n/en_GB.json +++ b/apps/files_external/l10n/en_GB.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Error configuring OAuth2", "Generate keys" : "Generate keys", "Error generating key pair" : "Error generating key pair", - "Enable encryption" : "Enable encryption", - "Enable previews" : "Enable previews", - "Enable sharing" : "Enable sharing", - "Check for changes" : "Check for changes", - "Never" : "Never", - "Once every direct access" : "Once every direct access", "All users. Type to select user or group." : "All users. Type to select user or group.", "(group)" : "(group)", "Admin defined" : "Admin defined", diff --git a/apps/files_external/l10n/eo.js b/apps/files_external/l10n/eo.js index 37e169d8848..fb3df15a1f1 100644 --- a/apps/files_external/l10n/eo.js +++ b/apps/files_external/l10n/eo.js @@ -11,10 +11,6 @@ OC.L10N.register( "Grant access" : "Doni alirpermeson", "Access granted" : "Alirpermeso donita", "Generate keys" : "Generi ŝlosilojn", - "Enable encryption" : "Kapabligi ĉifradon", - "Enable previews" : "Kapabligi antaŭvidojn", - "Enable sharing" : "Kapabligi kunhavigadon", - "Never" : "Neniam", "All users. Type to select user or group." : "Ĉiuj uzantoj. Tajpu por elekti uzanton aŭ grupon.", "(group)" : "(grupo)", "Admin defined" : "Difinita de administranto", diff --git a/apps/files_external/l10n/eo.json b/apps/files_external/l10n/eo.json index ba849995cef..bea2b881685 100644 --- a/apps/files_external/l10n/eo.json +++ b/apps/files_external/l10n/eo.json @@ -9,10 +9,6 @@ "Grant access" : "Doni alirpermeson", "Access granted" : "Alirpermeso donita", "Generate keys" : "Generi ŝlosilojn", - "Enable encryption" : "Kapabligi ĉifradon", - "Enable previews" : "Kapabligi antaŭvidojn", - "Enable sharing" : "Kapabligi kunhavigadon", - "Never" : "Neniam", "All users. Type to select user or group." : "Ĉiuj uzantoj. Tajpu por elekti uzanton aŭ grupon.", "(group)" : "(grupo)", "Admin defined" : "Difinita de administranto", diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js index 648c91e3164..5efc0ff27b9 100644 --- a/apps/files_external/l10n/es.js +++ b/apps/files_external/l10n/es.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Error al configurar OAuth2", "Generate keys" : "Generar claves", "Error generating key pair" : "Error al generar el par de claves", - "Enable encryption" : "Habilitar cifrado", - "Enable previews" : "Habilitar previsualizaciones", - "Enable sharing" : "Habilitar comparto", - "Check for changes" : "Comprobar si hay cambios", - "Never" : "Nunca", - "Once every direct access" : "Una vez cada acceso directo", "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.", "(group)" : "(grupo)", "Admin defined" : "Admin definido", @@ -69,7 +63,7 @@ OC.L10N.register( "Rackspace" : "Espacio de Rack", "API key" : "Clave API", "Username and password" : "Nombre de usuario y contraseña", - "Log-in credentials, save in session" : "Iniciar credenciales, guardar en la sesión", + "Log-in credentials, save in session" : "Credenciales de login, guardar en la sesión", "RSA public key" : "Clave pública RSA", "Public key" : "Clave pública", "Amazon S3" : "Amazon S3", diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json index c9a07f20d13..20b753757a6 100644 --- a/apps/files_external/l10n/es.json +++ b/apps/files_external/l10n/es.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Error al configurar OAuth2", "Generate keys" : "Generar claves", "Error generating key pair" : "Error al generar el par de claves", - "Enable encryption" : "Habilitar cifrado", - "Enable previews" : "Habilitar previsualizaciones", - "Enable sharing" : "Habilitar comparto", - "Check for changes" : "Comprobar si hay cambios", - "Never" : "Nunca", - "Once every direct access" : "Una vez cada acceso directo", "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.", "(group)" : "(grupo)", "Admin defined" : "Admin definido", @@ -67,7 +61,7 @@ "Rackspace" : "Espacio de Rack", "API key" : "Clave API", "Username and password" : "Nombre de usuario y contraseña", - "Log-in credentials, save in session" : "Iniciar credenciales, guardar en la sesión", + "Log-in credentials, save in session" : "Credenciales de login, guardar en la sesión", "RSA public key" : "Clave pública RSA", "Public key" : "Clave pública", "Amazon S3" : "Amazon S3", diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js index 5e03f32571d..86d78b35e4a 100644 --- a/apps/files_external/l10n/et_EE.js +++ b/apps/files_external/l10n/et_EE.js @@ -19,12 +19,6 @@ OC.L10N.register( "Error configuring OAuth2" : "OAuth2 seadistamise tõrge", "Generate keys" : "Loo võtmed", "Error generating key pair" : "Viga võtmepaari loomisel", - "Enable encryption" : "Luba krüpteerimine", - "Enable previews" : "Luba eelvaated", - "Enable sharing" : "Luba jagamine", - "Check for changes" : "Otsi uuendusi", - "Never" : "Mitte kunagi", - "Once every direct access" : "Kord iga otsese pöördumise korral", "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.", "(group)" : "(grupp)", "Admin defined" : "Admini poolt määratud", diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json index 8d4334225e7..3eebf584dc6 100644 --- a/apps/files_external/l10n/et_EE.json +++ b/apps/files_external/l10n/et_EE.json @@ -17,12 +17,6 @@ "Error configuring OAuth2" : "OAuth2 seadistamise tõrge", "Generate keys" : "Loo võtmed", "Error generating key pair" : "Viga võtmepaari loomisel", - "Enable encryption" : "Luba krüpteerimine", - "Enable previews" : "Luba eelvaated", - "Enable sharing" : "Luba jagamine", - "Check for changes" : "Otsi uuendusi", - "Never" : "Mitte kunagi", - "Once every direct access" : "Kord iga otsese pöördumise korral", "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.", "(group)" : "(grupp)", "Admin defined" : "Admini poolt määratud", diff --git a/apps/files_external/l10n/fa.js b/apps/files_external/l10n/fa.js index edc3f1c0fb3..6d71212117e 100644 --- a/apps/files_external/l10n/fa.js +++ b/apps/files_external/l10n/fa.js @@ -13,9 +13,6 @@ OC.L10N.register( "Error configuring OAuth1" : "خطا پیکربندی OAuth1", "Error configuring OAuth2" : "خطا پیکربندی OAuth2", "Generate keys" : "تولید کلید", - "Enable encryption" : "فعال کردن رمزگذاری", - "Check for changes" : "بررسی برای تغییرات", - "Never" : "هرگز", "(group)" : "(گروه)", "Saved" : "ذخیره شد", "Username" : "نام کاربری", diff --git a/apps/files_external/l10n/fa.json b/apps/files_external/l10n/fa.json index c3dfcafbbfe..e498e083957 100644 --- a/apps/files_external/l10n/fa.json +++ b/apps/files_external/l10n/fa.json @@ -11,9 +11,6 @@ "Error configuring OAuth1" : "خطا پیکربندی OAuth1", "Error configuring OAuth2" : "خطا پیکربندی OAuth2", "Generate keys" : "تولید کلید", - "Enable encryption" : "فعال کردن رمزگذاری", - "Check for changes" : "بررسی برای تغییرات", - "Never" : "هرگز", "(group)" : "(گروه)", "Saved" : "ذخیره شد", "Username" : "نام کاربری", diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js index b64d44bf12b..64b428f355a 100644 --- a/apps/files_external/l10n/fi_FI.js +++ b/apps/files_external/l10n/fi_FI.js @@ -15,12 +15,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä", "Generate keys" : "Luo avaimet", "Error generating key pair" : "Virhe luotaessa avainparia", - "Enable encryption" : "Käytä salausta", - "Enable previews" : "Käytä esikatseluja", - "Enable sharing" : "Käytä jakamista", - "Check for changes" : "Tarkista muutokset", - "Never" : "Ei koskaan", - "Once every direct access" : "Kerran aina suoran käytön yhteydessä", "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.", "(group)" : "(ryhmä)", "Admin defined" : "Ylläpitäjän määrittämä", diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json index 543ccafca3a..e222449b975 100644 --- a/apps/files_external/l10n/fi_FI.json +++ b/apps/files_external/l10n/fi_FI.json @@ -13,12 +13,6 @@ "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä", "Generate keys" : "Luo avaimet", "Error generating key pair" : "Virhe luotaessa avainparia", - "Enable encryption" : "Käytä salausta", - "Enable previews" : "Käytä esikatseluja", - "Enable sharing" : "Käytä jakamista", - "Check for changes" : "Tarkista muutokset", - "Never" : "Ei koskaan", - "Once every direct access" : "Kerran aina suoran käytön yhteydessä", "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.", "(group)" : "(ryhmä)", "Admin defined" : "Ylläpitäjän määrittämä", diff --git a/apps/files_external/l10n/fil.js b/apps/files_external/l10n/fil.js index e049851ae50..650a1c9f83a 100644 --- a/apps/files_external/l10n/fil.js +++ b/apps/files_external/l10n/fil.js @@ -2,6 +2,8 @@ OC.L10N.register( "files_external", { "Username" : "Username", - "Password" : "Password" + "Password" : "Password", + "Share" : "I-share", + "Folder name" : "Pangalan ng folder" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_external/l10n/fil.json b/apps/files_external/l10n/fil.json index 95d8e5f9717..4038379e221 100644 --- a/apps/files_external/l10n/fil.json +++ b/apps/files_external/l10n/fil.json @@ -1,5 +1,7 @@ { "translations": { "Username" : "Username", - "Password" : "Password" + "Password" : "Password", + "Share" : "I-share", + "Folder name" : "Pangalan ng folder" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index faef02726ce..fc348af2d2f 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2", "Generate keys" : "Générer des clés", "Error generating key pair" : "Erreur lors de la génération des clés", - "Enable encryption" : "Activer le chiffrement", - "Enable previews" : "Activer les prévisualisations", - "Enable sharing" : "Permettre le partage", - "Check for changes" : "Rechercher les modifications", - "Never" : "Jamais", - "Once every direct access" : "Une fois à chaque accès direct", "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.", "(group)" : "(groupe)", "Admin defined" : "Défini par l'administrateur", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index 4bcb65e9caf..bab4f950811 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2", "Generate keys" : "Générer des clés", "Error generating key pair" : "Erreur lors de la génération des clés", - "Enable encryption" : "Activer le chiffrement", - "Enable previews" : "Activer les prévisualisations", - "Enable sharing" : "Permettre le partage", - "Check for changes" : "Rechercher les modifications", - "Never" : "Jamais", - "Once every direct access" : "Une fois à chaque accès direct", "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.", "(group)" : "(groupe)", "Admin defined" : "Défini par l'administrateur", diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js index 7c37f9a5694..4afe1939ae7 100644 --- a/apps/files_external/l10n/gl.js +++ b/apps/files_external/l10n/gl.js @@ -13,11 +13,6 @@ OC.L10N.register( "Access granted" : "Concedeuse acceso", "Generate keys" : "Xerar chaves", "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves", - "Enable encryption" : "Activar o cifrado", - "Enable previews" : "Activar as vistas previas", - "Check for changes" : "Comprobar se hai cambios", - "Never" : "Nunca", - "Once every direct access" : "Unha vez cada acceso directo", "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.", "(group)" : "(grupo)", "Saved" : "Gardado", diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json index 10daf8b6d20..b323595a42f 100644 --- a/apps/files_external/l10n/gl.json +++ b/apps/files_external/l10n/gl.json @@ -11,11 +11,6 @@ "Access granted" : "Concedeuse acceso", "Generate keys" : "Xerar chaves", "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves", - "Enable encryption" : "Activar o cifrado", - "Enable previews" : "Activar as vistas previas", - "Check for changes" : "Comprobar se hai cambios", - "Never" : "Nunca", - "Once every direct access" : "Unha vez cada acceso directo", "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.", "(group)" : "(grupo)", "Saved" : "Gardado", diff --git a/apps/files_external/l10n/he.js b/apps/files_external/l10n/he.js index eb716d6b2cd..1a3f711f62d 100644 --- a/apps/files_external/l10n/he.js +++ b/apps/files_external/l10n/he.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "שגיאה בתצורת OAuth2", "Generate keys" : "יצירת מפתחות", "Error generating key pair" : "שגיאה ביצירת זוג מפתחות", - "Enable encryption" : "אפשר הצפנה", - "Enable previews" : "מאפשר תצוגות מקדימות", - "Enable sharing" : "הפעלת שיתוף", - "Check for changes" : "בדיקה אחר שינויים", - "Never" : "לעולם לא", - "Once every direct access" : "פעם אחת כל כניסה ישירה", "All users. Type to select user or group." : "כל המשתמשים. יש להקיש לבחירת משתמש או קבוצה.", "(group)" : "(קבוצה)", "Admin defined" : "הוגדר מנהל", diff --git a/apps/files_external/l10n/he.json b/apps/files_external/l10n/he.json index ffe7b62b5de..ba00b2d047b 100644 --- a/apps/files_external/l10n/he.json +++ b/apps/files_external/l10n/he.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "שגיאה בתצורת OAuth2", "Generate keys" : "יצירת מפתחות", "Error generating key pair" : "שגיאה ביצירת זוג מפתחות", - "Enable encryption" : "אפשר הצפנה", - "Enable previews" : "מאפשר תצוגות מקדימות", - "Enable sharing" : "הפעלת שיתוף", - "Check for changes" : "בדיקה אחר שינויים", - "Never" : "לעולם לא", - "Once every direct access" : "פעם אחת כל כניסה ישירה", "All users. Type to select user or group." : "כל המשתמשים. יש להקיש לבחירת משתמש או קבוצה.", "(group)" : "(קבוצה)", "Admin defined" : "הוגדר מנהל", diff --git a/apps/files_external/l10n/hu_HU.js b/apps/files_external/l10n/hu_HU.js index f5c2ae33051..f8b7b873ba3 100644 --- a/apps/files_external/l10n/hu_HU.js +++ b/apps/files_external/l10n/hu_HU.js @@ -9,11 +9,6 @@ OC.L10N.register( "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", - "Enable encryption" : "Titkosítás engedélyezése", - "Enable previews" : "Előnézet engedélyezése", - "Check for changes" : "Változások keresése", - "Never" : "Soha", - "Once every direct access" : "Minden közvetlen elérésnél", "All users. Type to select user or group." : "Összes felhasználó. Írj be egy felhasználót vagy csoportot.", "(group)" : "(csoport)", "Admin defined" : "Adminisztrátor definiálva", diff --git a/apps/files_external/l10n/hu_HU.json b/apps/files_external/l10n/hu_HU.json index 846c6ee775d..bf0775aff34 100644 --- a/apps/files_external/l10n/hu_HU.json +++ b/apps/files_external/l10n/hu_HU.json @@ -7,11 +7,6 @@ "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", - "Enable encryption" : "Titkosítás engedélyezése", - "Enable previews" : "Előnézet engedélyezése", - "Check for changes" : "Változások keresése", - "Never" : "Soha", - "Once every direct access" : "Minden közvetlen elérésnél", "All users. Type to select user or group." : "Összes felhasználó. Írj be egy felhasználót vagy csoportot.", "(group)" : "(csoport)", "Admin defined" : "Adminisztrátor definiálva", diff --git a/apps/files_external/l10n/hy.js b/apps/files_external/l10n/hy.js index 9de18052e45..798f0ce831e 100644 --- a/apps/files_external/l10n/hy.js +++ b/apps/files_external/l10n/hy.js @@ -2,7 +2,6 @@ OC.L10N.register( "files_external", { "Personal" : "Անձնական", - "Never" : "Երբեք", "Saved" : "Պահված", "Username" : "Օգտանուն", "Password" : "Գաղտնաբառ", diff --git a/apps/files_external/l10n/hy.json b/apps/files_external/l10n/hy.json index d5b5ca52112..a99e22cf077 100644 --- a/apps/files_external/l10n/hy.json +++ b/apps/files_external/l10n/hy.json @@ -1,6 +1,5 @@ { "translations": { "Personal" : "Անձնական", - "Never" : "Երբեք", "Saved" : "Պահված", "Username" : "Օգտանուն", "Password" : "Գաղտնաբառ", diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js index c17a0d5d0b2..ba26a966d83 100644 --- a/apps/files_external/l10n/id.js +++ b/apps/files_external/l10n/id.js @@ -24,11 +24,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2", "Generate keys" : "Hasilkan kunci", "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci", - "Enable encryption" : "Aktifkan enkripsi", - "Enable previews" : "Aktifkan pratinjau", - "Check for changes" : "Periksa perubahan", - "Never" : "Jangan pernah", - "Once every direct access" : "Setiap kali akses langsung", "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.", "(group)" : "(grup)", "Saved" : "Disimpan", diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json index f7a3054ab8d..8c49d2a341a 100644 --- a/apps/files_external/l10n/id.json +++ b/apps/files_external/l10n/id.json @@ -22,11 +22,6 @@ "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2", "Generate keys" : "Hasilkan kunci", "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci", - "Enable encryption" : "Aktifkan enkripsi", - "Enable previews" : "Aktifkan pratinjau", - "Check for changes" : "Periksa perubahan", - "Never" : "Jangan pernah", - "Once every direct access" : "Setiap kali akses langsung", "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.", "(group)" : "(grup)", "Saved" : "Disimpan", diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js index 4ea2081014a..e5415c26151 100644 --- a/apps/files_external/l10n/is.js +++ b/apps/files_external/l10n/is.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Villa við uppsetningu OAuth2", "Generate keys" : "Útbúa lykla", "Error generating key pair" : "Villa við að útbúa nýtt lyklapar", - "Enable encryption" : "Virkja dulritun", - "Enable previews" : "Virkja forskoðanir", - "Enable sharing" : "Virkja deilingu", - "Check for changes" : "Fylgjast með breytingum", - "Never" : "Aldrei", - "Once every direct access" : "Einu sinni við hvern beinan aðgang", "All users. Type to select user or group." : "Allir notendur. Skrifaðu til að velja notanda eða hóp.", "(group)" : "(hópur)", "Admin defined" : "Skilgreindur kerfisstjóri", diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json index bd424aca99e..28f20fc01df 100644 --- a/apps/files_external/l10n/is.json +++ b/apps/files_external/l10n/is.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Villa við uppsetningu OAuth2", "Generate keys" : "Útbúa lykla", "Error generating key pair" : "Villa við að útbúa nýtt lyklapar", - "Enable encryption" : "Virkja dulritun", - "Enable previews" : "Virkja forskoðanir", - "Enable sharing" : "Virkja deilingu", - "Check for changes" : "Fylgjast með breytingum", - "Never" : "Aldrei", - "Once every direct access" : "Einu sinni við hvern beinan aðgang", "All users. Type to select user or group." : "Allir notendur. Skrifaðu til að velja notanda eða hóp.", "(group)" : "(hópur)", "Admin defined" : "Skilgreindur kerfisstjóri", diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js index 7d92442b8f1..194602fd8e2 100644 --- a/apps/files_external/l10n/it.js +++ b/apps/files_external/l10n/it.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Errore di configurazione OAuth2", "Generate keys" : "Genera la chiavi", "Error generating key pair" : "Errore durante la generazione della coppia di chiavi", - "Enable encryption" : "Abilita cifratura", - "Enable previews" : "Abilita le anteprime", - "Enable sharing" : "Abilita condivisione", - "Check for changes" : "Controlla le modifiche", - "Never" : "Mai", - "Once every direct access" : "Una volta per ogni accesso diretto", "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.", "(group)" : "(gruppo)", "Admin defined" : "Definito dall'amministratore", diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json index c447b626d0e..12aece3db23 100644 --- a/apps/files_external/l10n/it.json +++ b/apps/files_external/l10n/it.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Errore di configurazione OAuth2", "Generate keys" : "Genera la chiavi", "Error generating key pair" : "Errore durante la generazione della coppia di chiavi", - "Enable encryption" : "Abilita cifratura", - "Enable previews" : "Abilita le anteprime", - "Enable sharing" : "Abilita condivisione", - "Check for changes" : "Controlla le modifiche", - "Never" : "Mai", - "Once every direct access" : "Una volta per ogni accesso diretto", "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.", "(group)" : "(gruppo)", "Admin defined" : "Definito dall'amministratore", diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js index 07b6c963b4a..37ace78a9f9 100644 --- a/apps/files_external/l10n/ja.js +++ b/apps/files_external/l10n/ja.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "OAuth2 設定エラー", "Generate keys" : "キーを生成", "Error generating key pair" : "キーペアの生成エラー", - "Enable encryption" : "暗号化を有効に", - "Enable previews" : "プレビューを有効に", - "Enable sharing" : "共有の有効化", - "Check for changes" : "変更点を確認", - "Never" : "更新無", - "Once every direct access" : "直指定時のみ", "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加", "(group)" : "(グループ)", "Admin defined" : "管理者設定済", diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json index 21767757b59..1284c4fad5c 100644 --- a/apps/files_external/l10n/ja.json +++ b/apps/files_external/l10n/ja.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "OAuth2 設定エラー", "Generate keys" : "キーを生成", "Error generating key pair" : "キーペアの生成エラー", - "Enable encryption" : "暗号化を有効に", - "Enable previews" : "プレビューを有効に", - "Enable sharing" : "共有の有効化", - "Check for changes" : "変更点を確認", - "Never" : "更新無", - "Once every direct access" : "直指定時のみ", "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加", "(group)" : "(グループ)", "Admin defined" : "管理者設定済", diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js index 921c647288f..ca38621dbb8 100644 --- a/apps/files_external/l10n/ko.js +++ b/apps/files_external/l10n/ko.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "OAuth2 설정 오류", "Generate keys" : "키 생성", "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생", - "Enable encryption" : "암호화 사용", - "Enable previews" : "미리 보기 사용", - "Enable sharing" : "공유 사용", - "Check for changes" : "변경 사항 감시", - "Never" : "하지 않음", - "Once every direct access" : "한 번 직접 접근할 때마다", "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오", "(group)" : "(그룹)", "Admin defined" : "관리자 지정", diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json index 9e15abb6160..0f3324b857a 100644 --- a/apps/files_external/l10n/ko.json +++ b/apps/files_external/l10n/ko.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "OAuth2 설정 오류", "Generate keys" : "키 생성", "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생", - "Enable encryption" : "암호화 사용", - "Enable previews" : "미리 보기 사용", - "Enable sharing" : "공유 사용", - "Check for changes" : "변경 사항 감시", - "Never" : "하지 않음", - "Once every direct access" : "한 번 직접 접근할 때마다", "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오", "(group)" : "(그룹)", "Admin defined" : "관리자 지정", diff --git a/apps/files_external/l10n/lv.js b/apps/files_external/l10n/lv.js index 8eea6b507b8..ac860c19c13 100644 --- a/apps/files_external/l10n/lv.js +++ b/apps/files_external/l10n/lv.js @@ -5,7 +5,6 @@ OC.L10N.register( "Personal" : "Personīgi", "Grant access" : "Piešķirt pieeju", "Access granted" : "Piešķirta pieeja", - "Enable encryption" : "Ieslēgt šifrēšanu", "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 dd0d40aa70e..7398d46bd14 100644 --- a/apps/files_external/l10n/lv.json +++ b/apps/files_external/l10n/lv.json @@ -3,7 +3,6 @@ "Personal" : "Personīgi", "Grant access" : "Piešķirt pieeju", "Access granted" : "Piešķirta pieeja", - "Enable encryption" : "Ieslēgt šifrēšanu", "Saved" : "Saglabāts", "Username" : "Lietotājvārds", "Password" : "Parole", diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js index f2bc60b147e..80a1ccbc024 100644 --- a/apps/files_external/l10n/nb_NO.js +++ b/apps/files_external/l10n/nb_NO.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2", "Generate keys" : "Generer nøkler", "Error generating key pair" : "Feil ved nøkkelgenerering", - "Enable encryption" : "Aktiver kryptering", - "Enable previews" : "Tillat fohåndsvisning", - "Enable sharing" : "Aktiver deling", - "Check for changes" : "Se etter endringer", - "Never" : "Aldri", - "Once every direct access" : "En gang pr. direkte aksess", "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.", "(group)" : "(gruppe)", "Admin defined" : "Admin-definert", diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json index 6de204d29dd..98308188737 100644 --- a/apps/files_external/l10n/nb_NO.json +++ b/apps/files_external/l10n/nb_NO.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2", "Generate keys" : "Generer nøkler", "Error generating key pair" : "Feil ved nøkkelgenerering", - "Enable encryption" : "Aktiver kryptering", - "Enable previews" : "Tillat fohåndsvisning", - "Enable sharing" : "Aktiver deling", - "Check for changes" : "Se etter endringer", - "Never" : "Aldri", - "Once every direct access" : "En gang pr. direkte aksess", "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.", "(group)" : "(gruppe)", "Admin defined" : "Admin-definert", diff --git a/apps/files_external/l10n/nds.js b/apps/files_external/l10n/nds.js index eb23a6d9666..1bc49465b7f 100644 --- a/apps/files_external/l10n/nds.js +++ b/apps/files_external/l10n/nds.js @@ -24,11 +24,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2", "Generate keys" : "Generiere Schlüssel", "Error generating key pair" : "Fehler beim Generieren des Schlüsselpaars", - "Enable encryption" : "Verschlüsselung aktivieren", - "Enable previews" : "Vorschau aktivieren", - "Check for changes" : "Auf Änderungen prüfen", - "Never" : "Nie", - "Once every direct access" : "Einmal bei jedem direkten Zugriff", "All users. Type to select user or group." : "Alle Benutzer. Tippe, um eine Benutzergruppe auszuwählen.", "(group)" : "(Gruppe)", "Saved" : "Gespeichert", diff --git a/apps/files_external/l10n/nds.json b/apps/files_external/l10n/nds.json index 3de4a89b020..06c24e0bf9d 100644 --- a/apps/files_external/l10n/nds.json +++ b/apps/files_external/l10n/nds.json @@ -22,11 +22,6 @@ "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2", "Generate keys" : "Generiere Schlüssel", "Error generating key pair" : "Fehler beim Generieren des Schlüsselpaars", - "Enable encryption" : "Verschlüsselung aktivieren", - "Enable previews" : "Vorschau aktivieren", - "Check for changes" : "Auf Änderungen prüfen", - "Never" : "Nie", - "Once every direct access" : "Einmal bei jedem direkten Zugriff", "All users. Type to select user or group." : "Alle Benutzer. Tippe, um eine Benutzergruppe auszuwählen.", "(group)" : "(Gruppe)", "Saved" : "Gespeichert", diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js index db10f28b984..774d15f6ad2 100644 --- a/apps/files_external/l10n/nl.js +++ b/apps/files_external/l10n/nl.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Fout bij configureren OAuth2", "Generate keys" : "Genereer sleutels", "Error generating key pair" : "Fout bij genereren sleutelpaar", - "Enable encryption" : "Versleuteling inschakelen", - "Enable previews" : "Activeren voorbeelden", - "Enable sharing" : "Activeren delen", - "Check for changes" : "Controleren op wijzigingen", - "Never" : "Nooit", - "Once every direct access" : "Een keer bij elke directe toegang", "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.", "(group)" : "(groep)", "Admin defined" : "Beheerder gedefinieerd", diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json index 3afd320905a..b8987e86151 100644 --- a/apps/files_external/l10n/nl.json +++ b/apps/files_external/l10n/nl.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Fout bij configureren OAuth2", "Generate keys" : "Genereer sleutels", "Error generating key pair" : "Fout bij genereren sleutelpaar", - "Enable encryption" : "Versleuteling inschakelen", - "Enable previews" : "Activeren voorbeelden", - "Enable sharing" : "Activeren delen", - "Check for changes" : "Controleren op wijzigingen", - "Never" : "Nooit", - "Once every direct access" : "Een keer bij elke directe toegang", "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.", "(group)" : "(groep)", "Admin defined" : "Beheerder gedefinieerd", diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js index 736e5f77a8a..ad415cb856e 100644 --- a/apps/files_external/l10n/oc.js +++ b/apps/files_external/l10n/oc.js @@ -25,11 +25,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Error al moment de la configuracion d'OAuth2", "Generate keys" : "Generar de claus", "Error generating key pair" : "Error al moment de la generacion de las claus", - "Enable encryption" : "Activar lo chiframent", - "Enable previews" : "Activar las previsualizacions", - "Check for changes" : "Recercar las modificacions", - "Never" : "Pas jamai", - "Once every direct access" : "Un còp a cada accès dirècte", "All users. Type to select user or group." : "Totes los utilizaires. Clicatz aicí per restrénher.", "(group)" : "(grop)", "Saved" : "Enregistrat", diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json index 597a5d96301..abcbc352b4b 100644 --- a/apps/files_external/l10n/oc.json +++ b/apps/files_external/l10n/oc.json @@ -23,11 +23,6 @@ "Error configuring OAuth2" : "Error al moment de la configuracion d'OAuth2", "Generate keys" : "Generar de claus", "Error generating key pair" : "Error al moment de la generacion de las claus", - "Enable encryption" : "Activar lo chiframent", - "Enable previews" : "Activar las previsualizacions", - "Check for changes" : "Recercar las modificacions", - "Never" : "Pas jamai", - "Once every direct access" : "Un còp a cada accès dirècte", "All users. Type to select user or group." : "Totes los utilizaires. Clicatz aicí per restrénher.", "(group)" : "(grop)", "Saved" : "Enregistrat", diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js index 176a10af6b9..f18fdd1439e 100644 --- a/apps/files_external/l10n/pl.js +++ b/apps/files_external/l10n/pl.js @@ -13,11 +13,6 @@ OC.L10N.register( "Access granted" : "Dostęp do", "Generate keys" : "Wygeneruj klucze", "Error generating key pair" : "Błąd podczas generowania pary kluczy", - "Enable encryption" : "Włącz szyfrowanie", - "Enable previews" : "Włącz podgląd", - "Check for changes" : "Sprawdź zmiany", - "Never" : "Nigdy", - "Once every direct access" : "Jeden raz przy każdym dostępie", "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", "(group)" : "(grupa)", "Saved" : "Zapisano", diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json index 241f6568f61..80092fe6a84 100644 --- a/apps/files_external/l10n/pl.json +++ b/apps/files_external/l10n/pl.json @@ -11,11 +11,6 @@ "Access granted" : "Dostęp do", "Generate keys" : "Wygeneruj klucze", "Error generating key pair" : "Błąd podczas generowania pary kluczy", - "Enable encryption" : "Włącz szyfrowanie", - "Enable previews" : "Włącz podgląd", - "Check for changes" : "Sprawdź zmiany", - "Never" : "Nigdy", - "Once every direct access" : "Jeden raz przy każdym dostępie", "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", "(group)" : "(grupa)", "Saved" : "Zapisano", diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js index 692334ce6c4..e0d1b30e87c 100644 --- a/apps/files_external/l10n/pt_BR.js +++ b/apps/files_external/l10n/pt_BR.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Erro configurando OAuth2", "Generate keys" : "Gerar chaves", "Error generating key pair" : "Erro ao gerar um par de chaves", - "Enable encryption" : "Ativar criptografia", - "Enable previews" : "Habilitar visualizações prévias", - "Enable sharing" : "Habilitar compartilhamento", - "Check for changes" : "Verifique se há alterações", - "Never" : "Nunca", - "Once every direct access" : "Uma vez a cada acesso direto", "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.", "(group)" : "(grupo)", "Admin defined" : "Definido pelo administrador", diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json index 0b961f79a8f..175da2153e3 100644 --- a/apps/files_external/l10n/pt_BR.json +++ b/apps/files_external/l10n/pt_BR.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Erro configurando OAuth2", "Generate keys" : "Gerar chaves", "Error generating key pair" : "Erro ao gerar um par de chaves", - "Enable encryption" : "Ativar criptografia", - "Enable previews" : "Habilitar visualizações prévias", - "Enable sharing" : "Habilitar compartilhamento", - "Check for changes" : "Verifique se há alterações", - "Never" : "Nunca", - "Once every direct access" : "Uma vez a cada acesso direto", "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.", "(group)" : "(grupo)", "Admin defined" : "Definido pelo administrador", diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js index d37818dd4c1..6c3250708a8 100644 --- a/apps/files_external/l10n/pt_PT.js +++ b/apps/files_external/l10n/pt_PT.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Erro de configuração OAuth2", "Generate keys" : "Gerar chaves", "Error generating key pair" : "Erro ao gerar chave par", - "Enable encryption" : "Ative a encriptação", - "Enable previews" : "Ative as pré-visualizações", - "Enable sharing" : "Ativar partilha", - "Check for changes" : "Verifique as suas alterações", - "Never" : "Nunca", - "Once every direct access" : "Uma vez em cada acesso direto", "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.", "(group)" : "(grupo)", "Admin defined" : "Administrador definido", diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json index 7b1ff7f5ef3..1548ba2568e 100644 --- a/apps/files_external/l10n/pt_PT.json +++ b/apps/files_external/l10n/pt_PT.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Erro de configuração OAuth2", "Generate keys" : "Gerar chaves", "Error generating key pair" : "Erro ao gerar chave par", - "Enable encryption" : "Ative a encriptação", - "Enable previews" : "Ative as pré-visualizações", - "Enable sharing" : "Ativar partilha", - "Check for changes" : "Verifique as suas alterações", - "Never" : "Nunca", - "Once every direct access" : "Uma vez em cada acesso direto", "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.", "(group)" : "(grupo)", "Admin defined" : "Administrador definido", diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js index 7475a6b5446..3b1a2d5f3f9 100644 --- a/apps/files_external/l10n/ru.js +++ b/apps/files_external/l10n/ru.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Ошибка настройки OAuth2", "Generate keys" : "Создать ключи", "Error generating key pair" : "Ошибка создания ключевой пары", - "Enable encryption" : "Включить шифрование", - "Enable previews" : "Включить предпросмотр", - "Enable sharing" : "Включить общий доступ", - "Check for changes" : "Проверять изменения", - "Never" : "Никогда", - "Once every direct access" : "Один раз при прямом доступе", "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.", "(group)" : "(группа)", "Admin defined" : "Админ определен", diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json index 657a16910b8..466cbf79726 100644 --- a/apps/files_external/l10n/ru.json +++ b/apps/files_external/l10n/ru.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Ошибка настройки OAuth2", "Generate keys" : "Создать ключи", "Error generating key pair" : "Ошибка создания ключевой пары", - "Enable encryption" : "Включить шифрование", - "Enable previews" : "Включить предпросмотр", - "Enable sharing" : "Включить общий доступ", - "Check for changes" : "Проверять изменения", - "Never" : "Никогда", - "Once every direct access" : "Один раз при прямом доступе", "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.", "(group)" : "(группа)", "Admin defined" : "Админ определен", diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js index 8c1f74051b0..58d4ad4d0b9 100644 --- a/apps/files_external/l10n/sk_SK.js +++ b/apps/files_external/l10n/sk_SK.js @@ -24,11 +24,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Chyba konfigurovania OAuth2", "Generate keys" : "Vytvoriť kľúče", "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov", - "Enable encryption" : "Povoliť šifrovanie", - "Enable previews" : "Povoliť náhľady", - "Check for changes" : "Zisťovať zmeny", - "Never" : "Nikdy", - "Once every direct access" : "S každým priamym prístupom", "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.", "(group)" : "(skupina)", "Saved" : "Uložené", diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json index d2bf8c37926..06d0693260b 100644 --- a/apps/files_external/l10n/sk_SK.json +++ b/apps/files_external/l10n/sk_SK.json @@ -22,11 +22,6 @@ "Error configuring OAuth2" : "Chyba konfigurovania OAuth2", "Generate keys" : "Vytvoriť kľúče", "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov", - "Enable encryption" : "Povoliť šifrovanie", - "Enable previews" : "Povoliť náhľady", - "Check for changes" : "Zisťovať zmeny", - "Never" : "Nikdy", - "Once every direct access" : "S každým priamym prístupom", "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.", "(group)" : "(skupina)", "Saved" : "Uložené", diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js index b6fcffb1e0b..48533509c47 100644 --- a/apps/files_external/l10n/sl.js +++ b/apps/files_external/l10n/sl.js @@ -23,12 +23,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Napaka nastavljanja OAuth2", "Generate keys" : "Ustvari ključe", "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev", - "Enable encryption" : "Omogoči šifriranje", - "Enable previews" : "Omogoči predogled", - "Enable sharing" : "Omogoči souporabo", - "Check for changes" : "Preveri za spremembe", - "Never" : "Nikoli", - "Once every direct access" : "Enkrat ob neposrednem dostopu", "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.", "(group)" : "(skupina)", "Admin defined" : "Skrbnik je določen", diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json index faa848795f1..310357fc684 100644 --- a/apps/files_external/l10n/sl.json +++ b/apps/files_external/l10n/sl.json @@ -21,12 +21,6 @@ "Error configuring OAuth2" : "Napaka nastavljanja OAuth2", "Generate keys" : "Ustvari ključe", "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev", - "Enable encryption" : "Omogoči šifriranje", - "Enable previews" : "Omogoči predogled", - "Enable sharing" : "Omogoči souporabo", - "Check for changes" : "Preveri za spremembe", - "Never" : "Nikoli", - "Once every direct access" : "Enkrat ob neposrednem dostopu", "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.", "(group)" : "(skupina)", "Admin defined" : "Skrbnik je določen", diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js index ce1ceaa3ba1..73aaa1ebe8c 100644 --- a/apps/files_external/l10n/sq.js +++ b/apps/files_external/l10n/sq.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "Gabim gjatë formësimit të OAuth2", "Generate keys" : "Prodho kyçe", "Error generating key pair" : "Gabim gjatë prodhimit të çiftit të kyçeve", - "Enable encryption" : "Aktivizoni fshehtëzim", - "Enable previews" : "Aktivizoni paraparje", - "Enable sharing" : "Aktivizo ndarjet", - "Check for changes" : "Kontrollo për ndryshime", - "Never" : "Kurrë", - "Once every direct access" : "Çdo herë pas hyrjesh të drejtpërdrejta", "All users. Type to select user or group." : "Krejt përdoruesit. Shtypni që të përzgjidhet përdorues ose grup.", "(group)" : "(grup)", "Admin defined" : "Përcaktuar nga përgjegjësi", diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json index f6eae29a17f..adf8141eab2 100644 --- a/apps/files_external/l10n/sq.json +++ b/apps/files_external/l10n/sq.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "Gabim gjatë formësimit të OAuth2", "Generate keys" : "Prodho kyçe", "Error generating key pair" : "Gabim gjatë prodhimit të çiftit të kyçeve", - "Enable encryption" : "Aktivizoni fshehtëzim", - "Enable previews" : "Aktivizoni paraparje", - "Enable sharing" : "Aktivizo ndarjet", - "Check for changes" : "Kontrollo për ndryshime", - "Never" : "Kurrë", - "Once every direct access" : "Çdo herë pas hyrjesh të drejtpërdrejta", "All users. Type to select user or group." : "Krejt përdoruesit. Shtypni që të përzgjidhet përdorues ose grup.", "(group)" : "(grup)", "Admin defined" : "Përcaktuar nga përgjegjësi", diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js index 53b8dad45f1..4f6a59f9b31 100644 --- a/apps/files_external/l10n/sr.js +++ b/apps/files_external/l10n/sr.js @@ -13,12 +13,6 @@ OC.L10N.register( "Access granted" : "Приступ одобрен", "Generate keys" : "Генериши кључеве", "Error generating key pair" : "Грешка при генерисању пара кључева", - "Enable encryption" : "Укључи шифровање", - "Enable previews" : "Укључи прегледе", - "Enable sharing" : "Укључи дељење", - "Check for changes" : "Провери измене", - "Never" : "никад", - "Once every direct access" : "једном при сваком директном приступу", "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.", "(group)" : "(група)", "Saved" : "Сачувано", diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json index a5b84eea915..deacfaa3c12 100644 --- a/apps/files_external/l10n/sr.json +++ b/apps/files_external/l10n/sr.json @@ -11,12 +11,6 @@ "Access granted" : "Приступ одобрен", "Generate keys" : "Генериши кључеве", "Error generating key pair" : "Грешка при генерисању пара кључева", - "Enable encryption" : "Укључи шифровање", - "Enable previews" : "Укључи прегледе", - "Enable sharing" : "Укључи дељење", - "Check for changes" : "Провери измене", - "Never" : "никад", - "Once every direct access" : "једном при сваком директном приступу", "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.", "(group)" : "(група)", "Saved" : "Сачувано", diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js index 51567940df1..c857a7b2cd2 100644 --- a/apps/files_external/l10n/sv.js +++ b/apps/files_external/l10n/sv.js @@ -14,11 +14,6 @@ OC.L10N.register( "Access granted" : "Åtkomst beviljad", "Generate keys" : "Generera nycklar", "Error generating key pair" : "Fel vid generering av nyckelpar", - "Enable encryption" : "Aktivera kryptering", - "Enable previews" : "Aktivera förhandsgranskningar", - "Enable sharing" : "Aktivera delning", - "Check for changes" : "Sök efter ändringar", - "Never" : "Aldrig", "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.", "(group)" : "(grupp)", "Admin defined" : "Admin definerad", diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json index 0a264bba4c1..d4701f0f396 100644 --- a/apps/files_external/l10n/sv.json +++ b/apps/files_external/l10n/sv.json @@ -12,11 +12,6 @@ "Access granted" : "Åtkomst beviljad", "Generate keys" : "Generera nycklar", "Error generating key pair" : "Fel vid generering av nyckelpar", - "Enable encryption" : "Aktivera kryptering", - "Enable previews" : "Aktivera förhandsgranskningar", - "Enable sharing" : "Aktivera delning", - "Check for changes" : "Sök efter ändringar", - "Never" : "Aldrig", "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.", "(group)" : "(grupp)", "Admin defined" : "Admin definerad", diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js index 7668864cc60..d91db9abf00 100644 --- a/apps/files_external/l10n/th_TH.js +++ b/apps/files_external/l10n/th_TH.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2", "Generate keys" : "สร้างคีย์", "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่", - "Enable encryption" : "เปิดใช้งานการเข้ารหัส", - "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง", - "Enable sharing" : "เปิดให้สามารถแชร์ได้", - "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง", - "Never" : "ไม่เคย", - "Once every direct access" : "เมื่อทุกคนเข้าถึงโดยตรง", "All users. Type to select user or group." : "ผู้ใช้ทุกคน พิมพ์เพื่อเลือกผู้ใช้หรือกลุ่ม", "(group)" : "(กลุ่ม)", "Admin defined" : "ถูกกำหนดโดยผู้ดูแลระบบ", diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json index 7eccb2d3718..f5f59ac2081 100644 --- a/apps/files_external/l10n/th_TH.json +++ b/apps/files_external/l10n/th_TH.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2", "Generate keys" : "สร้างคีย์", "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่", - "Enable encryption" : "เปิดใช้งานการเข้ารหัส", - "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง", - "Enable sharing" : "เปิดให้สามารถแชร์ได้", - "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง", - "Never" : "ไม่เคย", - "Once every direct access" : "เมื่อทุกคนเข้าถึงโดยตรง", "All users. Type to select user or group." : "ผู้ใช้ทุกคน พิมพ์เพื่อเลือกผู้ใช้หรือกลุ่ม", "(group)" : "(กลุ่ม)", "Admin defined" : "ถูกกำหนดโดยผู้ดูแลระบบ", diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js index dfbbef593ae..1baad972f68 100644 --- a/apps/files_external/l10n/tr.js +++ b/apps/files_external/l10n/tr.js @@ -27,12 +27,6 @@ OC.L10N.register( "Error configuring OAuth2" : "OAuth2 yapılandırma hatası", "Generate keys" : "Anahtarlar üret", "Error generating key pair" : "Anahtar çifti üretirken hata", - "Enable encryption" : "Şifrelemeyi aç", - "Enable previews" : "Önizlemeleri aç", - "Enable sharing" : "Paylaşımı etkinleştir", - "Check for changes" : "Değişiklikleri denetle", - "Never" : "Daha yeni", - "Once every direct access" : "Her doğrudan erişimde bir kez", "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.", "(group)" : "(grup)", "Admin defined" : "Yönetici tanımlandı", @@ -43,8 +37,15 @@ OC.L10N.register( "Couldn't get the list of external mount points: {type}" : "Harici bağlama noktalarının listesi alınamadı: {type}", "There was an error with message: " : "Şu mesajla bir hata oluştu:", "External mount error" : "Harici bağlama hatası", + "external-storage" : "harici-depolama", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows ağ sürücüsü bağlama nokta listesi alınamadı: sunucudan boş yanıt", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Yapılandırılmış harici bağlama noktalarından bazıları bağlı değil. Lütfen daha fazla bilgi için kırmızı satırlara tıklayın", + "Please enter the credentials for the {mount} mount" : "{mount} bağlaması için kimlik bilgilerini girin", "Username" : "Kullanıcı Adı", "Password" : "Parola", + "Credentials saved" : "Kimlik bilgileri kaydedildi", + "Credentials saving failed" : "Kimlik bilgileri kaydedilemedi", + "Credentials required" : "Kimlik bilgileri gerekli", "Save" : "Kaydet", "Access key" : "Erişim anahtarı", "Secret key" : "Gizli anahtar", @@ -62,6 +63,7 @@ OC.L10N.register( "Rackspace" : "Rackspace", "API key" : "API anahtarı", "Username and password" : "Kullanıcı adı ve parola", + "Log-in credentials, save in session" : "Oturum kimlik bilgileri, oturumda kaydet", "RSA public key" : "RSA ortak anahtarı", "Public key" : "Ortak anahtar", "Amazon S3" : "Amazon S3", diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json index 2b1296e3c6f..01c3c52d1e8 100644 --- a/apps/files_external/l10n/tr.json +++ b/apps/files_external/l10n/tr.json @@ -25,12 +25,6 @@ "Error configuring OAuth2" : "OAuth2 yapılandırma hatası", "Generate keys" : "Anahtarlar üret", "Error generating key pair" : "Anahtar çifti üretirken hata", - "Enable encryption" : "Şifrelemeyi aç", - "Enable previews" : "Önizlemeleri aç", - "Enable sharing" : "Paylaşımı etkinleştir", - "Check for changes" : "Değişiklikleri denetle", - "Never" : "Daha yeni", - "Once every direct access" : "Her doğrudan erişimde bir kez", "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.", "(group)" : "(grup)", "Admin defined" : "Yönetici tanımlandı", @@ -41,8 +35,15 @@ "Couldn't get the list of external mount points: {type}" : "Harici bağlama noktalarının listesi alınamadı: {type}", "There was an error with message: " : "Şu mesajla bir hata oluştu:", "External mount error" : "Harici bağlama hatası", + "external-storage" : "harici-depolama", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows ağ sürücüsü bağlama nokta listesi alınamadı: sunucudan boş yanıt", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Yapılandırılmış harici bağlama noktalarından bazıları bağlı değil. Lütfen daha fazla bilgi için kırmızı satırlara tıklayın", + "Please enter the credentials for the {mount} mount" : "{mount} bağlaması için kimlik bilgilerini girin", "Username" : "Kullanıcı Adı", "Password" : "Parola", + "Credentials saved" : "Kimlik bilgileri kaydedildi", + "Credentials saving failed" : "Kimlik bilgileri kaydedilemedi", + "Credentials required" : "Kimlik bilgileri gerekli", "Save" : "Kaydet", "Access key" : "Erişim anahtarı", "Secret key" : "Gizli anahtar", @@ -60,6 +61,7 @@ "Rackspace" : "Rackspace", "API key" : "API anahtarı", "Username and password" : "Kullanıcı adı ve parola", + "Log-in credentials, save in session" : "Oturum kimlik bilgileri, oturumda kaydet", "RSA public key" : "RSA ortak anahtarı", "Public key" : "Ortak anahtar", "Amazon S3" : "Amazon S3", diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js index 9341782dc86..ebf1d69e83d 100644 --- a/apps/files_external/l10n/uk.js +++ b/apps/files_external/l10n/uk.js @@ -13,7 +13,6 @@ OC.L10N.register( "Access granted" : "Доступ дозволено", "Generate keys" : "Створити ключі", "Error generating key pair" : "Помилка створення ключової пари", - "Enable encryption" : "Увімкнути шифрування", "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.", "(group)" : "(група)", "Saved" : "Збережено", diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json index a76795cba5e..d25a1f37232 100644 --- a/apps/files_external/l10n/uk.json +++ b/apps/files_external/l10n/uk.json @@ -11,7 +11,6 @@ "Access granted" : "Доступ дозволено", "Generate keys" : "Створити ключі", "Error generating key pair" : "Помилка створення ключової пари", - "Enable encryption" : "Увімкнути шифрування", "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.", "(group)" : "(група)", "Saved" : "Збережено", diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js index 9582a5a2180..e198947e3af 100644 --- a/apps/files_external/l10n/zh_CN.js +++ b/apps/files_external/l10n/zh_CN.js @@ -10,10 +10,6 @@ OC.L10N.register( "System" : "系统", "Grant access" : "授权", "Access granted" : "权限已授予。", - "Enable encryption" : "启用加密", - "Enable previews" : "启用预览", - "Enable sharing" : "启用分享", - "Never" : "从不", "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 1c8ae2f0697..e48190ac344 100644 --- a/apps/files_external/l10n/zh_CN.json +++ b/apps/files_external/l10n/zh_CN.json @@ -8,10 +8,6 @@ "System" : "系统", "Grant access" : "授权", "Access granted" : "权限已授予。", - "Enable encryption" : "启用加密", - "Enable previews" : "启用预览", - "Enable sharing" : "启用分享", - "Never" : "从不", "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 b61b2e61b8b..414e561b0d5 100644 --- a/apps/files_external/l10n/zh_TW.js +++ b/apps/files_external/l10n/zh_TW.js @@ -26,10 +26,6 @@ OC.L10N.register( "Error configuring OAuth2" : "設定 OAuth2 時發生錯誤", "Generate keys" : "產生金鑰", "Error generating key pair" : "產生金鑰對錯誤", - "Enable encryption" : "啟用加密", - "Enable previews" : "啟動預覽", - "Check for changes" : "檢查變動", - "Never" : "絕不", "All users. Type to select user or group." : "所有人都可以使用，或者選擇特定使用者、群組", "(group)" : "(群組)", "Saved" : "已儲存", diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json index 72d17f93161..fa06120ba17 100644 --- a/apps/files_external/l10n/zh_TW.json +++ b/apps/files_external/l10n/zh_TW.json @@ -24,10 +24,6 @@ "Error configuring OAuth2" : "設定 OAuth2 時發生錯誤", "Generate keys" : "產生金鑰", "Error generating key pair" : "產生金鑰對錯誤", - "Enable encryption" : "啟用加密", - "Enable previews" : "啟動預覽", - "Check for changes" : "檢查變動", - "Never" : "絕不", "All users. Type to select user or group." : "所有人都可以使用，或者選擇特定使用者、群組", "(group)" : "(群組)", "Saved" : "已儲存", diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index f59b5a460e1..8381ccbae59 100644 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -29,7 +29,9 @@ namespace OC\Files\Storage; +use GuzzleHttp\Exception\RequestException; use Icewind\Streams\IteratorDirectory; +use Icewind\Streams\RetryWrapper; require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php'; @@ -257,10 +259,9 @@ class Dropbox extends \OC\Files\Storage\Common { $client = \OC::$server->getHTTPClientService()->newClient(); try { - $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); - $client->get($downloadUrl, [ + $response = $client->get($downloadUrl, [ 'headers' => $headers, - 'save_to' => $tmpFile, + 'stream' => true, ]); } catch (RequestException $e) { if (!is_null($e->getResponse())) { @@ -274,7 +275,8 @@ class Dropbox extends \OC\Files\Storage\Common { } } - return fopen($tmpFile, 'r'); + $handle = $response->getBody(); + return RetryWrapper::wrap($handle); } catch (\Exception $exception) { \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR); return false; diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index 338e2c14fa4..7249aeceb5d 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -78,7 +78,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{ if ($this->secure) { $url.='s'; } - $url.='://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path; + $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path; return $url; } diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index b79f42d1e00..62d264dfeef 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -35,6 +35,7 @@ namespace OC\Files\Storage; use GuzzleHttp\Exception\RequestException; use Icewind\Streams\IteratorDirectory; +use Icewind\Streams\RetryWrapper; set_include_path(get_include_path().PATH_SEPARATOR. \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src'); @@ -441,10 +442,10 @@ class Google extends \OC\Files\Storage\Common { // the library's service doesn't support streaming, so we use Guzzle instead $client = \OC::$server->getHTTPClientService()->newClient(); try { - $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext); - $client->get($downloadUrl, [ + $response = $client->get($downloadUrl, [ 'headers' => $httpRequest->getRequestHeaders(), - 'save_to' => $tmpFile, + 'stream' => true, + 'verify' => __DIR__ . '/../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem', ]); } catch (RequestException $e) { if(!is_null($e->getResponse())) { @@ -458,7 +459,8 @@ class Google extends \OC\Files\Storage\Common { } } - return fopen($tmpFile, 'r'); + $handle = $response->getBody(); + return RetryWrapper::wrap($handle); } } return false; diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index f6b2873cf49..a6984f3b4e0 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -32,6 +32,7 @@ namespace OC\Files\Storage; use Icewind\Streams\IteratorDirectory; +use Icewind\Streams\RetryWrapper; use phpseclib\Net\SFTP\Stream; /** @@ -374,7 +375,8 @@ class SFTP extends \OC\Files\Storage\Common { case 'c': case 'c+': $context = stream_context_create(array('sftp' => array('session' => $this->getConnection()))); - return fopen($this->constructUrl($path), $mode, false, $context); + $handle = fopen($this->constructUrl($path), $mode, false, $context); + return RetryWrapper::wrap($handle); } } catch (\Exception $e) { } @@ -459,7 +461,7 @@ class SFTP extends \OC\Files\Storage\Common { // Do not pass the password here. We want to use the Net_SFTP object // supplied via stream context or fail. We only supply username and // hostname because this might show up in logs (they are not used). - $url = 'sftp://'.$this->user.'@'.$this->host.':'.$this->port.$this->root.$path; + $url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path; return $url; } } diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php index 312d8417a92..62da314c5fa 100644 --- a/apps/files_external/service/globalstoragesservice.php +++ b/apps/files_external/service/globalstoragesservice.php @@ -72,7 +72,7 @@ class GlobalStoragesService extends StoragesService { /** * Triggers signal_create_mount or signal_delete_mount to - * accomodate for additions/deletions in applicableUsers + * accommodate for additions/deletions in applicableUsers * and applicableGroups fields. * * @param StorageConfig $oldStorage old storage config diff --git a/apps/files_external/service/legacystoragesservice.php b/apps/files_external/service/legacystoragesservice.php index bab1008e561..158fc2b5137 100644 --- a/apps/files_external/service/legacystoragesservice.php +++ b/apps/files_external/service/legacystoragesservice.php @@ -188,7 +188,7 @@ abstract class LegacyStoragesService { $storagesWithConfigHash[$configId] = $currentStorage; } } catch (\UnexpectedValueException $e) { - // dont die if a storage backend doesn't exist + // don't die if a storage backend doesn't exist \OCP\Util::writeLog( 'files_external', 'Could not load storage: "' . $e->getMessage() . '"', diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php index 1762b55a06c..6542be146d6 100644 --- a/apps/files_external/service/storagesservice.php +++ b/apps/files_external/service/storagesservice.php @@ -96,7 +96,7 @@ abstract class StoragesService { $config->setId((int)$mount['mount_id']); return $config; } catch (\UnexpectedValueException $e) { - // dont die if a storage backend doesn't exist + // don't die if a storage backend doesn't exist \OCP\Util::writeLog( 'files_external', 'Could not load storage: "' . $e->getMessage() . '"', @@ -352,7 +352,7 @@ abstract class StoragesService { /** * Triggers signal_create_mount or signal_delete_mount to - * accomodate for additions/deletions in applicableUsers + * accommodate for additions/deletions in applicableUsers * and applicableGroups fields. * * @param StorageConfig $oldStorage old storage data diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/service/userstoragesservice.php index d4b04de609d..c46846e76d6 100644 --- a/apps/files_external/service/userstoragesservice.php +++ b/apps/files_external/service/userstoragesservice.php @@ -82,7 +82,7 @@ class UserStoragesService extends StoragesService { /** * Triggers signal_create_mount or signal_delete_mount to - * accomodate for additions/deletions in applicableUsers + * accommodate for additions/deletions in applicableUsers * and applicableGroups fields. * * @param StorageConfig $oldStorage old storage data diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 697a145131c..feccd2a4e45 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -124,7 +124,7 @@ </td> <?php endif; ?> <td class="mountOptionsToggle hidden"> - <img class="svg action" + <img class="svg" title="<?php p($l->t('Advanced settings')); ?>" alt="<?php p($l->t('Advanced settings')); ?>" src="<?php print_unescaped(image_path('core', 'actions/settings.svg')); ?>" @@ -132,7 +132,7 @@ <input type="hidden" class="mountOptions" value="" /> </td> <td class="hidden"> - <img class="svg action" + <img class="svg" alt="<?php p($l->t('Delete')); ?>" title="<?php p($l->t('Delete')); ?>" src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>" diff --git a/apps/files_external/tests/env/start-amazons3-ceph.sh b/apps/files_external/tests/env/start-amazons3-ceph.sh index d36980fdd11..1aa14ac990d 100755 --- a/apps/files_external/tests/env/start-amazons3-ceph.sh +++ b/apps/files_external/tests/env/start-amazons3-ceph.sh @@ -33,6 +33,7 @@ fi; # create readiness notification socket notify_sock=$(readlink -f "$thisFolder"/dockerContainerCeph.$EXECUTOR_NUMBER.amazons3.sock) +rm -f "$notify_sock" # in case an unfinished test left one behind mkfifo "$notify_sock" user=test diff --git a/apps/files_external/tests/env/start-swift-ceph.sh b/apps/files_external/tests/env/start-swift-ceph.sh index e884087c248..1e417c69057 100755 --- a/apps/files_external/tests/env/start-swift-ceph.sh +++ b/apps/files_external/tests/env/start-swift-ceph.sh @@ -33,6 +33,7 @@ fi; # create readiness notification socket notify_sock=$(readlink -f "$thisFolder"/dockerContainerCeph.$EXECUTOR_NUMBER.swift.sock) +rm -f "$notify_sock" # in case an unfinished test left one behind mkfifo "$notify_sock" port=5001 diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index a253763389c..5bfc8e1d4a2 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -111,8 +111,9 @@ _.each($files, function(file) { var $tr = $(file); - var shareTypes = $tr.attr('data-share-types'); - if (shareTypes) { + var shareTypes = $tr.attr('data-share-types') || ''; + var shareOwner = $tr.attr('data-share-owner'); + if (shareTypes || shareOwner) { var hasLink = false; var hasShares = false; _.each(shareTypes.split(',') || [], function(shareType) { diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js index d3ba2463591..b981022986a 100644 --- a/apps/files_sharing/l10n/da.js +++ b/apps/files_sharing/l10n/da.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Server to server sharing is not enabled on this server" : "Server til serverdeling er ikke slået til på denne server", "The mountpoint name contains invalid characters." : "Monteringspunktets navn indeholder ugyldige tegn.", + "Not allowed to create a federated share with the same user server" : "Det er ikke tilladt at danne et datafællesskab med samme brugerserver", "Invalid or untrusted SSL certificate" : "Ugyldigt eller upålideligt SSL-certifikat", "Could not authenticate to remote share, password might be wrong" : "Kunne ikke godkende fjerndelingen - kodeordet er muilgvis forkert", "Storage not valid" : "Lagerplads er ikke gyldig", @@ -10,6 +11,7 @@ OC.L10N.register( "Shared with you" : "Delt med dig", "Shared with others" : "Delt med andre", "Shared by link" : "Delt via link", + "Federated sharing" : "Datafællesskabsdeling", "Nothing shared with you yet" : "Der deles ikke noget med dig endnu", "Files and folders others share with you will show up here" : "Filer og mapper som andre deler med dig, vil blive vist her", "Nothing shared yet" : "Der deles endnu ikke noget", diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json index d447dee544e..38f98ca22b8 100644 --- a/apps/files_sharing/l10n/da.json +++ b/apps/files_sharing/l10n/da.json @@ -1,6 +1,7 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Server til serverdeling er ikke slået til på denne server", "The mountpoint name contains invalid characters." : "Monteringspunktets navn indeholder ugyldige tegn.", + "Not allowed to create a federated share with the same user server" : "Det er ikke tilladt at danne et datafællesskab med samme brugerserver", "Invalid or untrusted SSL certificate" : "Ugyldigt eller upålideligt SSL-certifikat", "Could not authenticate to remote share, password might be wrong" : "Kunne ikke godkende fjerndelingen - kodeordet er muilgvis forkert", "Storage not valid" : "Lagerplads er ikke gyldig", @@ -8,6 +9,7 @@ "Shared with you" : "Delt med dig", "Shared with others" : "Delt med andre", "Shared by link" : "Delt via link", + "Federated sharing" : "Datafællesskabsdeling", "Nothing shared with you yet" : "Der deles ikke noget med dig endnu", "Files and folders others share with you will show up here" : "Filer og mapper som andre deler med dig, vil blive vist her", "Nothing shared yet" : "Der deles endnu ikke noget", diff --git a/apps/files_sharing/l10n/fil.js b/apps/files_sharing/l10n/fil.js index 59f17cc001b..89f2cadd416 100644 --- a/apps/files_sharing/l10n/fil.js +++ b/apps/files_sharing/l10n/fil.js @@ -1,6 +1,8 @@ OC.L10N.register( "files_sharing", { - "Password" : "Password" + "Cancel" : "I-cancel", + "Password" : "Password", + "Download" : "I-download" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fil.json b/apps/files_sharing/l10n/fil.json index b60f17590ba..adfa180e683 100644 --- a/apps/files_sharing/l10n/fil.json +++ b/apps/files_sharing/l10n/fil.json @@ -1,4 +1,6 @@ { "translations": { - "Password" : "Password" + "Cancel" : "I-cancel", + "Password" : "Password", + "Download" : "I-download" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js index d2357c0de33..2381031c192 100644 --- a/apps/files_sharing/l10n/sv.js +++ b/apps/files_sharing/l10n/sv.js @@ -3,11 +3,15 @@ OC.L10N.register( { "Server to server sharing is not enabled on this server" : "Server-till-server-delning är inte aktiverat på denna server", "The mountpoint name contains invalid characters." : "Monteringspunktens namn innehåller ogiltiga tecken.", + "Not allowed to create a federated share with the same user server" : "Ej tillåten att skapa en federerad delning med samma användarserver.", "Invalid or untrusted SSL certificate" : "Ogiltigt eller ej betrott SSL-certifikat", + "Could not authenticate to remote share, password might be wrong" : "Kunde ej autensiera fjärrdelningen, lösenordet kan vara fel", + "Storage not valid" : "Lagring ej giltig", "Couldn't add remote share" : "Kunde inte lägga till fjärrutdelning", "Shared with you" : "Delat med dig", "Shared with others" : "Delat med andra", "Shared by link" : "Delad som länk", + "Federated sharing" : "Federated Delning", "Nothing shared with you yet" : "Inget delat med dig ännu", "Files and folders others share with you will show up here" : "Filer och mappar andra delar med dig kommer visas här", "Nothing shared yet" : "Inget delat ännu", @@ -19,12 +23,15 @@ OC.L10N.register( "Remote share password" : "Lösenord för fjärrdelning", "Cancel" : "Avbryt", "Add remote share" : "Lägg till fjärrdelning", + "You can upload into this folder" : "Du kan ladda upp i denna map", + "No ownCloud installation (7 or higher) found at {remote}" : "Ingen OwnCloud Installation (7 eller senare) funnen på {remote}", "Invalid ownCloud url" : "Felaktig ownCloud url", "Shared by" : "Delad av", "Sharing" : "Dela", "A file or folder has been <strong>shared</strong>" : "En fil eller mapp har <strong>delats</strong>", "A file or folder was shared from <strong>another server</strong>" : "En fil eller mapp delades från <strong>en annan server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "En publikt delad fil eller mapp blev <strong>nerladdad</strong>", + "You received a new remote share %2$s from %1$s" : "Du har mottagit en fjärrdelning %2$s från %1$s", "You received a new remote share from %s" : "Du mottog en ny fjärrdelning från %s", "%1$s accepted remote share %2$s" : "%1$s accepterade fjärrdelning %2$s", "%1$s declined remote share %2$s" : "%1$s nekade fjärrdelning %2$s", @@ -32,11 +39,43 @@ OC.L10N.register( "Public shared folder %1$s was downloaded" : "Publikt delad mapp %1$s blev nerladdad", "Public shared file %1$s was downloaded" : "Publikt delad fil %1$s blev nerladdad", "You shared %1$s with %2$s" : "Du delade %1$s med %2$s", + "%2$s shared %1$s with %3$s" : "%2$s delade %1$s med %3$s", + "You removed the share of %2$s for %1$s" : "Du tog bort delning av %2$s för %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s tog bort delningen av %3$s för %1$s", "You shared %1$s with group %2$s" : "Du delade %1$s med grupp %2$s", + "%2$s shared %1$s with group %3$s" : "%2$s delade %1$s med gruppen %3$s", + "You removed the share of group %2$s for %1$s" : "Du tog bort delningen av gruppen %2$s för %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s tog bort delningen av grupp %3$s för %1$s", + "%2$s shared %1$s via link" : "%2$s delade %1$s via länk", "You shared %1$s via link" : "Du delade %1$s via länk", + "You removed the public link for %1$s" : "Du tog bort den publika länken för %1$s", + "%2$s removed the public link for %1$s" : "%2$s tog bort den publika länken för %1$s", + "Your public link for %1$s expired" : "Din publika länk för %1$s har löpt ut", + "The public link of %2$s for %1$s expired" : "Den publika länken för %2$s av %1$s har löpt ut", "%2$s shared %1$s with you" : "%2$s delade %1$s med dig", + "%2$s removed the share for %1$s" : "%2$s tog bort delningen av %1$s", + "Downloaded via public link" : "Nerladdad via publik länk", + "Shared with %2$s" : "Delad med %2$s", + "Shared with %3$s by %2$s" : "Delad med %3$s av %2$s", + "Removed share for %2$s" : "Tog bort delningen för %2$s", + "%2$s removed share for %3$s" : "%2$s tog bort delningen för %3$s", + "Shared with group %2$s" : "Delning med grupp %2$s", + "Shared with group %3$s by %2$s" : "Delade med grupp %3$s av %2$s", + "Removed share of group %2$s" : "Tog bort delning av grupp %2$s", + "%2$s removed share of group %3$s" : "%2$s tog bort delningen av grupp %3$s", + "Shared via link by %2$s" : "Delad via länk av %2$s", + "Shared via public link" : "Delad via publik länk", + "Removed public link" : "Tog bort publik länk", + "%2$s removed public link" : "%2$s tog bort publik länk", + "Public link expired" : "Tidsgräns för publik länk har löpt ut", + "Public link of %2$s expired" : "Tidsgräns för publik länk för %2$s har löpt ut", + "Shared by %2$s" : "Delad av %2$s", "Shares" : "Delningar", + "You received \"/%2$s\" as a remote share from %1$s" : "Du mottog \"/%2$s\" som fjärrdelning från %1$s", "Accept" : "Acceptera", + "Decline" : "Neka", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dela med mig genom min #owncloud Federated Cloud ID, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Dela med mig genom min #ownCloud Federated Cloud ID", "This share is password-protected" : "Den här delningen är lösenordsskyddad", "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.", "Password" : "Lösenord", @@ -53,7 +92,15 @@ OC.L10N.register( "Download" : "Ladda ner", "Download %s" : "Ladda ner %s", "Direct link" : "Direkt länk", + "Federated Cloud Sharing" : "Federate Cloud delning", + "Open documentation" : "Öppna dokumentation", "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", - "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar" + "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ditt Federated Cloud ID", + "Share it:" : "Dela detta:", + "Add to your website" : "Lägg till på din hemsida", + "Share with me via ownCloud" : "Dela med mig via Owncloud", + "HTML Code:" : "HTML Kod:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json index 9331d95aafb..f86e9491149 100644 --- a/apps/files_sharing/l10n/sv.json +++ b/apps/files_sharing/l10n/sv.json @@ -1,11 +1,15 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Server-till-server-delning är inte aktiverat på denna server", "The mountpoint name contains invalid characters." : "Monteringspunktens namn innehåller ogiltiga tecken.", + "Not allowed to create a federated share with the same user server" : "Ej tillåten att skapa en federerad delning med samma användarserver.", "Invalid or untrusted SSL certificate" : "Ogiltigt eller ej betrott SSL-certifikat", + "Could not authenticate to remote share, password might be wrong" : "Kunde ej autensiera fjärrdelningen, lösenordet kan vara fel", + "Storage not valid" : "Lagring ej giltig", "Couldn't add remote share" : "Kunde inte lägga till fjärrutdelning", "Shared with you" : "Delat med dig", "Shared with others" : "Delat med andra", "Shared by link" : "Delad som länk", + "Federated sharing" : "Federated Delning", "Nothing shared with you yet" : "Inget delat med dig ännu", "Files and folders others share with you will show up here" : "Filer och mappar andra delar med dig kommer visas här", "Nothing shared yet" : "Inget delat ännu", @@ -17,12 +21,15 @@ "Remote share password" : "Lösenord för fjärrdelning", "Cancel" : "Avbryt", "Add remote share" : "Lägg till fjärrdelning", + "You can upload into this folder" : "Du kan ladda upp i denna map", + "No ownCloud installation (7 or higher) found at {remote}" : "Ingen OwnCloud Installation (7 eller senare) funnen på {remote}", "Invalid ownCloud url" : "Felaktig ownCloud url", "Shared by" : "Delad av", "Sharing" : "Dela", "A file or folder has been <strong>shared</strong>" : "En fil eller mapp har <strong>delats</strong>", "A file or folder was shared from <strong>another server</strong>" : "En fil eller mapp delades från <strong>en annan server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "En publikt delad fil eller mapp blev <strong>nerladdad</strong>", + "You received a new remote share %2$s from %1$s" : "Du har mottagit en fjärrdelning %2$s från %1$s", "You received a new remote share from %s" : "Du mottog en ny fjärrdelning från %s", "%1$s accepted remote share %2$s" : "%1$s accepterade fjärrdelning %2$s", "%1$s declined remote share %2$s" : "%1$s nekade fjärrdelning %2$s", @@ -30,11 +37,43 @@ "Public shared folder %1$s was downloaded" : "Publikt delad mapp %1$s blev nerladdad", "Public shared file %1$s was downloaded" : "Publikt delad fil %1$s blev nerladdad", "You shared %1$s with %2$s" : "Du delade %1$s med %2$s", + "%2$s shared %1$s with %3$s" : "%2$s delade %1$s med %3$s", + "You removed the share of %2$s for %1$s" : "Du tog bort delning av %2$s för %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s tog bort delningen av %3$s för %1$s", "You shared %1$s with group %2$s" : "Du delade %1$s med grupp %2$s", + "%2$s shared %1$s with group %3$s" : "%2$s delade %1$s med gruppen %3$s", + "You removed the share of group %2$s for %1$s" : "Du tog bort delningen av gruppen %2$s för %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s tog bort delningen av grupp %3$s för %1$s", + "%2$s shared %1$s via link" : "%2$s delade %1$s via länk", "You shared %1$s via link" : "Du delade %1$s via länk", + "You removed the public link for %1$s" : "Du tog bort den publika länken för %1$s", + "%2$s removed the public link for %1$s" : "%2$s tog bort den publika länken för %1$s", + "Your public link for %1$s expired" : "Din publika länk för %1$s har löpt ut", + "The public link of %2$s for %1$s expired" : "Den publika länken för %2$s av %1$s har löpt ut", "%2$s shared %1$s with you" : "%2$s delade %1$s med dig", + "%2$s removed the share for %1$s" : "%2$s tog bort delningen av %1$s", + "Downloaded via public link" : "Nerladdad via publik länk", + "Shared with %2$s" : "Delad med %2$s", + "Shared with %3$s by %2$s" : "Delad med %3$s av %2$s", + "Removed share for %2$s" : "Tog bort delningen för %2$s", + "%2$s removed share for %3$s" : "%2$s tog bort delningen för %3$s", + "Shared with group %2$s" : "Delning med grupp %2$s", + "Shared with group %3$s by %2$s" : "Delade med grupp %3$s av %2$s", + "Removed share of group %2$s" : "Tog bort delning av grupp %2$s", + "%2$s removed share of group %3$s" : "%2$s tog bort delningen av grupp %3$s", + "Shared via link by %2$s" : "Delad via länk av %2$s", + "Shared via public link" : "Delad via publik länk", + "Removed public link" : "Tog bort publik länk", + "%2$s removed public link" : "%2$s tog bort publik länk", + "Public link expired" : "Tidsgräns för publik länk har löpt ut", + "Public link of %2$s expired" : "Tidsgräns för publik länk för %2$s har löpt ut", + "Shared by %2$s" : "Delad av %2$s", "Shares" : "Delningar", + "You received \"/%2$s\" as a remote share from %1$s" : "Du mottog \"/%2$s\" som fjärrdelning från %1$s", "Accept" : "Acceptera", + "Decline" : "Neka", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dela med mig genom min #owncloud Federated Cloud ID, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Dela med mig genom min #ownCloud Federated Cloud ID", "This share is password-protected" : "Den här delningen är lösenordsskyddad", "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.", "Password" : "Lösenord", @@ -51,7 +90,15 @@ "Download" : "Ladda ner", "Download %s" : "Ladda ner %s", "Direct link" : "Direkt länk", + "Federated Cloud Sharing" : "Federate Cloud delning", + "Open documentation" : "Öppna dokumentation", "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", - "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar" + "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ditt Federated Cloud ID", + "Share it:" : "Dela detta:", + "Add to your website" : "Lägg till på din hemsida", + "Share with me via ownCloud" : "Dela med mig via Owncloud", + "HTML Code:" : "HTML Kod:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index df267d35b1f..c08d9baa0d5 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -74,8 +74,8 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "%1$s kişisinden \"/%2$s\" uzak paylaşımını aldınız", "Accept" : "Kabul et", "Decline" : "Reddet", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s", - "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaş, bkz %s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaş", "This share is password-protected" : "Bu paylaşım parola korumalı", "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.", "Password" : "Parola", @@ -100,7 +100,7 @@ OC.L10N.register( "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", "Share it:" : "Paylaşın:", "Add to your website" : "Web sitenize ekleyin", - "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı", + "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşın", "HTML Code:" : "HTML Kodu:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index 1b921920dd7..b107ec25589 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -72,8 +72,8 @@ "You received \"/%2$s\" as a remote share from %1$s" : "%1$s kişisinden \"/%2$s\" uzak paylaşımını aldınız", "Accept" : "Kabul et", "Decline" : "Reddet", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s", - "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaş, bkz %s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaş", "This share is password-protected" : "Bu paylaşım parola korumalı", "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.", "Password" : "Parola", @@ -98,7 +98,7 @@ "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", "Share it:" : "Paylaşın:", "Add to your website" : "Web sitenize ekleyin", - "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı", + "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşın", "HTML Code:" : "HTML Kodu:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/lib/capabilities.php b/apps/files_sharing/lib/capabilities.php index 913f248b174..5ec540ad4e0 100644 --- a/apps/files_sharing/lib/capabilities.php +++ b/apps/files_sharing/lib/capabilities.php @@ -74,6 +74,8 @@ class Capabilities implements ICapability { $res['user']['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no') === 'yes'; $res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes'; + + $res['group_sharing'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes'; } //Federated sharing diff --git a/apps/files_sharing/tests/capabilities.php b/apps/files_sharing/tests/capabilities.php index 7572f5c84aa..0e17811be03 100644 --- a/apps/files_sharing/tests/capabilities.php +++ b/apps/files_sharing/tests/capabilities.php @@ -243,6 +243,24 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase { $this->assertFalse($result['public']['upload']); } + public function testNoGroupSharing() { + $map = [ + ['core', 'shareapi_enabled', 'yes', 'yes'], + ['core', 'shareapi_allow_group_sharing', 'yes', 'no'], + ]; + $result = $this->getResults($map); + $this->assertFalse($result['group_sharing']); + } + + public function testGroupSharing() { + $map = [ + ['core', 'shareapi_enabled', 'yes', 'yes'], + ['core', 'shareapi_allow_group_sharing', 'yes', 'yes'], + ]; + $result = $this->getResults($map); + $this->assertTrue($result['group_sharing']); + } + public function testFederatedSharingIncomming() { $map = [ ['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'yes'], diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js index c488bd94fab..c34234bfe13 100644 --- a/apps/files_sharing/tests/js/shareSpec.js +++ b/apps/files_sharing/tests/js/shareSpec.js @@ -141,7 +141,7 @@ describe('OCA.Sharing.Util tests', function() { permissions: OC.PERMISSION_ALL, shareOwner: 'User One', etag: 'abc', - shareTypes: [OC.Share.SHARE_TYPE_USER] + shareTypes: [] }]); $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 46447908b90..52692950a65 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -56,7 +56,7 @@ class Trashbin { private static $scannedVersions = false; /** - * Ensure we dont need to scan the file during the move to trash + * Ensure we don't need to scan the file during the move to trash * by triggering the scan in the pre-hook * * @param array $params diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php index 958c5f79a98..afc07ff36c8 100644 --- a/apps/files_trashbin/tests/storage.php +++ b/apps/files_trashbin/tests/storage.php @@ -435,7 +435,7 @@ class Storage extends \Test\TestCase { } /** - * Delete should fail is the source file cant be deleted + * Delete should fail if the source file can't be deleted. */ public function testSingleStorageDeleteFileFail() { /** @@ -472,7 +472,7 @@ class Storage extends \Test\TestCase { } /** - * Delete should fail is the source folder cant be deleted + * Delete should fail if the source folder can't be deleted. */ public function testSingleStorageDeleteFolderFail() { /** diff --git a/apps/systemtags/l10n/da.js b/apps/systemtags/l10n/da.js index 5b381b76f48..8d0273a7707 100644 --- a/apps/systemtags/l10n/da.js +++ b/apps/systemtags/l10n/da.js @@ -1,7 +1,20 @@ OC.L10N.register( "systemtags", { + "<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", + "%1$s created system tag %2$s" : "%1$s oprettede systemmærke %2$s", + "%1$s deleted system tag %2$s" : "%1$s fjernede systemmærket %2$s", + "%1$s updated system tag %3$s to %2$s" : "%1$s ændrede systemmærket %3$s til %2$s", + "%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 9b5049facc7..1fdf24f6e51 100644 --- a/apps/systemtags/l10n/da.json +++ b/apps/systemtags/l10n/da.json @@ -1,5 +1,18 @@ { "translations": { + "<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", + "%1$s created system tag %2$s" : "%1$s oprettede systemmærke %2$s", + "%1$s deleted system tag %2$s" : "%1$s fjernede systemmærket %2$s", + "%1$s updated system tag %3$s to %2$s" : "%1$s ændrede systemmærket %3$s til %2$s", + "%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/el.js b/apps/systemtags/l10n/el.js index fc28aae1554..54a89c389c9 100644 --- a/apps/systemtags/l10n/el.js +++ b/apps/systemtags/l10n/el.js @@ -1,6 +1,7 @@ OC.L10N.register( "systemtags", { + "<strong>System tags</strong> for a file have been modified" : "<strong>Οι ετικέτες συστήματος</strong> για ένα αρχείο έχουν τροποποιηθεί", "Tags" : "Ετικέτες", "No files in here" : "Δεν υπάρχουν αρχεία", "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", diff --git a/apps/systemtags/l10n/el.json b/apps/systemtags/l10n/el.json index ff5a775d737..c93616dcf6c 100644 --- a/apps/systemtags/l10n/el.json +++ b/apps/systemtags/l10n/el.json @@ -1,4 +1,5 @@ { "translations": { + "<strong>System tags</strong> for a file have been modified" : "<strong>Οι ετικέτες συστήματος</strong> για ένα αρχείο έχουν τροποποιηθεί", "Tags" : "Ετικέτες", "No files in here" : "Δεν υπάρχουν αρχεία", "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο", diff --git a/apps/systemtags/l10n/tr.js b/apps/systemtags/l10n/tr.js index 6ca4c299006..2356ac42584 100644 --- a/apps/systemtags/l10n/tr.js +++ b/apps/systemtags/l10n/tr.js @@ -1,7 +1,21 @@ OC.L10N.register( "systemtags", { + "<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ı", + "%1$s created system tag %2$s" : "%1$s, %2$s sistem etiketini oluşturdu", + "%1$s deleted system tag %2$s" : "%1$s, %2$s sistem etiketini sildi", + "%1$s updated system tag %3$s to %2$s" : "%1$s, %3$s sistem etiketini %2$s olarak güncelledi", + "%1$s assigned system tag %3$s to %2$s" : "%1$s, %3$s sistem etiketini %2$s etiketine atadı", + "%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 4dfd5722459..b85c64ab0b3 100644 --- a/apps/systemtags/l10n/tr.json +++ b/apps/systemtags/l10n/tr.json @@ -1,5 +1,19 @@ { "translations": { + "<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ı", + "%1$s created system tag %2$s" : "%1$s, %2$s sistem etiketini oluşturdu", + "%1$s deleted system tag %2$s" : "%1$s, %2$s sistem etiketini sildi", + "%1$s updated system tag %3$s to %2$s" : "%1$s, %3$s sistem etiketini %2$s olarak güncelledi", + "%1$s assigned system tag %3$s to %2$s" : "%1$s, %3$s sistem etiketini %2$s etiketine atadı", + "%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/updatenotification/l10n/da.js b/apps/updatenotification/l10n/da.js index 4954c5c4581..530b18ec29c 100644 --- a/apps/updatenotification/l10n/da.js +++ b/apps/updatenotification/l10n/da.js @@ -1,9 +1,14 @@ 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.", "Updater" : "Updater", "A new version is available: %s" : "Der er en ny version tligængelig: %s", - "Update channel:" : "Opdatér kanal:" + "Open updater" : "Åbn for opdatering", + "Your version is up to date." : "Du har seneste version.", + "Checked on %s" : "Tjekket per %s", + "Update channel:" : "Opdatér kanal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kan altid opdatere til en nyere version / eksperimentel kanal. Men du kan aldrig nedgradere til en mere stabil kanal" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/da.json b/apps/updatenotification/l10n/da.json index 0d59d404f55..7f9dd1888bc 100644 --- a/apps/updatenotification/l10n/da.json +++ b/apps/updatenotification/l10n/da.json @@ -1,7 +1,12 @@ { "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.", "Updater" : "Updater", "A new version is available: %s" : "Der er en ny version tligængelig: %s", - "Update channel:" : "Opdatér kanal:" + "Open updater" : "Åbn for opdatering", + "Your version is up to date." : "Du har seneste version.", + "Checked on %s" : "Tjekket per %s", + "Update channel:" : "Opdatér kanal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kan altid opdatere til en nyere version / eksperimentel kanal. Men du kan aldrig nedgradere til en mere stabil kanal" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/de.js b/apps/updatenotification/l10n/de.js index 3cd825bff94..6b940024e18 100644 --- a/apps/updatenotification/l10n/de.js +++ b/apps/updatenotification/l10n/de.js @@ -9,6 +9,6 @@ OC.L10N.register( "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 stabiliere 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 updaten / experimentelle Version, aber kein Downgrade auf eine stabilere Version durchführen." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/de.json b/apps/updatenotification/l10n/de.json index 566a33d9ba6..05965dbcb68 100644 --- a/apps/updatenotification/l10n/de.json +++ b/apps/updatenotification/l10n/de.json @@ -7,6 +7,6 @@ "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 stabiliere 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 updaten / experimentelle Version, aber kein Downgrade auf eine stabilere Version 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 63cfea77fdc..4d06cae7060 100644 --- a/apps/updatenotification/l10n/de_DE.js +++ b/apps/updatenotification/l10n/de_DE.js @@ -8,6 +8,7 @@ OC.L10N.register( "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:" + "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." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/de_DE.json b/apps/updatenotification/l10n/de_DE.json index 03cc71ef26e..ea4f0dd8807 100644 --- a/apps/updatenotification/l10n/de_DE.json +++ b/apps/updatenotification/l10n/de_DE.json @@ -6,6 +6,7 @@ "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:" + "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." },"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 2ec6d67cbd5..4852da01df9 100644 --- a/apps/updatenotification/l10n/el.js +++ b/apps/updatenotification/l10n/el.js @@ -1,6 +1,7 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "Ενημερωμένο κανάλι", "{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.", "Updater" : "Εφαρμογή Ενημέρωσης", "A new version is available: %s" : "Μία νέα έκδοση είναι διαθέσιμη: %s", diff --git a/apps/updatenotification/l10n/el.json b/apps/updatenotification/l10n/el.json index a5228e7e1c9..0eff5d2857a 100644 --- a/apps/updatenotification/l10n/el.json +++ b/apps/updatenotification/l10n/el.json @@ -1,4 +1,5 @@ { "translations": { + "Updated channel" : "Ενημερωμένο κανάλι", "{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.", "Updater" : "Εφαρμογή Ενημέρωσης", "A new version is available: %s" : "Μία νέα έκδοση είναι διαθέσιμη: %s", diff --git a/apps/updatenotification/l10n/tr.js b/apps/updatenotification/l10n/tr.js index 26b00321924..036cedb6fb6 100644 --- a/apps/updatenotification/l10n/tr.js +++ b/apps/updatenotification/l10n/tr.js @@ -1,9 +1,13 @@ 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.", "Updater" : "Güncelleyici", "A new version is available: %s" : "Yeni bir sürüm mevcut: %s", + "Open updater" : "Güncelleyiciyi aç", + "Your version is up to date." : "Sürümünüz güncel.", + "Checked on %s" : "Son denetlenme: %s", "Update channel:" : "Güncelleme kanalı:", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Her zaman yeni / deneysel bir sürüme güncelleyebilirsiniz, ancak daha düşük bir kararlı sürüme düşüremezsiniz." }, diff --git a/apps/updatenotification/l10n/tr.json b/apps/updatenotification/l10n/tr.json index 07f42475269..a7523e3472b 100644 --- a/apps/updatenotification/l10n/tr.json +++ b/apps/updatenotification/l10n/tr.json @@ -1,7 +1,11 @@ { "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.", "Updater" : "Güncelleyici", "A new version is available: %s" : "Yeni bir sürüm mevcut: %s", + "Open updater" : "Güncelleyiciyi aç", + "Your version is up to date." : "Sürümünüz güncel.", + "Checked on %s" : "Son denetlenme: %s", "Update channel:" : "Güncelleme kanalı:", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Her zaman yeni / deneysel bir sürüme güncelleyebilirsiniz, ancak daha düşük bir kararlı sürüme düşüremezsiniz." },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css index db24588f761..c99efc48c5b 100644 --- a/apps/user_ldap/css/settings.css +++ b/apps/user_ldap/css/settings.css @@ -208,3 +208,21 @@ select[multiple=multiple] + button { position: absolute; left: -2000px; } + +#ldapSettings { + background-color: white; + padding: 0; +} + +#ldapSettings > fieldset { + background-color: white; +} + +#ldapSettings ul.ui-tabs-nav .ui-tabs-active, +#ldapSettings ul.ui-tabs-nav .ui-tabs-active > a { + background-color: white; +} + +#ldapSettings div.ui-accordion-content { + background: white; +} diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js index c01d3efa018..055fe44d504 100644 --- a/apps/user_ldap/l10n/da.js +++ b/apps/user_ldap/l10n/da.js @@ -24,6 +24,7 @@ OC.L10N.register( "Could not detect Base DN, please enter it manually." : "Kunne ikke registrere Base DN - angiv den venligst manuelt.", "{nthServer}. Server" : "{nthServer}. server", "No object found in the given Base DN. Please revise." : "Intet objekt fundet i den givne Base DN. Gennemse venligst.", + "More than 1,000 directory entries available." : "Mere end 1.000 mappeposter", " entries available within the provided Base DN" : "poster tilgængelige inden for det angivne Base DN.", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Der opstod en fejl. Tjek venligst Base DN, såvel som forbindelsesindstillingerne og brugeroplysningerne.", "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?", diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json index db61541ef73..c3d2ba6abbf 100644 --- a/apps/user_ldap/l10n/da.json +++ b/apps/user_ldap/l10n/da.json @@ -22,6 +22,7 @@ "Could not detect Base DN, please enter it manually." : "Kunne ikke registrere Base DN - angiv den venligst manuelt.", "{nthServer}. Server" : "{nthServer}. server", "No object found in the given Base DN. Please revise." : "Intet objekt fundet i den givne Base DN. Gennemse venligst.", + "More than 1,000 directory entries available." : "Mere end 1.000 mappeposter", " entries available within the provided Base DN" : "poster tilgængelige inden for det angivne Base DN.", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Der opstod en fejl. Tjek venligst Base DN, såvel som forbindelsesindstillingerne og brugeroplysningerne.", "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?", diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js index 431f99a87e7..8e185d3806d 100644 --- a/apps/user_ldap/l10n/de.js +++ b/apps/user_ldap/l10n/de.js @@ -134,7 +134,7 @@ OC.L10N.register( "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile", "Group Search Attributes" : "Gruppensucheigenschaften", "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer", - "Dynamic Group Member URL" : "Dynamische Gruppen Mitglied URL", + "Dynamic Group Member URL" : "Dynamische Gruppenmitglied URL", "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "Ein LDAP-Attribut von Gruppenobjekten, das eine LDAP Such-URL enthält die festlegt welche Objekte zu der Gruppe gehören. (Ein leeres Feld deaktiviert die Funktion \"Dynamisch Gruppenzugehörigkeit\".)", "Nested Groups" : "Eingebundene Gruppen", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)", diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json index 3e03d9b7294..7ce59debdec 100644 --- a/apps/user_ldap/l10n/de.json +++ b/apps/user_ldap/l10n/de.json @@ -132,7 +132,7 @@ "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile", "Group Search Attributes" : "Gruppensucheigenschaften", "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer", - "Dynamic Group Member URL" : "Dynamische Gruppen Mitglied URL", + "Dynamic Group Member URL" : "Dynamische Gruppenmitglied URL", "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "Ein LDAP-Attribut von Gruppenobjekten, das eine LDAP Such-URL enthält die festlegt welche Objekte zu der Gruppe gehören. (Ein leeres Feld deaktiviert die Funktion \"Dynamisch Gruppenzugehörigkeit\".)", "Nested Groups" : "Eingebundene Gruppen", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)", diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index b72b41ea293..87ec6ba222a 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -122,6 +122,8 @@ OC.L10N.register( "Directory Settings" : "Ordnereinstellungen", "User Display Name Field" : "Feld für den Anzeigenamen des Benutzers", "The LDAP attribute to use to generate the user's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.", + "2nd User Display Name Field" : "2. Benutzeranzeigename Feld", + "Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«." : "Optional. Ein hinzuzufügendes LDAP-Attribut um den Namen in Klammern anzuzeigen. Beispiel: »John Doe (john.doe@example.org)«.", "Base User Tree" : "Basis-Benutzerbaum", "One User Base DN per line" : "Ein Benutzer Basis-DN pro Zeile", "User Search Attributes" : "Benutzersucheigenschaften", @@ -132,6 +134,8 @@ OC.L10N.register( "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile", "Group Search Attributes" : "Gruppensucheigenschaften", "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer", + "Dynamic Group Member URL" : "Dynamische Gruppenmitglied URL", + "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "Ein LDAP-Attribut von Gruppenobjekten, das eine LDAP Such-URL enthält die festlegt welche Objekte zu der Gruppe gehören. (Ein leeres Feld deaktiviert die Funktion \"Dynamisch Gruppenzugehörigkeit\".)", "Nested Groups" : "Eingebundene Gruppen", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)", "Paging chunksize" : "Seitenstücke (Paging chunksize)", diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index 58ccaa400c9..f345ba52c2c 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -120,6 +120,8 @@ "Directory Settings" : "Ordnereinstellungen", "User Display Name Field" : "Feld für den Anzeigenamen des Benutzers", "The LDAP attribute to use to generate the user's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.", + "2nd User Display Name Field" : "2. Benutzeranzeigename Feld", + "Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«." : "Optional. Ein hinzuzufügendes LDAP-Attribut um den Namen in Klammern anzuzeigen. Beispiel: »John Doe (john.doe@example.org)«.", "Base User Tree" : "Basis-Benutzerbaum", "One User Base DN per line" : "Ein Benutzer Basis-DN pro Zeile", "User Search Attributes" : "Benutzersucheigenschaften", @@ -130,6 +132,8 @@ "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile", "Group Search Attributes" : "Gruppensucheigenschaften", "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer", + "Dynamic Group Member URL" : "Dynamische Gruppenmitglied URL", + "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "Ein LDAP-Attribut von Gruppenobjekten, das eine LDAP Such-URL enthält die festlegt welche Objekte zu der Gruppe gehören. (Ein leeres Feld deaktiviert die Funktion \"Dynamisch Gruppenzugehörigkeit\".)", "Nested Groups" : "Eingebundene Gruppen", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)", "Paging chunksize" : "Seitenstücke (Paging chunksize)", diff --git a/apps/user_ldap/l10n/fil.js b/apps/user_ldap/l10n/fil.js index db848ae4c2c..ef3eeaef0cf 100644 --- a/apps/user_ldap/l10n/fil.js +++ b/apps/user_ldap/l10n/fil.js @@ -1,6 +1,7 @@ OC.L10N.register( "user_ldap", { + "Help" : "Tulong", "Password" : "Password" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/user_ldap/l10n/fil.json b/apps/user_ldap/l10n/fil.json index b60f17590ba..d31ca17d01c 100644 --- a/apps/user_ldap/l10n/fil.json +++ b/apps/user_ldap/l10n/fil.json @@ -1,4 +1,5 @@ { "translations": { + "Help" : "Tulong", "Password" : "Password" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/user_ldap/l10n/is.js b/apps/user_ldap/l10n/is.js index 231875d07f9..b158b796056 100644 --- a/apps/user_ldap/l10n/is.js +++ b/apps/user_ldap/l10n/is.js @@ -1,15 +1,41 @@ OC.L10N.register( "user_ldap", { + "No action specified" : "Engin aðgerð tiltekin", + "No data specified" : "Engin gögn tiltekin", + "Action does not exist" : "Aðgerð er ekki til", + "Configuration incorrect" : "Röng uppsetning", + "Configuration OK" : "Stillingar eru í lagi", + "Select groups" : "Veldu hópa", + "{nthServer}. Server" : "{nthServer}. Þjónn", + "Confirm Deletion" : "Staðfesta eyðingu", + "Select attributes" : "Veldu eigindi", + "_%s group found_::_%s groups found_" : ["%s hópur fannst","%s hópar fundust"], + "_%s user found_::_%s users found_" : ["%s notandi fannst","%s notendur fundust"], + "Invalid Host" : "Ógild vél", "Server" : "Þjónn", "Users" : "Notendur", + "Login Attributes" : "Eigindi innskráningar", "Groups" : "Hópar", "Test Configuration" : "Prúfa uppsetningu", "Help" : "Hjálp", - "Host" : "Netþjónn", + "Search groups" : "Leita í hópum", + "Available groups" : "Tiltækir hópar", + "Selected groups" : "Valdir hópar", + "Verify settings" : "Sannprófa stillingar", + "1. Server" : "1. Þjónn", + "%s. Server:" : "%s. Þjónn:", + "Host" : "Hýsill", "Port" : "Gátt", + "Detect Port" : "Finna gátt", "Password" : "Lykilorð", + "Saving" : "Vistun", + "Back" : "Til baka", "Continue" : "Halda áfram", - "Advanced" : "Ítarlegt" + "LDAP" : "LDAP", + "Expert" : "Snillingur", + "Advanced" : "Ítarlegt", + "Connection Settings" : "Valkostir tengingar ", + "in bytes" : "í bætum" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/user_ldap/l10n/is.json b/apps/user_ldap/l10n/is.json index ac8cdeb9ad3..3c049382900 100644 --- a/apps/user_ldap/l10n/is.json +++ b/apps/user_ldap/l10n/is.json @@ -1,13 +1,39 @@ { "translations": { + "No action specified" : "Engin aðgerð tiltekin", + "No data specified" : "Engin gögn tiltekin", + "Action does not exist" : "Aðgerð er ekki til", + "Configuration incorrect" : "Röng uppsetning", + "Configuration OK" : "Stillingar eru í lagi", + "Select groups" : "Veldu hópa", + "{nthServer}. Server" : "{nthServer}. Þjónn", + "Confirm Deletion" : "Staðfesta eyðingu", + "Select attributes" : "Veldu eigindi", + "_%s group found_::_%s groups found_" : ["%s hópur fannst","%s hópar fundust"], + "_%s user found_::_%s users found_" : ["%s notandi fannst","%s notendur fundust"], + "Invalid Host" : "Ógild vél", "Server" : "Þjónn", "Users" : "Notendur", + "Login Attributes" : "Eigindi innskráningar", "Groups" : "Hópar", "Test Configuration" : "Prúfa uppsetningu", "Help" : "Hjálp", - "Host" : "Netþjónn", + "Search groups" : "Leita í hópum", + "Available groups" : "Tiltækir hópar", + "Selected groups" : "Valdir hópar", + "Verify settings" : "Sannprófa stillingar", + "1. Server" : "1. Þjónn", + "%s. Server:" : "%s. Þjónn:", + "Host" : "Hýsill", "Port" : "Gátt", + "Detect Port" : "Finna gátt", "Password" : "Lykilorð", + "Saving" : "Vistun", + "Back" : "Til baka", "Continue" : "Halda áfram", - "Advanced" : "Ítarlegt" + "LDAP" : "LDAP", + "Expert" : "Snillingur", + "Advanced" : "Ítarlegt", + "Connection Settings" : "Valkostir tengingar ", + "in bytes" : "í bætum" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js index 0fd05945d55..e359ae585a8 100644 --- a/apps/user_ldap/l10n/sl.js +++ b/apps/user_ldap/l10n/sl.js @@ -12,6 +12,7 @@ OC.L10N.register( "No data specified" : "Ni navedenih podatkov", " 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", "Configuration incorrect" : "Nastavitev ni ustrezna", "Configuration incomplete" : "Nastavitev je nepopolna", "Configuration OK" : "Nastavitev je ustrezna", diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json index 2e1501e1e54..bb7586eed7c 100644 --- a/apps/user_ldap/l10n/sl.json +++ b/apps/user_ldap/l10n/sl.json @@ -10,6 +10,7 @@ "No data specified" : "Ni navedenih podatkov", " 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", "Configuration incorrect" : "Nastavitev ni ustrezna", "Configuration incomplete" : "Nastavitev je nepopolna", "Configuration OK" : "Nastavitev je ustrezna", diff --git a/apps/user_ldap/l10n/sv.js b/apps/user_ldap/l10n/sv.js index dd75c836333..8ccc9fdb5b5 100644 --- a/apps/user_ldap/l10n/sv.js +++ b/apps/user_ldap/l10n/sv.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Fel vid rensning av mappningar", "Failed to delete the server configuration" : "Misslyckades med att radera serverinställningen", + "The configuration is invalid: anonymous bind is not allowed." : "Denna konfiguration är ogiltig: anonymous bind är ej tillåten.", "The configuration is valid and the connection could be established!" : "Inställningen är giltig och anslutningen kunde upprättas!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation.", "The configuration is invalid. Please have a look at the logs for further details." : "Inställningen är ogiltig. Vänligen se ownCloud-loggen för fler detaljer.", @@ -10,15 +11,38 @@ OC.L10N.register( "No configuration specified" : "Ingen konfiguration har angetts", "No data specified" : "Ingen data har angetts", " 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", "Configuration incorrect" : "Felaktig konfiguration", "Configuration incomplete" : "Konfigurationen är ej komplett", "Configuration OK" : "Konfigurationen är OK", "Select groups" : "Välj grupper", "Select object classes" : "Välj objekt-klasser", + "Please check the credentials, they seem to be wrong." : "Var god kontrollera dina uppgifter, de verkar vara fel.", + "Please specify the port, it could not be auto-detected." : "Var god specificera en port, den kunde ej autodetekteras.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "Grundläggande DN kunde ej autodetekteras, var god dubbelkontrollera dina uppgifter, värd och port.", + "Could not detect Base DN, please enter it manually." : "Kunde ej upptäcka Base DN, var god ange det manuellt.", "{nthServer}. Server" : "{nthServer}. Server", + "No object found in the given Base DN. Please revise." : "Inget objekt funnet i den givna Base DN. Var god granska.", + "More than 1,000 directory entries available." : "Mer än 1,000 katalogposter tillgängliga.", + " entries available within the provided Base DN" : "Poster tillgängliga inom angivet Base DN", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ett fel uppstod. Var god kontrollera Base DN, och även anslutningsinställningar och referenser.", "Do you really want to delete the current Server Configuration?" : "Vill du verkligen radera den nuvarande serverinställningen?", "Confirm Deletion" : "Bekräfta radering", + "Mappings cleared successfully!" : "Rensning av mappningar lyckades!", + "Error while clearing the mappings." : "Fel uppstod under rensning av mappningar", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonymous bind är inte tillåten. Var god ange en Användar-DN och lösenord.", + "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP procedursfel. Anonymous bind tillåts troligtvis inte.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Sparning misslyckades. Var god kontrollera att databasen är verksam. Ladda om innan du fortsätter.", + "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?" : "Byte av läge kommer aktivera automatiska LDAP förfrågningar. Beroende på din LDAP storlek kan de ta ett tag. Vill du fortfarande ändra läge?", + "Mode switch" : "Lägesändring", "Select attributes" : "Välj attribut", + "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Användare inte hittad. Var god kontrollera din inloggnings attribut och användarnamn. Effektivt filter (för att kopiera och klistra in i kommandofönster validering):", + "User found and settings verified." : "Användare hittad och inställnings bekräftade.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Inställningar bekräftade, men inga användare funna. Endast den första kommer kunna logga in. Överväg ett mer begränsat filter.", + "An unspecified error occurred. Please check the settings and the log." : "Ett ospecificerat fel uppstod. Var god kontrollera inställningar och logfilen.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Sökfiltret är ej giltigt, antagligen på grund utav ett syntaxfel så som ojämnat antal öppna och stängda klammrar. Var god granska.", + "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Ett anslutningsfel till LDAP / AD uppstod. Var god granska värd, port och inloggningsuppgifter.", "_%s group found_::_%s groups found_" : ["%s grupp hittad","%s grupper hittade"], "_%s user found_::_%s users found_" : ["%s användare hittad","%s användare hittade"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunde inte upptäcka attributet användarvisningsnamn. Vänligen ange det själv i de avancerade LDAP-inställningarna.", diff --git a/apps/user_ldap/l10n/sv.json b/apps/user_ldap/l10n/sv.json index d71e94b3050..9ed20fbeda0 100644 --- a/apps/user_ldap/l10n/sv.json +++ b/apps/user_ldap/l10n/sv.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Fel vid rensning av mappningar", "Failed to delete the server configuration" : "Misslyckades med att radera serverinställningen", + "The configuration is invalid: anonymous bind is not allowed." : "Denna konfiguration är ogiltig: anonymous bind är ej tillåten.", "The configuration is valid and the connection could be established!" : "Inställningen är giltig och anslutningen kunde upprättas!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation.", "The configuration is invalid. Please have a look at the logs for further details." : "Inställningen är ogiltig. Vänligen se ownCloud-loggen för fler detaljer.", @@ -8,15 +9,38 @@ "No configuration specified" : "Ingen konfiguration har angetts", "No data specified" : "Ingen data har angetts", " 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", "Configuration incorrect" : "Felaktig konfiguration", "Configuration incomplete" : "Konfigurationen är ej komplett", "Configuration OK" : "Konfigurationen är OK", "Select groups" : "Välj grupper", "Select object classes" : "Välj objekt-klasser", + "Please check the credentials, they seem to be wrong." : "Var god kontrollera dina uppgifter, de verkar vara fel.", + "Please specify the port, it could not be auto-detected." : "Var god specificera en port, den kunde ej autodetekteras.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "Grundläggande DN kunde ej autodetekteras, var god dubbelkontrollera dina uppgifter, värd och port.", + "Could not detect Base DN, please enter it manually." : "Kunde ej upptäcka Base DN, var god ange det manuellt.", "{nthServer}. Server" : "{nthServer}. Server", + "No object found in the given Base DN. Please revise." : "Inget objekt funnet i den givna Base DN. Var god granska.", + "More than 1,000 directory entries available." : "Mer än 1,000 katalogposter tillgängliga.", + " entries available within the provided Base DN" : "Poster tillgängliga inom angivet Base DN", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ett fel uppstod. Var god kontrollera Base DN, och även anslutningsinställningar och referenser.", "Do you really want to delete the current Server Configuration?" : "Vill du verkligen radera den nuvarande serverinställningen?", "Confirm Deletion" : "Bekräfta radering", + "Mappings cleared successfully!" : "Rensning av mappningar lyckades!", + "Error while clearing the mappings." : "Fel uppstod under rensning av mappningar", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonymous bind är inte tillåten. Var god ange en Användar-DN och lösenord.", + "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP procedursfel. Anonymous bind tillåts troligtvis inte.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Sparning misslyckades. Var god kontrollera att databasen är verksam. Ladda om innan du fortsätter.", + "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?" : "Byte av läge kommer aktivera automatiska LDAP förfrågningar. Beroende på din LDAP storlek kan de ta ett tag. Vill du fortfarande ändra läge?", + "Mode switch" : "Lägesändring", "Select attributes" : "Välj attribut", + "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Användare inte hittad. Var god kontrollera din inloggnings attribut och användarnamn. Effektivt filter (för att kopiera och klistra in i kommandofönster validering):", + "User found and settings verified." : "Användare hittad och inställnings bekräftade.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Inställningar bekräftade, men inga användare funna. Endast den första kommer kunna logga in. Överväg ett mer begränsat filter.", + "An unspecified error occurred. Please check the settings and the log." : "Ett ospecificerat fel uppstod. Var god kontrollera inställningar och logfilen.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Sökfiltret är ej giltigt, antagligen på grund utav ett syntaxfel så som ojämnat antal öppna och stängda klammrar. Var god granska.", + "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Ett anslutningsfel till LDAP / AD uppstod. Var god granska värd, port och inloggningsuppgifter.", "_%s group found_::_%s groups found_" : ["%s grupp hittad","%s grupper hittade"], "_%s user found_::_%s users found_" : ["%s användare hittad","%s användare hittade"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunde inte upptäcka attributet användarvisningsnamn. Vänligen ange det själv i de avancerade LDAP-inställningarna.", diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php index 9bf505c5c22..23aba0e0d85 100644 --- a/apps/user_ldap/lib/user/user.php +++ b/apps/user_ldap/lib/user/user.php @@ -24,12 +24,12 @@ namespace OCA\user_ldap\lib\user; -use OCA\user_ldap\lib\user\IUserTools; use OCA\user_ldap\lib\Connection; use OCA\user_ldap\lib\FilesystemHelper; use OCA\user_ldap\lib\LogWrapper; use OCP\IAvatarManager; use OCP\IConfig; +use OCP\Image; use OCP\IUserManager; /** @@ -55,7 +55,7 @@ class User { */ protected $fs; /** - * @var \OCP\Image + * @var Image */ protected $image; /** @@ -101,13 +101,13 @@ class User { * LDAP interaction * @param IConfig $config * @param FilesystemHelper $fs - * @param \OCP\Image $image any empty instance + * @param Image $image any empty instance * @param LogWrapper $log * @param IAvatarManager $avatarManager * @param IUserManager $userManager */ public function __construct($username, $dn, IUserTools $access, - IConfig $config, FilesystemHelper $fs, \OCP\Image $image, + IConfig $config, FilesystemHelper $fs, Image $image, LogWrapper $log, IAvatarManager $avatarManager, IUserManager $userManager) { $this->access = $access; @@ -432,7 +432,9 @@ class User { } if(!is_null($email)) { $user = $this->userManager->get($this->uid); - $user->setEMailAddress($email); + if (!is_null($user)) { + $user->setEMailAddress($email); + } } } diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php index fb5deb1897d..4dc57eae6d2 100644 --- a/apps/user_ldap/templates/part.settingcontrols.php +++ b/apps/user_ldap/templates/part.settingcontrols.php @@ -2,9 +2,9 @@ <button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection"> <?php p($l->t('Test Configuration'));?> </button> - <a href="<?php p(\OC::$server->getURLGenerator()->linkToDocs('admin-ldap')); ?>" + <a href="<?php p(link_to_docs('admin-ldap')); ?>" target="_blank" rel="noreferrer"> - <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" + <img src="<?php print_unescaped(image_path('', 'actions/info.png')); ?>" style="height:1.75ex" /> <?php p($l->t('Help'));?> </a> diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php index 19d6de94ebe..4760aa0d8ef 100644 --- a/apps/user_ldap/templates/part.wizardcontrols.php +++ b/apps/user_ldap/templates/part.wizardcontrols.php @@ -8,9 +8,9 @@ <button class="ldap_action_continue" name="ldap_action_continue" type="button"> <?php p($l->t('Continue'));?> </button> - <a href="<?php p(\OC::$server->getURLGenerator()->linkToDocs('admin-ldap')); ?>" + <a href="<?php p(link_to_docs('admin-ldap')); ?>" target="_blank" rel="noreferrer"> - <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" + <img src="<?php print_unescaped(image_path('', 'actions/info.png')); ?>" style="height:1.75ex" /> <span class="ldap_grey"><?php p($l->t('Help'));?></span> </a> diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 23e6d5591a9..bae16691ba0 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -120,5 +120,5 @@ style('user_ldap', 'settings'); </fieldset> </div> <!-- Spinner Template --> - <img class="ldapSpinner hidden" src="<?php p(\OCP\Util::imagePath('core', 'loading.gif')); ?>"> + <img class="ldapSpinner hidden" src="<?php p(image_path('core', 'loading.gif')); ?>"> </form> diff --git a/build/integration/capabilities_features/capabilities.feature b/build/integration/capabilities_features/capabilities.feature index 3c1eb025ec7..500ea0297a6 100644 --- a/build/integration/capabilities_features/capabilities.feature +++ b/build/integration/capabilities_features/capabilities.feature @@ -16,6 +16,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -35,6 +36,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -73,6 +75,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -92,6 +95,7 @@ Feature: capabilities | files_sharing | resharing | EMPTY | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -111,6 +115,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | EMPTY | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -130,6 +135,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | EMPTY | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -150,6 +156,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -170,6 +177,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -190,6 +198,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -212,6 +221,27 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | + | files | bigfilechunking | 1 | + | files | undelete | 1 | + | files | versioning | 1 | + + Scenario: Changing group sharing allowed + Given As an "admin" + And parameter "shareapi_allow_group_sharing" of app "core" is set to "no" + When sending "GET" to "/cloud/capabilities" + Then the HTTP status code should be "200" + And fields of capabilities match with + | capability | path_to_element | value | + | core | pollinterval | 60 | + | core | webdav-root | remote.php/webdav | + | files_sharing | api_enabled | 1 | + | files_sharing | public@@@enabled | 1 | + | files_sharing | public@@@upload | 1 | + | files_sharing | resharing | 1 | + | files_sharing | federation@@@outgoing | 1 | + | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | EMPTY | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php index 91a4265504c..57db3555790 100644 --- a/build/integration/features/bootstrap/CapabilitiesContext.php +++ b/build/integration/features/bootstrap/CapabilitiesContext.php @@ -51,5 +51,6 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext { $this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no'); $this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no'); $this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no'); + $this->modifyServerConfig('core', 'shareapi_allow_group_sharing', 'yes'); } } diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php index b56a1b7d2f6..2ef5f252f11 100644 --- a/build/integration/features/bootstrap/WebDav.php +++ b/build/integration/features/bootstrap/WebDav.php @@ -316,6 +316,20 @@ trait WebDav { } /** + * @When User :user uploads file with content :content to :destination + */ + public function userUploadsAFileWithContentTo($user, $content, $destination) + { + $file = \GuzzleHttp\Stream\Stream::factory($content); + try { + $this->response = $this->makeDavRequest($user, "PUT", $destination, [], $file); + } catch (\GuzzleHttp\Exception\ServerException $e) { + // 4xx and 5xx responses cause an exception + $this->response = $e->getResponse(); + } + } + + /** * @When User :user deletes file :file * @param string $user * @param string $file diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature index ba535e83aab..b9d77120b9c 100644 --- a/build/integration/features/sharing-v1.feature +++ b/build/integration/features/sharing-v1.feature @@ -566,3 +566,107 @@ Feature: sharing | path | welcome.txt | | shareType | 3 | Then share ids should match + + Scenario: Correct webdav share-permissions for owned file + Given user "user0" exists + And User "user0" uploads file with content "foo" to "/tmp.txt" + When as "user0" gets properties of folder "/tmp.txt" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "19" + + Scenario: Correct webdav share-permissions for received file with edit and reshare permissions + Given user "user0" exists + And user "user1" exists + And User "user0" uploads file with content "foo" to "/tmp.txt" + And file "tmp.txt" of user "user0" is shared with user "user1" + When as "user1" gets properties of folder "/tmp.txt" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "19" + + Scenario: Correct webdav share-permissions for received file with edit permissions but no reshare permissions + Given user "user0" exists + And user "user1" exists + And User "user0" uploads file with content "foo" to "/tmp.txt" + And file "tmp.txt" of user "user0" is shared with user "user1" + And As an "user0" + And Updating last share with + | permissions | 3 | + When as "user1" gets properties of folder "/tmp.txt" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "0" + + Scenario: Correct webdav share-permissions for received file with reshare permissions but no edit permissions + Given user "user0" exists + And user "user1" exists + And User "user0" uploads file with content "foo" to "/tmp.txt" + And file "tmp.txt" of user "user0" is shared with user "user1" + And As an "user0" + And Updating last share with + | permissions | 17 | + When as "user1" gets properties of folder "/tmp.txt" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "17" + + Scenario: Correct webdav share-permissions for owned folder + Given user "user0" exists + And user "user0" created a folder "/tmp" + When as "user0" gets properties of folder "/" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "31" + + Scenario: Correct webdav share-permissions for received folder with all permissions + Given user "user0" exists + And user "user1" exists + And user "user0" created a folder "/tmp" + And file "/tmp" of user "user0" is shared with user "user1" + When as "user1" gets properties of folder "/tmp" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "31" + + Scenario: Correct webdav share-permissions for received folder with all permissions but edit + Given user "user0" exists + And user "user1" exists + And user "user0" created a folder "/tmp" + And file "/tmp" of user "user0" is shared with user "user1" + And As an "user0" + And Updating last share with + | permissions | 29 | + When as "user1" gets properties of folder "/tmp" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "29" + + Scenario: Correct webdav share-permissions for received folder with all permissions but create + Given user "user0" exists + And user "user1" exists + And user "user0" created a folder "/tmp" + And file "/tmp" of user "user0" is shared with user "user1" + And As an "user0" + And Updating last share with + | permissions | 27 | + When as "user1" gets properties of folder "/tmp" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "27" + + Scenario: Correct webdav share-permissions for received folder with all permissions but delete + Given user "user0" exists + And user "user1" exists + And user "user0" created a folder "/tmp" + And file "/tmp" of user "user0" is shared with user "user1" + And As an "user0" + And Updating last share with + | permissions | 23 | + When as "user1" gets properties of folder "/tmp" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "23" + + Scenario: Correct webdav share-permissions for received folder with all permissions but share + Given user "user0" exists + And user "user1" exists + And user "user0" created a folder "/tmp" + And file "/tmp" of user "user0" is shared with user "user1" + And As an "user0" + And Updating last share with + | permissions | 15 | + When as "user1" gets properties of folder "/tmp" with + |{http://owncloud.org/ns}share-permissions| + Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "0" diff --git a/composer.json b/composer.json index 21575b5fa60..0f0d0bd3104 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,8 @@ "autoload" : { "psr-4": { "OC\\": "lib/private", + "OC\\Core\\": "core/", + "OC\\Settings\\": "settings/", "OCP\\": "lib/public" } }, diff --git a/core/application.php b/core/Application.php index 30376ee4f2e..30376ee4f2e 100644 --- a/core/application.php +++ b/core/Application.php diff --git a/core/command/app/checkcode.php b/core/Command/App/CheckCode.php index 78f4390e70a..78f4390e70a 100644 --- a/core/command/app/checkcode.php +++ b/core/Command/App/CheckCode.php diff --git a/core/command/app/disable.php b/core/Command/App/Disable.php index 743a78cb88d..743a78cb88d 100644 --- a/core/command/app/disable.php +++ b/core/Command/App/Disable.php diff --git a/core/command/app/enable.php b/core/Command/App/Enable.php index 0f6ce51fe8f..0f6ce51fe8f 100644 --- a/core/command/app/enable.php +++ b/core/Command/App/Enable.php diff --git a/core/command/app/getpath.php b/core/Command/App/GetPath.php index 33a3f64c53d..33a3f64c53d 100644 --- a/core/command/app/getpath.php +++ b/core/Command/App/GetPath.php diff --git a/core/command/app/listapps.php b/core/Command/App/ListApps.php index d7546b3c0c7..d7546b3c0c7 100644 --- a/core/command/app/listapps.php +++ b/core/Command/App/ListApps.php diff --git a/core/command/background/ajax.php b/core/Command/Background/Ajax.php index e9cd1405ebd..e9cd1405ebd 100644 --- a/core/command/background/ajax.php +++ b/core/Command/Background/Ajax.php diff --git a/core/command/background/base.php b/core/Command/Background/Base.php index 48fee818d0a..48fee818d0a 100644 --- a/core/command/background/base.php +++ b/core/Command/Background/Base.php diff --git a/core/command/background/cron.php b/core/Command/Background/Cron.php index 434e88893b2..434e88893b2 100644 --- a/core/command/background/cron.php +++ b/core/Command/Background/Cron.php diff --git a/core/command/background/webcron.php b/core/Command/Background/WebCron.php index 23dbe98e635..23dbe98e635 100644 --- a/core/command/background/webcron.php +++ b/core/Command/Background/WebCron.php diff --git a/core/command/base.php b/core/Command/Base.php index 7538effd74a..7538effd74a 100644 --- a/core/command/base.php +++ b/core/Command/Base.php diff --git a/core/command/check.php b/core/Command/Check.php index c2e92f7a8da..c2e92f7a8da 100644 --- a/core/command/check.php +++ b/core/Command/Check.php diff --git a/core/command/config/app/deleteconfig.php b/core/Command/Config/App/DeleteConfig.php index cccd92ea3d6..cccd92ea3d6 100644 --- a/core/command/config/app/deleteconfig.php +++ b/core/Command/Config/App/DeleteConfig.php diff --git a/core/command/config/app/getconfig.php b/core/Command/Config/App/GetConfig.php index abe71e57d8c..abe71e57d8c 100644 --- a/core/command/config/app/getconfig.php +++ b/core/Command/Config/App/GetConfig.php diff --git a/core/command/config/app/setconfig.php b/core/Command/Config/App/SetConfig.php index 097fde6ba95..097fde6ba95 100644 --- a/core/command/config/app/setconfig.php +++ b/core/Command/Config/App/SetConfig.php diff --git a/core/command/config/import.php b/core/Command/Config/Import.php index 7f1e09d2c95..7f1e09d2c95 100644 --- a/core/command/config/import.php +++ b/core/Command/Config/Import.php diff --git a/core/command/config/listconfigs.php b/core/Command/Config/ListConfigs.php index afebe4c4c07..afebe4c4c07 100644 --- a/core/command/config/listconfigs.php +++ b/core/Command/Config/ListConfigs.php diff --git a/core/command/config/system/deleteconfig.php b/core/Command/Config/System/DeleteConfig.php index 374f5ac69b7..374f5ac69b7 100644 --- a/core/command/config/system/deleteconfig.php +++ b/core/Command/Config/System/DeleteConfig.php diff --git a/core/command/config/system/getconfig.php b/core/Command/Config/System/GetConfig.php index b76474112a0..b76474112a0 100644 --- a/core/command/config/system/getconfig.php +++ b/core/Command/Config/System/GetConfig.php diff --git a/core/command/config/system/setconfig.php b/core/Command/Config/System/SetConfig.php index c7f206b05d1..c7f206b05d1 100644 --- a/core/command/config/system/setconfig.php +++ b/core/Command/Config/System/SetConfig.php diff --git a/core/command/db/converttype.php b/core/Command/Db/ConvertType.php index 864499dcce0..864499dcce0 100644 --- a/core/command/db/converttype.php +++ b/core/Command/Db/ConvertType.php diff --git a/core/command/db/generatechangescript.php b/core/Command/Db/GenerateChangeScript.php index 85436b02d65..85436b02d65 100644 --- a/core/command/db/generatechangescript.php +++ b/core/Command/Db/GenerateChangeScript.php diff --git a/core/command/encryption/changekeystorageroot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php index 801a08b42a8..801a08b42a8 100644 --- a/core/command/encryption/changekeystorageroot.php +++ b/core/Command/Encryption/ChangeKeyStorageRoot.php diff --git a/core/command/encryption/decryptall.php b/core/Command/Encryption/DecryptAll.php index 0a126db5b17..0a126db5b17 100644 --- a/core/command/encryption/decryptall.php +++ b/core/Command/Encryption/DecryptAll.php diff --git a/core/command/encryption/disable.php b/core/Command/Encryption/Disable.php index 0e08a314473..0e08a314473 100644 --- a/core/command/encryption/disable.php +++ b/core/Command/Encryption/Disable.php diff --git a/core/command/encryption/enable.php b/core/Command/Encryption/Enable.php index 273320e6155..273320e6155 100644 --- a/core/command/encryption/enable.php +++ b/core/Command/Encryption/Enable.php diff --git a/core/command/encryption/encryptall.php b/core/Command/Encryption/EncryptAll.php index 02f74a9dea4..02f74a9dea4 100644 --- a/core/command/encryption/encryptall.php +++ b/core/Command/Encryption/EncryptAll.php diff --git a/core/command/encryption/listmodules.php b/core/Command/Encryption/ListModules.php index 9c061b6e764..9c061b6e764 100644 --- a/core/command/encryption/listmodules.php +++ b/core/Command/Encryption/ListModules.php diff --git a/core/command/encryption/setdefaultmodule.php b/core/Command/Encryption/SetDefaultModule.php index e9978536201..e9978536201 100644 --- a/core/command/encryption/setdefaultmodule.php +++ b/core/Command/Encryption/SetDefaultModule.php diff --git a/core/command/encryption/showkeystorageroot.php b/core/Command/Encryption/ShowKeyStorageRoot.php index 402352c4bcf..402352c4bcf 100644 --- a/core/command/encryption/showkeystorageroot.php +++ b/core/Command/Encryption/ShowKeyStorageRoot.php diff --git a/core/command/encryption/status.php b/core/Command/Encryption/Status.php index b97ea8833fa..b97ea8833fa 100644 --- a/core/command/encryption/status.php +++ b/core/Command/Encryption/Status.php diff --git a/core/command/integrity/checkapp.php b/core/Command/Integrity/CheckApp.php index 643af5285b4..643af5285b4 100644 --- a/core/command/integrity/checkapp.php +++ b/core/Command/Integrity/CheckApp.php diff --git a/core/command/integrity/checkcore.php b/core/Command/Integrity/CheckCore.php index 460a78e4da7..460a78e4da7 100644 --- a/core/command/integrity/checkcore.php +++ b/core/Command/Integrity/CheckCore.php diff --git a/core/command/integrity/signapp.php b/core/Command/Integrity/SignApp.php index 53df9619c6d..53df9619c6d 100644 --- a/core/command/integrity/signapp.php +++ b/core/Command/Integrity/SignApp.php diff --git a/core/command/integrity/signcore.php b/core/Command/Integrity/SignCore.php index e5c2de73e00..e5c2de73e00 100644 --- a/core/command/integrity/signcore.php +++ b/core/Command/Integrity/SignCore.php diff --git a/core/command/l10n/createjs.php b/core/Command/L10n/CreateJs.php index c2cfc5d0934..c2cfc5d0934 100644 --- a/core/command/l10n/createjs.php +++ b/core/Command/L10n/CreateJs.php diff --git a/core/command/log/manage.php b/core/Command/Log/Manage.php index 1d65d7ed0d8..1d65d7ed0d8 100644 --- a/core/command/log/manage.php +++ b/core/Command/Log/Manage.php diff --git a/core/command/log/owncloud.php b/core/Command/Log/OwnCloud.php index 7213f6726a2..7213f6726a2 100644 --- a/core/command/log/owncloud.php +++ b/core/Command/Log/OwnCloud.php diff --git a/core/command/maintenance/install.php b/core/Command/Maintenance/Install.php index b1b63b9b3bd..b1b63b9b3bd 100644 --- a/core/command/maintenance/install.php +++ b/core/Command/Maintenance/Install.php diff --git a/core/command/maintenance/mimetype/updatedb.php b/core/Command/Maintenance/Mimetype/UpdateDB.php index 9532f9e1cd9..9532f9e1cd9 100644 --- a/core/command/maintenance/mimetype/updatedb.php +++ b/core/Command/Maintenance/Mimetype/UpdateDB.php diff --git a/core/command/maintenance/mimetype/updatejs.php b/core/Command/Maintenance/Mimetype/UpdateJS.php index a87f50e32de..a87f50e32de 100644 --- a/core/command/maintenance/mimetype/updatejs.php +++ b/core/Command/Maintenance/Mimetype/UpdateJS.php diff --git a/core/command/maintenance/mode.php b/core/Command/Maintenance/Mode.php index 28f4fb2f7f1..28f4fb2f7f1 100644 --- a/core/command/maintenance/mode.php +++ b/core/Command/Maintenance/Mode.php diff --git a/core/command/maintenance/repair.php b/core/Command/Maintenance/Repair.php index 95e2b872227..95e2b872227 100644 --- a/core/command/maintenance/repair.php +++ b/core/Command/Maintenance/Repair.php diff --git a/core/command/maintenance/singleuser.php b/core/Command/Maintenance/SingleUser.php index 2e6f1f136e7..2e6f1f136e7 100644 --- a/core/command/maintenance/singleuser.php +++ b/core/Command/Maintenance/SingleUser.php diff --git a/core/command/security/importcertificate.php b/core/Command/Security/ImportCertificate.php index 6aae7ad1d9f..6aae7ad1d9f 100644 --- a/core/command/security/importcertificate.php +++ b/core/Command/Security/ImportCertificate.php diff --git a/core/command/security/listcertificates.php b/core/Command/Security/ListCertificates.php index 91deb2d340a..91deb2d340a 100644 --- a/core/command/security/listcertificates.php +++ b/core/Command/Security/ListCertificates.php diff --git a/core/command/security/removecertificate.php b/core/Command/Security/RemoveCertificate.php index 68e409aee1c..68e409aee1c 100644 --- a/core/command/security/removecertificate.php +++ b/core/Command/Security/RemoveCertificate.php diff --git a/core/command/status.php b/core/Command/Status.php index 6bc9c28d4d1..6bc9c28d4d1 100644 --- a/core/command/status.php +++ b/core/Command/Status.php diff --git a/core/command/upgrade.php b/core/Command/Upgrade.php index c45984d7a30..cbb1f26f938 100644 --- a/core/command/upgrade.php +++ b/core/Command/Upgrade.php @@ -34,9 +34,11 @@ use OC\Updater; use OCP\IConfig; use OCP\ILogger; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\EventDispatcher\GenericEvent; class Upgrade extends Command { @@ -135,6 +137,34 @@ class Upgrade extends Command { $updater->setSimulateStepEnabled($simulateStepEnabled); $updater->setUpdateStepEnabled($updateStepEnabled); $updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable); + $dispatcher = \OC::$server->getEventDispatcher(); + $progress = new ProgressBar($output); + $progress->setFormat(" %message%\n %current%/%max% [%bar%] %percent:3s%%"); + $listener = function($event) use ($progress, $output) { + if ($event instanceof GenericEvent) { + $message = $event->getSubject(); + if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) { + $output->writeln(' Checking table ' . $message); + } else { + if (strlen($message) > 60) { + $message = substr($message, 0, 57) . '...'; + } + $progress->setMessage($message); + if ($event[0] === 1) { + $output->writeln(''); + $progress->start($event[1]); + } + $progress->setProgress($event[0]); + if ($event[0] === $event[1]) { + $progress->setMessage('Done'); + $progress->finish(); + $output->writeln(''); + } + } + } + }; + $dispatcher->addListener('\OC\DB\Migrator::executeSql', $listener); + $dispatcher->addListener('\OC\DB\Migrator::checkTable', $listener); $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) { $output->writeln('<info>Turned on maintenance mode</info>'); diff --git a/core/command/user/add.php b/core/Command/User/Add.php index 6c7e3a47231..6c7e3a47231 100644 --- a/core/command/user/add.php +++ b/core/Command/User/Add.php diff --git a/core/command/user/delete.php b/core/Command/User/Delete.php index b9a0a0e3950..b9a0a0e3950 100644 --- a/core/command/user/delete.php +++ b/core/Command/User/Delete.php diff --git a/core/command/user/lastseen.php b/core/Command/User/LastSeen.php index 6bb45a87875..6bb45a87875 100644 --- a/core/command/user/lastseen.php +++ b/core/Command/User/LastSeen.php diff --git a/core/command/user/report.php b/core/Command/User/Report.php index df9f7e41620..df9f7e41620 100644 --- a/core/command/user/report.php +++ b/core/Command/User/Report.php diff --git a/core/command/user/resetpassword.php b/core/Command/User/ResetPassword.php index f3f2d5b0630..f3f2d5b0630 100644 --- a/core/command/user/resetpassword.php +++ b/core/Command/User/ResetPassword.php diff --git a/core/controller/avatarcontroller.php b/core/Controller/AvatarController.php index adfe38ab2db..adfe38ab2db 100644 --- a/core/controller/avatarcontroller.php +++ b/core/Controller/AvatarController.php diff --git a/core/controller/lostcontroller.php b/core/Controller/LostController.php index 0e0932b288b..0e0932b288b 100644 --- a/core/controller/lostcontroller.php +++ b/core/Controller/LostController.php diff --git a/core/controller/setupcontroller.php b/core/Controller/SetupController.php index f25c6f39a0b..f25c6f39a0b 100644 --- a/core/controller/setupcontroller.php +++ b/core/Controller/SetupController.php diff --git a/core/controller/usercontroller.php b/core/Controller/UserController.php index 72193761022..72193761022 100644 --- a/core/controller/usercontroller.php +++ b/core/Controller/UserController.php diff --git a/core/tags/controller.php b/core/Tags/Controller.php index 9798a59d56f..9798a59d56f 100644 --- a/core/tags/controller.php +++ b/core/Tags/Controller.php diff --git a/core/ajax/update.php b/core/ajax/update.php index 4d8fe19f168..631a8a7871c 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -26,6 +26,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ +use Symfony\Component\EventDispatcher\GenericEvent; + set_time_limit(0); require_once '../../lib/base.php'; @@ -53,6 +55,18 @@ if (OC::checkUpgrade(false)) { $incompatibleApps = []; $disabledThirdPartyApps = []; + $dispatcher = \OC::$server->getEventDispatcher(); + $dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) { + if ($event instanceof GenericEvent) { + $eventSource->send('success', (string)$l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()])); + } + }); + $dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) { + if ($event instanceof GenericEvent) { + $eventSource->send('success', (string)$l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()])); + } + }); + $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) { $eventSource->send('success', (string)$l->t('Turned on maintenance mode')); }); diff --git a/core/css/apps.css b/core/css/apps.css index de40c40dfc5..79044fbaee5 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -84,7 +84,7 @@ } #app-navigation .collapse { - display: none; /* hide collapse button intially */ + display: none; /* hide collapse button initially */ } #app-navigation .collapsible > .collapse { position: absolute; diff --git a/core/css/styles.css b/core/css/styles.css index a429d55560e..a1dda59a86b 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -177,17 +177,20 @@ body { #emptycontent, .emptycontent { - font-size: 16px; color: #888; text-align: center; margin-top: 100px; /* ie8 */ margin-top: 30vh; width: 100%; } +#emptycontent.emptycontent-search, +.emptycontent.emptycontent-search { + position: static; +} #emptycontent h2, .emptycontent h2 { - font-weight: 600; margin-bottom: 10px; + line-height: 150%; } #emptycontent [class^="icon-"], .emptycontent [class^="icon-"], diff --git a/core/css/update.css b/core/css/update.css new file mode 100644 index 00000000000..b1e086af3fd --- /dev/null +++ b/core/css/update.css @@ -0,0 +1,26 @@ +#update-progress-icon { + height: 32px; + margin: 10px; + background-size: 32px; +} + +#update-progress-message { + margin-bottom: 10px; +} + +.update-show-detailed { + padding: 13px; + display: block; +} + +#body-login .update a.update-show-detailed { + border-bottom: inherit; +} + +#update-progress-detailed { + text-align: left; +} + +#body-login .warning.hidden { + display: none; +}
\ No newline at end of file diff --git a/core/img/actions/upload-white.png b/core/img/actions/upload-white.png Binary files differindex a3b233e8aa6..28693f855d3 100644 --- a/core/img/actions/upload-white.png +++ b/core/img/actions/upload-white.png diff --git a/core/img/actions/upload-white.svg b/core/img/actions/upload-white.svg index 9c54cac5e1e..afc8ca9e5cc 100644 --- a/core/img/actions/upload-white.svg +++ b/core/img/actions/upload-white.svg @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <g transform="translate(0 -1036.4)"> - <path d="m10 1051.4h-4l-1-7h-4l7-7 7 7h-4z" fill="#fff"/> - </g> + <path fill="#fff" d="m8 1-6 6h4v4h4v-4h4zm-6 12v2h12v-2z"/> </svg> diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js index a4373ec82bf..23ddf947719 100644 --- a/core/js/jquery-showpassword.js +++ b/core/js/jquery-showpassword.js @@ -1,6 +1,6 @@ /* * @name Show Password -* @descripton +* @description * @version 1.3 * @requires Jquery 1.5 * diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index d87c234e14e..6ae9cf78a13 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -21,7 +21,7 @@ * This will make the div to jdoe's fitting avatar, with a size of 128px. * * 2. $('.avatardiv').avatar('jdoe'); - * This will make the div to jdoe's fitting avatar. If the div aready has a + * This will make the div to jdoe's fitting avatar. If the div already has a * height, it will be used for the avatars size. Otherwise this plugin will * search for 'size' DOM data, to use for avatar size. If neither are available * it will default to 64px. @@ -117,7 +117,7 @@ var img = new Image(); - // If the new image loads successfull set it. + // If the new image loads successfully set it. img.onload = function() { $div.show(); $div.text(''); diff --git a/core/js/js.js b/core/js/js.js index e90ceaf4e18..598e0dcd185 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -255,7 +255,7 @@ var OC={ * * Examples: * http://example.com => example.com - * https://example.com => exmaple.com + * https://example.com => example.com * http://example.com:8080 => example.com:8080 * * @return {string} host @@ -740,13 +740,23 @@ var OC={ * if an error/auth error status was returned. */ _processAjaxError: function(xhr) { + var self = this; // purposefully aborted request ? - if (xhr.status === 0 && (xhr.statusText === 'abort' || xhr.statusText === 'timeout')) { + // this._userIsNavigatingAway needed to distinguish ajax calls cancelled by navigating away + // from calls cancelled by failed cross-domain ajax due to SSO redirect + if (xhr.status === 0 && (xhr.statusText === 'abort' || xhr.statusText === 'timeout' || self._reloadCalled)) { return; } - if (_.contains([0, 302, 307, 401], xhr.status)) { - OC.reload(); + if (_.contains([0, 302, 303, 307, 401], xhr.status)) { + // sometimes "beforeunload" happens later, so need to defer the reload a bit + setTimeout(function() { + if (!self._userIsNavigatingAway && !self._reloadCalled) { + OC.reload(); + // only call reload once + self._reloadCalled = true; + } + }, 100); } }, @@ -1438,6 +1448,29 @@ function initCore() { $('html').addClass('edge'); } + $(window).on('unload.main', function() { + OC._unloadCalled = true; + }); + $(window).on('beforeunload.main', function() { + // super-trick thanks to http://stackoverflow.com/a/4651049 + // in case another handler displays a confirmation dialog (ex: navigating away + // during an upload), there are two possible outcomes: user clicked "ok" or + // "cancel" + + // first timeout handler is called after unload dialog is closed + setTimeout(function() { + OC._userIsNavigatingAway = true; + + // second timeout event is only called if user cancelled (Chrome), + // but in other browsers it might still be triggered, so need to + // set a higher delay... + setTimeout(function() { + if (!OC._unloadCalled) { + OC._userIsNavigatingAway = false; + } + }, 10000); + },1); + }); $(document).on('ajaxError.main', function( event, request, settings ) { if (settings && settings.allowAuthErrors) { return; @@ -1477,7 +1510,7 @@ function initCore() { initSessionHeartBeat(); } - if(!OC.Util.hasSVGSupport()){ //replace all svg images with png images for browser that dont support svg + if(!OC.Util.hasSVGSupport()){ //replace all svg images with png images for browser that don't support svg OC.Util.replaceSVG(); }else{ SVGSupport.checkMimeType(); diff --git a/core/js/placeholder.js b/core/js/placeholder.js index 5fb5b5b8f80..8eb17b43fa4 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -1,6 +1,8 @@ /** * ownCloud * + * @author John Molakvoæ + * @copyright 2016 John Molakvoæ <fremulon@protonmail.com> * @author Morris Jobke * @copyright 2013 Morris Jobke <morris.jobke@gmail.com> * @@ -48,16 +50,64 @@ (function ($) { $.fn.imageplaceholder = function(seed, text, size) { - // set optional argument "text" to value of "seed" if undefined text = text || seed; - var hash = md5(seed).substring(0, 4), - maxRange = parseInt('ffff', 16), - hue = parseInt(hash, 16) / maxRange * 256, - height = this.height() || size || 32; - this.css('background-color', 'hsl(' + hue + ', 90%, 65%)'); + var hash = seed.toLowerCase().replace(/[^0-9a-f]+/g, ''); + + // Already a md5 hash? + if( !hash.match(/^[0-9a-f]{32}$/g) ) { + hash = md5(hash); + } + + function rgbToHsl(r, g, b) { + r /= 255, g /= 255, b /= 255; + var max = Math.max(r, g, b), min = Math.min(r, g, b); + var h, s, l = (max + min) / 2; + if(max === min) { + h = s = 0; // achromatic + } else { + var d = max - min; + s = l > 0.5 ? d / (2 - max - min) : d / (max + min); + switch(max) { + case r: h = (g - b) / d + (g < b ? 6 : 0); break; + case g: h = (b - r) / d + 2; break; + case b: h = (r - g) / d + 4; break; + } + h /= 6; + } + return [h, s, l]; + } + + // Init vars + var result = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; + var rgb = [0, 0, 0]; + var sat = 80; + var lum = 68; + var modulo = 16; + + // Splitting evenly the string + for(var i in hash) { + result[i%modulo] = result[i%modulo] + parseInt(hash.charAt(i), 16).toString(); + } + + // Converting our data into a usable rgb format + // Start at 1 because 16%3=1 but 15%3=0 and makes the repartition even + for(var count=1;count<modulo;count++) { + rgb[count%3] += parseInt(result[count]); + } + var hsl = rgbToHsl(rgb[0], rgb[1], rgb[2]); + + // Classic formulla to check the brigtness for our eye + // If too bright, lower the sat + var bright = Math.sqrt( 0.299 * Math.pow(rgb[0], 2) + 0.587 * Math.pow(rgb[1], 2) + 0.114 * Math.pow(rgb[2], 2) ); + if (bright >= 200) { + sat = 60; + } + var hue = parseInt(hsl[0] * 360); + this.css('background-color', 'hsl('+hue+', '+sat+'%, '+lum+'%)'); // Placeholders are square + var height = this.height() || size || 32; this.height(height); this.width(height); diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index e5ef5bb1d6f..56f53caddae 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -238,7 +238,7 @@ ).fail(function() { $loading.addClass('hidden'); $loading.removeClass('inlineblock'); - OC.Notification.show(t('core', 'An error occured. Please try again')); + OC.Notification.show(t('core', 'An error occurred. Please try again')); window.setTimeout(OC.Notification.hide, 5000); }); }, diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index 774c2fdc72f..f18ecbc1a44 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -20,6 +20,15 @@ */ describe('Core base tests', function() { + afterEach(function() { + // many tests call window.initCore so need to unregister global events + // ideally in the future we'll need a window.unloadCore() function + $(document).off('ajaxError.main'); + $(document).off('unload.main'); + $(document).off('beforeunload.main'); + OC._userIsNavigatingAway = false; + OC._reloadCalled = false; + }); describe('Base values', function() { it('Sets webroots', function() { expect(OC.webroot).toBeDefined(); @@ -925,9 +934,10 @@ describe('Core base tests', function() { }); }); describe('global ajax errors', function() { - var reloadStub, ajaxErrorStub; + var reloadStub, ajaxErrorStub, clock; beforeEach(function() { + clock = sinon.useFakeTimers(); reloadStub = sinon.stub(OC, 'reload'); // unstub the error processing method ajaxErrorStub = OC._processAjaxError; @@ -936,15 +946,17 @@ describe('Core base tests', function() { }); afterEach(function() { reloadStub.restore(); - $(document).off('ajaxError'); + clock.restore(); }); - it('reloads current page in case of auth error', function () { + it('reloads current page in case of auth error', function() { var dataProvider = [ [200, false], [400, false], + [0, true], [401, true], [302, true], + [303, true], [307, true] ]; @@ -953,9 +965,13 @@ describe('Core base tests', function() { var expectedCall = dataProvider[i][1]; reloadStub.reset(); + OC._reloadCalled = false; $(document).trigger(new $.Event('ajaxError'), xhr); + // trigger timers + clock.tick(1000); + if (expectedCall) { expect(reloadStub.calledOnce).toEqual(true); } else { @@ -963,6 +979,27 @@ describe('Core base tests', function() { } } }); - }) + it('reload only called once in case of auth error', function() { + var xhr = { status: 401 }; + + $(document).trigger(new $.Event('ajaxError'), xhr); + $(document).trigger(new $.Event('ajaxError'), xhr); + + // trigger timers + clock.tick(1000); + + expect(reloadStub.calledOnce).toEqual(true); + }); + it('does not reload the page if the user was navigating away', function() { + var xhr = { status: 0 }; + OC._userIsNavigatingAway = true; + clock.tick(100); + + $(document).trigger(new $.Event('ajaxError'), xhr); + + clock.tick(1000); + expect(reloadStub.notCalled).toEqual(true); + }); + }); }); diff --git a/core/js/update.js b/core/js/update.js index 77ac1bb20ff..31b97c56894 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -28,38 +28,47 @@ this._started = true; + var self = this; + $(window).on('beforeunload.inprogress', function () { return t('core', 'The upgrade is in progress, leaving this page might interrupt the process in some environments.'); }); - this.addMessage(t( + $('#update-progress-title').html(t( 'core', - 'Updating {productName} to version {version}, this may take a while.', { - productName: options.productName || 'ownCloud', + 'Updating to {version}', { version: options.version - }), - 'bold' - ).append('<br />'); // FIXME: these should be ul/li with CSS paddings! + }) + ); var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php'); updateEventSource.listen('success', function(message) { - $('<span>').append(message).append('<br />').appendTo($el); + self.setMessage(message); }); updateEventSource.listen('notice', function(message) { - $('<span>').addClass('error').append(message).append('<br />').appendTo($el); + self.setPermanentMessage(message); hasWarnings = true; }); updateEventSource.listen('error', function(message) { + $('#update-progress-message').hide(); + $('#update-progress-icon') + .addClass('icon-error-white') + .removeClass('icon-loading-dark'); message = message || t('core', 'An error occurred.'); $(window).off('beforeunload.inprogress'); - $('<span>').addClass('error').append(message).append('<br />').appendTo($el); + self.setErrorMessage(message); message = t('core', 'Please reload the page.'); $('<span>').addClass('error').append('<a href=".">'+message+'</a><br />').appendTo($el); updateEventSource.close(); }); updateEventSource.listen('failure', function(message) { $(window).off('beforeunload.inprogress'); - $('<span>').addClass('error').append(message).append('<br />').appendTo($el); + $('#update-progress-message').hide(); + $('#update-progress-icon') + .addClass('icon-error-white') + .removeClass('icon-loading-dark'); + + self.setErrorMessage(message); var span = $('<span>') .addClass('bold'); if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') { @@ -74,17 +83,23 @@ updateEventSource.listen('done', function() { $(window).off('beforeunload.inprogress'); + $('#update-progress-message').hide(); + + $('#update-progress-icon') + .addClass('icon-checkmark-white') + .removeClass('icon-loading-dark'); + if (hasWarnings) { - $('<span>').addClass('bold') - .append('<br />') - .append(t('core', 'The update was successful. There were warnings.')) - .appendTo($el); + $el.find('.update-show-detailed').before( + $('<span>') + .append('<br />') + .append(t('core', 'The update was successful. There were warnings.')) + ); var message = t('core', 'Please reload the page.'); - $('<span>').append('<br />').append(message).append('<br />').appendTo($el); + $('<span>').append(message).append('<br />').appendTo($el); } else { // FIXME: use product name - $('<span>').addClass('bold') - .append('<br />') + $('<span>') .append(t('core', 'The update was successful. Redirecting you to ownCloud now.')) .appendTo($el); setTimeout(function () { @@ -94,10 +109,33 @@ }); }, - addMessage: function(message, className) { - var $span = $('<span>'); - $span.addClass(className).append(message).append('<br />').appendTo(this.$el); - return $span; + setMessage: function(message) { + $('#update-progress-message').html(message); + $('#update-progress-detailed') + .append($('<span>')) + .append(message) + .append($('<br>')); + }, + + setPermanentMessage: function(message) { + $('#update-progress-message').html(message); + $('#update-progress-message-warnings') + .show() + .append($('<ul>').append(message)); + $('#update-progress-detailed') + .append($('<span>')) + .append(message) + .append($('<br>')); + }, + + setErrorMessage: function (message) { + $('#update-progress-message-error') + .show() + .html(message); + $('#update-progress-detailed') + .append($('<span>')) + .append(message) + .append($('<br>')); } }; @@ -106,13 +144,19 @@ $(document).ready(function() { $('.updateButton').on('click', function() { var $updateEl = $('.update'); - var $progressEl = $('.updateProgress'); + var $progressEl = $('.update-progress'); $progressEl.removeClass('hidden'); $('.updateOverview').addClass('hidden'); + $('#update-progress-message-error').hide(); + $('#update-progress-message-warnings').hide(); OC.Update.start($progressEl, { productName: $updateEl.attr('data-productname'), - version: $updateEl.attr('data-version'), + version: $updateEl.attr('data-version') }); return false; }); + $('.update-show-detailed').on('click', function() { + $('#update-progress-detailed').toggleClass('hidden'); + return false; + }); }); diff --git a/core/l10n/ast.js b/core/l10n/ast.js index 9d51f8bb639..433de1f3fed 100644 --- a/core/l10n/ast.js +++ b/core/l10n/ast.js @@ -118,7 +118,6 @@ OC.L10N.register( "change" : "camudar", "delete" : "desaniciar", "access control" : "control d'accesu", - "An error occured. Please try again" : "Hebo un fallu. Por favor, inténtalo dempués. ", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir con xente d'otros ownClouds usando la sintaxis usuariu@exemplu.com/owncloud", "Warning" : "Avisu", @@ -130,7 +129,6 @@ OC.L10N.register( "Edit tags" : "Editar etiquetes", "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}", "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.", - "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.", "Please reload the page." : "Por favor, recarga la páxina", "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.", "Personal" : "Personal", diff --git a/core/l10n/ast.json b/core/l10n/ast.json index df5ccdb1ae3..4340d13b1ff 100644 --- a/core/l10n/ast.json +++ b/core/l10n/ast.json @@ -116,7 +116,6 @@ "change" : "camudar", "delete" : "desaniciar", "access control" : "control d'accesu", - "An error occured. Please try again" : "Hebo un fallu. Por favor, inténtalo dempués. ", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir con xente d'otros ownClouds usando la sintaxis usuariu@exemplu.com/owncloud", "Warning" : "Avisu", @@ -128,7 +127,6 @@ "Edit tags" : "Editar etiquetes", "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}", "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.", - "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.", "Please reload the page." : "Por favor, recarga la páxina", "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.", "Personal" : "Personal", diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js index de53143a261..dead3eea4b3 100644 --- a/core/l10n/bg_BG.js +++ b/core/l10n/bg_BG.js @@ -142,7 +142,6 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Здравей {name}, времето е {weather}", "Hello {name}" : "Здравейте, {name}", "_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"], - "Updating {productName} to version {version}, this may take a while." : "Обновяване на {productName} към версия {version}. Това може да отнеме време.", "Please reload the page." : "Моля, презаредете страницата.", "The update was unsuccessful. " : "Обновяването бе неуспешно.", "The update was successful. Redirecting you to ownCloud now." : "Обновяването е успешно. Сега Ви пренасочваме към ownCloud.", diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json index 32992bf087f..389127ce58f 100644 --- a/core/l10n/bg_BG.json +++ b/core/l10n/bg_BG.json @@ -140,7 +140,6 @@ "Hello {name}, the weather is {weather}" : "Здравей {name}, времето е {weather}", "Hello {name}" : "Здравейте, {name}", "_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"], - "Updating {productName} to version {version}, this may take a while." : "Обновяване на {productName} към версия {version}. Това може да отнеме време.", "Please reload the page." : "Моля, презаредете страницата.", "The update was unsuccessful. " : "Обновяването бе неуспешно.", "The update was successful. Redirecting you to ownCloud now." : "Обновяването е успешно. Сега Ви пренасочваме към ownCloud.", diff --git a/core/l10n/bs.js b/core/l10n/bs.js index d16438ee25a..e6c64b29d65 100644 --- a/core/l10n/bs.js +++ b/core/l10n/bs.js @@ -130,7 +130,6 @@ OC.L10N.register( "Hello world!" : "Halo svijete!", "sunny" : "sunčan", "Hello {name}, the weather is {weather}" : "Halo {name}, vrijeme je {weather}", - "Updating {productName} to version {version}, this may take a while." : "Ažuriranje {productName} u verziiju {version}, to može potrajati neko vrijeme.", "Please reload the page." : "Molim, ponovno učitajte stranicu", "The update was unsuccessful. " : "Ažuriranje nije uspjelo.", "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Preusmjeravam vas na ownCloud.", diff --git a/core/l10n/bs.json b/core/l10n/bs.json index a04d73a7c25..85bd2e17a80 100644 --- a/core/l10n/bs.json +++ b/core/l10n/bs.json @@ -128,7 +128,6 @@ "Hello world!" : "Halo svijete!", "sunny" : "sunčan", "Hello {name}, the weather is {weather}" : "Halo {name}, vrijeme je {weather}", - "Updating {productName} to version {version}, this may take a while." : "Ažuriranje {productName} u verziiju {version}, to može potrajati neko vrijeme.", "Please reload the page." : "Molim, ponovno učitajte stranicu", "The update was unsuccessful. " : "Ažuriranje nije uspjelo.", "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Preusmjeravam vas na ownCloud.", diff --git a/core/l10n/ca.js b/core/l10n/ca.js index 1ea6bcce1b3..c5029b403cf 100644 --- a/core/l10n/ca.js +++ b/core/l10n/ca.js @@ -141,7 +141,6 @@ OC.L10N.register( "change" : "canvi", "delete" : "elimina", "access control" : "control d'accés", - "An error occured. Please try again" : "Va ocórrer un error. Per favor, intenta-ho de nou", "Share" : "Comparteix", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud", "Warning" : "Avís", @@ -159,7 +158,6 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Hola {name}, el temps és {weather}", "Hello {name}" : "Hola {name}", "_download %n file_::_download %n files_" : ["descarregar l'arxiu %n","descarregar arxius %n "], - "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.", "Please reload the page." : "Carregueu la pàgina de nou.", "The update was unsuccessful. " : "La actualització no ha tingut èxit", "The update was successful. There were warnings." : "La actualització ha estat exitosa. Hi ha alertes.", @@ -226,7 +224,6 @@ OC.L10N.register( "Search" : "Cerca", "Server side authentication failed!" : "L'autenticació del servidor ha fallat!", "Please contact your administrator." : "Contacteu amb l'administrador.", - "An internal error occured." : "S'ha produït un error intern.", "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.", "Log in" : "Inici de sessió", "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?", diff --git a/core/l10n/ca.json b/core/l10n/ca.json index 8101cc326c4..6f1f855be63 100644 --- a/core/l10n/ca.json +++ b/core/l10n/ca.json @@ -139,7 +139,6 @@ "change" : "canvi", "delete" : "elimina", "access control" : "control d'accés", - "An error occured. Please try again" : "Va ocórrer un error. Per favor, intenta-ho de nou", "Share" : "Comparteix", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud", "Warning" : "Avís", @@ -157,7 +156,6 @@ "Hello {name}, the weather is {weather}" : "Hola {name}, el temps és {weather}", "Hello {name}" : "Hola {name}", "_download %n file_::_download %n files_" : ["descarregar l'arxiu %n","descarregar arxius %n "], - "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.", "Please reload the page." : "Carregueu la pàgina de nou.", "The update was unsuccessful. " : "La actualització no ha tingut èxit", "The update was successful. There were warnings." : "La actualització ha estat exitosa. Hi ha alertes.", @@ -224,7 +222,6 @@ "Search" : "Cerca", "Server side authentication failed!" : "L'autenticació del servidor ha fallat!", "Please contact your administrator." : "Contacteu amb l'administrador.", - "An internal error occured." : "S'ha produït un error intern.", "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.", "Log in" : "Inici de sessió", "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?", diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index 51affff4034..75fdb5c7712 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -3,6 +3,8 @@ OC.L10N.register( { "Couldn't send mail to following users: %s " : "Nebylo možné odeslat email následujícím uživatelům: %s", "Preparing update" : "Příprava na aktualizaci", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Kontrola tabulky %s", "Turned on maintenance mode" : "Zapnut režim údržby", "Turned off maintenance mode" : "Vypnut režim údržby", "Maintenance mode is kept active" : "Mód údržby je aktivní", @@ -119,7 +121,7 @@ OC.L10N.register( "Good password" : "Dobré heslo", "Strong password" : "Silné heslo", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Váš webový server ještě není správně nastaven pro umožnění synchronizace souborů, protože rozhraní WebDAV je pravděpodobně rozbité.", - "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Váš webový server není správně nastaven pro rozpoznání \"{url}\". Více informací lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Tento webový server není správně nastaven pro rozpoznání \"{url}\". Více informací lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Tento server nemá funkční připojení k Internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích emailů také nemusí fungovat. Pokud chcete využívat všechny možnosti ownCloud, doporučujeme povolit pro tento server připojení k Internetu.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pokud je dostupná, nakonfigurujte ji prosím pro zlepšení výkonu. Další informace lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP nemá práva pro čtení v /dev/urandom, to je ale z bezpečnostních důvodů velmi doporučováno. Více informací lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.", @@ -169,9 +171,8 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Detaily sdílení pro tuto položku nelze načíst.", "No users or groups found for {search}" : "Nebyli nalezeni žádní členové ani skupiny pro {search}", "No users found for {search}" : "Nebyli nalezeni žádní uživatelé pro {search}", - "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu", "{sharee} (group)" : "{sharee} (skupina)", - "{sharee} (at {server})" : "{sharee} (v {server})", + "{sharee} (at {server})" : "{sharee} (na {server})", "{sharee} (remote)" : "{sharee} (vzdálený)", "Share" : "Sdílet", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud", @@ -203,7 +204,6 @@ OC.L10N.register( "new" : "nový", "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Probíhá aktualizace, opuštění této stránky může v některých prostředích přerušit proces.", - "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.", "An error occurred." : "Došlo k chybě.", "Please reload the page." : "Načtěte stránku znovu, prosím.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Aktualizace nebyla úspěšná. Pro více informací si <a href=\"{url}\">přečtěte komentáře ve fóru</a> pojednávající o tomto problému.", @@ -275,7 +275,6 @@ OC.L10N.register( "Search" : "Hledat", "Server side authentication failed!" : "Autentizace na serveru selhala!", "Please contact your administrator." : "Kontaktujte prosím svého správce systému.", - "An internal error occured." : "Nastala vnitřní chyba.", "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", @@ -302,6 +301,7 @@ OC.L10N.register( "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány. ", "Start update" : "Spustit aktualizaci", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:", + "Detailed logs" : "Podrobné logy", "This %s instance is currently in maintenance mode, which may take a while." : "Tato instalace %s je právě ve stavu údržby a to může chvíli trvat.", "This page will refresh itself when the %s instance is available again." : "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s." }, diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index 6c5312672e5..ef732827965 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -1,6 +1,8 @@ { "translations": { "Couldn't send mail to following users: %s " : "Nebylo možné odeslat email následujícím uživatelům: %s", "Preparing update" : "Příprava na aktualizaci", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Kontrola tabulky %s", "Turned on maintenance mode" : "Zapnut režim údržby", "Turned off maintenance mode" : "Vypnut režim údržby", "Maintenance mode is kept active" : "Mód údržby je aktivní", @@ -117,7 +119,7 @@ "Good password" : "Dobré heslo", "Strong password" : "Silné heslo", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Váš webový server ještě není správně nastaven pro umožnění synchronizace souborů, protože rozhraní WebDAV je pravděpodobně rozbité.", - "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Váš webový server není správně nastaven pro rozpoznání \"{url}\". Více informací lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Tento webový server není správně nastaven pro rozpoznání \"{url}\". Více informací lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Tento server nemá funkční připojení k Internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích emailů také nemusí fungovat. Pokud chcete využívat všechny možnosti ownCloud, doporučujeme povolit pro tento server připojení k Internetu.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pokud je dostupná, nakonfigurujte ji prosím pro zlepšení výkonu. Další informace lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP nemá práva pro čtení v /dev/urandom, to je ale z bezpečnostních důvodů velmi doporučováno. Více informací lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.", @@ -167,9 +169,8 @@ "Share details could not be loaded for this item." : "Detaily sdílení pro tuto položku nelze načíst.", "No users or groups found for {search}" : "Nebyli nalezeni žádní členové ani skupiny pro {search}", "No users found for {search}" : "Nebyli nalezeni žádní uživatelé pro {search}", - "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu", "{sharee} (group)" : "{sharee} (skupina)", - "{sharee} (at {server})" : "{sharee} (v {server})", + "{sharee} (at {server})" : "{sharee} (na {server})", "{sharee} (remote)" : "{sharee} (vzdálený)", "Share" : "Sdílet", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud", @@ -201,7 +202,6 @@ "new" : "nový", "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Probíhá aktualizace, opuštění této stránky může v některých prostředích přerušit proces.", - "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.", "An error occurred." : "Došlo k chybě.", "Please reload the page." : "Načtěte stránku znovu, prosím.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Aktualizace nebyla úspěšná. Pro více informací si <a href=\"{url}\">přečtěte komentáře ve fóru</a> pojednávající o tomto problému.", @@ -273,7 +273,6 @@ "Search" : "Hledat", "Server side authentication failed!" : "Autentizace na serveru selhala!", "Please contact your administrator." : "Kontaktujte prosím svého správce systému.", - "An internal error occured." : "Nastala vnitřní chyba.", "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", @@ -300,6 +299,7 @@ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány. ", "Start update" : "Spustit aktualizaci", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:", + "Detailed logs" : "Podrobné logy", "This %s instance is currently in maintenance mode, which may take a while." : "Tato instalace %s je právě ve stavu údržby a to může chvíli trvat.", "This page will refresh itself when the %s instance is available again." : "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s." },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" diff --git a/core/l10n/da.js b/core/l10n/da.js index 7d2717f5c36..3392f4c187c 100644 --- a/core/l10n/da.js +++ b/core/l10n/da.js @@ -16,6 +16,10 @@ OC.L10N.register( "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s", "Repair warning: " : "Reparationsadvarsel:", "Repair error: " : "Reparationsfejl:", + "Set log level to debug" : "Sæt logningsniveau til fejlfinding", + "Reset log level" : "Nulstil logningsniveau", + "Starting code integrity check" : "Begynder tjek af kodeintegritet", + "Finished code integrity check" : "Fuldførte tjek af kodeintegritet", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (inkombatible)", "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s", @@ -34,6 +38,7 @@ OC.L10N.register( "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt", "Couldn't reset password because the token is expired" : "Kunne ikke nulstille kodeord, da tokenet er udløbet", "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kunne ikke sende e-mail om nulstilling af kodeord, da der ikke er knyttet en e-mail-adresse til dette brugernavn. Kontakt venligst din administrator.", "%s password reset" : "%s adgangskode nulstillet", "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.", "Sunday" : "Søndag", @@ -152,7 +157,6 @@ OC.L10N.register( "delete" : "slet", "access control" : "Adgangskontrol", "Share details could not be loaded for this item." : "Detaljer for deling kunne ikke indlæses for dette element.", - "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen", "Share" : "Del", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud", "Error removing share" : "Fejl ved fjernelse af deling", @@ -175,7 +179,6 @@ OC.L10N.register( "new" : "ny", "_download %n file_::_download %n files_" : ["hent %n fil","hent %n filer"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Opgraderingen er i gang, forlader du denne side kan det afbryde processen.", - "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.", "An error occurred." : "Der opstod en fejl.", "Please reload the page." : "Genindlæs venligst siden", "The update was unsuccessful. " : "Opdateringen blev ikke gennemført.", @@ -245,7 +248,6 @@ OC.L10N.register( "Search" : "Søg", "Server side authentication failed!" : "Server side godkendelse mislykkedes!", "Please contact your administrator." : "Kontakt venligst din administrator", - "An internal error occured." : "Der skete en intern fejl.", "Please try again or contact your administrator." : "Kontakt venligst din administrator.", "Log in" : "Log ind", "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?", diff --git a/core/l10n/da.json b/core/l10n/da.json index f252af58e15..725655913e8 100644 --- a/core/l10n/da.json +++ b/core/l10n/da.json @@ -14,6 +14,10 @@ "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s", "Repair warning: " : "Reparationsadvarsel:", "Repair error: " : "Reparationsfejl:", + "Set log level to debug" : "Sæt logningsniveau til fejlfinding", + "Reset log level" : "Nulstil logningsniveau", + "Starting code integrity check" : "Begynder tjek af kodeintegritet", + "Finished code integrity check" : "Fuldførte tjek af kodeintegritet", "%s (3rdparty)" : "%s (3rdparty)", "%s (incompatible)" : "%s (inkombatible)", "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s", @@ -32,6 +36,7 @@ "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt", "Couldn't reset password because the token is expired" : "Kunne ikke nulstille kodeord, da tokenet er udløbet", "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kunne ikke sende e-mail om nulstilling af kodeord, da der ikke er knyttet en e-mail-adresse til dette brugernavn. Kontakt venligst din administrator.", "%s password reset" : "%s adgangskode nulstillet", "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.", "Sunday" : "Søndag", @@ -150,7 +155,6 @@ "delete" : "slet", "access control" : "Adgangskontrol", "Share details could not be loaded for this item." : "Detaljer for deling kunne ikke indlæses for dette element.", - "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen", "Share" : "Del", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud", "Error removing share" : "Fejl ved fjernelse af deling", @@ -173,7 +177,6 @@ "new" : "ny", "_download %n file_::_download %n files_" : ["hent %n fil","hent %n filer"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Opgraderingen er i gang, forlader du denne side kan det afbryde processen.", - "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.", "An error occurred." : "Der opstod en fejl.", "Please reload the page." : "Genindlæs venligst siden", "The update was unsuccessful. " : "Opdateringen blev ikke gennemført.", @@ -243,7 +246,6 @@ "Search" : "Søg", "Server side authentication failed!" : "Server side godkendelse mislykkedes!", "Please contact your administrator." : "Kontakt venligst din administrator", - "An internal error occured." : "Der skete en intern fejl.", "Please try again or contact your administrator." : "Kontakt venligst din administrator.", "Log in" : "Log ind", "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?", diff --git a/core/l10n/de.js b/core/l10n/de.js index cf384551cd7..2df292c0417 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -3,6 +3,8 @@ OC.L10N.register( { "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s", "Preparing update" : "Update vorbereiten", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Überprüfe Tabelle %s", "Turned on maintenance mode" : "Wartungsmodus eingeschaltet", "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet", "Maintenance mode is kept active" : "Wartungsmodus bleibt aktiviert", @@ -119,10 +121,18 @@ OC.L10N.register( "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Dein Web-Server ist nicht richtig eingerichtet um die folgende URL richtig aufzulösen \"{url}\". Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Du alle Funktionen nutzen möchtest.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP hat keine Leserechte auf /dev/urandom wovon aus Sicherheitsgründen höchst abzuraten ist. Weitere Informationen sind in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a> zu finden.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du verwendest im Moment PHP {version}. Wir empfehlen ein Upgrade deiner PHP Version, um die <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald diese deine Distribution diese unterstützt.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Die Header-Einstellungen des Reverse Proxy sind falsch, oder du versuchst, dich mit ownCloud von einem vertrauten Proxy aus zu verbinden. Solltest du ownCloud nicht von einem vertrauten Proxy aus benutzen wollen, dann stellt die momentane Situation ein Sicherheitsproblem da und erlaubt Hackern, eine für ownCloud sichtbare IP-Adresse zu nutzen. Weitere Informationen findest du in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached ist als distributed cache konfiguriert aber das falsche PHP-Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nur \"memcached\" jedoch nicht \"memcache\". Schau in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki nach beiden Modulen</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Einige Dateien haben die Integritätsprüfung nicht bestanden. Weiterführende Information findest Du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien ...</a> / <a href=\"{rescanEndpoint}\">Erneut analysieren…</a>)", "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "Der \"Strict-Transport-Security\" HTTP-Header ist nicht auf mindestens \"{seconds}\" Sekunden eingestellt. Um die Sicherheit zu erhöhen, empfehlen wir das Aktivieren von HSTS, wie es in den <a href=\"{docUrl}\" rel=\"noreferrer\">Sicherheitshinweisen</a> erläutert ist.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du greifst auf diese Site über HTTP zu. Wir raten dringend dazu, Deinen Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.", "Shared" : "Geteilt", "Shared with {recipients}" : "Geteilt mit {recipients}", @@ -161,7 +171,7 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Details der geteilten Freigabe konnten nicht geladen werden zu diesem Eintrag.", "No users or groups found for {search}" : "Kein Benutzer oder Gruppen gefunden für {search}", "No users found for {search}" : "Kein Benutzer gefunden für {search}", - "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal", + "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -195,7 +205,7 @@ OC.L10N.register( "new" : "neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Update läuft gerade. Das Verlassen dieser Seite könnte den Update Prozess in einigen Umgebungen unterbrechen.", - "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.", + "Updating to {version}" : "Aktualisierung auf {version}", "An error occurred." : "Es ist ein Fehler aufgetreten.", "Please reload the page." : "Bitte lade die Seite neu.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für weitere Informationen <a href=\"{url}\"> schaue bitte in unser Forum </a> um das Problem zu lösen.", @@ -239,6 +249,7 @@ OC.L10N.register( "Trace" : "Spur", "Security warning" : "Sicherheitshinweis", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Informationen zum richtigen Konfigurieren Deines Servers kannst Du der <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">Dokumentation</a> entnehmen.", "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", "Username" : "Benutzername", "Storage & database" : "Speicher & Datenbank", @@ -266,7 +277,7 @@ OC.L10N.register( "Search" : "Suche", "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!", "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.", - "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", + "An internal error occurred." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.", "Log in" : "Anmelden", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", @@ -293,6 +304,7 @@ OC.L10N.register( "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Bitte stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.", "Start update" : "Aktualisierung starten", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen kannst Du stattdessen den folgenden Befehl in Deinem Installationsverzeichnis ausführen:", + "Detailed logs" : "Detaillierte Fehlermeldungen", "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.", "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist." }, diff --git a/core/l10n/de.json b/core/l10n/de.json index 7838275abde..4b20e5cf155 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -1,6 +1,8 @@ { "translations": { "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s", "Preparing update" : "Update vorbereiten", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Überprüfe Tabelle %s", "Turned on maintenance mode" : "Wartungsmodus eingeschaltet", "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet", "Maintenance mode is kept active" : "Wartungsmodus bleibt aktiviert", @@ -117,10 +119,18 @@ "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Dein Web-Server ist nicht richtig eingerichtet um die folgende URL richtig aufzulösen \"{url}\". Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Du alle Funktionen nutzen möchtest.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP hat keine Leserechte auf /dev/urandom wovon aus Sicherheitsgründen höchst abzuraten ist. Weitere Informationen sind in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a> zu finden.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du verwendest im Moment PHP {version}. Wir empfehlen ein Upgrade deiner PHP Version, um die <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald diese deine Distribution diese unterstützt.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Die Header-Einstellungen des Reverse Proxy sind falsch, oder du versuchst, dich mit ownCloud von einem vertrauten Proxy aus zu verbinden. Solltest du ownCloud nicht von einem vertrauten Proxy aus benutzen wollen, dann stellt die momentane Situation ein Sicherheitsproblem da und erlaubt Hackern, eine für ownCloud sichtbare IP-Adresse zu nutzen. Weitere Informationen findest du in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached ist als distributed cache konfiguriert aber das falsche PHP-Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nur \"memcached\" jedoch nicht \"memcache\". Schau in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki nach beiden Modulen</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Einige Dateien haben die Integritätsprüfung nicht bestanden. Weiterführende Information findest Du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien ...</a> / <a href=\"{rescanEndpoint}\">Erneut analysieren…</a>)", "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "Der \"Strict-Transport-Security\" HTTP-Header ist nicht auf mindestens \"{seconds}\" Sekunden eingestellt. Um die Sicherheit zu erhöhen, empfehlen wir das Aktivieren von HSTS, wie es in den <a href=\"{docUrl}\" rel=\"noreferrer\">Sicherheitshinweisen</a> erläutert ist.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du greifst auf diese Site über HTTP zu. Wir raten dringend dazu, Deinen Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.", "Shared" : "Geteilt", "Shared with {recipients}" : "Geteilt mit {recipients}", @@ -159,7 +169,7 @@ "Share details could not be loaded for this item." : "Details der geteilten Freigabe konnten nicht geladen werden zu diesem Eintrag.", "No users or groups found for {search}" : "Kein Benutzer oder Gruppen gefunden für {search}", "No users found for {search}" : "Kein Benutzer gefunden für {search}", - "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal", + "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -193,7 +203,7 @@ "new" : "neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Update läuft gerade. Das Verlassen dieser Seite könnte den Update Prozess in einigen Umgebungen unterbrechen.", - "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.", + "Updating to {version}" : "Aktualisierung auf {version}", "An error occurred." : "Es ist ein Fehler aufgetreten.", "Please reload the page." : "Bitte lade die Seite neu.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für weitere Informationen <a href=\"{url}\"> schaue bitte in unser Forum </a> um das Problem zu lösen.", @@ -237,6 +247,7 @@ "Trace" : "Spur", "Security warning" : "Sicherheitshinweis", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Informationen zum richtigen Konfigurieren Deines Servers kannst Du der <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">Dokumentation</a> entnehmen.", "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", "Username" : "Benutzername", "Storage & database" : "Speicher & Datenbank", @@ -264,7 +275,7 @@ "Search" : "Suche", "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!", "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.", - "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", + "An internal error occurred." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.", "Log in" : "Anmelden", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", @@ -291,6 +302,7 @@ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Bitte stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.", "Start update" : "Aktualisierung starten", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen kannst Du stattdessen den folgenden Befehl in Deinem Installationsverzeichnis ausführen:", + "Detailed logs" : "Detaillierte Fehlermeldungen", "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.", "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 015b3650856..1e9bc073125 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -3,6 +3,8 @@ OC.L10N.register( { "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s", "Preparing update" : "Update vorbereiten", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Überprüfe Tabelle %s", "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ", "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet", "Maintenance mode is kept active" : "Wartungsmodus bleibt aktiviert", @@ -119,10 +121,18 @@ OC.L10N.register( "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Dein Webserver ist nicht richtig konfiguriert um \"{url}\" aufzulösen. Weitere Informationen hierzu finden Sie in unserer a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sie verwenden im Moment PHP {version}. Wir empfehlen ein Upgrade ihrer PHP Version, um die <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald diese ihre Distribution diese unterstützt.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Die Einstellung der Reverse Proxy Kopfzeile is falsch oder Sie greifen über einen gesicherten Proxy auf ownCloud zu. Falls Sie nicht über einen gesicherten Proxy auf ownCloud zugreifen handelt es sich um eine Sicherheitslücke, die es Angreifern erlaubt ihre IP-Adresse ownCloud gegenüber als sichtbar darzustellen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcache ist als verteilter Cache konfiguriert, aber das falsche PHP Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nud \"memcached\" und nicht \"memcache\". Siehe <<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached Wiki über beide Module</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu behen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)", "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für mehr Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\" rel=\"noreferrer\">Sicherheitshinweisen</a> erläutert ist.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sie greifen auf diese Site über HTTP zu. Wir raten dringend dazu, Ihren Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.", "Shared" : "Geteilt", "Shared with {recipients}" : "Geteilt mit {recipients}", @@ -161,7 +171,7 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Die Freigabedetails konnten für dieses Element nicht geladen werden.", "No users or groups found for {search}" : "Keine Benutzer oder Gruppen für {search} gefunden", "No users found for {search}" : "Keine Benutzer für {search} gefunden", - "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", + "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", "{sharee} (group)" : "{sharee} (Gruppe)", "{sharee} (at {server})" : "{sharee} (über {server})", "{sharee} (remote)" : "{sharee} (entfernt)", @@ -195,7 +205,7 @@ OC.L10N.register( "new" : "Neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Upgrade läuft noch , diese Seite zu verlassen könnte das Verfahren in einigen Umgebungen unterbrechen.", - "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.", + "Updating to {version}" : "Aktualisierung auf {version}", "An error occurred." : "Ein Fehler ist aufgetreten.", "Please reload the page." : "Bitte laden Sie die Seite neu.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für mehr Informationen <a href=\"{url}\">lesen Sie unseren Forenbeitrag</a> zu diesem Thema.", @@ -239,6 +249,7 @@ OC.L10N.register( "Trace" : "Ablauf", "Security warning" : "Sicherheitshinweis", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">Dokumentation</a> entnehmen.", "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", "Username" : "Benutzername", "Storage & database" : "Speicher & Datenbank", @@ -266,7 +277,7 @@ OC.L10N.register( "Search" : "Suche", "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!", "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.", - "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", + "An internal error occurred." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.", "Log in" : "Einloggen", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", @@ -293,6 +304,7 @@ OC.L10N.register( "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stellen Sie vor dem Fortsetzen bitte sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.", "Start update" : "Aktualisierung starten", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen können Sie stattdessen den folgenden Befehl in Ihrem Installationsverzeichnis ausführen:", + "Detailed logs" : "Detaillierte Fehlermeldungen", "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.", "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist." }, diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 9bba656171c..7c2afa1d125 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -1,6 +1,8 @@ { "translations": { "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s", "Preparing update" : "Update vorbereiten", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Überprüfe Tabelle %s", "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ", "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet", "Maintenance mode is kept active" : "Wartungsmodus bleibt aktiviert", @@ -117,10 +119,18 @@ "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Dein Webserver ist nicht richtig konfiguriert um \"{url}\" aufzulösen. Weitere Informationen hierzu finden Sie in unserer a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sie verwenden im Moment PHP {version}. Wir empfehlen ein Upgrade ihrer PHP Version, um die <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald diese ihre Distribution diese unterstützt.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Die Einstellung der Reverse Proxy Kopfzeile is falsch oder Sie greifen über einen gesicherten Proxy auf ownCloud zu. Falls Sie nicht über einen gesicherten Proxy auf ownCloud zugreifen handelt es sich um eine Sicherheitslücke, die es Angreifern erlaubt ihre IP-Adresse ownCloud gegenüber als sichtbar darzustellen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcache ist als verteilter Cache konfiguriert, aber das falsche PHP Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nud \"memcached\" und nicht \"memcache\". Siehe <<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached Wiki über beide Module</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu behen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)", "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für mehr Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\" rel=\"noreferrer\">Sicherheitshinweisen</a> erläutert ist.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sie greifen auf diese Site über HTTP zu. Wir raten dringend dazu, Ihren Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.", "Shared" : "Geteilt", "Shared with {recipients}" : "Geteilt mit {recipients}", @@ -159,7 +169,7 @@ "Share details could not be loaded for this item." : "Die Freigabedetails konnten für dieses Element nicht geladen werden.", "No users or groups found for {search}" : "Keine Benutzer oder Gruppen für {search} gefunden", "No users found for {search}" : "Keine Benutzer für {search} gefunden", - "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", + "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", "{sharee} (group)" : "{sharee} (Gruppe)", "{sharee} (at {server})" : "{sharee} (über {server})", "{sharee} (remote)" : "{sharee} (entfernt)", @@ -193,7 +203,7 @@ "new" : "Neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Upgrade läuft noch , diese Seite zu verlassen könnte das Verfahren in einigen Umgebungen unterbrechen.", - "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.", + "Updating to {version}" : "Aktualisierung auf {version}", "An error occurred." : "Ein Fehler ist aufgetreten.", "Please reload the page." : "Bitte laden Sie die Seite neu.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für mehr Informationen <a href=\"{url}\">lesen Sie unseren Forenbeitrag</a> zu diesem Thema.", @@ -237,6 +247,7 @@ "Trace" : "Ablauf", "Security warning" : "Sicherheitshinweis", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">Dokumentation</a> entnehmen.", "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", "Username" : "Benutzername", "Storage & database" : "Speicher & Datenbank", @@ -264,7 +275,7 @@ "Search" : "Suche", "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!", "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.", - "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", + "An internal error occurred." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.", "Log in" : "Einloggen", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", @@ -291,6 +302,7 @@ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stellen Sie vor dem Fortsetzen bitte sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.", "Start update" : "Aktualisierung starten", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen können Sie stattdessen den folgenden Befehl in Ihrem Installationsverzeichnis ausführen:", + "Detailed logs" : "Detaillierte Fehlermeldungen", "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.", "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/core/l10n/el.js b/core/l10n/el.js index 819d97aaa2b..244d26ba90b 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -152,7 +152,6 @@ OC.L10N.register( "delete" : "διαγραφή", "access control" : "έλεγχος πρόσβασης", "Share details could not be loaded for this item." : "Αδυναμία φόρτωσης λεπτομερειών διαμοιρασμού για αυτό το αντικείμενο.", - "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά", "Share" : "Διαμοιρασμός", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud", "Warning" : "Προειδοποίηση", @@ -172,7 +171,6 @@ OC.L10N.register( "Hello {name}" : "Γεια σου {name}", "_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Η αναβάθμιση είναι σε εξέλιξη, αν φύγετε από αυτή τη σελίδα μπορεί να διακοπεί η διαδικασία σε ορισμένα περιβάλλοντα χρήσης.", - "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.", "An error occurred." : "Παρουσιάστηκε σφάλμα", "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.", "The update was unsuccessful. " : "Η ενημέρωση ήταν ανεπιτυχής.", @@ -242,7 +240,6 @@ OC.L10N.register( "Search" : "Αναζήτηση", "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!", "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.", - "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.", "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.", "Log in" : "Είσοδος", "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;", diff --git a/core/l10n/el.json b/core/l10n/el.json index 533ac71cffa..6d371af1670 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -150,7 +150,6 @@ "delete" : "διαγραφή", "access control" : "έλεγχος πρόσβασης", "Share details could not be loaded for this item." : "Αδυναμία φόρτωσης λεπτομερειών διαμοιρασμού για αυτό το αντικείμενο.", - "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά", "Share" : "Διαμοιρασμός", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud", "Warning" : "Προειδοποίηση", @@ -170,7 +169,6 @@ "Hello {name}" : "Γεια σου {name}", "_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Η αναβάθμιση είναι σε εξέλιξη, αν φύγετε από αυτή τη σελίδα μπορεί να διακοπεί η διαδικασία σε ορισμένα περιβάλλοντα χρήσης.", - "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.", "An error occurred." : "Παρουσιάστηκε σφάλμα", "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.", "The update was unsuccessful. " : "Η ενημέρωση ήταν ανεπιτυχής.", @@ -240,7 +238,6 @@ "Search" : "Αναζήτηση", "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!", "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.", - "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.", "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.", "Log in" : "Είσοδος", "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;", diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js index 685bca68822..d97279eee21 100644 --- a/core/l10n/en_GB.js +++ b/core/l10n/en_GB.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "Could not unshare", "Share details could not be loaded for this item." : "Share details could not be loaded for this item.", "No users or groups found for {search}" : "No users or groups found for {search}", - "An error occured. Please try again" : "An error occured. Please try again", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -190,7 +189,6 @@ OC.L10N.register( "new" : "new", "_download %n file_::_download %n files_" : ["download %n file","download %n files"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "The upgrade is in progress, leaving this page might interrupt the process in some environments.", - "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.", "An error occurred." : "An error occurred.", "Please reload the page." : "Please reload the page.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue.", @@ -261,7 +259,6 @@ OC.L10N.register( "Search" : "Search", "Server side authentication failed!" : "Server side authentication failed!", "Please contact your administrator." : "Please contact your administrator.", - "An internal error occured." : "An internal error occured.", "Please try again or contact your administrator." : "Please try again or contact your administrator.", "Log in" : "Log in", "Wrong password. Reset it?" : "Wrong password. Reset it?", diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json index 58bde73515f..a69eb61e966 100644 --- a/core/l10n/en_GB.json +++ b/core/l10n/en_GB.json @@ -158,7 +158,6 @@ "Could not unshare" : "Could not unshare", "Share details could not be loaded for this item." : "Share details could not be loaded for this item.", "No users or groups found for {search}" : "No users or groups found for {search}", - "An error occured. Please try again" : "An error occured. Please try again", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -188,7 +187,6 @@ "new" : "new", "_download %n file_::_download %n files_" : ["download %n file","download %n files"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "The upgrade is in progress, leaving this page might interrupt the process in some environments.", - "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.", "An error occurred." : "An error occurred.", "Please reload the page." : "Please reload the page.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue.", @@ -259,7 +257,6 @@ "Search" : "Search", "Server side authentication failed!" : "Server side authentication failed!", "Please contact your administrator." : "Please contact your administrator.", - "An internal error occured." : "An internal error occured.", "Please try again or contact your administrator." : "Please try again or contact your administrator.", "Log in" : "Log in", "Wrong password. Reset it?" : "Wrong password. Reset it?", diff --git a/core/l10n/eo.js b/core/l10n/eo.js index 0f3901993c4..35daba35a41 100644 --- a/core/l10n/eo.js +++ b/core/l10n/eo.js @@ -118,7 +118,6 @@ OC.L10N.register( "Could not unshare" : "Ne malkunhaveblas", "Share details could not be loaded for this item." : "Kunhavaj detaloj ne ŝargeblis por ĉi tiu ero.", "No users or groups found for {search}" : "Neniu uzanto aŭ grupo troviĝis por {search}", - "An error occured. Please try again" : "Eraro okazis, Bonvolu provi ree.", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (ĉe {server})", "{sharee} (remote)" : "{sharee} (fora)", @@ -196,7 +195,6 @@ OC.L10N.register( "Log out" : "Elsaluti", "Search" : "Serĉi", "Please contact your administrator." : "Bonvolu kontakti vian administranton.", - "An internal error occured." : "Ena eraro okazis.", "Please try again or contact your administrator." : "Bonvolu provi ree aŭ kontakti vian administranton.", "Log in" : "Ensaluti", "Wrong password." : "Malĝusta pasvorto.", diff --git a/core/l10n/eo.json b/core/l10n/eo.json index 6c29a78da12..a1c7bd51dba 100644 --- a/core/l10n/eo.json +++ b/core/l10n/eo.json @@ -116,7 +116,6 @@ "Could not unshare" : "Ne malkunhaveblas", "Share details could not be loaded for this item." : "Kunhavaj detaloj ne ŝargeblis por ĉi tiu ero.", "No users or groups found for {search}" : "Neniu uzanto aŭ grupo troviĝis por {search}", - "An error occured. Please try again" : "Eraro okazis, Bonvolu provi ree.", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (ĉe {server})", "{sharee} (remote)" : "{sharee} (fora)", @@ -194,7 +193,6 @@ "Log out" : "Elsaluti", "Search" : "Serĉi", "Please contact your administrator." : "Bonvolu kontakti vian administranton.", - "An internal error occured." : "Ena eraro okazis.", "Please try again or contact your administrator." : "Bonvolu provi ree aŭ kontakti vian administranton.", "Log in" : "Ensaluti", "Wrong password." : "Malĝusta pasvorto.", diff --git a/core/l10n/es.js b/core/l10n/es.js index d13da491e2b..3bfce05baff 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -160,12 +160,16 @@ OC.L10N.register( "Could not unshare" : "No se puede quitar el comparto", "Share details could not be loaded for this item." : "No se han podido cargar los detalles de compartición para este elemento.", "No users or groups found for {search}" : "No se han encontrado usuarios ni grupos para {search}", - "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.", + "No users found for {search}" : "No se han encontrado usuarios para {search}", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (en {server})", "{sharee} (remote)" : "{sharee} (remoto)", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud", + "Share with users…" : "Compartir con usuarios...", + "Share with users, groups or remote users…" : "Compartir con usuarios, grupos o usuarios remotos...", + "Share with users or groups…" : "Compartir con usuarios o grupos...", + "Share with users or remote users…" : "Compartir con usuarios o usuarios remotos...", "Error removing share" : "Error quitando el comparto", "Warning" : "Precaución", "Error while sending notification" : "Error mientras se enviaba la notificación", @@ -190,7 +194,6 @@ OC.L10N.register( "new" : "Nuevo", "_download %n file_::_download %n files_" : ["descargar %n ficheros","descargar %n archivos"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La actualización está en curso, salir de esta página podrían interrumpir el proceso en algunos entornos.", - "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.", "An error occurred." : "Ocurrió un error.", "Please reload the page." : "Recargue/Actualice la página", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "La actualización tuvo un problema. Para más información <a href=\"{url}\">consulta nuestro artículo del foro</a> para arreglar este problema.", @@ -261,7 +264,6 @@ OC.L10N.register( "Search" : "Buscar", "Server side authentication failed!" : "La autenticación a fallado en el servidor.", "Please contact your administrator." : "Por favor, contacte con el administrador.", - "An internal error occured." : "Un error interno ocurrió.", "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.", "Log in" : "Ingresar", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?", diff --git a/core/l10n/es.json b/core/l10n/es.json index e3ec5a883ef..bde9305000a 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -158,12 +158,16 @@ "Could not unshare" : "No se puede quitar el comparto", "Share details could not be loaded for this item." : "No se han podido cargar los detalles de compartición para este elemento.", "No users or groups found for {search}" : "No se han encontrado usuarios ni grupos para {search}", - "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.", + "No users found for {search}" : "No se han encontrado usuarios para {search}", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (en {server})", "{sharee} (remote)" : "{sharee} (remoto)", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud", + "Share with users…" : "Compartir con usuarios...", + "Share with users, groups or remote users…" : "Compartir con usuarios, grupos o usuarios remotos...", + "Share with users or groups…" : "Compartir con usuarios o grupos...", + "Share with users or remote users…" : "Compartir con usuarios o usuarios remotos...", "Error removing share" : "Error quitando el comparto", "Warning" : "Precaución", "Error while sending notification" : "Error mientras se enviaba la notificación", @@ -188,7 +192,6 @@ "new" : "Nuevo", "_download %n file_::_download %n files_" : ["descargar %n ficheros","descargar %n archivos"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La actualización está en curso, salir de esta página podrían interrumpir el proceso en algunos entornos.", - "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.", "An error occurred." : "Ocurrió un error.", "Please reload the page." : "Recargue/Actualice la página", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "La actualización tuvo un problema. Para más información <a href=\"{url}\">consulta nuestro artículo del foro</a> para arreglar este problema.", @@ -259,7 +262,6 @@ "Search" : "Buscar", "Server side authentication failed!" : "La autenticación a fallado en el servidor.", "Please contact your administrator." : "Por favor, contacte con el administrador.", - "An internal error occured." : "Un error interno ocurrió.", "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.", "Log in" : "Ingresar", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?", diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js index 36028879841..a56be741150 100644 --- a/core/l10n/et_EE.js +++ b/core/l10n/et_EE.js @@ -140,7 +140,6 @@ OC.L10N.register( "delete" : "kustuta", "access control" : "ligipääsukontroll", "Could not unshare" : "Jagamise lõpetamine ebaõnnestus", - "An error occured. Please try again" : "Tekkis tõrge. Palun proovi uuesti", "Share" : "Jaga", "Warning" : "Hoiatus", "Error while sending notification" : "Tõrge teavituse saatmisel", @@ -161,7 +160,6 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Tere {name}, ilm on {weather}", "Hello {name}" : "Tere, {name}", "_download %n file_::_download %n files_" : ["laadi alla %n fail","laadi alla %n faili"], - "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.", "An error occurred." : "Tekkis tõrge.", "Please reload the page." : "Palun laadi see uuesti.", "The update was unsuccessful. " : "Uuendamine ebaõnnestus.", @@ -225,7 +223,6 @@ OC.L10N.register( "Search" : "Otsi", "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!", "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.", - "An internal error occured." : "Tekkis sisemine tõrge.", "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.", "Log in" : "Logi sisse", "Wrong password. Reset it?" : "Vale parool. Kas vajad parooli taastamist?", diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json index b5060fb4a33..88a287c0524 100644 --- a/core/l10n/et_EE.json +++ b/core/l10n/et_EE.json @@ -138,7 +138,6 @@ "delete" : "kustuta", "access control" : "ligipääsukontroll", "Could not unshare" : "Jagamise lõpetamine ebaõnnestus", - "An error occured. Please try again" : "Tekkis tõrge. Palun proovi uuesti", "Share" : "Jaga", "Warning" : "Hoiatus", "Error while sending notification" : "Tõrge teavituse saatmisel", @@ -159,7 +158,6 @@ "Hello {name}, the weather is {weather}" : "Tere {name}, ilm on {weather}", "Hello {name}" : "Tere, {name}", "_download %n file_::_download %n files_" : ["laadi alla %n fail","laadi alla %n faili"], - "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.", "An error occurred." : "Tekkis tõrge.", "Please reload the page." : "Palun laadi see uuesti.", "The update was unsuccessful. " : "Uuendamine ebaõnnestus.", @@ -223,7 +221,6 @@ "Search" : "Otsi", "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!", "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.", - "An internal error occured." : "Tekkis sisemine tõrge.", "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.", "Log in" : "Logi sisse", "Wrong password. Reset it?" : "Vale parool. Kas vajad parooli taastamist?", diff --git a/core/l10n/eu.js b/core/l10n/eu.js index 32bde88b159..2d7b8dc4d34 100644 --- a/core/l10n/eu.js +++ b/core/l10n/eu.js @@ -137,7 +137,6 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Kaixo {name}, eguraldia {weather} da", "Hello {name}" : "Kaixo {name}", "_download %n file_::_download %n files_" : ["%n fitxategia jaitsi","jaitsi %n fitxategiak"], - "Updating {productName} to version {version}, this may take a while." : "Eguneratu {productName} {version} bertsiora, bere denbora behar du.", "An error occurred." : "Errore bat gertatu da.", "Please reload the page." : "Mesedez birkargatu orria.", "The update was unsuccessful. " : "Eguneraketa ongi burutu da.", diff --git a/core/l10n/eu.json b/core/l10n/eu.json index fbb201ddba6..b4a71037e51 100644 --- a/core/l10n/eu.json +++ b/core/l10n/eu.json @@ -135,7 +135,6 @@ "Hello {name}, the weather is {weather}" : "Kaixo {name}, eguraldia {weather} da", "Hello {name}" : "Kaixo {name}", "_download %n file_::_download %n files_" : ["%n fitxategia jaitsi","jaitsi %n fitxategiak"], - "Updating {productName} to version {version}, this may take a while." : "Eguneratu {productName} {version} bertsiora, bere denbora behar du.", "An error occurred." : "Errore bat gertatu da.", "Please reload the page." : "Mesedez birkargatu orria.", "The update was unsuccessful. " : "Eguneraketa ongi burutu da.", diff --git a/core/l10n/fa.js b/core/l10n/fa.js index feea09c8ce1..4af2bc02dad 100644 --- a/core/l10n/fa.js +++ b/core/l10n/fa.js @@ -129,7 +129,6 @@ OC.L10N.register( "change" : "تغییر", "delete" : "پاک کردن", "access control" : "کنترل دسترسی", - "An error occured. Please try again" : "یک خطا رخ داده است، لطفا مجددا تلاش کنید", "Share" : "اشتراکگذاری", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "اشتراکگذاری با دیگر افراد بر روی ownClouds بصورت username@example.com/owncloud", "Warning" : "اخطار", @@ -147,7 +146,6 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "سلام {name}, هوا {weather} است", "Hello {name}" : "سلام {name}", "_download %n file_::_download %n files_" : ["دانلود %n فایل"], - "Updating {productName} to version {version}, this may take a while." : "بروزرسانی {productName} به نسخهی {version}، این عملیات ممکن است زمانبر باشد.", "An error occurred." : "یک خطا رخداده است.", "The update was unsuccessful. " : "بروزرسانی ناموفق بود.", "The update was successful. There were warnings." : "بروزرسانی با موفقیت انجام شد، اخطارهایی وجود دارد.", @@ -205,7 +203,6 @@ OC.L10N.register( "Log out" : "خروج", "Search" : "جستوجو", "Please contact your administrator." : "لطفا با مدیر وبسایت تماس بگیرید.", - "An internal error occured." : "یک خطای داخلی رخ دادهاست.", "Please try again or contact your administrator." : "لطفا مجددا تلاش کنید یا با مدیر سیستم تماس بگیرید.", "Log in" : "ورود", "Alternative Logins" : "ورود متناوب", diff --git a/core/l10n/fa.json b/core/l10n/fa.json index e294bd86a96..5dfce1bd7ef 100644 --- a/core/l10n/fa.json +++ b/core/l10n/fa.json @@ -127,7 +127,6 @@ "change" : "تغییر", "delete" : "پاک کردن", "access control" : "کنترل دسترسی", - "An error occured. Please try again" : "یک خطا رخ داده است، لطفا مجددا تلاش کنید", "Share" : "اشتراکگذاری", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "اشتراکگذاری با دیگر افراد بر روی ownClouds بصورت username@example.com/owncloud", "Warning" : "اخطار", @@ -145,7 +144,6 @@ "Hello {name}, the weather is {weather}" : "سلام {name}, هوا {weather} است", "Hello {name}" : "سلام {name}", "_download %n file_::_download %n files_" : ["دانلود %n فایل"], - "Updating {productName} to version {version}, this may take a while." : "بروزرسانی {productName} به نسخهی {version}، این عملیات ممکن است زمانبر باشد.", "An error occurred." : "یک خطا رخداده است.", "The update was unsuccessful. " : "بروزرسانی ناموفق بود.", "The update was successful. There were warnings." : "بروزرسانی با موفقیت انجام شد، اخطارهایی وجود دارد.", @@ -203,7 +201,6 @@ "Log out" : "خروج", "Search" : "جستوجو", "Please contact your administrator." : "لطفا با مدیر وبسایت تماس بگیرید.", - "An internal error occured." : "یک خطای داخلی رخ دادهاست.", "Please try again or contact your administrator." : "لطفا مجددا تلاش کنید یا با مدیر سیستم تماس بگیرید.", "Log in" : "ورود", "Alternative Logins" : "ورود متناوب", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index 727a64ed871..d3390b8a332 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -3,6 +3,8 @@ OC.L10N.register( { "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s", "Preparing update" : "Valmistellaan päivitystä", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Tarkistetaan taulua %s", "Turned on maintenance mode" : "Siirrytty huoltotilaan", "Turned off maintenance mode" : "Huoltotila asetettu pois päältä", "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena", @@ -161,7 +163,7 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Tämän kohteen jakamistietoja ei voitu ladata.", "No users or groups found for {search}" : "Haulla {search} ei löytynyt käyttäjiä tai ryhmiä", "No users found for {search}" : "Haulla {search} ei löytynyt käyttäjiä", - "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan", + "An error occurred. Please try again" : "Tapahtui virhe, yritä uudelleen", "{sharee} (group)" : "{sharee} (ryhmä)", "{sharee} (at {server})" : "{sharee} (palvelimella {server})", "{sharee} (remote)" : "{sharee} (etä)", @@ -195,7 +197,7 @@ OC.L10N.register( "new" : "uusi", "_download %n file_::_download %n files_" : ["lataa %n tiedosto","lataa %n tiedostoa"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Päivitys on meneillään. Poistuminen tältä sivulta saattaa keskeyttää toimenpiteen joissain käyttöympäristöissä.", - "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.", + "Updating to {version}" : "Päivitetään versioon {version}", "An error occurred." : "Tapahtui virhe.", "Please reload the page." : "Päivitä sivu.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Päivitys epäonnistui. Katso lisätietoja tähän ongelmaan liittyen <a href=\"{url}\">keskustelupalstan viestistä</a>.", @@ -266,7 +268,7 @@ OC.L10N.register( "Search" : "Etsi", "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!", "Please contact your administrator." : "Ota yhteys ylläpitäjään.", - "An internal error occured." : "Tapahtui sisäinen virhe.", + "An internal error occurred." : "Tapahtui sisäinen virhe", "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.", "Log in" : "Kirjaudu sisään", "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?", @@ -293,6 +295,7 @@ OC.L10N.register( "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.", "Start update" : "Käynnistä päivitys", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Välttääksesi aikakatkaisuja suurikokoisten asennusten kanssa, voit suorittaa vaihtoehtoisesti seuraavan komennon asennushakemistossa:", + "Detailed logs" : "Yksityiskohtainen loki", "This %s instance is currently in maintenance mode, which may take a while." : "Tämä %s-instanssi on parhaillaan huoltotilassa, huollossa saattaa kestää hetki.", "This page will refresh itself when the %s instance is available again." : "Tämä sivu päivittää itsensä, kun %s on jälleen käytettävissä." }, diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index afac7060118..df3ee2fe487 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -1,6 +1,8 @@ { "translations": { "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s", "Preparing update" : "Valmistellaan päivitystä", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Tarkistetaan taulua %s", "Turned on maintenance mode" : "Siirrytty huoltotilaan", "Turned off maintenance mode" : "Huoltotila asetettu pois päältä", "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena", @@ -159,7 +161,7 @@ "Share details could not be loaded for this item." : "Tämän kohteen jakamistietoja ei voitu ladata.", "No users or groups found for {search}" : "Haulla {search} ei löytynyt käyttäjiä tai ryhmiä", "No users found for {search}" : "Haulla {search} ei löytynyt käyttäjiä", - "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan", + "An error occurred. Please try again" : "Tapahtui virhe, yritä uudelleen", "{sharee} (group)" : "{sharee} (ryhmä)", "{sharee} (at {server})" : "{sharee} (palvelimella {server})", "{sharee} (remote)" : "{sharee} (etä)", @@ -193,7 +195,7 @@ "new" : "uusi", "_download %n file_::_download %n files_" : ["lataa %n tiedosto","lataa %n tiedostoa"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Päivitys on meneillään. Poistuminen tältä sivulta saattaa keskeyttää toimenpiteen joissain käyttöympäristöissä.", - "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.", + "Updating to {version}" : "Päivitetään versioon {version}", "An error occurred." : "Tapahtui virhe.", "Please reload the page." : "Päivitä sivu.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Päivitys epäonnistui. Katso lisätietoja tähän ongelmaan liittyen <a href=\"{url}\">keskustelupalstan viestistä</a>.", @@ -264,7 +266,7 @@ "Search" : "Etsi", "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!", "Please contact your administrator." : "Ota yhteys ylläpitäjään.", - "An internal error occured." : "Tapahtui sisäinen virhe.", + "An internal error occurred." : "Tapahtui sisäinen virhe", "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.", "Log in" : "Kirjaudu sisään", "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?", @@ -291,6 +293,7 @@ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.", "Start update" : "Käynnistä päivitys", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Välttääksesi aikakatkaisuja suurikokoisten asennusten kanssa, voit suorittaa vaihtoehtoisesti seuraavan komennon asennushakemistossa:", + "Detailed logs" : "Yksityiskohtainen loki", "This %s instance is currently in maintenance mode, which may take a while." : "Tämä %s-instanssi on parhaillaan huoltotilassa, huollossa saattaa kestää hetki.", "This page will refresh itself when the %s instance is available again." : "Tämä sivu päivittää itsensä, kun %s on jälleen käytettävissä." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/core/l10n/fil.js b/core/l10n/fil.js index 24e87b454c0..e5d4867fc67 100644 --- a/core/l10n/fil.js +++ b/core/l10n/fil.js @@ -20,8 +20,15 @@ OC.L10N.register( "October" : "Oktubre", "November" : "Nobyembre", "December" : "Disyembre", + "seconds ago" : "(na) segundo ang nakalipas", + "No" : "Hindi", + "Yes" : "Oo", + "Cancel" : "I-cancel", "Error" : "Error", "Password" : "Password", + "Send" : "Ipadala", + "Share" : "I-share", + "Help" : "Tulong", "Username" : "Username" }, "nplurals=2; plural=(n > 1);"); diff --git a/core/l10n/fil.json b/core/l10n/fil.json index 9a6e99de5c7..72d7df1a617 100644 --- a/core/l10n/fil.json +++ b/core/l10n/fil.json @@ -18,8 +18,15 @@ "October" : "Oktubre", "November" : "Nobyembre", "December" : "Disyembre", + "seconds ago" : "(na) segundo ang nakalipas", + "No" : "Hindi", + "Yes" : "Oo", + "Cancel" : "I-cancel", "Error" : "Error", "Password" : "Password", + "Send" : "Ipadala", + "Share" : "I-share", + "Help" : "Tulong", "Username" : "Username" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 5eec2c1329e..b775d86af07 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Les informations de partage n'ont pu être chargées pour cet élément.", "No users or groups found for {search}" : "Pas d'utilisateur ou de groupe trouvé pour {search}", "No users found for {search}" : "Aucun utilisateur trouvé pour {search}", - "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer", "{sharee} (group)" : "{sharee} (groupe)", "{sharee} (at {server})" : "{sharee} (sur {server})", "{sharee} (remote)" : "{sharee} (distant)", @@ -203,7 +202,6 @@ OC.L10N.register( "new" : "Nouveau ", "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mise à jour est en cours. Selon la configuration, le fait de quitter cette page peut entraîner l'interruption de la procédure.", - "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.", "An error occurred." : "Une erreur est survenue.", "Please reload the page." : "Veuillez recharger la page.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "La mise à jour a échoué. Pour plus d'informations <a href=\"{url}\">consultez notre publication sur le forum</a> à propos de ce problème.", @@ -275,7 +273,6 @@ OC.L10N.register( "Search" : "Rechercher", "Server side authentication failed!" : "L'authentification sur le serveur a échoué !", "Please contact your administrator." : "Veuillez contacter votre administrateur.", - "An internal error occured." : "Une erreur interne est survenue.", "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.", "Log in" : "Se connecter", "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 9e1cc88a906..7f029add357 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Les informations de partage n'ont pu être chargées pour cet élément.", "No users or groups found for {search}" : "Pas d'utilisateur ou de groupe trouvé pour {search}", "No users found for {search}" : "Aucun utilisateur trouvé pour {search}", - "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer", "{sharee} (group)" : "{sharee} (groupe)", "{sharee} (at {server})" : "{sharee} (sur {server})", "{sharee} (remote)" : "{sharee} (distant)", @@ -201,7 +200,6 @@ "new" : "Nouveau ", "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mise à jour est en cours. Selon la configuration, le fait de quitter cette page peut entraîner l'interruption de la procédure.", - "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.", "An error occurred." : "Une erreur est survenue.", "Please reload the page." : "Veuillez recharger la page.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "La mise à jour a échoué. Pour plus d'informations <a href=\"{url}\">consultez notre publication sur le forum</a> à propos de ce problème.", @@ -273,7 +271,6 @@ "Search" : "Rechercher", "Server side authentication failed!" : "L'authentification sur le serveur a échoué !", "Please contact your administrator." : "Veuillez contacter votre administrateur.", - "An internal error occured." : "Une erreur interne est survenue.", "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.", "Log in" : "Se connecter", "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?", diff --git a/core/l10n/gl.js b/core/l10n/gl.js index dc718fd6814..c5b11cb3c23 100644 --- a/core/l10n/gl.js +++ b/core/l10n/gl.js @@ -140,7 +140,6 @@ OC.L10N.register( "change" : "cambio", "delete" : "eliminar", "access control" : "control de acceso", - "An error occured. Please try again" : "Produciuse un erro, ténteo de novo", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»", "Warning" : "Aviso", @@ -158,7 +157,6 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Ola {name}, o tempo é {weather}", "Hello {name}" : "Ola {name}", "_download %n file_::_download %n files_" : ["descargar %n ficheiro","descargar %n ficheiros"], - "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.", "Please reload the page." : "Volva cargar a páxina.", "The update was unsuccessful. " : "Fracasou a actualización.", "The update was successful. There were warnings." : "A actualización realizouse correctamente. Houbo algún aviso.", @@ -225,7 +223,6 @@ OC.L10N.register( "Search" : "Buscar", "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!", "Please contact your administrator." : "Contacte co administrador.", - "An internal error occured." : "Produciuse un erro interno.", "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.", "Log in" : "Acceder", "Alternative Logins" : "Accesos alternativos", diff --git a/core/l10n/gl.json b/core/l10n/gl.json index 9ef26278e30..c96cb55bb11 100644 --- a/core/l10n/gl.json +++ b/core/l10n/gl.json @@ -138,7 +138,6 @@ "change" : "cambio", "delete" : "eliminar", "access control" : "control de acceso", - "An error occured. Please try again" : "Produciuse un erro, ténteo de novo", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»", "Warning" : "Aviso", @@ -156,7 +155,6 @@ "Hello {name}, the weather is {weather}" : "Ola {name}, o tempo é {weather}", "Hello {name}" : "Ola {name}", "_download %n file_::_download %n files_" : ["descargar %n ficheiro","descargar %n ficheiros"], - "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.", "Please reload the page." : "Volva cargar a páxina.", "The update was unsuccessful. " : "Fracasou a actualización.", "The update was successful. There were warnings." : "A actualización realizouse correctamente. Houbo algún aviso.", @@ -223,7 +221,6 @@ "Search" : "Buscar", "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!", "Please contact your administrator." : "Contacte co administrador.", - "An internal error occured." : "Produciuse un erro interno.", "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.", "Log in" : "Acceder", "Alternative Logins" : "Accesos alternativos", diff --git a/core/l10n/he.js b/core/l10n/he.js index 95e330cd42d..80da819cfd5 100644 --- a/core/l10n/he.js +++ b/core/l10n/he.js @@ -161,7 +161,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "לא ניתן היה לטעון מידע שיתוף לפריט זה", "No users or groups found for {search}" : "לא אותרו משתמשים או קבוצות עבור {search}", "No users found for {search}" : "לא אותרו משתמשים עבור {search}", - "An error occured. Please try again" : "אירעה שגיאה. יש לנסות בבקשה שוב", "{sharee} (group)" : "{sharee} (קבוצה)", "{sharee} (at {server})" : "{sharee} (ב- {server})", "{sharee} (remote)" : "{sharee} (מרוחק)", @@ -195,7 +194,6 @@ OC.L10N.register( "new" : "חדש", "_download %n file_::_download %n files_" : ["הורד %n קובץ","הורדו %n קבצים"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "מתבצע עכשיו שדרוג, מעבר מדף זה עלול לפגוע בתהליך בסביבות הפעלה מסויימות.", - "Updating {productName} to version {version}, this may take a while." : "מעדכן {productName} לגרסה {version}, זה יקח זמן מה.", "An error occurred." : "אירעה שגיאה.", "Please reload the page." : "יש להעלות מחדש דף זה.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "העדכון בוצע בהצלחה. למידע נוסף <a href=\"{url}\">ניתן לבדוק בהודעת הפורום שלנו</a> המכסה נושא זו.", @@ -267,7 +265,6 @@ OC.L10N.register( "Search" : "חיפוש", "Server side authentication failed!" : "אימות לצד שרת נכשל!", "Please contact your administrator." : "יש ליצור קשר עם המנהל.", - "An internal error occured." : "שגיאה פנימית אירעה.", "Please try again or contact your administrator." : "יש לנסות שוב ליצור קשר עם המנהל שלך.", "Log in" : "כניסה", "Wrong password. Reset it?" : "סיסמא שגוייה. האם לאפס אותה?", diff --git a/core/l10n/he.json b/core/l10n/he.json index 3c09caf1293..c94b664b4ca 100644 --- a/core/l10n/he.json +++ b/core/l10n/he.json @@ -159,7 +159,6 @@ "Share details could not be loaded for this item." : "לא ניתן היה לטעון מידע שיתוף לפריט זה", "No users or groups found for {search}" : "לא אותרו משתמשים או קבוצות עבור {search}", "No users found for {search}" : "לא אותרו משתמשים עבור {search}", - "An error occured. Please try again" : "אירעה שגיאה. יש לנסות בבקשה שוב", "{sharee} (group)" : "{sharee} (קבוצה)", "{sharee} (at {server})" : "{sharee} (ב- {server})", "{sharee} (remote)" : "{sharee} (מרוחק)", @@ -193,7 +192,6 @@ "new" : "חדש", "_download %n file_::_download %n files_" : ["הורד %n קובץ","הורדו %n קבצים"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "מתבצע עכשיו שדרוג, מעבר מדף זה עלול לפגוע בתהליך בסביבות הפעלה מסויימות.", - "Updating {productName} to version {version}, this may take a while." : "מעדכן {productName} לגרסה {version}, זה יקח זמן מה.", "An error occurred." : "אירעה שגיאה.", "Please reload the page." : "יש להעלות מחדש דף זה.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "העדכון בוצע בהצלחה. למידע נוסף <a href=\"{url}\">ניתן לבדוק בהודעת הפורום שלנו</a> המכסה נושא זו.", @@ -265,7 +263,6 @@ "Search" : "חיפוש", "Server side authentication failed!" : "אימות לצד שרת נכשל!", "Please contact your administrator." : "יש ליצור קשר עם המנהל.", - "An internal error occured." : "שגיאה פנימית אירעה.", "Please try again or contact your administrator." : "יש לנסות שוב ליצור קשר עם המנהל שלך.", "Log in" : "כניסה", "Wrong password. Reset it?" : "סיסמא שגוייה. האם לאפס אותה?", diff --git a/core/l10n/hr.js b/core/l10n/hr.js index 28f2aab5ec5..f571bac4087 100644 --- a/core/l10n/hr.js +++ b/core/l10n/hr.js @@ -120,7 +120,6 @@ OC.L10N.register( "change" : "promijeni", "delete" : "Izbrišite", "access control" : "Kontrola pristupa", - "An error occured. Please try again" : "Dogodila se pogreška. Molimo Vas, pokušajte ponovno. ", "Share" : "Podijelite", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Podijelite sa korisnicima drugoga ownClouda koristeći format korisnickoime@primjer.com/owncloud", "Warning" : "Upozorenje", @@ -138,7 +137,6 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Pozdrav {name}, vrijeme je {weather}", "Hello {name}" : "Pozdrav {name}", "_download %n file_::_download %n files_" : ["preuzimanje %n datoteke","preuzimanje %n datoteke","preuzimanje %n datoteka"], - "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.", "Please reload the page." : "Molimo, ponovno učitajte stranicu", "The update was unsuccessful. " : "Usklađivanje je bilo neuspješno.", "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.", diff --git a/core/l10n/hr.json b/core/l10n/hr.json index ee3111aa419..8c2aa314eb9 100644 --- a/core/l10n/hr.json +++ b/core/l10n/hr.json @@ -118,7 +118,6 @@ "change" : "promijeni", "delete" : "Izbrišite", "access control" : "Kontrola pristupa", - "An error occured. Please try again" : "Dogodila se pogreška. Molimo Vas, pokušajte ponovno. ", "Share" : "Podijelite", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Podijelite sa korisnicima drugoga ownClouda koristeći format korisnickoime@primjer.com/owncloud", "Warning" : "Upozorenje", @@ -136,7 +135,6 @@ "Hello {name}, the weather is {weather}" : "Pozdrav {name}, vrijeme je {weather}", "Hello {name}" : "Pozdrav {name}", "_download %n file_::_download %n files_" : ["preuzimanje %n datoteke","preuzimanje %n datoteke","preuzimanje %n datoteka"], - "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.", "Please reload the page." : "Molimo, ponovno učitajte stranicu", "The update was unsuccessful. " : "Usklađivanje je bilo neuspješno.", "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.", diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js index 91c069baf66..11c46f2814d 100644 --- a/core/l10n/hu_HU.js +++ b/core/l10n/hu_HU.js @@ -159,7 +159,6 @@ OC.L10N.register( "Could not unshare" : "Nem sikerült visszavonni a megosztást", "Share details could not be loaded for this item." : "A megosztás részletei nem lehet betölteni ehhez az elemhez.", "No users or groups found for {search}" : "{search} keresésre nem található felhasználó vagy csoport", - "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!", "{sharee} (group)" : "{sharee} (csoport)", "{sharee} (at {server})" : "{sharee} ({server} szerveren)", "{sharee} (remote)" : "{sharee} (távoli)", @@ -188,7 +187,6 @@ OC.L10N.register( "new" : "új", "_download %n file_::_download %n files_" : ["%n fájl letöltése","%n fájl letöltése"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "A frissítés folyamatban van, az oldal elhagyása néhány környezetben lehet, hogy megszakítja a folyamatot.", - "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.", "An error occurred." : "Hiba történt.", "Please reload the page." : "Kérjük frissítse az oldalt!", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Frissítés sikertelen. Bővebb információért <a href=\"{url}\">keresse fel a fórumunkat</a> a probléma lefedéséért.", @@ -259,7 +257,6 @@ OC.L10N.register( "Search" : "Keresés", "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!", "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.", - "An internal error occured." : "Belső hiba történt.", "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.", "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json index d58601c54dd..4e75c372c14 100644 --- a/core/l10n/hu_HU.json +++ b/core/l10n/hu_HU.json @@ -157,7 +157,6 @@ "Could not unshare" : "Nem sikerült visszavonni a megosztást", "Share details could not be loaded for this item." : "A megosztás részletei nem lehet betölteni ehhez az elemhez.", "No users or groups found for {search}" : "{search} keresésre nem található felhasználó vagy csoport", - "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!", "{sharee} (group)" : "{sharee} (csoport)", "{sharee} (at {server})" : "{sharee} ({server} szerveren)", "{sharee} (remote)" : "{sharee} (távoli)", @@ -186,7 +185,6 @@ "new" : "új", "_download %n file_::_download %n files_" : ["%n fájl letöltése","%n fájl letöltése"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "A frissítés folyamatban van, az oldal elhagyása néhány környezetben lehet, hogy megszakítja a folyamatot.", - "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.", "An error occurred." : "Hiba történt.", "Please reload the page." : "Kérjük frissítse az oldalt!", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Frissítés sikertelen. Bővebb információért <a href=\"{url}\">keresse fel a fórumunkat</a> a probléma lefedéséért.", @@ -257,7 +255,6 @@ "Search" : "Keresés", "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!", "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.", - "An internal error occured." : "Belső hiba történt.", "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.", "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", diff --git a/core/l10n/id.js b/core/l10n/id.js index e9262f22c2a..ceb3186c361 100644 --- a/core/l10n/id.js +++ b/core/l10n/id.js @@ -151,7 +151,6 @@ OC.L10N.register( "delete" : "hapus", "access control" : "kontrol akses", "Share details could not be loaded for this item." : "Rincian berbagi tidak dapat dimuat untuk item ini.", - "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali", "Share" : "Bagikan", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud", "Warning" : "Peringatan", @@ -171,7 +170,6 @@ OC.L10N.register( "Hello {name}" : "Helo {name}", "_download %n file_::_download %n files_" : ["unduh %n berkas"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Pembaruan sedang dalam proses, meninggalkan halaman ini mungkin dapat mengganggu proses di beberapa lingkungan.", - "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.", "An error occurred." : "Terjadi kesalahan.", "Please reload the page." : "Silakan muat ulang halaman.", "The update was unsuccessful. " : "Pembaruan tidak berhasil.", @@ -241,7 +239,6 @@ OC.L10N.register( "Search" : "Cari", "Server side authentication failed!" : "Otentikasi dari sisi server gagal!", "Please contact your administrator." : "Silahkan hubungi administrator anda.", - "An internal error occured." : "Terjadi kesalahan internal.", "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.", "Log in" : "Masuk", "Wrong password. Reset it?" : "Sandi salah. Atur ulang?", diff --git a/core/l10n/id.json b/core/l10n/id.json index 3e6be0a632e..c6c6bae3b45 100644 --- a/core/l10n/id.json +++ b/core/l10n/id.json @@ -149,7 +149,6 @@ "delete" : "hapus", "access control" : "kontrol akses", "Share details could not be loaded for this item." : "Rincian berbagi tidak dapat dimuat untuk item ini.", - "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali", "Share" : "Bagikan", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud", "Warning" : "Peringatan", @@ -169,7 +168,6 @@ "Hello {name}" : "Helo {name}", "_download %n file_::_download %n files_" : ["unduh %n berkas"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Pembaruan sedang dalam proses, meninggalkan halaman ini mungkin dapat mengganggu proses di beberapa lingkungan.", - "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.", "An error occurred." : "Terjadi kesalahan.", "Please reload the page." : "Silakan muat ulang halaman.", "The update was unsuccessful. " : "Pembaruan tidak berhasil.", @@ -239,7 +237,6 @@ "Search" : "Cari", "Server side authentication failed!" : "Otentikasi dari sisi server gagal!", "Please contact your administrator." : "Silahkan hubungi administrator anda.", - "An internal error occured." : "Terjadi kesalahan internal.", "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.", "Log in" : "Masuk", "Wrong password. Reset it?" : "Sandi salah. Atur ulang?", diff --git a/core/l10n/is.js b/core/l10n/is.js index 04ba2851364..52a94f5feb7 100644 --- a/core/l10n/is.js +++ b/core/l10n/is.js @@ -161,7 +161,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Ekki tókst að hlaða inn upplýsingum um sameign varðandi þetta atriði.", "No users or groups found for {search}" : "Engir notendur eða hópar fundust í {search}", "No users found for {search}" : "Engir notendur fundust með {search}", - "An error occured. Please try again" : "Villa kom upp. Endilega reyndu aftur", "{sharee} (group)" : "{sharee} (hópur)", "{sharee} (at {server})" : "{sharee} (á {server})", "{sharee} (remote)" : "{sharee} (fjartengdur)", @@ -195,7 +194,6 @@ OC.L10N.register( "new" : "nýtt", "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.", - "Updating {productName} to version {version}, this may take a while." : "Uppfæri {productName} í útgáfu {version}, þetta getur tekið smá stund.", "An error occurred." : "Villa átti sér stað.", "Please reload the page." : "Þú ættir að hlaða síðunni aftur inn.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Uppfærslan tókst ekki. Til að fá frekari upplýsingar <a href=\"{url}\">skoðaðu færslu á spjallsvæðinu okkar</a> sem fjallar um þetta mál.", @@ -266,7 +264,6 @@ OC.L10N.register( "Search" : "Leita", "Server side authentication failed!" : "Auðkenning af hálfu þjóns tókst ekki!", "Please contact your administrator." : "Hafðu samband við kerfisstjóra.", - "An internal error occured." : "Innri villa kom upp.", "Please try again or contact your administrator." : "Reyndu aftur eða hafðu samband við kerfisstjóra.", "Log in" : "Skrá inn", "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?", diff --git a/core/l10n/is.json b/core/l10n/is.json index 49a0a22dceb..da97530f781 100644 --- a/core/l10n/is.json +++ b/core/l10n/is.json @@ -159,7 +159,6 @@ "Share details could not be loaded for this item." : "Ekki tókst að hlaða inn upplýsingum um sameign varðandi þetta atriði.", "No users or groups found for {search}" : "Engir notendur eða hópar fundust í {search}", "No users found for {search}" : "Engir notendur fundust með {search}", - "An error occured. Please try again" : "Villa kom upp. Endilega reyndu aftur", "{sharee} (group)" : "{sharee} (hópur)", "{sharee} (at {server})" : "{sharee} (á {server})", "{sharee} (remote)" : "{sharee} (fjartengdur)", @@ -193,7 +192,6 @@ "new" : "nýtt", "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.", - "Updating {productName} to version {version}, this may take a while." : "Uppfæri {productName} í útgáfu {version}, þetta getur tekið smá stund.", "An error occurred." : "Villa átti sér stað.", "Please reload the page." : "Þú ættir að hlaða síðunni aftur inn.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Uppfærslan tókst ekki. Til að fá frekari upplýsingar <a href=\"{url}\">skoðaðu færslu á spjallsvæðinu okkar</a> sem fjallar um þetta mál.", @@ -264,7 +262,6 @@ "Search" : "Leita", "Server side authentication failed!" : "Auðkenning af hálfu þjóns tókst ekki!", "Please contact your administrator." : "Hafðu samband við kerfisstjóra.", - "An internal error occured." : "Innri villa kom upp.", "Please try again or contact your administrator." : "Reyndu aftur eða hafðu samband við kerfisstjóra.", "Log in" : "Skrá inn", "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?", diff --git a/core/l10n/it.js b/core/l10n/it.js index 4cf2917d82b..a58412910ac 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -3,6 +3,8 @@ OC.L10N.register( { "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s", "Preparing update" : "Preparazione aggiornamento", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: controllo della tabella %s", "Turned on maintenance mode" : "Modalità di manutenzione attivata", "Turned off maintenance mode" : "Modalità di manutenzione disattivata", "Maintenance mode is kept active" : "La modalità di manutenzione è lasciata attiva", @@ -169,7 +171,7 @@ OC.L10N.register( "Share details could not be loaded for this item." : "I dettagli della condivisione non possono essere caricati per questo elemento.", "No users or groups found for {search}" : "Nessun utente o gruppo trovato per {search}", "No users found for {search}" : "Nessun utente trovato per {search}", - "An error occured. Please try again" : "Si è verificato un errore. Prova ancora", + "An error occurred. Please try again" : "Si è verificato un errore. Prova ancora", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (su {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -203,7 +205,7 @@ OC.L10N.register( "new" : "nuovo", "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "L'aggiornamento è in corso, l'abbandono di questa pagina potrebbe interrompere il processo in alcuni ambienti.", - "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.", + "Updating to {version}" : "Aggiornamento a {version}", "An error occurred." : "Si è verificato un errore.", "Please reload the page." : "Ricarica la pagina.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "L'aggiornamento non è riuscito. Per ulteriori informazioni <a href=\"{url}\">controlla l'articolo del nostro forum</a> che riguarda questo problema.", @@ -275,7 +277,7 @@ OC.L10N.register( "Search" : "Cerca", "Server side authentication failed!" : "Autenticazione lato server non riuscita!", "Please contact your administrator." : "Contatta il tuo amministratore di sistema.", - "An internal error occured." : "Si è verificato un errore interno.", + "An internal error occurred." : "Si è verificato un errore interno.", "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.", "Log in" : "Accedi", "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?", @@ -302,6 +304,7 @@ OC.L10N.register( "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ", "Start update" : "Avvia l'aggiornamento", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitare timeout con installazioni di grandi dimensioni, puoi eseguire il comando che segue dalla cartella di installazione:", + "Detailed logs" : "Log dettagliati", "This %s instance is currently in maintenance mode, which may take a while." : "Questa istanza di %s è attualmente in manutenzione, potrebbe richiedere del tempo.", "This page will refresh itself when the %s instance is available again." : "Questa pagina si aggiornerà quando l'istanza di %s sarà nuovamente disponibile." }, diff --git a/core/l10n/it.json b/core/l10n/it.json index a65e39289f5..f8d63c13a38 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -1,6 +1,8 @@ { "translations": { "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s", "Preparing update" : "Preparazione aggiornamento", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: controllo della tabella %s", "Turned on maintenance mode" : "Modalità di manutenzione attivata", "Turned off maintenance mode" : "Modalità di manutenzione disattivata", "Maintenance mode is kept active" : "La modalità di manutenzione è lasciata attiva", @@ -167,7 +169,7 @@ "Share details could not be loaded for this item." : "I dettagli della condivisione non possono essere caricati per questo elemento.", "No users or groups found for {search}" : "Nessun utente o gruppo trovato per {search}", "No users found for {search}" : "Nessun utente trovato per {search}", - "An error occured. Please try again" : "Si è verificato un errore. Prova ancora", + "An error occurred. Please try again" : "Si è verificato un errore. Prova ancora", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (su {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -201,7 +203,7 @@ "new" : "nuovo", "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "L'aggiornamento è in corso, l'abbandono di questa pagina potrebbe interrompere il processo in alcuni ambienti.", - "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.", + "Updating to {version}" : "Aggiornamento a {version}", "An error occurred." : "Si è verificato un errore.", "Please reload the page." : "Ricarica la pagina.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "L'aggiornamento non è riuscito. Per ulteriori informazioni <a href=\"{url}\">controlla l'articolo del nostro forum</a> che riguarda questo problema.", @@ -273,7 +275,7 @@ "Search" : "Cerca", "Server side authentication failed!" : "Autenticazione lato server non riuscita!", "Please contact your administrator." : "Contatta il tuo amministratore di sistema.", - "An internal error occured." : "Si è verificato un errore interno.", + "An internal error occurred." : "Si è verificato un errore interno.", "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.", "Log in" : "Accedi", "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?", @@ -300,6 +302,7 @@ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ", "Start update" : "Avvia l'aggiornamento", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitare timeout con installazioni di grandi dimensioni, puoi eseguire il comando che segue dalla cartella di installazione:", + "Detailed logs" : "Log dettagliati", "This %s instance is currently in maintenance mode, which may take a while." : "Questa istanza di %s è attualmente in manutenzione, potrebbe richiedere del tempo.", "This page will refresh itself when the %s instance is available again." : "Questa pagina si aggiornerà quando l'istanza di %s sarà nuovamente disponibile." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/core/l10n/ja.js b/core/l10n/ja.js index b9cb8b7154c..81cf6be2467 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "共有の解除ができませんでした", "Share details could not be loaded for this item." : "共有の詳細はこのアイテムによりロードできませんでした。", "No users or groups found for {search}" : "{search} の検索でユーザー、グループが見つかりません", - "An error occured. Please try again" : "エラーが発生しました。もう一度トライしてください。", "{sharee} (group)" : "{sharee} (グループ)", "{sharee} (at {server})" : "{sharee} ({server} で)", "{sharee} (remote)" : "{sharee} (リモート)", @@ -189,7 +188,6 @@ OC.L10N.register( "Hello {name}" : " {name}さん､こんにちは", "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "アップグレード実行中です。このページを離れると、一部の環境では処理が中断されてしまうことがあります。", - "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。", "An error occurred." : "エラーが発生しました。", "Please reload the page." : "ページをリロードしてください。", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "アップデートできませんでした。この問題に対する詳細な情報については、<a href=\"{url}\">フォーラムの投稿を確認してください</a> ", @@ -260,7 +258,6 @@ OC.L10N.register( "Search" : "検索", "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！", "Please contact your administrator." : "管理者に問い合わせてください。", - "An internal error occured." : "内部エラーが発生しました。", "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。", "Log in" : "ログイン", "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index 60e0942afbd..a33705ac141 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -158,7 +158,6 @@ "Could not unshare" : "共有の解除ができませんでした", "Share details could not be loaded for this item." : "共有の詳細はこのアイテムによりロードできませんでした。", "No users or groups found for {search}" : "{search} の検索でユーザー、グループが見つかりません", - "An error occured. Please try again" : "エラーが発生しました。もう一度トライしてください。", "{sharee} (group)" : "{sharee} (グループ)", "{sharee} (at {server})" : "{sharee} ({server} で)", "{sharee} (remote)" : "{sharee} (リモート)", @@ -187,7 +186,6 @@ "Hello {name}" : " {name}さん､こんにちは", "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "アップグレード実行中です。このページを離れると、一部の環境では処理が中断されてしまうことがあります。", - "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。", "An error occurred." : "エラーが発生しました。", "Please reload the page." : "ページをリロードしてください。", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "アップデートできませんでした。この問題に対する詳細な情報については、<a href=\"{url}\">フォーラムの投稿を確認してください</a> ", @@ -258,7 +256,6 @@ "Search" : "検索", "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！", "Please contact your administrator." : "管理者に問い合わせてください。", - "An internal error occured." : "内部エラーが発生しました。", "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。", "Log in" : "ログイン", "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？", diff --git a/core/l10n/ko.js b/core/l10n/ko.js index 0410b541cc6..b2d4e59fb26 100644 --- a/core/l10n/ko.js +++ b/core/l10n/ko.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "공유 해제할 수 없음", "Share details could not be loaded for this item." : "이 항목의 공유 정보를 불러올 수 없습니다.", "No users or groups found for {search}" : "{search}에 해당하는 사용자나 그룹을 찾을 수 없음", - "An error occured. Please try again" : "오류가 발생했습니다. 다시 시도하십시오.", "{sharee} (group)" : "{sharee}(그룹)", "{sharee} (at {server})" : "{sharee}({server}에 있음)", "{sharee} (remote)" : "{sharee}(원격)", @@ -190,7 +189,6 @@ OC.L10N.register( "new" : "새로운 항목", "_download %n file_::_download %n files_" : ["파일 %n개 다운로드"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "업그레이드 중입니다. 이 페이지를 열어 두면 일부 환경에서 진행 과정을 중단시킬 수 있습니다.", - "Updating {productName} to version {version}, this may take a while." : "{productName}을(를) 버전 {version}으로 업데이트하고 있습니다. 시간이 걸릴 수 있습니다.", "An error occurred." : "오류가 발생했습니다.", "Please reload the page." : "페이지를 새로 고치십시오.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "업데이트에 실패했습니다. 더 많은 정보를 보려면 이 문제를 다루은 <a href=\"{url}\">포럼 글</a>을 참조하십시오.", @@ -261,7 +259,6 @@ OC.L10N.register( "Search" : "검색", "Server side authentication failed!" : "서버 인증 실패!", "Please contact your administrator." : "관리자에게 문의하십시오.", - "An internal error occured." : "내부 오류가 발생했습니다.", "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.", "Log in" : "로그인", "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?", diff --git a/core/l10n/ko.json b/core/l10n/ko.json index 3977af2e565..df454f24814 100644 --- a/core/l10n/ko.json +++ b/core/l10n/ko.json @@ -158,7 +158,6 @@ "Could not unshare" : "공유 해제할 수 없음", "Share details could not be loaded for this item." : "이 항목의 공유 정보를 불러올 수 없습니다.", "No users or groups found for {search}" : "{search}에 해당하는 사용자나 그룹을 찾을 수 없음", - "An error occured. Please try again" : "오류가 발생했습니다. 다시 시도하십시오.", "{sharee} (group)" : "{sharee}(그룹)", "{sharee} (at {server})" : "{sharee}({server}에 있음)", "{sharee} (remote)" : "{sharee}(원격)", @@ -188,7 +187,6 @@ "new" : "새로운 항목", "_download %n file_::_download %n files_" : ["파일 %n개 다운로드"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "업그레이드 중입니다. 이 페이지를 열어 두면 일부 환경에서 진행 과정을 중단시킬 수 있습니다.", - "Updating {productName} to version {version}, this may take a while." : "{productName}을(를) 버전 {version}으로 업데이트하고 있습니다. 시간이 걸릴 수 있습니다.", "An error occurred." : "오류가 발생했습니다.", "Please reload the page." : "페이지를 새로 고치십시오.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "업데이트에 실패했습니다. 더 많은 정보를 보려면 이 문제를 다루은 <a href=\"{url}\">포럼 글</a>을 참조하십시오.", @@ -259,7 +257,6 @@ "Search" : "검색", "Server side authentication failed!" : "서버 인증 실패!", "Please contact your administrator." : "관리자에게 문의하십시오.", - "An internal error occured." : "내부 오류가 발생했습니다.", "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.", "Log in" : "로그인", "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?", diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js index f529399379c..4edb055f8b9 100644 --- a/core/l10n/lt_LT.js +++ b/core/l10n/lt_LT.js @@ -129,7 +129,6 @@ OC.L10N.register( "change" : "keisti", "delete" : "ištrinti", "access control" : "priėjimo kontrolė", - "An error occured. Please try again" : "Klaida, prašau bandyti dar kartą.", "Share" : "Dalintis", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dalintis su vartotoju kitame ownCloud debesyje, sintaksė vartotojas@example.com/owncloud", "Warning" : "Įspėjimas", diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json index abd9d3b2a97..372bbe3c529 100644 --- a/core/l10n/lt_LT.json +++ b/core/l10n/lt_LT.json @@ -127,7 +127,6 @@ "change" : "keisti", "delete" : "ištrinti", "access control" : "priėjimo kontrolė", - "An error occured. Please try again" : "Klaida, prašau bandyti dar kartą.", "Share" : "Dalintis", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dalintis su vartotoju kitame ownCloud debesyje, sintaksė vartotojas@example.com/owncloud", "Warning" : "Įspėjimas", diff --git a/core/l10n/mk.js b/core/l10n/mk.js index c01acfc0c92..054f74f6be3 100644 --- a/core/l10n/mk.js +++ b/core/l10n/mk.js @@ -138,7 +138,6 @@ OC.L10N.register( "change" : "промени", "delete" : "избриши", "access control" : "контрола на пристап", - "An error occured. Please try again" : "Се случи грешка. Обиди се повторно", "Share" : "Сподели", "Warning" : "Предупредување", "not assignable" : "не може да се додаде", @@ -201,7 +200,6 @@ OC.L10N.register( "Search" : "Барај", "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!", "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.", - "An internal error occured." : "Се случи интерна грешка", "Log in" : "Најава", "Wrong password. Reset it?" : "Погрешна лозинка. Да ја ресетирам?", "Wrong password." : "Погрешна лозинка.", diff --git a/core/l10n/mk.json b/core/l10n/mk.json index 632472c5034..bacbdee226c 100644 --- a/core/l10n/mk.json +++ b/core/l10n/mk.json @@ -136,7 +136,6 @@ "change" : "промени", "delete" : "избриши", "access control" : "контрола на пристап", - "An error occured. Please try again" : "Се случи грешка. Обиди се повторно", "Share" : "Сподели", "Warning" : "Предупредување", "not assignable" : "не може да се додаде", @@ -199,7 +198,6 @@ "Search" : "Барај", "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!", "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.", - "An internal error occured." : "Се случи интерна грешка", "Log in" : "Најава", "Wrong password. Reset it?" : "Погрешна лозинка. Да ја ресетирам?", "Wrong password." : "Погрешна лозинка.", diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js index 39513e71926..97f572bd59f 100644 --- a/core/l10n/nb_NO.js +++ b/core/l10n/nb_NO.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "Kunne ikke avslutte deling", "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.", "No users or groups found for {search}" : "Ingen brukere eller grupper funnet for {search}", - "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen", "{sharee} (group)" : "{sharee} (gruppe)", "{sharee} (at {server})" : "{sharee} (på {server})", "{sharee} (remote)" : "{sharee} (ekstern)", @@ -190,7 +189,6 @@ OC.L10N.register( "new" : "ny", "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "En oppdatering foregår, lukking av denne siden kan forstyrre prosessen for enkelte systemer.", - "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.", "An error occurred." : "En feil oppstod.", "Please reload the page." : "Vennligst last siden på nytt.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Oppdateringen var mislykket. For mer informasjon <a href=\"{url}\">se vår forum-artikkel</a> som beskriver dette problemet.", @@ -261,7 +259,6 @@ OC.L10N.register( "Search" : "Søk", "Server side authentication failed!" : "Autentisering feilet på serveren!", "Please contact your administrator." : "Vennligst kontakt administratoren din.", - "An internal error occured." : "Det oppstod en intern feil.", "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.", "Log in" : "Logg inn", "Wrong password. Reset it?" : "Feil passord. Nullstille det?", diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json index 2585d9203c2..27290310e40 100644 --- a/core/l10n/nb_NO.json +++ b/core/l10n/nb_NO.json @@ -158,7 +158,6 @@ "Could not unshare" : "Kunne ikke avslutte deling", "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.", "No users or groups found for {search}" : "Ingen brukere eller grupper funnet for {search}", - "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen", "{sharee} (group)" : "{sharee} (gruppe)", "{sharee} (at {server})" : "{sharee} (på {server})", "{sharee} (remote)" : "{sharee} (ekstern)", @@ -188,7 +187,6 @@ "new" : "ny", "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "En oppdatering foregår, lukking av denne siden kan forstyrre prosessen for enkelte systemer.", - "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.", "An error occurred." : "En feil oppstod.", "Please reload the page." : "Vennligst last siden på nytt.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Oppdateringen var mislykket. For mer informasjon <a href=\"{url}\">se vår forum-artikkel</a> som beskriver dette problemet.", @@ -259,7 +257,6 @@ "Search" : "Søk", "Server side authentication failed!" : "Autentisering feilet på serveren!", "Please contact your administrator." : "Vennligst kontakt administratoren din.", - "An internal error occured." : "Det oppstod en intern feil.", "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.", "Log in" : "Logg inn", "Wrong password. Reset it?" : "Feil passord. Nullstille det?", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index aade9882602..9f995ebe485 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -119,10 +119,18 @@ OC.L10N.register( "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface verstoord lijkt.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Uw webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom is niet leesbaar door PHP, hetgeen wordt afgeraden wegens beveiligingsredenen. Meer informatie in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "U draait momenteel PHP {version}. We adviseren u om zo gauw uw distributie dat biedt, uw PHP versie bij te werken voor betere <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">prestaties en beveiliging geleverd door de PHP Group</a>.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of u hebt toegang tot ownCloud via een vertrouwde proxy. Als u ownCloud niet via een vertrouwde proxy benadert, dan levert dan een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat ownCloud ziet kan spoofen. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki over beide modules</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sommige bestanden kwamen niet door de code betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lijst met ongeldige bestanden…</a> / <a href=\"{rescanEndpoint}\">Opnieuw…</a>)", "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze<a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "U bent met deze site verbonden over HTTP. We adviseren met klem uw server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.", "Shared" : "Gedeeld", "Shared with {recipients}" : "Gedeeld met {recipients}", @@ -161,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Details van shares voor dit object konden niet worden geladen.", "No users or groups found for {search}" : "Geen gebruikers of groepen gevonden voor {search}", "No users found for {search}" : "Geen gebruikers gevonden voor {search}", - "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw", "{sharee} (group)" : "{sharee} (groep)", "{sharee} (at {server})" : "{sharee} (op {server})", "{sharee} (remote)" : "{sharee} (extern)", @@ -195,7 +202,6 @@ OC.L10N.register( "new" : "nieuw", "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "De update is bezig, deze pagina verlaten kan het updateproces in sommige omgevingen onderbreken.", - "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.", "An error occurred." : "Er heeft zich een fout voorgedaan.", "Please reload the page." : "Herlaad deze pagina.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "De update was niet succesvol. Voor meer informatie <a href=\"{url}\">zie ons bericht op het forum</a> over dit probleem.", @@ -239,6 +245,7 @@ OC.L10N.register( "Trace" : "Trace", "Security warning" : "Beveiligingswaarschuwing", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet, omdat het .htaccess-bestand niet functioneert.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentatie</a> voor Informatie over het correct configureren van uw server.", "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan", "Username" : "Gebruikersnaam", "Storage & database" : "Opslag & database", @@ -266,7 +273,6 @@ OC.L10N.register( "Search" : "Zoeken", "Server side authentication failed!" : "Authenticatie bij de server mislukte!", "Please contact your administrator." : "Neem contact op met uw systeembeheerder.", - "An internal error occured." : "Er heeft zich een interne fout voorgedaan.", "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.", "Log in" : "Meld u aan", "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index db19836ef8b..09de68f92ae 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -117,10 +117,18 @@ "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface verstoord lijkt.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Uw webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom is niet leesbaar door PHP, hetgeen wordt afgeraden wegens beveiligingsredenen. Meer informatie in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "U draait momenteel PHP {version}. We adviseren u om zo gauw uw distributie dat biedt, uw PHP versie bij te werken voor betere <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">prestaties en beveiliging geleverd door de PHP Group</a>.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of u hebt toegang tot ownCloud via een vertrouwde proxy. Als u ownCloud niet via een vertrouwde proxy benadert, dan levert dan een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat ownCloud ziet kan spoofen. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki over beide modules</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sommige bestanden kwamen niet door de code betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lijst met ongeldige bestanden…</a> / <a href=\"{rescanEndpoint}\">Opnieuw…</a>)", "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze<a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "U bent met deze site verbonden over HTTP. We adviseren met klem uw server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.", "Shared" : "Gedeeld", "Shared with {recipients}" : "Gedeeld met {recipients}", @@ -159,7 +167,6 @@ "Share details could not be loaded for this item." : "Details van shares voor dit object konden niet worden geladen.", "No users or groups found for {search}" : "Geen gebruikers of groepen gevonden voor {search}", "No users found for {search}" : "Geen gebruikers gevonden voor {search}", - "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw", "{sharee} (group)" : "{sharee} (groep)", "{sharee} (at {server})" : "{sharee} (op {server})", "{sharee} (remote)" : "{sharee} (extern)", @@ -193,7 +200,6 @@ "new" : "nieuw", "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "De update is bezig, deze pagina verlaten kan het updateproces in sommige omgevingen onderbreken.", - "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.", "An error occurred." : "Er heeft zich een fout voorgedaan.", "Please reload the page." : "Herlaad deze pagina.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "De update was niet succesvol. Voor meer informatie <a href=\"{url}\">zie ons bericht op het forum</a> over dit probleem.", @@ -237,6 +243,7 @@ "Trace" : "Trace", "Security warning" : "Beveiligingswaarschuwing", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet, omdat het .htaccess-bestand niet functioneert.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentatie</a> voor Informatie over het correct configureren van uw server.", "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan", "Username" : "Gebruikersnaam", "Storage & database" : "Opslag & database", @@ -264,7 +271,6 @@ "Search" : "Zoeken", "Server side authentication failed!" : "Authenticatie bij de server mislukte!", "Please contact your administrator." : "Neem contact op met uw systeembeheerder.", - "An internal error occured." : "Er heeft zich een interne fout voorgedaan.", "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.", "Log in" : "Meld u aan", "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?", diff --git a/core/l10n/oc.js b/core/l10n/oc.js index 48036d3110d..a8de57008b0 100644 --- a/core/l10n/oc.js +++ b/core/l10n/oc.js @@ -151,7 +151,6 @@ OC.L10N.register( "delete" : "suprimir", "access control" : "contraròtle d'accès", "Share details could not be loaded for this item." : "Las informacions de partiment an pas pogut èsser cargadas per aqueste element.", - "An error occured. Please try again" : "Una error s'es produsida. Mercé d'ensajar tornamai", "Share" : "Partejar", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud", "Warning" : "Atencion", @@ -171,7 +170,6 @@ OC.L10N.register( "Hello {name}" : "Adiu {name}", "_download %n file_::_download %n files_" : ["Telecargar %n fichièr","Telecargar %n fichièrs"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mesa a jorn es en cors. Segon la configuracion, lo fach de quitar aquesta pagina pòt entraïnar l'interrupcion de la procedura.", - "Updating {productName} to version {version}, this may take a while." : "La mesa a jorn de {productName} cap a la version {version} es en cors. Aquò pòt prene un certan temps.", "An error occurred." : "Una error s'es produsida.", "Please reload the page." : "Recargatz la pagina.", "The update was unsuccessful. " : "La mesa a jorn a fracassat.", @@ -241,7 +239,6 @@ OC.L10N.register( "Search" : "Recercar", "Server side authentication failed!" : "L'autentificacion sul servidor a fracassat !", "Please contact your administrator." : "Contactatz vòstre administrator.", - "An internal error occured." : "Una error intèrna s'es produsida.", "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.", "Log in" : "Connexion", "Wrong password. Reset it?" : "Senhal incorrècte. Reïnicializar ?", diff --git a/core/l10n/oc.json b/core/l10n/oc.json index 4610829bccd..4d728ae07fc 100644 --- a/core/l10n/oc.json +++ b/core/l10n/oc.json @@ -149,7 +149,6 @@ "delete" : "suprimir", "access control" : "contraròtle d'accès", "Share details could not be loaded for this item." : "Las informacions de partiment an pas pogut èsser cargadas per aqueste element.", - "An error occured. Please try again" : "Una error s'es produsida. Mercé d'ensajar tornamai", "Share" : "Partejar", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud", "Warning" : "Atencion", @@ -169,7 +168,6 @@ "Hello {name}" : "Adiu {name}", "_download %n file_::_download %n files_" : ["Telecargar %n fichièr","Telecargar %n fichièrs"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mesa a jorn es en cors. Segon la configuracion, lo fach de quitar aquesta pagina pòt entraïnar l'interrupcion de la procedura.", - "Updating {productName} to version {version}, this may take a while." : "La mesa a jorn de {productName} cap a la version {version} es en cors. Aquò pòt prene un certan temps.", "An error occurred." : "Una error s'es produsida.", "Please reload the page." : "Recargatz la pagina.", "The update was unsuccessful. " : "La mesa a jorn a fracassat.", @@ -239,7 +237,6 @@ "Search" : "Recercar", "Server side authentication failed!" : "L'autentificacion sul servidor a fracassat !", "Please contact your administrator." : "Contactatz vòstre administrator.", - "An internal error occured." : "Una error intèrna s'es produsida.", "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.", "Log in" : "Connexion", "Wrong password. Reset it?" : "Senhal incorrècte. Reïnicializar ?", diff --git a/core/l10n/pl.js b/core/l10n/pl.js index df04e2d8122..cef93a0564c 100644 --- a/core/l10n/pl.js +++ b/core/l10n/pl.js @@ -149,7 +149,6 @@ OC.L10N.register( "change" : "zmiany", "delete" : "usuń", "access control" : "kontrola dostępu", - "An error occured. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.", "Share" : "Udostępnij", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Współdziel z użytkownikami innych chmur ownCloud używając wzorca uzytkownik@example.com/owncloud", "Warning" : "Ostrzeżenie", @@ -167,7 +166,6 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Cześć {name}, dzisiejsza pogoda jest {weather}", "Hello {name}" : "Witaj {name}", "_download %n file_::_download %n files_" : ["pobrano %n plik","pobrano %n plików","pobrano %n plików"], - "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.", "Please reload the page." : "Proszę przeładować stronę", "The update was unsuccessful. " : "Aktualizowanie zakończyło się niepowodzeniem.", "The update was successful. Redirecting you to ownCloud now." : "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.", diff --git a/core/l10n/pl.json b/core/l10n/pl.json index 421eae9ebde..554d137af4f 100644 --- a/core/l10n/pl.json +++ b/core/l10n/pl.json @@ -147,7 +147,6 @@ "change" : "zmiany", "delete" : "usuń", "access control" : "kontrola dostępu", - "An error occured. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.", "Share" : "Udostępnij", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Współdziel z użytkownikami innych chmur ownCloud używając wzorca uzytkownik@example.com/owncloud", "Warning" : "Ostrzeżenie", @@ -165,7 +164,6 @@ "Hello {name}, the weather is {weather}" : "Cześć {name}, dzisiejsza pogoda jest {weather}", "Hello {name}" : "Witaj {name}", "_download %n file_::_download %n files_" : ["pobrano %n plik","pobrano %n plików","pobrano %n plików"], - "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.", "Please reload the page." : "Proszę przeładować stronę", "The update was unsuccessful. " : "Aktualizowanie zakończyło się niepowodzeniem.", "The update was successful. Redirecting you to ownCloud now." : "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index c7223f80a4b..9c8255e8255 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -3,6 +3,8 @@ OC.L10N.register( { "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s", "Preparing update" : "Preparando atualização", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Verificando tabela %s", "Turned on maintenance mode" : "Ativar modo de manutenção", "Turned off maintenance mode" : "Desligar o modo de manutenção", "Maintenance mode is kept active" : "O modo de manutenção está sendo mantido como ativo", @@ -119,10 +121,18 @@ OC.L10N.register( "Good password" : "Boa senha", "Strong password" : "Senha forte", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Seu servidor web ainda não está configurado corretamente para permitir a sincronização de arquivos, pois a interface WebDAV parece ser desconfigurada.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Seu servidor web não está configurado corretamente para resolver \"{url}\". Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor não tem nenhuma conexão com a Internet. Isto significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de terceiros não vai funcionar. Acessar arquivos remotamente e envio de e-mails de notificação pode não funcionar, também. Sugerimos permitir conexão com a Internet para este servidor, se você quer ter todas as funcionalidades.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Nenhum cache de memória foi configurado. Para melhorar o seu desempenho, por favor configurar um memcached se disponível. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom não pode ser lido pelo PHP e é altamente desencorajado por razões de segurança. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Você stá atualmente em executando PHP {version}. Nós o incentivamos a atualizar sua versão do PHP para aproveitar<a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">atualizações de segurança e desempenho proporcionados pelo Grupo PHP</a> assim que sua distribuição suportar.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "A configuração de cabeçalhos do proxy reverso está incorreta, ou você está acessando ownCloud de um proxy confiável. Se você não estiver acessando ownCloud de um proxy de confiança, esta é uma questão de segurança e pode permitir a um invasor falsificar o endereço IP como visíveis para ownCloud. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached é configurado como cache distribuído, mas o módulo PHP errado \"memcache\" está instalado. \\OC\\Memcache\\Memcached suporta apenas \"memcached\" e não \"memcache\". Veja a <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki memcached sobre ambos os módulos </a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Alguns arquivos não passaram na verificação de integridade. Mais informações sobre como resolver este problema pode ser encontrado em nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista de arquivos inválidos…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)", "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O seu diretório de dados e os arquivos estão, provavelmente, acessíveis a partir da Internet. O arquivo .htaccess não está funcionando. Nós sugerimos que você configure o servidor web de uma forma que o diretório de dados não seja acessível ou mova o diretório de dados para fora do diretório raiz de documentos do servidor web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "O \"Strict-Transport-Security\" cabeçalho HTTP não está configurado para pelo menos \"{segundos}\" segundos. Para maior segurança recomendamos a ativação HSTS como descrito em nossas <a href=\"{docUrl}\" rel=\"noreferrer\">dicas de segurança</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Você está acessando este site via HTTP. Nós fortemente sugerimos que você ao invéz, configure o servidor para exigir o uso de HTTPS como descrito em nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "Shared" : "Compartilhado", "Shared with {recipients}" : "Compartilhado com {recipients}", @@ -160,12 +170,17 @@ OC.L10N.register( "Could not unshare" : "Não foi possível descompartilhar", "Share details could not be loaded for this item." : "Detalhes de compartilhamento não puderam ser carregados para este item.", "No users or groups found for {search}" : "Nenhum usuário grupo encontrado para {search}", - "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente", + "No users found for {search}" : "Nenhum usuário encontrado para {search}", + "An error occurred. Please try again" : "Ocorreu um erro. Por favor tente novamente", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (no {server})", "{sharee} (remote)" : "{sharee} (remoto)", "Share" : "Compartilhar", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud", + "Share with users…" : "Compartilhar com os usuários...", + "Share with users, groups or remote users…" : "Compartilhar com usuários, grupos ou usuários remoto…", + "Share with users or groups…" : "Compartilhar com usuários ou grupos…", + "Share with users or remote users…" : "Compartilhar com usuários ou usuários remoto…", "Error removing share" : "Erro na remoção do compartilhamento", "Warning" : "Aviso", "Error while sending notification" : "Erro ao enviar notificação", @@ -190,7 +205,7 @@ OC.L10N.register( "new" : "novo", "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "A atualização está em andamento, deixando esta página pode haver interrupção do processo em alguns ambientes.", - "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.", + "Updating to {version}" : "Atualizando para {version}", "An error occurred." : "Ocorreu um erro.", "Please reload the page." : "Por favor recarregue a página", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "A atualização não foi bem sucedida. Para mais informações <a href=\"{url}\">verificar o nosso post no fórum</a> que abrange esta questão.", @@ -234,6 +249,7 @@ OC.L10N.register( "Trace" : "Rastreamento", "Security warning" : "Alerta de Segurança", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Para obter informações sobre como configurar corretamente o servidor, consulte a <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentação</a>.", "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>", "Username" : "Nome de usuário", "Storage & database" : "Armazenamento & banco de dados", @@ -261,7 +277,7 @@ OC.L10N.register( "Search" : "Perquisar", "Server side authentication failed!" : "Autenticação do servidor falhou!", "Please contact your administrator." : "Por favor, contate o administrador.", - "An internal error occured." : "Ocorreu um erro interno.", + "An internal error occurred." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.", "Log in" : "Entrar", "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?", @@ -288,6 +304,7 @@ OC.L10N.register( "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.", "Start update" : "Iniciar atualização", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:", + "Detailed logs" : "Logs detalhados", "This %s instance is currently in maintenance mode, which may take a while." : "Esta instância %s está em modo de manutenção, o que pode demorar um pouco.", "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente." }, diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index 9b667a41335..741d964f5a3 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -1,6 +1,8 @@ { "translations": { "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s", "Preparing update" : "Preparando atualização", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Verificando tabela %s", "Turned on maintenance mode" : "Ativar modo de manutenção", "Turned off maintenance mode" : "Desligar o modo de manutenção", "Maintenance mode is kept active" : "O modo de manutenção está sendo mantido como ativo", @@ -117,10 +119,18 @@ "Good password" : "Boa senha", "Strong password" : "Senha forte", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Seu servidor web ainda não está configurado corretamente para permitir a sincronização de arquivos, pois a interface WebDAV parece ser desconfigurada.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Seu servidor web não está configurado corretamente para resolver \"{url}\". Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor não tem nenhuma conexão com a Internet. Isto significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de terceiros não vai funcionar. Acessar arquivos remotamente e envio de e-mails de notificação pode não funcionar, também. Sugerimos permitir conexão com a Internet para este servidor, se você quer ter todas as funcionalidades.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Nenhum cache de memória foi configurado. Para melhorar o seu desempenho, por favor configurar um memcached se disponível. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom não pode ser lido pelo PHP e é altamente desencorajado por razões de segurança. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Você stá atualmente em executando PHP {version}. Nós o incentivamos a atualizar sua versão do PHP para aproveitar<a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">atualizações de segurança e desempenho proporcionados pelo Grupo PHP</a> assim que sua distribuição suportar.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "A configuração de cabeçalhos do proxy reverso está incorreta, ou você está acessando ownCloud de um proxy confiável. Se você não estiver acessando ownCloud de um proxy de confiança, esta é uma questão de segurança e pode permitir a um invasor falsificar o endereço IP como visíveis para ownCloud. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached é configurado como cache distribuído, mas o módulo PHP errado \"memcache\" está instalado. \\OC\\Memcache\\Memcached suporta apenas \"memcached\" e não \"memcache\". Veja a <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki memcached sobre ambos os módulos </a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Alguns arquivos não passaram na verificação de integridade. Mais informações sobre como resolver este problema pode ser encontrado em nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista de arquivos inválidos…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)", "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O seu diretório de dados e os arquivos estão, provavelmente, acessíveis a partir da Internet. O arquivo .htaccess não está funcionando. Nós sugerimos que você configure o servidor web de uma forma que o diretório de dados não seja acessível ou mova o diretório de dados para fora do diretório raiz de documentos do servidor web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "O \"Strict-Transport-Security\" cabeçalho HTTP não está configurado para pelo menos \"{segundos}\" segundos. Para maior segurança recomendamos a ativação HSTS como descrito em nossas <a href=\"{docUrl}\" rel=\"noreferrer\">dicas de segurança</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Você está acessando este site via HTTP. Nós fortemente sugerimos que você ao invéz, configure o servidor para exigir o uso de HTTPS como descrito em nossas <a href=\"{docUrl}\">dicas de segurança</a>.", "Shared" : "Compartilhado", "Shared with {recipients}" : "Compartilhado com {recipients}", @@ -158,12 +168,17 @@ "Could not unshare" : "Não foi possível descompartilhar", "Share details could not be loaded for this item." : "Detalhes de compartilhamento não puderam ser carregados para este item.", "No users or groups found for {search}" : "Nenhum usuário grupo encontrado para {search}", - "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente", + "No users found for {search}" : "Nenhum usuário encontrado para {search}", + "An error occurred. Please try again" : "Ocorreu um erro. Por favor tente novamente", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (no {server})", "{sharee} (remote)" : "{sharee} (remoto)", "Share" : "Compartilhar", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud", + "Share with users…" : "Compartilhar com os usuários...", + "Share with users, groups or remote users…" : "Compartilhar com usuários, grupos ou usuários remoto…", + "Share with users or groups…" : "Compartilhar com usuários ou grupos…", + "Share with users or remote users…" : "Compartilhar com usuários ou usuários remoto…", "Error removing share" : "Erro na remoção do compartilhamento", "Warning" : "Aviso", "Error while sending notification" : "Erro ao enviar notificação", @@ -188,7 +203,7 @@ "new" : "novo", "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "A atualização está em andamento, deixando esta página pode haver interrupção do processo em alguns ambientes.", - "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.", + "Updating to {version}" : "Atualizando para {version}", "An error occurred." : "Ocorreu um erro.", "Please reload the page." : "Por favor recarregue a página", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "A atualização não foi bem sucedida. Para mais informações <a href=\"{url}\">verificar o nosso post no fórum</a> que abrange esta questão.", @@ -232,6 +247,7 @@ "Trace" : "Rastreamento", "Security warning" : "Alerta de Segurança", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Para obter informações sobre como configurar corretamente o servidor, consulte a <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentação</a>.", "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>", "Username" : "Nome de usuário", "Storage & database" : "Armazenamento & banco de dados", @@ -259,7 +275,7 @@ "Search" : "Perquisar", "Server side authentication failed!" : "Autenticação do servidor falhou!", "Please contact your administrator." : "Por favor, contate o administrador.", - "An internal error occured." : "Ocorreu um erro interno.", + "An internal error occurred." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.", "Log in" : "Entrar", "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?", @@ -286,6 +302,7 @@ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.", "Start update" : "Iniciar atualização", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:", + "Detailed logs" : "Logs detalhados", "This %s instance is currently in maintenance mode, which may take a while." : "Esta instância %s está em modo de manutenção, o que pode demorar um pouco.", "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente." },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js index 74ca2c94da0..fa3d4e03948 100644 --- a/core/l10n/pt_PT.js +++ b/core/l10n/pt_PT.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.", "No users or groups found for {search}" : "Nenhuns utilizadores ou grupos encontrados para {search}", "No users found for {search}" : "Nenhum utilizador encontrado para {search}", - "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (em {server})", "{sharee} (remote)" : "{sharee} (remoto)", @@ -203,7 +202,6 @@ OC.L10N.register( "new" : "novo", "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "A atualização está em curso. Deixar esta página agora poderá interromper o processo nalguns ambientes.", - "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.", "An error occurred." : "Ocorreu um erro.", "Please reload the page." : "Por favor, recarregue a página.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "A atualização falhou. Para mais informação <a href=\"{url}\">verifique o nosso fórum</a> sobre como resolver este problema.", @@ -275,7 +273,6 @@ OC.L10N.register( "Search" : "Procurar", "Server side authentication failed!" : "Autenticação do lado do servidor falhou!", "Please contact your administrator." : "Por favor contacte o administrador.", - "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.", "Log in" : "Iniciar Sessão", "Wrong password. Reset it?" : "Senha errada. Repô-la?", diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json index 798b3f228ab..c27047c8edc 100644 --- a/core/l10n/pt_PT.json +++ b/core/l10n/pt_PT.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.", "No users or groups found for {search}" : "Nenhuns utilizadores ou grupos encontrados para {search}", "No users found for {search}" : "Nenhum utilizador encontrado para {search}", - "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (em {server})", "{sharee} (remote)" : "{sharee} (remoto)", @@ -201,7 +200,6 @@ "new" : "novo", "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "A atualização está em curso. Deixar esta página agora poderá interromper o processo nalguns ambientes.", - "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.", "An error occurred." : "Ocorreu um erro.", "Please reload the page." : "Por favor, recarregue a página.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "A atualização falhou. Para mais informação <a href=\"{url}\">verifique o nosso fórum</a> sobre como resolver este problema.", @@ -273,7 +271,6 @@ "Search" : "Procurar", "Server side authentication failed!" : "Autenticação do lado do servidor falhou!", "Please contact your administrator." : "Por favor contacte o administrador.", - "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.", "Log in" : "Iniciar Sessão", "Wrong password. Reset it?" : "Senha errada. Repô-la?", diff --git a/core/l10n/ro.js b/core/l10n/ro.js index 56ca1e1481c..6528c5ee0d7 100644 --- a/core/l10n/ro.js +++ b/core/l10n/ro.js @@ -114,7 +114,6 @@ OC.L10N.register( "The object type is not specified." : "Tipul obiectului nu este specificat.", "Enter new" : "Introducere nou", "Add" : "Adaugă", - "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.", "Please reload the page." : "Te rugăm să reîncarci pagina.", "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.", "Personal" : "Personal", diff --git a/core/l10n/ro.json b/core/l10n/ro.json index a20d1c436cb..427fc78e7d3 100644 --- a/core/l10n/ro.json +++ b/core/l10n/ro.json @@ -112,7 +112,6 @@ "The object type is not specified." : "Tipul obiectului nu este specificat.", "Enter new" : "Introducere nou", "Add" : "Adaugă", - "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.", "Please reload the page." : "Te rugăm să reîncarci pagina.", "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.", "Personal" : "Personal", diff --git a/core/l10n/ru.js b/core/l10n/ru.js index 1a0359f0981..d1aa04c23ce 100644 --- a/core/l10n/ru.js +++ b/core/l10n/ru.js @@ -162,7 +162,6 @@ OC.L10N.register( "Could not unshare" : "Не удается отменить доступ", "Share details could not be loaded for this item." : "Не удалось загрузить информацию об общем доступе для этого элемента.", "No users or groups found for {search}" : "Не найдено пользователей или групп по запросу {search}", - "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз", "{sharee} (group)" : "{sharee} (группа)", "{sharee} (at {server})" : "{sharee} (на {server})", "{sharee} (remote)" : "{sharee} (удалённо)", @@ -191,7 +190,6 @@ OC.L10N.register( "new" : "новый", "_download %n file_::_download %n files_" : ["скачать %n файл","скачать %n файла","скачать %n файлов","скачать %n файлов"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Идет обновление. Покидая эту страницу, вы можете прервать процесс обновления.", - "Updating {productName} to version {version}, this may take a while." : "Идет обновление {productName} до версии {version}, это может занять некоторое время.", "An error occurred." : "Произошла ошибка.", "Please reload the page." : "Пожалуйста, обновите страницу.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Обновление прошло не успешно. За дополнительной информацией по этой проблеме <a href=\"{url}\">обратитесь к нашему форуму</a>.", @@ -262,7 +260,6 @@ OC.L10N.register( "Search" : "Найти", "Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!", "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.", - "An internal error occured." : "Произошла внутренняя ошибка.", "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", diff --git a/core/l10n/ru.json b/core/l10n/ru.json index d571bc4c399..626def53000 100644 --- a/core/l10n/ru.json +++ b/core/l10n/ru.json @@ -160,7 +160,6 @@ "Could not unshare" : "Не удается отменить доступ", "Share details could not be loaded for this item." : "Не удалось загрузить информацию об общем доступе для этого элемента.", "No users or groups found for {search}" : "Не найдено пользователей или групп по запросу {search}", - "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз", "{sharee} (group)" : "{sharee} (группа)", "{sharee} (at {server})" : "{sharee} (на {server})", "{sharee} (remote)" : "{sharee} (удалённо)", @@ -189,7 +188,6 @@ "new" : "новый", "_download %n file_::_download %n files_" : ["скачать %n файл","скачать %n файла","скачать %n файлов","скачать %n файлов"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Идет обновление. Покидая эту страницу, вы можете прервать процесс обновления.", - "Updating {productName} to version {version}, this may take a while." : "Идет обновление {productName} до версии {version}, это может занять некоторое время.", "An error occurred." : "Произошла ошибка.", "Please reload the page." : "Пожалуйста, обновите страницу.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Обновление прошло не успешно. За дополнительной информацией по этой проблеме <a href=\"{url}\">обратитесь к нашему форуму</a>.", @@ -260,7 +258,6 @@ "Search" : "Найти", "Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!", "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.", - "An internal error occured." : "Произошла внутренняя ошибка.", "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js index a9b485559a6..e2f6a8cb5c5 100644 --- a/core/l10n/sk_SK.js +++ b/core/l10n/sk_SK.js @@ -149,7 +149,6 @@ OC.L10N.register( "delete" : "vymazať", "access control" : "prístupové práva", "Share details could not be loaded for this item." : "Nebolo možné načítať údaje o zdieľaní tejto položky.", - "An error occured. Please try again" : "Nastala chyba. Skúste to znovu", "Share" : "Zdieľať", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Zdieľať s ľuďmi na iných serveroch ownClouds pomocou syntaxe používateľ@doména.com/owncloud", "Warning" : "Varovanie", @@ -169,7 +168,6 @@ OC.L10N.register( "Hello {name}" : "Vitaj {name}", "_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Aktualizácie prebieha. V niektorých prostrediach môže opustenie tejto stránky spôsobiť prerušenie aktualizácie.", - "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.", "An error occurred." : "Vyskytla sa chyba.", "Please reload the page." : "Obnovte prosím stránku.", "The update was unsuccessful. " : "Aktualizácia bola neúspešná.", @@ -239,7 +237,6 @@ OC.L10N.register( "Search" : "Hľadať", "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!", "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.", - "An internal error occured." : "Vyskytla sa vnútorná chyba.", "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.", "Log in" : "Prihlásiť sa", "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json index cb9a2f11b09..c53d2b44534 100644 --- a/core/l10n/sk_SK.json +++ b/core/l10n/sk_SK.json @@ -147,7 +147,6 @@ "delete" : "vymazať", "access control" : "prístupové práva", "Share details could not be loaded for this item." : "Nebolo možné načítať údaje o zdieľaní tejto položky.", - "An error occured. Please try again" : "Nastala chyba. Skúste to znovu", "Share" : "Zdieľať", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Zdieľať s ľuďmi na iných serveroch ownClouds pomocou syntaxe používateľ@doména.com/owncloud", "Warning" : "Varovanie", @@ -167,7 +166,6 @@ "Hello {name}" : "Vitaj {name}", "_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Aktualizácie prebieha. V niektorých prostrediach môže opustenie tejto stránky spôsobiť prerušenie aktualizácie.", - "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.", "An error occurred." : "Vyskytla sa chyba.", "Please reload the page." : "Obnovte prosím stránku.", "The update was unsuccessful. " : "Aktualizácia bola neúspešná.", @@ -237,7 +235,6 @@ "Search" : "Hľadať", "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!", "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.", - "An internal error occured." : "Vyskytla sa vnútorná chyba.", "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.", "Log in" : "Prihlásiť sa", "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", diff --git a/core/l10n/sl.js b/core/l10n/sl.js index b82357da193..86e7303488b 100644 --- a/core/l10n/sl.js +++ b/core/l10n/sl.js @@ -154,12 +154,12 @@ OC.L10N.register( "Could not unshare" : "Ni mogoče prekiniti souporabe", "Share details could not be loaded for this item." : "Podrobnosti souporabe za te predmet ni mogoče naložiti.", "No users or groups found for {search}" : "Ni najdenih uporabnikov ali skupin za {search}", - "An error occured. Please try again" : "Prišlo je do napake. Poskusite znova.", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (at {server})" : "{sharee} (na {server})", "{sharee} (remote)" : "{sharee} (oddaljeno)", "Share" : "Souporaba", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Souporaba z uporabniki, ki so na drugih oblakih ownCloud s povezavo uporabnik@domena.si/owncloud", + "Share with users…" : "Omogoči souporabo z ...", "Error removing share" : "Napaka odstranjevanja souporabe", "Warning" : "Opozorilo", "Error while sending notification" : "Napaka med pošiljanjem obvestila", @@ -183,7 +183,6 @@ OC.L10N.register( "new" : "novo", "_download %n file_::_download %n files_" : ["prejmi %n datoteko","prejmi %n datoteki","prejmi %n datoteke","prejmi %n datotek"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Trenutno se izvaja posodobitev sistema. Priporočljivo je počakati, saj se lahko opravilo, če stran zapustite, prekine.", - "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.", "An error occurred." : "Prišlo je do napake.", "Please reload the page." : "Stran je treba ponovno naložiti", "The update was unsuccessful. " : "Posodobitev je spodletela.", @@ -250,7 +249,6 @@ OC.L10N.register( "Search" : "Poišči", "Server side authentication failed!" : "Overitev s strežnika je spodletela!", "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.", - "An internal error occured." : "Prišlo je do notranje napake.", "Please try again or contact your administrator." : "Poskusite znova ali pa stopite v stik s skrbnikom sistema.", "Log in" : "Prijava", "Wrong password. Reset it?" : "Napačno geslo. Ali ga želite ponastaviti?", diff --git a/core/l10n/sl.json b/core/l10n/sl.json index cceacb94194..41c4132fe0d 100644 --- a/core/l10n/sl.json +++ b/core/l10n/sl.json @@ -152,12 +152,12 @@ "Could not unshare" : "Ni mogoče prekiniti souporabe", "Share details could not be loaded for this item." : "Podrobnosti souporabe za te predmet ni mogoče naložiti.", "No users or groups found for {search}" : "Ni najdenih uporabnikov ali skupin za {search}", - "An error occured. Please try again" : "Prišlo je do napake. Poskusite znova.", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (at {server})" : "{sharee} (na {server})", "{sharee} (remote)" : "{sharee} (oddaljeno)", "Share" : "Souporaba", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Souporaba z uporabniki, ki so na drugih oblakih ownCloud s povezavo uporabnik@domena.si/owncloud", + "Share with users…" : "Omogoči souporabo z ...", "Error removing share" : "Napaka odstranjevanja souporabe", "Warning" : "Opozorilo", "Error while sending notification" : "Napaka med pošiljanjem obvestila", @@ -181,7 +181,6 @@ "new" : "novo", "_download %n file_::_download %n files_" : ["prejmi %n datoteko","prejmi %n datoteki","prejmi %n datoteke","prejmi %n datotek"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Trenutno se izvaja posodobitev sistema. Priporočljivo je počakati, saj se lahko opravilo, če stran zapustite, prekine.", - "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.", "An error occurred." : "Prišlo je do napake.", "Please reload the page." : "Stran je treba ponovno naložiti", "The update was unsuccessful. " : "Posodobitev je spodletela.", @@ -248,7 +247,6 @@ "Search" : "Poišči", "Server side authentication failed!" : "Overitev s strežnika je spodletela!", "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.", - "An internal error occured." : "Prišlo je do notranje napake.", "Please try again or contact your administrator." : "Poskusite znova ali pa stopite v stik s skrbnikom sistema.", "Log in" : "Prijava", "Wrong password. Reset it?" : "Napačno geslo. Ali ga želite ponastaviti?", diff --git a/core/l10n/sq.js b/core/l10n/sq.js index c69215105a8..3c6bed4f276 100644 --- a/core/l10n/sq.js +++ b/core/l10n/sq.js @@ -3,6 +3,8 @@ OC.L10N.register( { "Couldn't send mail to following users: %s " : "S’u dërgua dot e-mail përdoruesve vijues: %s ", "Preparing update" : "Po përgatitet përditësimi", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Po kontrollohet tabela %s", "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua", "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua", "Maintenance mode is kept active" : "Mënyra mirëmbajtje është mbajtur e aktivizuar", @@ -119,10 +121,12 @@ OC.L10N.register( "Good password" : "Fjalëkalim i mirë", "Strong password" : "Fjalëkalim i fortë", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Shërbyesi juaj web ende s’është rregulluar për të lejuar njëkohësim kartelash, ngaqë ndërfaqja WebDAV duket se është e dëmtuar.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Shërbyesi juaj s’është rregulluar si duhet për të kuptuar \"{url}\". Të dhëna të mëtejshme mund të gjenden te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ky shërbyes nuk ka lidhje Internet që funksionon. Kjo do të thotë që disa prej veçorive, të tilla si montimi i depozitave të jashtme, njoftimet mbi përditësime apo instalim aplikacionesh nga palë të treta, s’do të funksionojnë. Edhe hyrja në kartela së largëti, apo dërgimi i email-eve për njoftime mund të mos funksionojnë. Këshillojmë të aktivizoni për këtë shërbyes lidhjen në Internet, nëse doni t’i keni krejt këto veçori.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "S’ka të formësuar fshehtinë kujtese. Që të përmirësoni punimin, ju lutemi formësoni një të tillë, në pastë. Më tepër të dhëna mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom s’lexohet dot nga PHP-ja, çka shkëshillohet me forcë, për arsye sigurie. Më tepër të dhëna mund të gjenden te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.", "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Po xhironi PHP {version}. Ju nxisim të përmirësoni versionin e PHP-së që të përfitoni <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">nga përditësimet e punimit dhe sigurisë të ofruara PHP Group</a>, sapo të mbulohet nga shpërndarja juaj.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Formësimi për krye ndërmjetësi prapësor është i pasaktë, ose jeni duke hyrë në ownCloud prej një ndërmjetësi të besuar. Nëse s’jeni duke hyrë në ownCloud prej një ndërmjetësi të besuar, ky është një problem sigurie dhe mund t’i lejojë një agresori të maskojë adresën e vet IP si një të pranueshme nga ownCloud-i. Të dhëna të mëtejshme mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.", "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached është formësuar si fshehtinë e shpërndarë, por është instaluar moduli i gabuar PHP \"memcache\". \\OC\\Memcache\\Memcached mbulon vetëm \"memcached\" dhe jo \"memcache\". Shihni <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki-n mbi memcached rreth të dy moduleve</a>.", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Disa kartela s’e kaluan dot kontrollin e pacenueshmërisë. Më tepër të dhëna se si të zgjidhet ky problem mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listë e kartelave të pavlefshme…</a> / <a href=\"{rescanEndpoint}\">Rikontrollojini…</a>)", "Error occurred while checking server setup" : "Ndodhi një gabim gjatë kontrollit të rregullimit të shërbyesit", @@ -167,7 +171,7 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Për këtë objekt s’u ngarkuan dot hollësi ndarjeje.", "No users or groups found for {search}" : "S’u gjetën përdorues ose grupe për {search}", "No users found for {search}" : "S’u gjet përdorues për {search}", - "An error occured. Please try again" : "Ndodhi një gabim. Ju lutemi, riprovoni", + "An error occurred. Please try again" : "Ndodhi një gabim. Ju lutemi, riprovoni", "{sharee} (group)" : "{sharee} (grup)", "{sharee} (at {server})" : "{sharee} (në {server})", "{sharee} (remote)" : "{sharee} (i largët)", @@ -200,7 +204,7 @@ OC.L10N.register( "Hello {name}" : "Tungjatjeta {name}", "_download %n file_::_download %n files_" : ["shkarko %n kartelë","shkarko %n kartela"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Përmirësimi po kryhet, braktisja e kësaj faqeje mund ta ndërpresë procesin në disa mjedise.", - "Updating {productName} to version {version}, this may take a while." : "Po përditësohet {productName} me versionin {version}, kjo mund të zgjasë pak.", + "Updating to {version}" : "Po përditësohet me {version}", "An error occurred." : "Ndodhi një gabim.", "Please reload the page." : "Ju lutemi, ringarkoni faqen.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Përditësimi qe i pasuksesshëm. Për më tepër të dhëna <a href=\"{url}\">shihni postimin te forumi ynë</a> lidhur me këtë çështje.", @@ -272,7 +276,7 @@ OC.L10N.register( "Search" : "Kërko", "Server side authentication failed!" : "Mirëfilltësimi më anë të shërbyesit dështoi!", "Please contact your administrator." : "Ju lutemi, lidhuni me përgjegjësin tuaj.", - "An internal error occured." : "Ndodhi një gabim i brendshëm.", + "An internal error occurred." : "Ndodhi një gabim i brendshëm.", "Please try again or contact your administrator." : "Ju lutemi, riprovoni ose lidhuni me përgjegjësin tuaj.", "Log in" : "Hyni", "Wrong password. Reset it?" : "Fjalëkalim i gabuar. Të ricaktohet?", @@ -299,6 +303,7 @@ OC.L10N.register( "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ju lutemi, para se të vazhdoni më tej, sigurohuni që baza e të dhënave, dosja e formësimeve dhe dosja e të dhënave janë kopjeruajtur.", "Start update" : "Fillo përditësimin", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Për të shmangur çaste bllokimi pune me instalime të mëdha, mundeni të ekzekutoni urdhrin vijues që nga drejtoria juaj e instalimit:", + "Detailed logs" : "Regjistrime të hollësishme", "This %s instance is currently in maintenance mode, which may take a while." : "Kjo instancë %s hëpërhë gjendet nën mënyrën mirëmbajtje, çka mund të zgjasë ca.", "This page will refresh itself when the %s instance is available again." : "Kjo faqe do të rifreskohet vetiu, sapo instanca %s të jetë sërish gati." }, diff --git a/core/l10n/sq.json b/core/l10n/sq.json index 5ed2a3d6c0f..44be6240eb9 100644 --- a/core/l10n/sq.json +++ b/core/l10n/sq.json @@ -1,6 +1,8 @@ { "translations": { "Couldn't send mail to following users: %s " : "S’u dërgua dot e-mail përdoruesve vijues: %s ", "Preparing update" : "Po përgatitet përditësimi", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Po kontrollohet tabela %s", "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua", "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua", "Maintenance mode is kept active" : "Mënyra mirëmbajtje është mbajtur e aktivizuar", @@ -117,10 +119,12 @@ "Good password" : "Fjalëkalim i mirë", "Strong password" : "Fjalëkalim i fortë", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Shërbyesi juaj web ende s’është rregulluar për të lejuar njëkohësim kartelash, ngaqë ndërfaqja WebDAV duket se është e dëmtuar.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Shërbyesi juaj s’është rregulluar si duhet për të kuptuar \"{url}\". Të dhëna të mëtejshme mund të gjenden te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ky shërbyes nuk ka lidhje Internet që funksionon. Kjo do të thotë që disa prej veçorive, të tilla si montimi i depozitave të jashtme, njoftimet mbi përditësime apo instalim aplikacionesh nga palë të treta, s’do të funksionojnë. Edhe hyrja në kartela së largëti, apo dërgimi i email-eve për njoftime mund të mos funksionojnë. Këshillojmë të aktivizoni për këtë shërbyes lidhjen në Internet, nëse doni t’i keni krejt këto veçori.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "S’ka të formësuar fshehtinë kujtese. Që të përmirësoni punimin, ju lutemi formësoni një të tillë, në pastë. Më tepër të dhëna mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom s’lexohet dot nga PHP-ja, çka shkëshillohet me forcë, për arsye sigurie. Më tepër të dhëna mund të gjenden te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.", "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Po xhironi PHP {version}. Ju nxisim të përmirësoni versionin e PHP-së që të përfitoni <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">nga përditësimet e punimit dhe sigurisë të ofruara PHP Group</a>, sapo të mbulohet nga shpërndarja juaj.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Formësimi për krye ndërmjetësi prapësor është i pasaktë, ose jeni duke hyrë në ownCloud prej një ndërmjetësi të besuar. Nëse s’jeni duke hyrë në ownCloud prej një ndërmjetësi të besuar, ky është një problem sigurie dhe mund t’i lejojë një agresori të maskojë adresën e vet IP si një të pranueshme nga ownCloud-i. Të dhëna të mëtejshme mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.", "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached është formësuar si fshehtinë e shpërndarë, por është instaluar moduli i gabuar PHP \"memcache\". \\OC\\Memcache\\Memcached mbulon vetëm \"memcached\" dhe jo \"memcache\". Shihni <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki-n mbi memcached rreth të dy moduleve</a>.", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Disa kartela s’e kaluan dot kontrollin e pacenueshmërisë. Më tepër të dhëna se si të zgjidhet ky problem mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listë e kartelave të pavlefshme…</a> / <a href=\"{rescanEndpoint}\">Rikontrollojini…</a>)", "Error occurred while checking server setup" : "Ndodhi një gabim gjatë kontrollit të rregullimit të shërbyesit", @@ -165,7 +169,7 @@ "Share details could not be loaded for this item." : "Për këtë objekt s’u ngarkuan dot hollësi ndarjeje.", "No users or groups found for {search}" : "S’u gjetën përdorues ose grupe për {search}", "No users found for {search}" : "S’u gjet përdorues për {search}", - "An error occured. Please try again" : "Ndodhi një gabim. Ju lutemi, riprovoni", + "An error occurred. Please try again" : "Ndodhi një gabim. Ju lutemi, riprovoni", "{sharee} (group)" : "{sharee} (grup)", "{sharee} (at {server})" : "{sharee} (në {server})", "{sharee} (remote)" : "{sharee} (i largët)", @@ -198,7 +202,7 @@ "Hello {name}" : "Tungjatjeta {name}", "_download %n file_::_download %n files_" : ["shkarko %n kartelë","shkarko %n kartela"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Përmirësimi po kryhet, braktisja e kësaj faqeje mund ta ndërpresë procesin në disa mjedise.", - "Updating {productName} to version {version}, this may take a while." : "Po përditësohet {productName} me versionin {version}, kjo mund të zgjasë pak.", + "Updating to {version}" : "Po përditësohet me {version}", "An error occurred." : "Ndodhi një gabim.", "Please reload the page." : "Ju lutemi, ringarkoni faqen.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Përditësimi qe i pasuksesshëm. Për më tepër të dhëna <a href=\"{url}\">shihni postimin te forumi ynë</a> lidhur me këtë çështje.", @@ -270,7 +274,7 @@ "Search" : "Kërko", "Server side authentication failed!" : "Mirëfilltësimi më anë të shërbyesit dështoi!", "Please contact your administrator." : "Ju lutemi, lidhuni me përgjegjësin tuaj.", - "An internal error occured." : "Ndodhi një gabim i brendshëm.", + "An internal error occurred." : "Ndodhi një gabim i brendshëm.", "Please try again or contact your administrator." : "Ju lutemi, riprovoni ose lidhuni me përgjegjësin tuaj.", "Log in" : "Hyni", "Wrong password. Reset it?" : "Fjalëkalim i gabuar. Të ricaktohet?", @@ -297,6 +301,7 @@ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ju lutemi, para se të vazhdoni më tej, sigurohuni që baza e të dhënave, dosja e formësimeve dhe dosja e të dhënave janë kopjeruajtur.", "Start update" : "Fillo përditësimin", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Për të shmangur çaste bllokimi pune me instalime të mëdha, mundeni të ekzekutoni urdhrin vijues që nga drejtoria juaj e instalimit:", + "Detailed logs" : "Regjistrime të hollësishme", "This %s instance is currently in maintenance mode, which may take a while." : "Kjo instancë %s hëpërhë gjendet nën mënyrën mirëmbajtje, çka mund të zgjasë ca.", "This page will refresh itself when the %s instance is available again." : "Kjo faqe do të rifreskohet vetiu, sapo instanca %s të jetë sërish gati." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/core/l10n/sr.js b/core/l10n/sr.js index 76f5e00a890..b4f8fc7fb66 100644 --- a/core/l10n/sr.js +++ b/core/l10n/sr.js @@ -140,7 +140,6 @@ OC.L10N.register( "change" : "измени", "delete" : "обриши", "access control" : "права приступа", - "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново", "Share" : "Дели", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud", "Warning" : "Упозорење", @@ -158,7 +157,6 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Здраво {name}, време је {weather}", "Hello {name}" : "Здраво {name}", "_download %n file_::_download %n files_" : ["преузми %n фајл","преузми %n фајла","преузми %n фајлова"], - "Updating {productName} to version {version}, this may take a while." : "Надограђујем {productName} на издање {version}. Ово би могло да потраје.", "Please reload the page." : "Поново учитајте страницу.", "The update was unsuccessful. " : "Ажурирање није успело.", "The update was successful. There were warnings." : "Ажурирање је успело. Било је упозорења.", @@ -225,7 +223,6 @@ OC.L10N.register( "Search" : "Претражи", "Server side authentication failed!" : "Аутентификација на серверу није успела!", "Please contact your administrator." : "Контактирајте вашег администратора.", - "An internal error occured." : "Дошло је до интерне грешке.", "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.", "Log in" : "Пријава", "Alternative Logins" : "Алтернативне пријаве", diff --git a/core/l10n/sr.json b/core/l10n/sr.json index cc1b50d87f8..c5914111d12 100644 --- a/core/l10n/sr.json +++ b/core/l10n/sr.json @@ -138,7 +138,6 @@ "change" : "измени", "delete" : "обриши", "access control" : "права приступа", - "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново", "Share" : "Дели", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud", "Warning" : "Упозорење", @@ -156,7 +155,6 @@ "Hello {name}, the weather is {weather}" : "Здраво {name}, време је {weather}", "Hello {name}" : "Здраво {name}", "_download %n file_::_download %n files_" : ["преузми %n фајл","преузми %n фајла","преузми %n фајлова"], - "Updating {productName} to version {version}, this may take a while." : "Надограђујем {productName} на издање {version}. Ово би могло да потраје.", "Please reload the page." : "Поново учитајте страницу.", "The update was unsuccessful. " : "Ажурирање није успело.", "The update was successful. There were warnings." : "Ажурирање је успело. Било је упозорења.", @@ -223,7 +221,6 @@ "Search" : "Претражи", "Server side authentication failed!" : "Аутентификација на серверу није успела!", "Please contact your administrator." : "Контактирајте вашег администратора.", - "An internal error occured." : "Дошло је до интерне грешке.", "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.", "Log in" : "Пријава", "Alternative Logins" : "Алтернативне пријаве", diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js index eaa2fdb1dac..6dc4ab9150d 100644 --- a/core/l10n/sr@latin.js +++ b/core/l10n/sr@latin.js @@ -134,7 +134,6 @@ OC.L10N.register( "sunny" : "sunčano", "Hello {name}, the weather is {weather}" : "Zdravo {name}, vreme je {weather}", "_download %n file_::_download %n files_" : ["Preuzmi %n fajl","Preuzmi %n fajlova","Preuzmi %n fajlova"], - "Updating {productName} to version {version}, this may take a while." : "Osvežavam {productName} na verziju {version}, ovo može potrajati.", "Please reload the page." : "Molimo, ponovo učitajte stranu.", "The update was unsuccessful. " : "Osvežavanje je uspelo.", "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.", diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json index b70c55096bc..e53e0665f65 100644 --- a/core/l10n/sr@latin.json +++ b/core/l10n/sr@latin.json @@ -132,7 +132,6 @@ "sunny" : "sunčano", "Hello {name}, the weather is {weather}" : "Zdravo {name}, vreme je {weather}", "_download %n file_::_download %n files_" : ["Preuzmi %n fajl","Preuzmi %n fajlova","Preuzmi %n fajlova"], - "Updating {productName} to version {version}, this may take a while." : "Osvežavam {productName} na verziju {version}, ovo može potrajati.", "Please reload the page." : "Molimo, ponovo učitajte stranu.", "The update was unsuccessful. " : "Osvežavanje je uspelo.", "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.", diff --git a/core/l10n/sv.js b/core/l10n/sv.js index 4fe45118610..f784e4f2f8f 100644 --- a/core/l10n/sv.js +++ b/core/l10n/sv.js @@ -38,6 +38,7 @@ OC.L10N.register( "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token", "Couldn't reset password because the token is expired" : "Lösenord kunde inte återställas eftersom \"token\" har utgått", "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka återställningsmail eftersom det saknas epost-adress för denna användaren. Kontakta din administratör", "%s password reset" : "%s återställ lösenord", "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.", "Sunday" : "Söndag", @@ -85,6 +86,7 @@ OC.L10N.register( "Oct." : "Okt.", "Nov." : "Nov.", "Dec." : "Dec.", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Ett problem uppstod under integritetskontrollen av koden. Mer information ... </a>", "Settings" : "Inställningar", "Saving..." : "Sparar...", "Dismiss" : "Avfärda", @@ -116,7 +118,20 @@ OC.L10N.register( "So-so password" : "Okej lösenord", "Good password" : "Bra lösenord", "Strong password" : "Starkt lösenord", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Din webbserver är inte konfigurerad korrekt för att tillåta filsynkronisering eftersom WebDAV gränssnittet verkar otillgängligt.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Din webbserver är inte konfigurerad riktigt för att lösa \"{url}\". Vidare information kan hittas i vår <a target=\"_blank\" rel\"noreferrer\" href=\"{docLink}\">dokumentation</a>.", + "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Servern har ingen fungerande internetuppkoppling. Detta betyder att vissa funktioner så som extern lagring, notifikationer om uppdateringar eller installationer utav tredjeparts applikationer inte kommer fungera. Åtkomst av filer utifrån och att skicka notifieringar via epost kanske inte fungerar heller. Vi föreslår att man aktiverar internetanslutningen för denna server om man vill använda samtliga funktioner.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ingen minnes cache har blivit konfigurerad. För att förbättra din prestanda var god konfigurera memcache om tillgängligt. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom är inte läsbar av PHP vilket definitivt inte är rekommenderat av säkerhetsskäl. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du kör för närvarande PHP {version}. Vi rekommenderar dig att uppgradera din PHP version så att ta fördel utav <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">prestanda och säkerhetsuppdateringar från PHP Group</a> så fort som din distribution stödjer det.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Owncloud från en betrodd proxy. Om du inte försöker nå Owncloud från en betrodd proxy, detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Owncloud. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached är konfigurerad som distribuerad cache, men fel PHP modul \"memcache\" är installerad. \\OC\\Memcache\\Memcached stödjer bara \"memcached\" och inte \"memcache\". Se wiki för <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached för båda modulerna</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Några filer passerade inte integritetskontrollen. Vidare information om hur man löser dessa problem kan finnas i vår dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista över felaktiga filer…</a> / <a href=\"{rescanEndpoint}\">Sök igenom igen…</a>)", "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes", + "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Din datakatalog och dina filer är sannolikt tillgängliga över internet. .htaccess filen fungerar ej korrekt. Vi uppmuntrar starkt att du konfigurerar din webbserver på ett sätt som inte gör din datakatalog tillgänglig på nätet eller att man flyttar hela datakatalogen ut ifrån webbserverns webbrot.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP headern är inte konfigurerad att evalueras till \"{expected}\". Detta är en potensiell säkerhetsrisk och vi rekommenderar dig åtgärda denna inställning.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "The \"Strict-Transport-Security\" HTTP headern är inte konfigurerad till minst \"{seconds}\" sekunder. För förbättrad säkerhet rekommenderas aktivering utav HSTS som beskrivs i våra <a href=\"{docUrl}\" rel=\"noreferrer\">säkerhetstips</a>.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du har begärt denna sidan över HTTP. Vi föreslår starkt att du konfigurerar din webbserver att kräva använding utav HTTPS istället, som beskrivs i våra <a href=\"{docUrl}\">säkerhetstips</a>.", "Shared" : "Delad", "Shared with {recipients}" : "Delad med {recipients}", "Error" : "Fel", @@ -150,18 +165,29 @@ OC.L10N.register( "change" : "ändra", "delete" : "radera", "access control" : "åtkomstkontroll", - "An error occured. Please try again" : "Ett fel uppstod. Var god försök igen", + "Could not unshare" : "Kunde inte odela", + "Share details could not be loaded for this item." : "Delningsdetaljer kunde inte laddas för detta objekt.", + "No users or groups found for {search}" : "Inga användare eller grupper funna för {search}", + "No users found for {search}" : "Inga användare funna för {search}", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", "Share" : "Dela", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dela med folk på andra ownClouds med följande syntax username@example.com/owncloud", + "Share with users…" : "Dela med användare...", + "Share with users, groups or remote users…" : "Dela med användare, grupper och fjärranvändare...", + "Share with users or groups…" : "Dela med användare eller grupper...", + "Share with users or remote users…" : "Dela med användare eller fjärranvändare...", + "Error removing share" : "Fel uppstod när delning försökte tas bort", "Warning" : "Varning", "Error while sending notification" : "Fel när notifikation skulle skickas", + "Non-existing tag #{tag}" : "Icke-existerande tag #{tag}", + "not assignable" : "Ej tilldelningsbar", "invisible" : "osynlig", "({scope})" : "({scope})", "Delete" : "Radera", "Rename" : "Byt namn", + "Collaborative tags" : "Sammarbets taggar", "The object type is not specified." : "Objekttypen är inte specificerad.", "Enter new" : "Skriv nytt", "Add" : "Lägg till", @@ -175,12 +201,16 @@ OC.L10N.register( "Hello {name}" : "Hej {name}", "new" : "ny", "_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ner %n filer"], - "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.", + "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Uppgradering pågår, att lämna denna sidan kan störa processen i vissa miljöer", "An error occurred." : "Ett fel inträffade.", "Please reload the page." : "Vänligen ladda om sidan.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Uppdateringen misslyckades. För mer information <a href=\"{url}\">kolla vår forum post</a> angående problemet.", "The update was unsuccessful. " : "Uppdateringen misslyckades.", "The update was successful. There were warnings." : "Uppdateringen lyckades. Det finns varningar.", "The update was successful. Redirecting you to ownCloud now." : "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.", + "Searching other places" : "Söker på andra platser", + "No search results in other folders" : "Inga sökresultat i andra mappar", + "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} sökresultat i en annan mapp","{count} sökresultat i andra mappar"], "Personal" : "Personligt", "Users" : "Användare", "Apps" : "Program", @@ -215,29 +245,34 @@ OC.L10N.register( "Trace" : "Spåra", "Security warning" : "Säkerhetsvarning", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "För information om hur man korrekt konfigurerar din server se <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dokumentationen</a>.", "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>", "Username" : "Användarnamn", "Storage & database" : "Lagring & databas", "Data folder" : "Datamapp", "Configure the database" : "Konfigurera databasen", "Only %s is available." : "Endast %s är tillgänglig.", + "Install and activate additional PHP modules to choose other database types." : "Installera och aktivera ytterligare moduler för att kunna välja andra databas-typer.", "For more details check out the documentation." : "För mer detaljer kolla dokumentationen", "Database user" : "Databasanvändare", "Database password" : "Lösenord till databasen", "Database name" : "Databasnamn", "Database tablespace" : "Databas tabellutrymme", "Database host" : "Databasserver", + "Performance warning" : "Prestanda varning", "SQLite will be used as database." : "SQLite kommer att användas som databas", + "For larger installations we recommend to choose a different database backend." : "För större installationer rekommenderar vi at man väljer en annan databasmotor.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när desktop klienten för filsynkronisering används så avråds användande av SQLite.", "Finish setup" : "Avsluta installation", "Finishing …" : "Avslutar ...", "Need help?" : "Behöver du hjälp?", "See the documentation" : "Kolla dokumentationen", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denna applikationen kräver JavaScript för att fungera korrekt. Var god {linkstart}aktivera JavaScript{linkend} och ladda om sidan.", "Log out" : "Logga ut", "Search" : "Sök", "Server side authentication failed!" : "Servern misslyckades med autentisering!", "Please contact your administrator." : "Kontakta din administratör.", - "An internal error occured." : "Ett internt fel inträffade.", "Please try again or contact your administrator." : "Vänligen försök igen eller kontakta din administratör.", "Log in" : "Logga in", "Wrong password. Reset it?" : "Fel lösenord. Vill du återställa?", @@ -253,6 +288,7 @@ OC.L10N.register( "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din systemadministratör ifall detta meddelande fortsätter eller visas oväntat.", "Thank you for your patience." : "Tack för ditt tålamod.", "You are accessing the server from an untrusted domain." : "Du ansluter till servern från en osäker domän.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Var god kontakta din administratör. Om du är en administratör för denna installationen konfigurera \"trusted_domains\" i inställnings i config/config.php. En exempelkonfiguration återfinns i confg/config.sample.php.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.", "Add \"%s\" as trusted domain" : "Lägg till \"%s\" som en pålitlig domän", "App update required" : "Appen behöver uppdateras", diff --git a/core/l10n/sv.json b/core/l10n/sv.json index fc05448e02d..229fbe7b7f8 100644 --- a/core/l10n/sv.json +++ b/core/l10n/sv.json @@ -36,6 +36,7 @@ "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token", "Couldn't reset password because the token is expired" : "Lösenord kunde inte återställas eftersom \"token\" har utgått", "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka återställningsmail eftersom det saknas epost-adress för denna användaren. Kontakta din administratör", "%s password reset" : "%s återställ lösenord", "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.", "Sunday" : "Söndag", @@ -83,6 +84,7 @@ "Oct." : "Okt.", "Nov." : "Nov.", "Dec." : "Dec.", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Ett problem uppstod under integritetskontrollen av koden. Mer information ... </a>", "Settings" : "Inställningar", "Saving..." : "Sparar...", "Dismiss" : "Avfärda", @@ -114,7 +116,20 @@ "So-so password" : "Okej lösenord", "Good password" : "Bra lösenord", "Strong password" : "Starkt lösenord", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Din webbserver är inte konfigurerad korrekt för att tillåta filsynkronisering eftersom WebDAV gränssnittet verkar otillgängligt.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Din webbserver är inte konfigurerad riktigt för att lösa \"{url}\". Vidare information kan hittas i vår <a target=\"_blank\" rel\"noreferrer\" href=\"{docLink}\">dokumentation</a>.", + "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Servern har ingen fungerande internetuppkoppling. Detta betyder att vissa funktioner så som extern lagring, notifikationer om uppdateringar eller installationer utav tredjeparts applikationer inte kommer fungera. Åtkomst av filer utifrån och att skicka notifieringar via epost kanske inte fungerar heller. Vi föreslår att man aktiverar internetanslutningen för denna server om man vill använda samtliga funktioner.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ingen minnes cache har blivit konfigurerad. För att förbättra din prestanda var god konfigurera memcache om tillgängligt. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom är inte läsbar av PHP vilket definitivt inte är rekommenderat av säkerhetsskäl. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du kör för närvarande PHP {version}. Vi rekommenderar dig att uppgradera din PHP version så att ta fördel utav <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">prestanda och säkerhetsuppdateringar från PHP Group</a> så fort som din distribution stödjer det.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Owncloud från en betrodd proxy. Om du inte försöker nå Owncloud från en betrodd proxy, detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Owncloud. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached är konfigurerad som distribuerad cache, men fel PHP modul \"memcache\" är installerad. \\OC\\Memcache\\Memcached stödjer bara \"memcached\" och inte \"memcache\". Se wiki för <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached för båda modulerna</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Några filer passerade inte integritetskontrollen. Vidare information om hur man löser dessa problem kan finnas i vår dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista över felaktiga filer…</a> / <a href=\"{rescanEndpoint}\">Sök igenom igen…</a>)", "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes", + "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Din datakatalog och dina filer är sannolikt tillgängliga över internet. .htaccess filen fungerar ej korrekt. Vi uppmuntrar starkt att du konfigurerar din webbserver på ett sätt som inte gör din datakatalog tillgänglig på nätet eller att man flyttar hela datakatalogen ut ifrån webbserverns webbrot.", + "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP headern är inte konfigurerad att evalueras till \"{expected}\". Detta är en potensiell säkerhetsrisk och vi rekommenderar dig åtgärda denna inställning.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "The \"Strict-Transport-Security\" HTTP headern är inte konfigurerad till minst \"{seconds}\" sekunder. För förbättrad säkerhet rekommenderas aktivering utav HSTS som beskrivs i våra <a href=\"{docUrl}\" rel=\"noreferrer\">säkerhetstips</a>.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du har begärt denna sidan över HTTP. Vi föreslår starkt att du konfigurerar din webbserver att kräva använding utav HTTPS istället, som beskrivs i våra <a href=\"{docUrl}\">säkerhetstips</a>.", "Shared" : "Delad", "Shared with {recipients}" : "Delad med {recipients}", "Error" : "Fel", @@ -148,18 +163,29 @@ "change" : "ändra", "delete" : "radera", "access control" : "åtkomstkontroll", - "An error occured. Please try again" : "Ett fel uppstod. Var god försök igen", + "Could not unshare" : "Kunde inte odela", + "Share details could not be loaded for this item." : "Delningsdetaljer kunde inte laddas för detta objekt.", + "No users or groups found for {search}" : "Inga användare eller grupper funna för {search}", + "No users found for {search}" : "Inga användare funna för {search}", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", "Share" : "Dela", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dela med folk på andra ownClouds med följande syntax username@example.com/owncloud", + "Share with users…" : "Dela med användare...", + "Share with users, groups or remote users…" : "Dela med användare, grupper och fjärranvändare...", + "Share with users or groups…" : "Dela med användare eller grupper...", + "Share with users or remote users…" : "Dela med användare eller fjärranvändare...", + "Error removing share" : "Fel uppstod när delning försökte tas bort", "Warning" : "Varning", "Error while sending notification" : "Fel när notifikation skulle skickas", + "Non-existing tag #{tag}" : "Icke-existerande tag #{tag}", + "not assignable" : "Ej tilldelningsbar", "invisible" : "osynlig", "({scope})" : "({scope})", "Delete" : "Radera", "Rename" : "Byt namn", + "Collaborative tags" : "Sammarbets taggar", "The object type is not specified." : "Objekttypen är inte specificerad.", "Enter new" : "Skriv nytt", "Add" : "Lägg till", @@ -173,12 +199,16 @@ "Hello {name}" : "Hej {name}", "new" : "ny", "_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ner %n filer"], - "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.", + "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Uppgradering pågår, att lämna denna sidan kan störa processen i vissa miljöer", "An error occurred." : "Ett fel inträffade.", "Please reload the page." : "Vänligen ladda om sidan.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Uppdateringen misslyckades. För mer information <a href=\"{url}\">kolla vår forum post</a> angående problemet.", "The update was unsuccessful. " : "Uppdateringen misslyckades.", "The update was successful. There were warnings." : "Uppdateringen lyckades. Det finns varningar.", "The update was successful. Redirecting you to ownCloud now." : "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.", + "Searching other places" : "Söker på andra platser", + "No search results in other folders" : "Inga sökresultat i andra mappar", + "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} sökresultat i en annan mapp","{count} sökresultat i andra mappar"], "Personal" : "Personligt", "Users" : "Användare", "Apps" : "Program", @@ -213,29 +243,34 @@ "Trace" : "Spåra", "Security warning" : "Säkerhetsvarning", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "För information om hur man korrekt konfigurerar din server se <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dokumentationen</a>.", "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>", "Username" : "Användarnamn", "Storage & database" : "Lagring & databas", "Data folder" : "Datamapp", "Configure the database" : "Konfigurera databasen", "Only %s is available." : "Endast %s är tillgänglig.", + "Install and activate additional PHP modules to choose other database types." : "Installera och aktivera ytterligare moduler för att kunna välja andra databas-typer.", "For more details check out the documentation." : "För mer detaljer kolla dokumentationen", "Database user" : "Databasanvändare", "Database password" : "Lösenord till databasen", "Database name" : "Databasnamn", "Database tablespace" : "Databas tabellutrymme", "Database host" : "Databasserver", + "Performance warning" : "Prestanda varning", "SQLite will be used as database." : "SQLite kommer att användas som databas", + "For larger installations we recommend to choose a different database backend." : "För större installationer rekommenderar vi at man väljer en annan databasmotor.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när desktop klienten för filsynkronisering används så avråds användande av SQLite.", "Finish setup" : "Avsluta installation", "Finishing …" : "Avslutar ...", "Need help?" : "Behöver du hjälp?", "See the documentation" : "Kolla dokumentationen", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denna applikationen kräver JavaScript för att fungera korrekt. Var god {linkstart}aktivera JavaScript{linkend} och ladda om sidan.", "Log out" : "Logga ut", "Search" : "Sök", "Server side authentication failed!" : "Servern misslyckades med autentisering!", "Please contact your administrator." : "Kontakta din administratör.", - "An internal error occured." : "Ett internt fel inträffade.", "Please try again or contact your administrator." : "Vänligen försök igen eller kontakta din administratör.", "Log in" : "Logga in", "Wrong password. Reset it?" : "Fel lösenord. Vill du återställa?", @@ -251,6 +286,7 @@ "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din systemadministratör ifall detta meddelande fortsätter eller visas oväntat.", "Thank you for your patience." : "Tack för ditt tålamod.", "You are accessing the server from an untrusted domain." : "Du ansluter till servern från en osäker domän.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Var god kontakta din administratör. Om du är en administratör för denna installationen konfigurera \"trusted_domains\" i inställnings i config/config.php. En exempelkonfiguration återfinns i confg/config.sample.php.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.", "Add \"%s\" as trusted domain" : "Lägg till \"%s\" som en pålitlig domän", "App update required" : "Appen behöver uppdateras", diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js index 49f1bf0fd57..daf17aa82f0 100644 --- a/core/l10n/th_TH.js +++ b/core/l10n/th_TH.js @@ -159,7 +159,6 @@ OC.L10N.register( "access control" : "ควบคุมการเข้าถึง", "Could not unshare" : "ไม่สามารถยกเลิกการแชร์ได้", "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้", - "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง", "Share" : "แชร์", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ", "Error removing share" : "พบข้อผิดพลาดในรายการที่แชร์ออก", @@ -184,7 +183,6 @@ OC.L10N.register( "Hello {name}" : "สวัสดี {name}", "_download %n file_::_download %n files_" : ["ดาวน์โหลด %n ไฟล์"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "กำลังดำเนินการอัพเกรด หากออกจากหน้านี้ ณ เวลานี้อาจเกิดปัญหาในภายหลัง", - "Updating {productName} to version {version}, this may take a while." : "กำลังอัพเดท {productName} ไปยังรุ่น {version} อาจใช้เวลาสักครู่", "An error occurred." : "เกิดข้อผิดพลาด", "Please reload the page." : "โปรดโหลดหน้าเว็บใหม่", "The update was unsuccessful. " : "อัพเดทไม่สำเร็จ", @@ -254,7 +252,6 @@ OC.L10N.register( "Search" : "ค้นหา", "Server side authentication failed!" : "การรับรองความถูกต้องจากเซิร์ฟเวอร์ล้มเหลว!", "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ", - "An internal error occured." : "เกิดข้อผิดพลาดภายใน", "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ", "Log in" : "เข้าสู่ระบบ", "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?", diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json index 6605a715d15..f01aa4955b8 100644 --- a/core/l10n/th_TH.json +++ b/core/l10n/th_TH.json @@ -157,7 +157,6 @@ "access control" : "ควบคุมการเข้าถึง", "Could not unshare" : "ไม่สามารถยกเลิกการแชร์ได้", "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้", - "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง", "Share" : "แชร์", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ", "Error removing share" : "พบข้อผิดพลาดในรายการที่แชร์ออก", @@ -182,7 +181,6 @@ "Hello {name}" : "สวัสดี {name}", "_download %n file_::_download %n files_" : ["ดาวน์โหลด %n ไฟล์"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "กำลังดำเนินการอัพเกรด หากออกจากหน้านี้ ณ เวลานี้อาจเกิดปัญหาในภายหลัง", - "Updating {productName} to version {version}, this may take a while." : "กำลังอัพเดท {productName} ไปยังรุ่น {version} อาจใช้เวลาสักครู่", "An error occurred." : "เกิดข้อผิดพลาด", "Please reload the page." : "โปรดโหลดหน้าเว็บใหม่", "The update was unsuccessful. " : "อัพเดทไม่สำเร็จ", @@ -252,7 +250,6 @@ "Search" : "ค้นหา", "Server side authentication failed!" : "การรับรองความถูกต้องจากเซิร์ฟเวอร์ล้มเหลว!", "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ", - "An internal error occured." : "เกิดข้อผิดพลาดภายใน", "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ", "Log in" : "เข้าสู่ระบบ", "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?", diff --git a/core/l10n/tr.js b/core/l10n/tr.js index cb919befef8..21e6c184879 100644 --- a/core/l10n/tr.js +++ b/core/l10n/tr.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "Paylaşım kaldırılamadı", "Share details could not be loaded for this item." : "Bu öge için paylaşma ayrıntıları yüklenemedi.", "No users or groups found for {search}" : "{search} için kullanıcı veya grup bulunamadı", - "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin", "Share" : "Paylaş", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş", "Error removing share" : "Paylaşım kaldırılırken hata", @@ -185,7 +184,6 @@ OC.L10N.register( "Hello {name}" : "Merhaba {name}", "_download %n file_::_download %n files_" : ["%n dosya indir","%n dosya indir"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Güncelleme yapılıyor, sayfadan ayrılmak bazı işlemleri kesebilir.", - "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.", "An error occurred." : "Bir hata oluştu", "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Güncelleme başarısız oldu. Daha fazla bilgi için bu sorunu kapsayan <a href=\"{url}\">forum gönderimize</a> bakın.", @@ -256,7 +254,6 @@ OC.L10N.register( "Search" : "Ara", "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!", "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.", - "An internal error occured." : "Dahili bir hata oluştu.", "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.", "Log in" : "Giriş yap", "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?", diff --git a/core/l10n/tr.json b/core/l10n/tr.json index 5b82fa9751e..eddcedd17dd 100644 --- a/core/l10n/tr.json +++ b/core/l10n/tr.json @@ -158,7 +158,6 @@ "Could not unshare" : "Paylaşım kaldırılamadı", "Share details could not be loaded for this item." : "Bu öge için paylaşma ayrıntıları yüklenemedi.", "No users or groups found for {search}" : "{search} için kullanıcı veya grup bulunamadı", - "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin", "Share" : "Paylaş", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş", "Error removing share" : "Paylaşım kaldırılırken hata", @@ -183,7 +182,6 @@ "Hello {name}" : "Merhaba {name}", "_download %n file_::_download %n files_" : ["%n dosya indir","%n dosya indir"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Güncelleme yapılıyor, sayfadan ayrılmak bazı işlemleri kesebilir.", - "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.", "An error occurred." : "Bir hata oluştu", "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Güncelleme başarısız oldu. Daha fazla bilgi için bu sorunu kapsayan <a href=\"{url}\">forum gönderimize</a> bakın.", @@ -254,7 +252,6 @@ "Search" : "Ara", "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!", "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.", - "An internal error occured." : "Dahili bir hata oluştu.", "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.", "Log in" : "Giriş yap", "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?", diff --git a/core/l10n/uk.js b/core/l10n/uk.js index 12960ced47d..4ab46acc9e1 100644 --- a/core/l10n/uk.js +++ b/core/l10n/uk.js @@ -153,7 +153,6 @@ OC.L10N.register( "delete" : "видалити", "access control" : "контроль доступу", "No users or groups found for {search}" : "Не знайдено груп або користувачів за пошуком {search}", - "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз", "{sharee} (group)" : "{sharee} (група)", "Share" : "Поділитися", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud", @@ -175,7 +174,6 @@ OC.L10N.register( "Hello {name}" : "Привіт {name}", "new" : "новий", "_download %n file_::_download %n files_" : ["завантаження %n файлу","завантаження %n файлів","завантаження %n файлів"], - "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.", "An error occurred." : "Виникла помилка.", "Please reload the page." : "Будь ласка, перезавантажте сторінку.", "The update was unsuccessful. " : "Оновлення завершилось невдачею.", @@ -245,7 +243,6 @@ OC.L10N.register( "Search" : "Пошук", "Server side authentication failed!" : "Невдала аутентифікація з сервером!", "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.", - "An internal error occured." : "Виникла внутрішня помилка.", "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.", "Log in" : "Увійти", "Wrong password. Reset it?" : "Невірний пароль. Скинути його?", diff --git a/core/l10n/uk.json b/core/l10n/uk.json index 9d29ce15b7b..8c363b07baa 100644 --- a/core/l10n/uk.json +++ b/core/l10n/uk.json @@ -151,7 +151,6 @@ "delete" : "видалити", "access control" : "контроль доступу", "No users or groups found for {search}" : "Не знайдено груп або користувачів за пошуком {search}", - "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз", "{sharee} (group)" : "{sharee} (група)", "Share" : "Поділитися", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud", @@ -173,7 +172,6 @@ "Hello {name}" : "Привіт {name}", "new" : "новий", "_download %n file_::_download %n files_" : ["завантаження %n файлу","завантаження %n файлів","завантаження %n файлів"], - "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.", "An error occurred." : "Виникла помилка.", "Please reload the page." : "Будь ласка, перезавантажте сторінку.", "The update was unsuccessful. " : "Оновлення завершилось невдачею.", @@ -243,7 +241,6 @@ "Search" : "Пошук", "Server side authentication failed!" : "Невдала аутентифікація з сервером!", "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.", - "An internal error occured." : "Виникла внутрішня помилка.", "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.", "Log in" : "Увійти", "Wrong password. Reset it?" : "Невірний пароль. Скинути його?", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index 1ebb7bfcbf2..3a79ce36c39 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "无法共享", "Share details could not be loaded for this item." : "无法加载这个项目的分享详情", "No users or groups found for {search}" : "{search} 条件下没有找到用户或用户组", - "An error occured. Please try again" : "发生了一个错误请重新尝试", "{sharee} (group)" : "{sharee} (组)", "{sharee} (at {server})" : "{sharee} (位于 {server})", "{sharee} (remote)" : "{sharee} (远程)", @@ -190,7 +189,6 @@ OC.L10N.register( "new" : "新建", "_download %n file_::_download %n files_" : ["下载 %n 个文件"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "升级正在进行，在某些环境中离开此网页可能中断该过程。", - "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。", "An error occurred." : "发生了一个错误", "Please reload the page." : "请重新加载页面。", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新不成功。有关此问题的更多信息请<a href=\"{url}\">查看我们的论坛帖子</a>。", @@ -261,7 +259,6 @@ OC.L10N.register( "Search" : "搜索", "Server side authentication failed!" : "服务端验证失败！", "Please contact your administrator." : "请联系你的管理员。", - "An internal error occured." : "发生了内部错误。", "Please try again or contact your administrator." : "请重试或联系管理员。", "Log in" : "登录", "Wrong password. Reset it?" : "密码错误。要重置么？", diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index 56466547372..6eae74f27d3 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -158,7 +158,6 @@ "Could not unshare" : "无法共享", "Share details could not be loaded for this item." : "无法加载这个项目的分享详情", "No users or groups found for {search}" : "{search} 条件下没有找到用户或用户组", - "An error occured. Please try again" : "发生了一个错误请重新尝试", "{sharee} (group)" : "{sharee} (组)", "{sharee} (at {server})" : "{sharee} (位于 {server})", "{sharee} (remote)" : "{sharee} (远程)", @@ -188,7 +187,6 @@ "new" : "新建", "_download %n file_::_download %n files_" : ["下载 %n 个文件"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "升级正在进行，在某些环境中离开此网页可能中断该过程。", - "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。", "An error occurred." : "发生了一个错误", "Please reload the page." : "请重新加载页面。", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新不成功。有关此问题的更多信息请<a href=\"{url}\">查看我们的论坛帖子</a>。", @@ -259,7 +257,6 @@ "Search" : "搜索", "Server side authentication failed!" : "服务端验证失败！", "Please contact your administrator." : "请联系你的管理员。", - "An internal error occured." : "发生了内部错误。", "Please try again or contact your administrator." : "请重试或联系管理员。", "Log in" : "登录", "Wrong password. Reset it?" : "密码错误。要重置么？", diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js index 4bb8e61dfb2..af9dbe0f197 100644 --- a/core/l10n/zh_TW.js +++ b/core/l10n/zh_TW.js @@ -156,14 +156,29 @@ OC.L10N.register( "change" : "更動", "delete" : "刪除", "access control" : "存取控制", + "Could not unshare" : "無法取消分享", "Share details could not be loaded for this item." : "無法載入分享細節", - "An error occured. Please try again" : "發生錯誤，請重試", + "No users or groups found for {search}" : "沒有群組或使用者符合 {search}", + "No users found for {search}" : "沒有使用者符合 {search}", + "{sharee} (group)" : "{sharee} （群組）", + "{sharee} (at {server})" : "{sharee} （在 {server}）", + "{sharee} (remote)" : "{sharee} （遠端）", "Share" : "分享", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "與其他在ownCloud上的人們分享，請使用此格式 username@example.com/owncloud", + "Share with users…" : "分享給其他使用者…", + "Share with users, groups or remote users…" : "分享給其他使用者、群組或遠端使用者…", + "Share with users or groups…" : "分享給群組或使用者…", + "Share with users or remote users…" : "分享給使用者或遠端使用者…", + "Error removing share" : "移除分享時發生錯誤", "Warning" : "警告", "Error while sending notification" : "發送通知錯誤", + "Non-existing tag #{tag}" : "不存在的標籤 #{tag}", + "not assignable" : "不可指定", + "invisible" : "不可見", + "({scope})" : "（{scope}）", "Delete" : "刪除", "Rename" : "重新命名", + "Collaborative tags" : "標籤", "The object type is not specified." : "未指定物件類型", "Enter new" : "輸入新的", "Add" : "增加", @@ -175,11 +190,12 @@ OC.L10N.register( "sunny" : "晴朗的", "Hello {name}, the weather is {weather}" : "哈囉 {name}, 天氣是 {weather}", "Hello {name}" : "哈囉 {name}", + "new" : "新", "_download %n file_::_download %n files_" : ["下載 %n 個檔案"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "正在更新，在某些狀況下，離開本頁面可能會導致更新中斷", - "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候", "An error occurred." : "發生錯誤", "Please reload the page." : "請重新整理頁面", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新失敗，檢視<a href=\"{url}\">論壇上的文章</a>來瞭解更多", "The update was unsuccessful. " : "更新失敗", "The update was successful. There were warnings." : "更新成功，有警告訊息", "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。", @@ -247,7 +263,6 @@ OC.L10N.register( "Search" : "搜尋", "Server side authentication failed!" : "伺服器端認證失敗！", "Please contact your administrator." : "請聯絡系統管理員", - "An internal error occured." : "發生內部錯誤", "Please try again or contact your administrator." : "請重試或聯絡系統管理員", "Log in" : "登入", "Wrong password. Reset it?" : "密碼錯誤，重設密碼？", diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json index ef0a3a81a8c..0cdb96c35b4 100644 --- a/core/l10n/zh_TW.json +++ b/core/l10n/zh_TW.json @@ -154,14 +154,29 @@ "change" : "更動", "delete" : "刪除", "access control" : "存取控制", + "Could not unshare" : "無法取消分享", "Share details could not be loaded for this item." : "無法載入分享細節", - "An error occured. Please try again" : "發生錯誤，請重試", + "No users or groups found for {search}" : "沒有群組或使用者符合 {search}", + "No users found for {search}" : "沒有使用者符合 {search}", + "{sharee} (group)" : "{sharee} （群組）", + "{sharee} (at {server})" : "{sharee} （在 {server}）", + "{sharee} (remote)" : "{sharee} （遠端）", "Share" : "分享", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "與其他在ownCloud上的人們分享，請使用此格式 username@example.com/owncloud", + "Share with users…" : "分享給其他使用者…", + "Share with users, groups or remote users…" : "分享給其他使用者、群組或遠端使用者…", + "Share with users or groups…" : "分享給群組或使用者…", + "Share with users or remote users…" : "分享給使用者或遠端使用者…", + "Error removing share" : "移除分享時發生錯誤", "Warning" : "警告", "Error while sending notification" : "發送通知錯誤", + "Non-existing tag #{tag}" : "不存在的標籤 #{tag}", + "not assignable" : "不可指定", + "invisible" : "不可見", + "({scope})" : "（{scope}）", "Delete" : "刪除", "Rename" : "重新命名", + "Collaborative tags" : "標籤", "The object type is not specified." : "未指定物件類型", "Enter new" : "輸入新的", "Add" : "增加", @@ -173,11 +188,12 @@ "sunny" : "晴朗的", "Hello {name}, the weather is {weather}" : "哈囉 {name}, 天氣是 {weather}", "Hello {name}" : "哈囉 {name}", + "new" : "新", "_download %n file_::_download %n files_" : ["下載 %n 個檔案"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "正在更新，在某些狀況下，離開本頁面可能會導致更新中斷", - "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候", "An error occurred." : "發生錯誤", "Please reload the page." : "請重新整理頁面", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新失敗，檢視<a href=\"{url}\">論壇上的文章</a>來瞭解更多", "The update was unsuccessful. " : "更新失敗", "The update was successful. There were warnings." : "更新成功，有警告訊息", "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。", @@ -245,7 +261,6 @@ "Search" : "搜尋", "Server side authentication failed!" : "伺服器端認證失敗！", "Please contact your administrator." : "請聯絡系統管理員", - "An internal error occured." : "發生內部錯誤", "Please try again or contact your administrator." : "請重試或聯絡系統管理員", "Log in" : "登入", "Wrong password. Reset it?" : "密碼錯誤，重設密碼？", diff --git a/core/strings.php b/core/strings.php index 4936866377a..ba4bc17813c 100644 --- a/core/strings.php +++ b/core/strings.php @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -//some strings that are used in /lib but wont be translatable unless they are in /core too +//some strings that are used in /lib but won't be translatable unless they are in /core too $l = \OC::$server->getL10N('core'); $l->t("Personal"); $l->t("Users"); diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 3a974b00c2c..29c2ca6696d 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -15,7 +15,10 @@ <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="#1d2d44"> <?php foreach ($_['cssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="screen"> + <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> + <?php endforeach; ?> + <?php foreach($_['printcssfiles'] as $cssfile): ?> + <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> <?php endforeach; ?> <?php foreach ($_['jsfiles'] as $jsfile): ?> <script src="<?php print_unescaped($jsfile); ?>"></script> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 7ee282faf0f..3f9c47f9aa6 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -16,7 +16,10 @@ <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="#1d2d44"> <?php foreach($_['cssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="screen"> + <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> + <?php endforeach; ?> + <?php foreach($_['printcssfiles'] as $cssfile): ?> + <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> <?php endforeach; ?> <?php foreach($_['jsfiles'] as $jsfile): ?> <script src="<?php print_unescaped($jsfile); ?>"></script> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dd4864ea73f..601af6077f4 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -23,7 +23,10 @@ <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="#1d2d44"> <?php foreach($_['cssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="screen"> + <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> + <?php endforeach; ?> + <?php foreach($_['printcssfiles'] as $cssfile): ?> + <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> <?php endforeach; ?> <?php foreach($_['jsfiles'] as $jsfile): ?> <script src="<?php print_unescaped($jsfile); ?>"></script> diff --git a/core/templates/login.php b/core/templates/login.php index a12008295c4..9934d4988d9 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -27,13 +27,13 @@ script('core', [ <?php endforeach; ?> <?php if (isset($_['internalexception']) && ($_['internalexception'])): ?> <div class="warning"> - <?php p($l->t('An internal error occured.')); ?><br> + <?php p($l->t('An internal error occurred.')); ?><br> <small><?php p($l->t('Please try again or contact your administrator.')); ?></small> </div> <?php endif; ?> <div id="message" class="hidden"> <img class="float-spinner" alt="" - src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"> + src="<?php p(image_path('core', 'loading-dark.gif'));?>"> <span id="messageText"></span> <!-- the following div ensures that the spinner is always inside the #message div --> <div style="clear: both;"></div> diff --git a/core/templates/lostpassword/resetpassword.php b/core/templates/lostpassword/resetpassword.php index 49ced424648..02e82fe6947 100644 --- a/core/templates/lostpassword/resetpassword.php +++ b/core/templates/lostpassword/resetpassword.php @@ -34,7 +34,7 @@ script('core', 'lostpassword'); </p> <input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" /> <p class="text-center"> - <img class="hidden" id="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/> + <img class="hidden" id="float-spinner" src="<?php p(image_path('core', 'loading-dark.gif'));?>"/> </p> </fieldset> </form> diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php index 75815de84bc..24b2beec6da 100644 --- a/core/templates/update.admin.php +++ b/core/templates/update.admin.php @@ -41,5 +41,13 @@ </div> </div> - <div class="updateProgress hidden"></div> + <div class="update-progress hidden"> + <h2 id="update-progress-title"></h2> + <div id="update-progress-icon" class="icon-loading-dark"></div> + <p id="update-progress-message-error" class="warning hidden"></p> + <ul id="update-progress-message-warnings" class="warning hidden"></ul> + <p id="update-progress-message"></p> + <a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a> + <div id="update-progress-detailed" class="hidden warning"></div> + </div> </div> diff --git a/lib/autoloader.php b/lib/autoloader.php index 87a07f6da12..6a427848235 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -110,9 +110,9 @@ class Autoloader { $split[1] = strtolower($split[1]); if ($split[1] === 'core') { - $paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; + // Covered by PSR-4 autoloader } else if ($split[1] === 'settings') { - $paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; + // Covered by PSR-4 autoloader } else { $paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; } diff --git a/lib/base.php b/lib/base.php index 1a3dbbaa56a..706322fb542 100644 --- a/lib/base.php +++ b/lib/base.php @@ -365,6 +365,7 @@ class OC { $systemConfig->setValue('theme', ''); \OCP\Util::addScript('config'); // needed for web root \OCP\Util::addScript('update'); + \OCP\Util::addStyle('update'); // check whether this is a core update or apps update $installedVersion = $systemConfig->getValue('version', '0.0.0'); @@ -722,7 +723,8 @@ class OC { } private static function registerEncryptionWrapper() { - \OCP\Util::connectHook('OC_Filesystem', 'preSetup', 'OC\Encryption\Manager', 'setupStorage'); + $manager = self::$server->getEncryptionManager(); + \OCP\Util::connectHook('OC_Filesystem', 'preSetup', $manager, 'setupStorage'); } private static function registerEncryptionHooks() { diff --git a/lib/composer/composer/LICENSE b/lib/composer/composer/LICENSE index c8d57af8b27..1a28124886d 100644 --- a/lib/composer/composer/LICENSE +++ b/lib/composer/composer/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) 2015 Nils Adermann, Jordi Boggiano +Copyright (c) 2016 Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php index 4610a912c6d..2561f0048c5 100644 --- a/lib/composer/composer/autoload_psr4.php +++ b/lib/composer/composer/autoload_psr4.php @@ -6,6 +6,8 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname($vendorDir)); return array( + 'OC\\Settings\\' => array($baseDir . '/settings'), + 'OC\\Core\\' => array($baseDir . '/core'), 'OC\\' => array($baseDir . '/lib/private'), 'OCP\\' => array($baseDir . '/lib/public'), ); diff --git a/lib/l10n/da.js b/lib/l10n/da.js index 171844ba890..6fced6db37e 100644 --- a/lib/l10n/da.js +++ b/lib/l10n/da.js @@ -8,6 +8,9 @@ OC.L10N.register( "Sample configuration detected" : "Eksempel for konfiguration registreret", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Der er registreret at eksempel for konfiguration er blevet kopieret. Dette kan ødelægge din installation og understøttes ikke. Læs venligst dokumentationen før der foretages ændringer i config.php", "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s", + "Cannot increase permissions of %s" : "Kan give yderigere rettigheder til %s", + "Expiration date is in the past" : "Udløbsdatoen ligger tilbage i tid", + "Cannot set expiration date more than %s days in the future" : "Udløbsdato kan ikke sættes mere end %s dage ud i fremtiden", "PHP %s or higher is required." : "Der kræves PHP %s eller nyere.", "PHP with a version lower than %s is required." : "Der kræves PHP %s eller ældre.", "Following databases are supported: %s" : "Følgende databaser understøttes: %s", @@ -95,6 +98,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "Der skete en fejl ved deling af %s, fordi %s ikke er medlem af gruppen %s", "You need to provide a password to create a public link, only protected links are allowed" : "Du skal angive et kodeord for at oprette et offentligt link - kun beskyttede links er tilladt", "Sharing %s failed, because sharing with links is not allowed" : "Der skete en fejl ved deling af %s, det er ikke tilladt at dele links", + "Not allowed to create a federated share with the same user" : "Det er ikke tilladt at danne et datafællesskab med samme bruger", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling af %s mislykkedes - kunne ikke finde %s. Måske er serveren ikke tilgængelig i øjeblikket.", "Share type %s is not valid for %s" : "Delingstypen %s er ikke gyldig for %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Angivelse af tilladelser for %s mislykkedes, fordi tilladelserne overskred de som var tildelt %s", diff --git a/lib/l10n/da.json b/lib/l10n/da.json index 5e6de0f8141..7a4a273e337 100644 --- a/lib/l10n/da.json +++ b/lib/l10n/da.json @@ -6,6 +6,9 @@ "Sample configuration detected" : "Eksempel for konfiguration registreret", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Der er registreret at eksempel for konfiguration er blevet kopieret. Dette kan ødelægge din installation og understøttes ikke. Læs venligst dokumentationen før der foretages ændringer i config.php", "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s", + "Cannot increase permissions of %s" : "Kan give yderigere rettigheder til %s", + "Expiration date is in the past" : "Udløbsdatoen ligger tilbage i tid", + "Cannot set expiration date more than %s days in the future" : "Udløbsdato kan ikke sættes mere end %s dage ud i fremtiden", "PHP %s or higher is required." : "Der kræves PHP %s eller nyere.", "PHP with a version lower than %s is required." : "Der kræves PHP %s eller ældre.", "Following databases are supported: %s" : "Følgende databaser understøttes: %s", @@ -93,6 +96,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "Der skete en fejl ved deling af %s, fordi %s ikke er medlem af gruppen %s", "You need to provide a password to create a public link, only protected links are allowed" : "Du skal angive et kodeord for at oprette et offentligt link - kun beskyttede links er tilladt", "Sharing %s failed, because sharing with links is not allowed" : "Der skete en fejl ved deling af %s, det er ikke tilladt at dele links", + "Not allowed to create a federated share with the same user" : "Det er ikke tilladt at danne et datafællesskab med samme bruger", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling af %s mislykkedes - kunne ikke finde %s. Måske er serveren ikke tilgængelig i øjeblikket.", "Share type %s is not valid for %s" : "Delingstypen %s er ikke gyldig for %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Angivelse af tilladelser for %s mislykkedes, fordi tilladelserne overskred de som var tildelt %s", diff --git a/lib/l10n/de.js b/lib/l10n/de.js index 1900ec39a3e..64250641b77 100644 --- a/lib/l10n/de.js +++ b/lib/l10n/de.js @@ -26,6 +26,7 @@ OC.L10N.register( "Users" : "Benutzer", "Admin" : "Administration", "Recommended" : "Empfohlen", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "Die Anwendung \"%s\" kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Die App „%s“ kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Die App „%s“ kann nicht installiert werden, da die folgenden Abhängigkeiten nicht erfüllt sind: %s", "No app name specified" : "Es wurde kein App-Name angegeben", @@ -60,6 +61,7 @@ OC.L10N.register( "Archives of type %s are not supported" : "Archive vom Typ %s werden nicht unterstützt", "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei", + "App cannot be installed because appinfo file cannot be read." : "Die Anwendung kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Die Signatur konnte nicht überprüft werden. Bitte kontaktiere die App-Entwickler und überprüfe deinen Admin-Bildschirm.", "App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält", "App can't be installed because it is not compatible with this version of ownCloud" : "Die App kann nicht installiert werden, weil sie mit dieser Version von ownCloud nicht kompatibel ist", @@ -131,6 +133,7 @@ OC.L10N.register( "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das App-Verzeichnis gegeben wird%s oder der App Store in der Konfigurationsdatei deaktiviert wird.", "Cannot create \"data\" directory (%s)" : "Das Erstellen des „data“-Verzeichnisses ist nicht möglich (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", "Please install one of these locales on your system and restart your webserver." : "Bitte installiere eine dieser Sprachen auf Deinem System und starte den Webserver neu.", diff --git a/lib/l10n/de.json b/lib/l10n/de.json index 24d9c4b6bc7..633ab47d9de 100644 --- a/lib/l10n/de.json +++ b/lib/l10n/de.json @@ -24,6 +24,7 @@ "Users" : "Benutzer", "Admin" : "Administration", "Recommended" : "Empfohlen", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "Die Anwendung \"%s\" kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Die App „%s“ kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Die App „%s“ kann nicht installiert werden, da die folgenden Abhängigkeiten nicht erfüllt sind: %s", "No app name specified" : "Es wurde kein App-Name angegeben", @@ -58,6 +59,7 @@ "Archives of type %s are not supported" : "Archive vom Typ %s werden nicht unterstützt", "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei", + "App cannot be installed because appinfo file cannot be read." : "Die Anwendung kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Die Signatur konnte nicht überprüft werden. Bitte kontaktiere die App-Entwickler und überprüfe deinen Admin-Bildschirm.", "App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält", "App can't be installed because it is not compatible with this version of ownCloud" : "Die App kann nicht installiert werden, weil sie mit dieser Version von ownCloud nicht kompatibel ist", @@ -129,6 +131,7 @@ "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das App-Verzeichnis gegeben wird%s oder der App Store in der Konfigurationsdatei deaktiviert wird.", "Cannot create \"data\" directory (%s)" : "Das Erstellen des „data“-Verzeichnisses ist nicht möglich (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", "Please install one of these locales on your system and restart your webserver." : "Bitte installiere eine dieser Sprachen auf Deinem System und starte den Webserver neu.", diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js index bc77163b9a4..54270493749 100644 --- a/lib/l10n/de_DE.js +++ b/lib/l10n/de_DE.js @@ -26,6 +26,7 @@ OC.L10N.register( "Users" : "Benutzer", "Admin" : "Administrator", "Recommended" : "Empfohlen", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "Die Anwendung \"%s\" kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Die App „%s“ kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Die App „%s“ kann nicht installiert werden, da die folgenden Abhängigkeiten nicht erfüllt sind: %s", "No app name specified" : "Es wurde kein App-Name angegeben", @@ -60,6 +61,7 @@ OC.L10N.register( "Archives of type %s are not supported" : "Archive des Typs %s werden nicht unterstützt.", "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei", + "App cannot be installed because appinfo file cannot be read." : "Die Anwendung kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signatur konnte nicht überprüft werden. Bitte kontaktieren Sie den App Entwickler und überprüfen Sie Ihren Administrationsbereich.", "App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält", "App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.", @@ -131,6 +133,7 @@ OC.L10N.register( "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das App-Verzeichnis gegeben wird%s oder der App Store in der Konfigurationsdatei deaktiviert wird.", "Cannot create \"data\" directory (%s)" : "Das Erstellen des „data“-Verzeichnisses ist nicht möglich (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", "Please install one of these locales on your system and restart your webserver." : "Bitte installieren Sie eine dieser Sprachen auf Ihrem System und starten Sie den Webserver neu.", diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json index 96187f3f254..49abf03a567 100644 --- a/lib/l10n/de_DE.json +++ b/lib/l10n/de_DE.json @@ -24,6 +24,7 @@ "Users" : "Benutzer", "Admin" : "Administrator", "Recommended" : "Empfohlen", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "Die Anwendung \"%s\" kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Die App „%s“ kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Die App „%s“ kann nicht installiert werden, da die folgenden Abhängigkeiten nicht erfüllt sind: %s", "No app name specified" : "Es wurde kein App-Name angegeben", @@ -58,6 +59,7 @@ "Archives of type %s are not supported" : "Archive des Typs %s werden nicht unterstützt.", "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei", + "App cannot be installed because appinfo file cannot be read." : "Die Anwendung kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signatur konnte nicht überprüft werden. Bitte kontaktieren Sie den App Entwickler und überprüfen Sie Ihren Administrationsbereich.", "App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält", "App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.", @@ -129,6 +131,7 @@ "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das App-Verzeichnis gegeben wird%s oder der App Store in der Konfigurationsdatei deaktiviert wird.", "Cannot create \"data\" directory (%s)" : "Das Erstellen des „data“-Verzeichnisses ist nicht möglich (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", "Please install one of these locales on your system and restart your webserver." : "Bitte installieren Sie eine dieser Sprachen auf Ihrem System und starten Sie den Webserver neu.", diff --git a/lib/l10n/es.js b/lib/l10n/es.js index aaeb2ec6239..b2b04e15f3c 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -130,6 +130,7 @@ OC.L10N.register( "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Esto puede solucionarse fácilmente %sdándole permisos de escritura al servidor en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.", "Cannot create \"data\" directory (%s)" : "No puedo crear del directorio \"data\" (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Normalmente esto se puede solucionar <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dándole al servidor web permisos de escritura en todo el directorio o el directorio 'root'</a>", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Los permisos normalmente puede solucionarse %sdándole al servidor permisos de escritura del directorio raíz%s.", "Setting locale to %s failed" : "Falló la activación del idioma %s ", "Please install one of these locales on your system and restart your webserver." : "Instale uno de estos idiomas en su sistema y reinicie su servidor web.", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index 362c2e34ca5..db87962de70 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -128,6 +128,7 @@ "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Esto puede solucionarse fácilmente %sdándole permisos de escritura al servidor en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.", "Cannot create \"data\" directory (%s)" : "No puedo crear del directorio \"data\" (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Normalmente esto se puede solucionar <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dándole al servidor web permisos de escritura en todo el directorio o el directorio 'root'</a>", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Los permisos normalmente puede solucionarse %sdándole al servidor permisos de escritura del directorio raíz%s.", "Setting locale to %s failed" : "Falló la activación del idioma %s ", "Please install one of these locales on your system and restart your webserver." : "Instale uno de estos idiomas en su sistema y reinicie su servidor web.", diff --git a/lib/l10n/fil.js b/lib/l10n/fil.js index 9408adc0dc3..ba15a969e64 100644 --- a/lib/l10n/fil.js +++ b/lib/l10n/fil.js @@ -1,10 +1,7 @@ OC.L10N.register( "lib", { - "_%n day ago_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""], - "_%n year ago_::_%n years ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n minute ago_::_%n minutes ago_" : ["",""] + "Help" : "Tulong", + "seconds ago" : "(na) segundo ang nakalipas" }, "nplurals=2; plural=(n > 1);"); diff --git a/lib/l10n/fil.json b/lib/l10n/fil.json index 2a227e468c7..d51b2f43951 100644 --- a/lib/l10n/fil.json +++ b/lib/l10n/fil.json @@ -1,8 +1,5 @@ { "translations": { - "_%n day ago_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""], - "_%n year ago_::_%n years ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n minute ago_::_%n minutes ago_" : ["",""] + "Help" : "Tulong", + "seconds ago" : "(na) segundo ang nakalipas" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js index 39b937279ad..51f22a711a4 100644 --- a/lib/l10n/fr.js +++ b/lib/l10n/fr.js @@ -26,6 +26,7 @@ OC.L10N.register( "Users" : "Utilisateurs", "Admin" : "Administration", "Recommended" : "Recommandée", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'application \"%s\" ne peut pas être installée car le fichier appinfo ne peut pas être lu.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "L'application \"%s\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'application \"%s\" ne peut pas être installée à cause des dépendances suivantes non satisfaites : %s", "No app name specified" : "Aucun nom d'application spécifié", @@ -60,6 +61,7 @@ OC.L10N.register( "Archives of type %s are not supported" : "Les archives de type %s ne sont pas prises en charge", "Failed to open archive when installing app" : "Échec de l'ouverture de l'archive lors de l'installation de l'application", "App does not provide an info.xml file" : "L'application ne fournit pas de fichier info.xml", + "App cannot be installed because appinfo file cannot be read." : "L'application ne peut pas être installée car le fichier appinfo ne peut pas être lu.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "La signature n'a pas pu être vérifiée. Merci de contacter le développeur de l'application et de vérifier votre page d'administration.", "App can't be installed because of not allowed code in the App" : "L'application ne peut être installée car elle contient du code non-autorisé", "App can't be installed because it is not compatible with this version of ownCloud" : "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud", diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json index d635304b0e7..d7351b2d422 100644 --- a/lib/l10n/fr.json +++ b/lib/l10n/fr.json @@ -24,6 +24,7 @@ "Users" : "Utilisateurs", "Admin" : "Administration", "Recommended" : "Recommandée", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'application \"%s\" ne peut pas être installée car le fichier appinfo ne peut pas être lu.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "L'application \"%s\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'application \"%s\" ne peut pas être installée à cause des dépendances suivantes non satisfaites : %s", "No app name specified" : "Aucun nom d'application spécifié", @@ -58,6 +59,7 @@ "Archives of type %s are not supported" : "Les archives de type %s ne sont pas prises en charge", "Failed to open archive when installing app" : "Échec de l'ouverture de l'archive lors de l'installation de l'application", "App does not provide an info.xml file" : "L'application ne fournit pas de fichier info.xml", + "App cannot be installed because appinfo file cannot be read." : "L'application ne peut pas être installée car le fichier appinfo ne peut pas être lu.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "La signature n'a pas pu être vérifiée. Merci de contacter le développeur de l'application et de vérifier votre page d'administration.", "App can't be installed because of not allowed code in the App" : "L'application ne peut être installée car elle contient du code non-autorisé", "App can't be installed because it is not compatible with this version of ownCloud" : "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud", diff --git a/lib/l10n/he.js b/lib/l10n/he.js index cb735c96c26..2b171ae887a 100644 --- a/lib/l10n/he.js +++ b/lib/l10n/he.js @@ -8,7 +8,9 @@ OC.L10N.register( "Sample configuration detected" : "התגלתה דוגמת תצורה", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "התגלה שדוגמת התצורה הועתקה. דבר זה עלול לשבור את ההתקנה ולא נתמך.יש לקרוא את מסמכי התיעוד לפני שמבצעים שינויים ב- config.php", "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s", + "Cannot increase permissions of %s" : "לא ניתן להגדיל את ההיתרים של %s", "Expiration date is in the past" : "תאריך תפוגה הנו בעבר", + "Cannot set expiration date more than %s days in the future" : "לא ניתן להגדיר את תאריך התפוגה מעל %s ימים בעתיד", "PHP %s or higher is required." : "נדרש PHP בגרסת %s ומעלה.", "PHP with a version lower than %s is required." : "נדרש PHP בגרסה נמוכה מ- %s.", "Following databases are supported: %s" : "מסדי הנתונים הבאים נתמכים: %s", @@ -58,17 +60,22 @@ OC.L10N.register( "Signature could not get checked. Please contact the app developer and check your admin screen." : "חתימה לא ניתנת לבדיקה. יש ליצור קשר עם מפתח היישום ולבדוק את מסך הניהול.", "App can't be installed because of not allowed code in the App" : "היישום לא ניתן להתקנה בשל קוד אסור ביישום", "App can't be installed because it is not compatible with this version of ownCloud" : "היישום לא ניתן להתקנה כיוון שהוא אינו תואם את גרסת ה- ownCloud הזו", + "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "יישום לא ניתן להתקנה כייון שכולל תווית <shipped>אמת</shipped> tag שאינו מאושר ליישומים שאינם נשלחים", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "לא ניתן להתקין את היישום כיוון שהגרסה בקובץ info.xml אינה תואמת לגרסה שמתקבלת מחנות היישומים", "Application is not enabled" : "יישומים אינם מופעלים", "Authentication error" : "שגיאת הזדהות", "Token expired. Please reload page." : "פג תוקף. נא לטעון שוב את הדף.", "Unknown user" : "משתמש לא ידוע", + "%s enter the database username and name." : "%s יש להכניס את שם המשתמש ושם מסד הנתונים.", "%s enter the database username." : "%s נכנס למסד נתוני שמות המשתמשים.", "%s enter the database name." : "%s נכנס למסד נתוני השמות.", "%s you may not use dots in the database name" : "%s לא ניתן להשתמש בנקודות בשם מסד הנתונים", "Oracle connection could not be established" : "לא ניתן היה ליצור חיבור Oracle", "Oracle username and/or password not valid" : "שם משתמש ו/או סיסמת Oracle אינם תקפים", "DB Error: \"%s\"" : "שגיאת מסד נתונים: \"%s\"", + "Offending command was: \"%s\"" : "הפקודה המזיקה הייתה: \"%s\"", "You need to enter either an existing account or the administrator." : "יש להכניס חשבון קיים או מנהל.", + "Offending command was: \"%s\", name: %s, password: %s" : "הפקודה המזיקה הייתה: \"%s\", שם: %s, סיסמא: %s", "PostgreSQL username and/or password not valid" : "שם משתמש ו/או סיסמת PostgreSQL אינם תקפים", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X אינו נתמך ו- %s לא יעבוד כשורה בפלטפורמה זו. ניתן לקחת סיכון ולהשתמש באחריותך! ", "For the best results, please consider using a GNU/Linux server instead." : "לתוצאות הכי טובות, יש לשקול שימוש בשרת GNU/Linux במקום.", @@ -99,20 +106,53 @@ OC.L10N.register( "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "לא ניתן לקבוע תאריך תפוגה. שיתופים אינם יכולים לפוג תוקף מאוחר יותר מ- %s לאחר ששותפו", "Cannot set expiration date. Expiration date is in the past" : "לא ניתן לקבוע תאריך תפוגה. תאריך התפוגה הנו בעבר", "Cannot clear expiration date. Shares are required to have an expiration date." : "לא ניתן לבטל תאריך תפוגה. שיתופים חייבים להכיל תאריך תפוגה.", + "Sharing backend %s must implement the interface OCP\\Share_Backend" : "צד אחורי לשיתוף %s חייב ליישם את ממשק OCP\\Share_Backend", "Sharing backend %s not found" : "צד אחורי לשיתוף %s לא נמצא", "Sharing backend for %s not found" : "צד אחורי לשיתוף של %s לא נמצא", "Sharing failed, because the user %s is the original sharer" : "שיתוף נכשל, כיוון שמשתמש %s הנו המשתף המקורי", + "Sharing %s failed, because the permissions exceed permissions granted to %s" : "השיתוף %s נכשל, כיוון שההרשאות עלו על ההרשאות שניתנו ל- %s", + "Sharing %s failed, because resharing is not allowed" : "השיתוף %s נכשל, כיוון ששיתוף מחודש אסור", + "Sharing %s failed, because the sharing backend for %s could not find its source" : "השיתוף %s נכשל, כיוון שבצד אחורי לשיתוף עבור %s לא ניתן היה לאתר את מקורו", + "Sharing %s failed, because the file could not be found in the file cache" : "השיתוף %s נכשל, כייון שלא ניתן היה למצוא את הקובץ בזכרון המטמון", "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Apps" : "יישומים", + "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "רק התווים הבאים מאושרים לשם משתמש: \"a-z\", \"A-Z\", \"0-9\", וגם \"_.@-'\"", "A valid username must be provided" : "יש לספק שם משתמש תקני", + "Username contains whitespace at the beginning or at the end" : "שם המשתמש מכיל רווח בתחילתו או בסופו", "A valid password must be provided" : "יש לספק ססמה תקנית", "The username is already being used" : "השם משתמש כבר בשימוש", + "No database drivers (sqlite, mysql, or postgresql) installed." : "לא מותקנים דרייברים למסד הנתונים (sqlite, mysql, או postgresql).", + "Microsoft Windows Platform is not supported" : "מערכת הפעלה חלונות אינה נתמכת", + "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "הרצת שרת ownCloud עם מערכת הפעלה Microsoft Windows אינה נתמכת. אנו ממליצים על שרת Linux בתצורת virtual machine אם אין אפשרות להמיר את השרת עצמו. ניתן למצוא את חבילת Linux וכן virtual machine קל להתקנה <a href=\"%s\">%s</a>. להמרת התקנה קיימת ל- Linux ניתן למצוא טיפים וסקריפטים ב- <a href=\"%s\">our תיעוד</a>.", "Cannot write into \"config\" directory" : "לא ניתן לכתוב לתיקיית \"config\"!", "Cannot write into \"apps\" directory" : "לא ניתן לכתוב לתיקיית \"apps\"", + "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "בדרך כלל ניתן להסתדר על ידי %s מתן הרשאות כתיבה בשרת האינטרנט לתיקיית היישומים %s או נטרול חנות היישומים בקובץ ה- config.", "Cannot create \"data\" directory (%s)" : "לא ניתן ליצור תיקיית \"data\" (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "זה בדרך כלל ניתן לתיקון על ידי <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">מתן הרשאות כתיבה בשרת לתיקיית הבסיס directory</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "הרשאות ניתנות בדרך כלל לתיקון על ידי %s מתן לשרת האינטרנט גישת כתיבה לתיקיית הבסיס %s.", + "Setting locale to %s failed" : "הגדרת שפה ל- %s נכשלה", + "Please install one of these locales on your system and restart your webserver." : "יש להתקין אחת מהשפות על המערכת שלך ולהפעיל מחדש את שרת האינטרנט.", + "Please ask your server administrator to install the module." : "יש לבקש ממנהל השרת שלך להתקין את המודול.", "PHP module %s not installed." : "מודול PHP %s אינו מותקן.", + "PHP setting \"%s\" is not set to \"%s\"." : "הגדרות PHP \"%s\" אינם מוגדרות ל- \"%s\"", + "Adjusting this setting in php.ini will make ownCloud run again" : "שינוי הגדרה זו בקובץ php.ini יאפשר ל- ownCloud לרוץ שוב", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload מוגדר ל- \"%s\" במקום הערך המצופה \"0\"", + "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "לתיקון בעיה זו יש להגדיר <code>mbstring.func_overload</code> כ- <code>0</code> iבקובץ ה- php.ini שלך", + "libxml2 2.7.0 is at least required. Currently %s is installed." : "libxml2 2.7.0 נדרש לכל הפחות. כרגע %s מותקן.", + "To fix this issue update your libxml2 version and restart your web server." : "לתיקון הבעיה יש לעדכן את גרסת ה- libxml2 שלך ולהפעיל מחדש את שרת האינטרנט שלך.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ככל הנראה מוגדר ל- strip inline doc blocks. זה יגרום למספר יישומי ליבה לא להיות נגישים.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "זה ככל הנראה נגרם על ידי מאיץ/מטמון כמו Zend OPcache או eAccelerator.", - "Please upgrade your database version" : "שדרג גירסת מסד הנתונים שלך", + "PHP modules have been installed, but they are still listed as missing?" : "מודולי PHP הותקנו, אך עדיין רשומים כחסרים?", + "Please ask your server administrator to restart the web server." : "יש לבקש ממנהל השרת שלך להפעיל מחדש את שרת האינטרנט.", + "PostgreSQL >= 9 required" : "נדרש PostgreSQL >= 9", + "Please upgrade your database version" : "יש לשדרג את גרסת מסד הנתונים שלך", + "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "יש לשנות את ההרשאות ל- 0770 כך שהתיקייה לא תרשם על ידי משתמשים אחרים.", + "Data directory (%s) is readable by other users" : "תיקיית המידע (%s) ניתנת לקריאה על ידי משתמשים אחרים", + "Data directory (%s) must be an absolute path" : "תיקיית המידע (%s) חייבת להיות כנתיב אבסולוטי", + "Check the value of \"datadirectory\" in your configuration" : "יש לבדוק את הערך \"datadirectory\" בהגדרות התצורה שלך", + "Data directory (%s) is invalid" : "תיקיית מידע (%s) אינה חוקית", + "Please check that the data directory contains a file \".ocdata\" in its root." : "יש לוודא שתיקיית המידע כוללת קובץ \".ocdata\" בנתיב הבסיס שלה", + "Could not obtain lock type %d on \"%s\"." : "לא ניתן היה להשיג סוג נעילה %d ב- \"%s\".", "Storage unauthorized. %s" : "אחסון לא מורשה. %s", "Storage incomplete configuration. %s" : "תצורה לא מושלמת של האחסון. %s", "Storage connection error. %s" : "שגיאת חיבור אחסון. %s", diff --git a/lib/l10n/he.json b/lib/l10n/he.json index 268af5fafed..97812942d56 100644 --- a/lib/l10n/he.json +++ b/lib/l10n/he.json @@ -6,7 +6,9 @@ "Sample configuration detected" : "התגלתה דוגמת תצורה", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "התגלה שדוגמת התצורה הועתקה. דבר זה עלול לשבור את ההתקנה ולא נתמך.יש לקרוא את מסמכי התיעוד לפני שמבצעים שינויים ב- config.php", "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s", + "Cannot increase permissions of %s" : "לא ניתן להגדיל את ההיתרים של %s", "Expiration date is in the past" : "תאריך תפוגה הנו בעבר", + "Cannot set expiration date more than %s days in the future" : "לא ניתן להגדיר את תאריך התפוגה מעל %s ימים בעתיד", "PHP %s or higher is required." : "נדרש PHP בגרסת %s ומעלה.", "PHP with a version lower than %s is required." : "נדרש PHP בגרסה נמוכה מ- %s.", "Following databases are supported: %s" : "מסדי הנתונים הבאים נתמכים: %s", @@ -56,17 +58,22 @@ "Signature could not get checked. Please contact the app developer and check your admin screen." : "חתימה לא ניתנת לבדיקה. יש ליצור קשר עם מפתח היישום ולבדוק את מסך הניהול.", "App can't be installed because of not allowed code in the App" : "היישום לא ניתן להתקנה בשל קוד אסור ביישום", "App can't be installed because it is not compatible with this version of ownCloud" : "היישום לא ניתן להתקנה כיוון שהוא אינו תואם את גרסת ה- ownCloud הזו", + "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "יישום לא ניתן להתקנה כייון שכולל תווית <shipped>אמת</shipped> tag שאינו מאושר ליישומים שאינם נשלחים", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "לא ניתן להתקין את היישום כיוון שהגרסה בקובץ info.xml אינה תואמת לגרסה שמתקבלת מחנות היישומים", "Application is not enabled" : "יישומים אינם מופעלים", "Authentication error" : "שגיאת הזדהות", "Token expired. Please reload page." : "פג תוקף. נא לטעון שוב את הדף.", "Unknown user" : "משתמש לא ידוע", + "%s enter the database username and name." : "%s יש להכניס את שם המשתמש ושם מסד הנתונים.", "%s enter the database username." : "%s נכנס למסד נתוני שמות המשתמשים.", "%s enter the database name." : "%s נכנס למסד נתוני השמות.", "%s you may not use dots in the database name" : "%s לא ניתן להשתמש בנקודות בשם מסד הנתונים", "Oracle connection could not be established" : "לא ניתן היה ליצור חיבור Oracle", "Oracle username and/or password not valid" : "שם משתמש ו/או סיסמת Oracle אינם תקפים", "DB Error: \"%s\"" : "שגיאת מסד נתונים: \"%s\"", + "Offending command was: \"%s\"" : "הפקודה המזיקה הייתה: \"%s\"", "You need to enter either an existing account or the administrator." : "יש להכניס חשבון קיים או מנהל.", + "Offending command was: \"%s\", name: %s, password: %s" : "הפקודה המזיקה הייתה: \"%s\", שם: %s, סיסמא: %s", "PostgreSQL username and/or password not valid" : "שם משתמש ו/או סיסמת PostgreSQL אינם תקפים", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X אינו נתמך ו- %s לא יעבוד כשורה בפלטפורמה זו. ניתן לקחת סיכון ולהשתמש באחריותך! ", "For the best results, please consider using a GNU/Linux server instead." : "לתוצאות הכי טובות, יש לשקול שימוש בשרת GNU/Linux במקום.", @@ -97,20 +104,53 @@ "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "לא ניתן לקבוע תאריך תפוגה. שיתופים אינם יכולים לפוג תוקף מאוחר יותר מ- %s לאחר ששותפו", "Cannot set expiration date. Expiration date is in the past" : "לא ניתן לקבוע תאריך תפוגה. תאריך התפוגה הנו בעבר", "Cannot clear expiration date. Shares are required to have an expiration date." : "לא ניתן לבטל תאריך תפוגה. שיתופים חייבים להכיל תאריך תפוגה.", + "Sharing backend %s must implement the interface OCP\\Share_Backend" : "צד אחורי לשיתוף %s חייב ליישם את ממשק OCP\\Share_Backend", "Sharing backend %s not found" : "צד אחורי לשיתוף %s לא נמצא", "Sharing backend for %s not found" : "צד אחורי לשיתוף של %s לא נמצא", "Sharing failed, because the user %s is the original sharer" : "שיתוף נכשל, כיוון שמשתמש %s הנו המשתף המקורי", + "Sharing %s failed, because the permissions exceed permissions granted to %s" : "השיתוף %s נכשל, כיוון שההרשאות עלו על ההרשאות שניתנו ל- %s", + "Sharing %s failed, because resharing is not allowed" : "השיתוף %s נכשל, כיוון ששיתוף מחודש אסור", + "Sharing %s failed, because the sharing backend for %s could not find its source" : "השיתוף %s נכשל, כיוון שבצד אחורי לשיתוף עבור %s לא ניתן היה לאתר את מקורו", + "Sharing %s failed, because the file could not be found in the file cache" : "השיתוף %s נכשל, כייון שלא ניתן היה למצוא את הקובץ בזכרון המטמון", "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Apps" : "יישומים", + "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "רק התווים הבאים מאושרים לשם משתמש: \"a-z\", \"A-Z\", \"0-9\", וגם \"_.@-'\"", "A valid username must be provided" : "יש לספק שם משתמש תקני", + "Username contains whitespace at the beginning or at the end" : "שם המשתמש מכיל רווח בתחילתו או בסופו", "A valid password must be provided" : "יש לספק ססמה תקנית", "The username is already being used" : "השם משתמש כבר בשימוש", + "No database drivers (sqlite, mysql, or postgresql) installed." : "לא מותקנים דרייברים למסד הנתונים (sqlite, mysql, או postgresql).", + "Microsoft Windows Platform is not supported" : "מערכת הפעלה חלונות אינה נתמכת", + "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "הרצת שרת ownCloud עם מערכת הפעלה Microsoft Windows אינה נתמכת. אנו ממליצים על שרת Linux בתצורת virtual machine אם אין אפשרות להמיר את השרת עצמו. ניתן למצוא את חבילת Linux וכן virtual machine קל להתקנה <a href=\"%s\">%s</a>. להמרת התקנה קיימת ל- Linux ניתן למצוא טיפים וסקריפטים ב- <a href=\"%s\">our תיעוד</a>.", "Cannot write into \"config\" directory" : "לא ניתן לכתוב לתיקיית \"config\"!", "Cannot write into \"apps\" directory" : "לא ניתן לכתוב לתיקיית \"apps\"", + "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "בדרך כלל ניתן להסתדר על ידי %s מתן הרשאות כתיבה בשרת האינטרנט לתיקיית היישומים %s או נטרול חנות היישומים בקובץ ה- config.", "Cannot create \"data\" directory (%s)" : "לא ניתן ליצור תיקיית \"data\" (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "זה בדרך כלל ניתן לתיקון על ידי <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">מתן הרשאות כתיבה בשרת לתיקיית הבסיס directory</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "הרשאות ניתנות בדרך כלל לתיקון על ידי %s מתן לשרת האינטרנט גישת כתיבה לתיקיית הבסיס %s.", + "Setting locale to %s failed" : "הגדרת שפה ל- %s נכשלה", + "Please install one of these locales on your system and restart your webserver." : "יש להתקין אחת מהשפות על המערכת שלך ולהפעיל מחדש את שרת האינטרנט.", + "Please ask your server administrator to install the module." : "יש לבקש ממנהל השרת שלך להתקין את המודול.", "PHP module %s not installed." : "מודול PHP %s אינו מותקן.", + "PHP setting \"%s\" is not set to \"%s\"." : "הגדרות PHP \"%s\" אינם מוגדרות ל- \"%s\"", + "Adjusting this setting in php.ini will make ownCloud run again" : "שינוי הגדרה זו בקובץ php.ini יאפשר ל- ownCloud לרוץ שוב", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload מוגדר ל- \"%s\" במקום הערך המצופה \"0\"", + "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "לתיקון בעיה זו יש להגדיר <code>mbstring.func_overload</code> כ- <code>0</code> iבקובץ ה- php.ini שלך", + "libxml2 2.7.0 is at least required. Currently %s is installed." : "libxml2 2.7.0 נדרש לכל הפחות. כרגע %s מותקן.", + "To fix this issue update your libxml2 version and restart your web server." : "לתיקון הבעיה יש לעדכן את גרסת ה- libxml2 שלך ולהפעיל מחדש את שרת האינטרנט שלך.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ככל הנראה מוגדר ל- strip inline doc blocks. זה יגרום למספר יישומי ליבה לא להיות נגישים.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "זה ככל הנראה נגרם על ידי מאיץ/מטמון כמו Zend OPcache או eAccelerator.", - "Please upgrade your database version" : "שדרג גירסת מסד הנתונים שלך", + "PHP modules have been installed, but they are still listed as missing?" : "מודולי PHP הותקנו, אך עדיין רשומים כחסרים?", + "Please ask your server administrator to restart the web server." : "יש לבקש ממנהל השרת שלך להפעיל מחדש את שרת האינטרנט.", + "PostgreSQL >= 9 required" : "נדרש PostgreSQL >= 9", + "Please upgrade your database version" : "יש לשדרג את גרסת מסד הנתונים שלך", + "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "יש לשנות את ההרשאות ל- 0770 כך שהתיקייה לא תרשם על ידי משתמשים אחרים.", + "Data directory (%s) is readable by other users" : "תיקיית המידע (%s) ניתנת לקריאה על ידי משתמשים אחרים", + "Data directory (%s) must be an absolute path" : "תיקיית המידע (%s) חייבת להיות כנתיב אבסולוטי", + "Check the value of \"datadirectory\" in your configuration" : "יש לבדוק את הערך \"datadirectory\" בהגדרות התצורה שלך", + "Data directory (%s) is invalid" : "תיקיית מידע (%s) אינה חוקית", + "Please check that the data directory contains a file \".ocdata\" in its root." : "יש לוודא שתיקיית המידע כוללת קובץ \".ocdata\" בנתיב הבסיס שלה", + "Could not obtain lock type %d on \"%s\"." : "לא ניתן היה להשיג סוג נעילה %d ב- \"%s\".", "Storage unauthorized. %s" : "אחסון לא מורשה. %s", "Storage incomplete configuration. %s" : "תצורה לא מושלמת של האחסון. %s", "Storage connection error. %s" : "שגיאת חיבור אחסון. %s", diff --git a/lib/l10n/it.js b/lib/l10n/it.js index 2b52d575822..ad0b50d3fc5 100644 --- a/lib/l10n/it.js +++ b/lib/l10n/it.js @@ -26,6 +26,7 @@ OC.L10N.register( "Users" : "Utenti", "Admin" : "Admin", "Recommended" : "Consigliata", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'applicazione \"%s\" non può essere installata poiché il file appinfo non può essere letto.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'applicazione \"%s\" non può essere installata poiché le seguenti dipendenze non sono soddisfatte: %s", "No app name specified" : "Il nome dell'applicazione non è specificato", @@ -60,6 +61,7 @@ OC.L10N.register( "Archives of type %s are not supported" : "Gli archivi di tipo %s non sono supportati", "Failed to open archive when installing app" : "Apertura archivio non riuscita durante l'installazione dell'applicazione", "App does not provide an info.xml file" : "L'applicazione non fornisce un file info.xml", + "App cannot be installed because appinfo file cannot be read." : "L'applicazione non può essere installata poiché il file appinfo non può essere letto.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "La firma non può essere verificata. Contatta lo sviluppatore dell'applicazione e controlla la schermata di amministrazione.", "App can't be installed because of not allowed code in the App" : "L'applicazione non può essere installata a causa di codice non consentito al suo interno", "App can't be installed because it is not compatible with this version of ownCloud" : "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud", diff --git a/lib/l10n/it.json b/lib/l10n/it.json index 9e238d7fa12..93acead882f 100644 --- a/lib/l10n/it.json +++ b/lib/l10n/it.json @@ -24,6 +24,7 @@ "Users" : "Utenti", "Admin" : "Admin", "Recommended" : "Consigliata", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'applicazione \"%s\" non può essere installata poiché il file appinfo non può essere letto.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'applicazione \"%s\" non può essere installata poiché le seguenti dipendenze non sono soddisfatte: %s", "No app name specified" : "Il nome dell'applicazione non è specificato", @@ -58,6 +59,7 @@ "Archives of type %s are not supported" : "Gli archivi di tipo %s non sono supportati", "Failed to open archive when installing app" : "Apertura archivio non riuscita durante l'installazione dell'applicazione", "App does not provide an info.xml file" : "L'applicazione non fornisce un file info.xml", + "App cannot be installed because appinfo file cannot be read." : "L'applicazione non può essere installata poiché il file appinfo non può essere letto.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "La firma non può essere verificata. Contatta lo sviluppatore dell'applicazione e controlla la schermata di amministrazione.", "App can't be installed because of not allowed code in the App" : "L'applicazione non può essere installata a causa di codice non consentito al suo interno", "App can't be installed because it is not compatible with this version of ownCloud" : "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud", diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index 47605b895df..41ca12d45d7 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -131,6 +131,7 @@ OC.L10N.register( "Cannot write into \"apps\" directory" : "Kan niet schrijven naar de \"apps\" directory", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de appsdirectory %s of door de appstore te deactiveren in het configbestand.", "Cannot create \"data\" directory (%s)" : "Kan de \"data\" directory (%s) niet aanmaken", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Dit kan worden hersteld door <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> de webserver schrijfrechten te geven tot de hoofddirectory</a>.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de hoofddirectory %s.", "Setting locale to %s failed" : "Instellen taal op %s mislukte", "Please install one of these locales on your system and restart your webserver." : "Installeer één van de talen op uw systeem en herstart uw webserver.", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index e7a8cb5f020..c43e2ea15ca 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -129,6 +129,7 @@ "Cannot write into \"apps\" directory" : "Kan niet schrijven naar de \"apps\" directory", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de appsdirectory %s of door de appstore te deactiveren in het configbestand.", "Cannot create \"data\" directory (%s)" : "Kan de \"data\" directory (%s) niet aanmaken", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Dit kan worden hersteld door <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> de webserver schrijfrechten te geven tot de hoofddirectory</a>.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de hoofddirectory %s.", "Setting locale to %s failed" : "Instellen taal op %s mislukte", "Please install one of these locales on your system and restart your webserver." : "Installeer één van de talen op uw systeem en herstart uw webserver.", diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js index 1a22368ca2c..1f2c517bfea 100644 --- a/lib/l10n/pt_BR.js +++ b/lib/l10n/pt_BR.js @@ -26,6 +26,7 @@ OC.L10N.register( "Users" : "Usuários", "Admin" : "Admin", "Recommended" : "Recomendado", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "O App \"%s\" não pode ser instalado porque o arquivo appinfo não pode ser lido.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" não pode ser instalado porque não é compatível com esta versão do ownCloud.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" não pode ser instalado porque as seguintes dependências não foram cumpridas: %s", "No app name specified" : "O nome do aplicativo não foi especificado.", @@ -60,6 +61,7 @@ OC.L10N.register( "Archives of type %s are not supported" : "Arquivos do tipo %s não são suportados", "Failed to open archive when installing app" : "Falha para abrir o arquivo enquanto instalava o aplicativo", "App does not provide an info.xml file" : "O aplicativo não fornece um arquivo info.xml", + "App cannot be installed because appinfo file cannot be read." : "O App não pode ser instalado porque o arquivo appinfo não pode ser lido.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "A assinatura não pode ser verificada. Por favor entre em contato com o desenvolvedor do aplicativo e verificar sua tela de administração.", "App can't be installed because of not allowed code in the App" : "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo", "App can't be installed because it is not compatible with this version of ownCloud" : "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud", @@ -131,6 +133,7 @@ OC.L10N.register( "Cannot write into \"apps\" directory" : "Não é possível gravar no diretório \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser corrigido dando ao webserver permissão de escrita %sgiving para o diretório apps directory%s ou desabilitando o appstore no arquivo de configuração.", "Cannot create \"data\" directory (%s)" : "Não pode ser criado \"dados\" no diretório (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Esta geralmente pode ser fixado por <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dando permissão de gravação ao diretório raiz do servidor</a>.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissões podem ser corrigidas dando permissão de escita %sgiving ao webserver para o diretório raiz directory%s", "Setting locale to %s failed" : "Falha ao configurar localidade para %s", "Please install one of these locales on your system and restart your webserver." : "Por favor, defina uma dessas localizações em seu sistema e reinicie o seu servidor web.", diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json index 946fdc32d32..48cd31f22c5 100644 --- a/lib/l10n/pt_BR.json +++ b/lib/l10n/pt_BR.json @@ -24,6 +24,7 @@ "Users" : "Usuários", "Admin" : "Admin", "Recommended" : "Recomendado", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "O App \"%s\" não pode ser instalado porque o arquivo appinfo não pode ser lido.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" não pode ser instalado porque não é compatível com esta versão do ownCloud.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" não pode ser instalado porque as seguintes dependências não foram cumpridas: %s", "No app name specified" : "O nome do aplicativo não foi especificado.", @@ -58,6 +59,7 @@ "Archives of type %s are not supported" : "Arquivos do tipo %s não são suportados", "Failed to open archive when installing app" : "Falha para abrir o arquivo enquanto instalava o aplicativo", "App does not provide an info.xml file" : "O aplicativo não fornece um arquivo info.xml", + "App cannot be installed because appinfo file cannot be read." : "O App não pode ser instalado porque o arquivo appinfo não pode ser lido.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "A assinatura não pode ser verificada. Por favor entre em contato com o desenvolvedor do aplicativo e verificar sua tela de administração.", "App can't be installed because of not allowed code in the App" : "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo", "App can't be installed because it is not compatible with this version of ownCloud" : "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud", @@ -129,6 +131,7 @@ "Cannot write into \"apps\" directory" : "Não é possível gravar no diretório \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser corrigido dando ao webserver permissão de escrita %sgiving para o diretório apps directory%s ou desabilitando o appstore no arquivo de configuração.", "Cannot create \"data\" directory (%s)" : "Não pode ser criado \"dados\" no diretório (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Esta geralmente pode ser fixado por <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dando permissão de gravação ao diretório raiz do servidor</a>.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissões podem ser corrigidas dando permissão de escita %sgiving ao webserver para o diretório raiz directory%s", "Setting locale to %s failed" : "Falha ao configurar localidade para %s", "Please install one of these locales on your system and restart your webserver." : "Por favor, defina uma dessas localizações em seu sistema e reinicie o seu servidor web.", diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js index c9757f8e6de..47511d0c49e 100644 --- a/lib/l10n/sl.js +++ b/lib/l10n/sl.js @@ -10,6 +10,7 @@ OC.L10N.register( "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.", "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s", "Expiration date is in the past" : "Datum preteka je že mimo!", + "Cannot set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnosti.", "PHP %s or higher is required." : "Zahtevana je različica PHP %s ali višja.", "PHP with a version lower than %s is required." : "Zahtevana je različica PHP manj kot %s.", "Following databases are supported: %s" : "Podprte so navedene podatkovne zbirke: %s", diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json index 8827701ef85..be488a84000 100644 --- a/lib/l10n/sl.json +++ b/lib/l10n/sl.json @@ -8,6 +8,7 @@ "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.", "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s", "Expiration date is in the past" : "Datum preteka je že mimo!", + "Cannot set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnosti.", "PHP %s or higher is required." : "Zahtevana je različica PHP %s ali višja.", "PHP with a version lower than %s is required." : "Zahtevana je različica PHP manj kot %s.", "Following databases are supported: %s" : "Podprte so navedene podatkovne zbirke: %s", diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js index 7a303ba38c1..54a162455c6 100644 --- a/lib/l10n/sq.js +++ b/lib/l10n/sq.js @@ -26,6 +26,7 @@ OC.L10N.register( "Users" : "Përdorues", "Admin" : "Admin", "Recommended" : "E rekomanduar", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikacioni \"%s\" s’mund të instalohet, ngaqë s’lexohet dot kartela appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Përditësimi \"%s\" s’instalohet dot, ngaqë s’është i përputhshëm me këtë version të ownCloud-it.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Përditësimi \"%s\" s’instalohet dot, ngaqë s’plotësohen varësitë vijuese: %s.", "No app name specified" : "S’u dha emër aplikacioni", @@ -60,6 +61,7 @@ OC.L10N.register( "Archives of type %s are not supported" : "Nuk mbulohen arkivat e llojit %s", "Failed to open archive when installing app" : "Dështoi në hapje arkivi teksa instalohej aplikacioni", "App does not provide an info.xml file" : "Aplikacioni s’ofron kartele të vlefshme .xml", + "App cannot be installed because appinfo file cannot be read." : "Aplikacioni s’mund të instalohet, ngaqë s’lexohet dot kartela appinfo.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Nënshkrimi s’u kontrollua dot. Ju lutemi, lidhuni me zhvilluesin e aplikacionit dhe kontrolloni te skena juaj e përgjegjësit.", "App can't be installed because of not allowed code in the App" : "Aplikacioni s’mund të instalohet, për shkak kodi të palejuar te Aplikacioni", "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikacioni s’mund të instalohet, ngaqë s’është i përputhshëm me këtë version të ownCloud-it", diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json index 984c0cb8890..09d48e8f52a 100644 --- a/lib/l10n/sq.json +++ b/lib/l10n/sq.json @@ -24,6 +24,7 @@ "Users" : "Përdorues", "Admin" : "Admin", "Recommended" : "E rekomanduar", + "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikacioni \"%s\" s’mund të instalohet, ngaqë s’lexohet dot kartela appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Përditësimi \"%s\" s’instalohet dot, ngaqë s’është i përputhshëm me këtë version të ownCloud-it.", "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Përditësimi \"%s\" s’instalohet dot, ngaqë s’plotësohen varësitë vijuese: %s.", "No app name specified" : "S’u dha emër aplikacioni", @@ -58,6 +59,7 @@ "Archives of type %s are not supported" : "Nuk mbulohen arkivat e llojit %s", "Failed to open archive when installing app" : "Dështoi në hapje arkivi teksa instalohej aplikacioni", "App does not provide an info.xml file" : "Aplikacioni s’ofron kartele të vlefshme .xml", + "App cannot be installed because appinfo file cannot be read." : "Aplikacioni s’mund të instalohet, ngaqë s’lexohet dot kartela appinfo.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Nënshkrimi s’u kontrollua dot. Ju lutemi, lidhuni me zhvilluesin e aplikacionit dhe kontrolloni te skena juaj e përgjegjësit.", "App can't be installed because of not allowed code in the App" : "Aplikacioni s’mund të instalohet, për shkak kodi të palejuar te Aplikacioni", "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikacioni s’mund të instalohet, ngaqë s’është i përputhshëm me këtë version të ownCloud-it", diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js index 0e696948c5b..a829153eeef 100644 --- a/lib/l10n/tr.js +++ b/lib/l10n/tr.js @@ -8,7 +8,9 @@ OC.L10N.register( "Sample configuration detected" : "Örnek yapılandırma tespit edildi", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Örnek yapılandırmanın kopyalanmış olabileceği tespit edildi. Bu kurulumunuzu bozabilir ve desteklenmemektedir. Lütfen config.php dosyasında değişiklik yapmadan önce belgelendirmeyi okuyun", "You are not allowed to share %s" : "%s paylaşımını yapma izniniz yok", + "Cannot increase permissions of %s" : "%s izinleri yükseltilemiyor", "Expiration date is in the past" : "Son kullanma tarihi geçmişte", + "Cannot set expiration date more than %s days in the future" : "Paylaşımların son kullanım süreleri, gelecekte %s günden fazla olamaz", "PHP %s or higher is required." : "PHP %s veya daha üst sürümü gerekli.", "PHP with a version lower than %s is required." : "PHP'nin %s sürümü öncesi gerekli.", "Following databases are supported: %s" : "Şu veritabanları desteklenmekte: %s", @@ -58,13 +60,17 @@ OC.L10N.register( "Archives of type %s are not supported" : "%s arşiv türü desteklenmiyor", "Failed to open archive when installing app" : "Uygulama kurulurken arşiv dosyası açılamadı", "App does not provide an info.xml file" : "Uygulama info.xml dosyası sağlamıyor", + "App cannot be installed because appinfo file cannot be read." : "uygulama yüklenemiyor çünkü appinfo dosyası okunamıyor.", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "İmza denetlenemedi. Lütfen uygulama yöneticisi ile iletişime geçin ve yönetici ekranınıza bakın.", "App can't be installed because of not allowed code in the App" : "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor", "App can't be installed because it is not compatible with this version of ownCloud" : "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Uygulama info.xml içindeki sürüm ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor", "Application is not enabled" : "Uygulama etkin değil", "Authentication error" : "Kimlik doğrulama hatası", "Token expired. Please reload page." : "Belirteç süresi geçti. Lütfen sayfayı yenileyin.", "Unknown user" : "Bilinmeyen kullanıcı", + "%s enter the database username and name." : "%s veritabanı adı ve kullanıcı adını girin.", "%s enter the database username." : "%s veritabanı kullanıcı adını girin.", "%s enter the database name." : "%s veritabanı adını girin.", "%s you may not use dots in the database name" : "%s veritabanı adında nokta kullanamayabilirsiniz", @@ -96,6 +102,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "%s paylaşımı, %s kullanıcısı %s grup üyesi olmadığından başarısız oldu", "You need to provide a password to create a public link, only protected links are allowed" : "Herkese açık bir bağlantı oluşturmak için bir parola belirtmeniz gerekiyor. Sadece korunmuş bağlantılara izin verilmektedir", "Sharing %s failed, because sharing with links is not allowed" : "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu", + "Not allowed to create a federated share with the same user" : "Aynı kullanıcı ile bir birleşik paylaşım oluşturulamaz", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s paylaşımı başarısız. %s bulunamadı veya sunucu şu anda ulaşılamıyor olabilir.", "Share type %s is not valid for %s" : "%s paylaşım türü %s için geçerli değil", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı", @@ -113,7 +120,9 @@ OC.L10N.register( "Sharing %s failed, because the file could not be found in the file cache" : "%s paylaşımı, dosyanın dosya önbelleğinde bulunamamasınndan dolayı başarısız oldu", "Could not find category \"%s\"" : "\"%s\" kategorisi bulunamadı", "Apps" : "Uygulamalar", + "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Kullanıcı adında sadece bu karakterlere izin verilmektedir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-'\"", "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı", + "Username contains whitespace at the beginning or at the end" : "Kullanıcı adı başlangıç veya sonda boşluk içeriyor", "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı", "The username is already being used" : "Bu kullanıcı adı zaten kullanımda", "No database drivers (sqlite, mysql, or postgresql) installed." : "Yüklü veritabanı sürücüsü (sqlite, mysql veya postgresql) yok.", @@ -123,6 +132,7 @@ OC.L10N.register( "Cannot write into \"apps\" directory" : "\"apps\" dizinine yazılamıyor", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Bu genellikle, %sweb sunucusuna apps dizinine yazma erişimi verilerek%s veya yapılandırma dosyasında appstore (uygulama mağazası) devre dışı bırakılarak çözülebilir.", "Cannot create \"data\" directory (%s)" : "\"Veri\" dizini oluşturulamıyor (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Bu genellikle, <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">web sunucusuna kök dizinine yazma erişimi verilerek</a> çözülebilir.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "İzinler genellikle, %sweb sunucusuna kök dizinine yazma erişimi verilerek%s çözülebilir", "Setting locale to %s failed" : "Dili %s olarak ayarlama başarısız", "Please install one of these locales on your system and restart your webserver." : "Lütfen bu yerellerden birini sisteminize yükleyin ve web sunucunuzu yeniden başlatın.", @@ -132,6 +142,8 @@ OC.L10N.register( "Adjusting this setting in php.ini will make ownCloud run again" : "Bu ayarı php.ini içerisinde ayarlamak ownCloud'ı tekrar çalıştıracak.", "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload, beklenen \"0\" değerinin aksine \"%s\" olarak ayarlanmış", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Bu hatayı düzeltmek için php.ini içerisindeki <code>mbstring.func_overload</code> ayarını <code>0</code> olarak ayarlayın", + "libxml2 2.7.0 is at least required. Currently %s is installed." : "En düşük libxml2 2.7.0 gerekli. Şu anda %s kurulu.", + "To fix this issue update your libxml2 version and restart your web server." : "Bu sorunu çözmek için libxml2 sürümünüzü güncelleyin ve web sunucusunu yeniden başlatın.", "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satıriçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek uygulamalarını erişilemez yapacak.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle meydana gelir.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modülleri yüklü, ancak hala eksik olarak mı görünüyorlar?", @@ -145,6 +157,10 @@ OC.L10N.register( "Data directory (%s) is invalid" : "Veri dizini (%s) geçersiz", "Please check that the data directory contains a file \".ocdata\" in its root." : "Lütfen veri dizininin kökünde \".ocdata\" adlı bir dosyanın bulunduğunu denetleyin.", "Could not obtain lock type %d on \"%s\"." : "\"%s\" üzerinde %d kilit türü alınamadı.", - "Storage not available" : "Depolama mevcut değil" + "Storage unauthorized. %s" : "Depolamaya erişim izni yok. %s", + "Storage incomplete configuration. %s" : "Depolamada tamamlanmamış yapılandırma. %s", + "Storage connection error. %s" : "Depolama bağlantı hatası. %s", + "Storage not available" : "Depolama mevcut değil", + "Storage connection timeout. %s" : "Depolama bağlantı zaman aşımı. %s" }, "nplurals=2; plural=(n > 1);"); diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json index 8843ea6b512..a5340ed3008 100644 --- a/lib/l10n/tr.json +++ b/lib/l10n/tr.json @@ -6,7 +6,9 @@ "Sample configuration detected" : "Örnek yapılandırma tespit edildi", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Örnek yapılandırmanın kopyalanmış olabileceği tespit edildi. Bu kurulumunuzu bozabilir ve desteklenmemektedir. Lütfen config.php dosyasında değişiklik yapmadan önce belgelendirmeyi okuyun", "You are not allowed to share %s" : "%s paylaşımını yapma izniniz yok", + "Cannot increase permissions of %s" : "%s izinleri yükseltilemiyor", "Expiration date is in the past" : "Son kullanma tarihi geçmişte", + "Cannot set expiration date more than %s days in the future" : "Paylaşımların son kullanım süreleri, gelecekte %s günden fazla olamaz", "PHP %s or higher is required." : "PHP %s veya daha üst sürümü gerekli.", "PHP with a version lower than %s is required." : "PHP'nin %s sürümü öncesi gerekli.", "Following databases are supported: %s" : "Şu veritabanları desteklenmekte: %s", @@ -56,13 +58,17 @@ "Archives of type %s are not supported" : "%s arşiv türü desteklenmiyor", "Failed to open archive when installing app" : "Uygulama kurulurken arşiv dosyası açılamadı", "App does not provide an info.xml file" : "Uygulama info.xml dosyası sağlamıyor", + "App cannot be installed because appinfo file cannot be read." : "uygulama yüklenemiyor çünkü appinfo dosyası okunamıyor.", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "İmza denetlenemedi. Lütfen uygulama yöneticisi ile iletişime geçin ve yönetici ekranınıza bakın.", "App can't be installed because of not allowed code in the App" : "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor", "App can't be installed because it is not compatible with this version of ownCloud" : "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Uygulama info.xml içindeki sürüm ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor", "Application is not enabled" : "Uygulama etkin değil", "Authentication error" : "Kimlik doğrulama hatası", "Token expired. Please reload page." : "Belirteç süresi geçti. Lütfen sayfayı yenileyin.", "Unknown user" : "Bilinmeyen kullanıcı", + "%s enter the database username and name." : "%s veritabanı adı ve kullanıcı adını girin.", "%s enter the database username." : "%s veritabanı kullanıcı adını girin.", "%s enter the database name." : "%s veritabanı adını girin.", "%s you may not use dots in the database name" : "%s veritabanı adında nokta kullanamayabilirsiniz", @@ -94,6 +100,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "%s paylaşımı, %s kullanıcısı %s grup üyesi olmadığından başarısız oldu", "You need to provide a password to create a public link, only protected links are allowed" : "Herkese açık bir bağlantı oluşturmak için bir parola belirtmeniz gerekiyor. Sadece korunmuş bağlantılara izin verilmektedir", "Sharing %s failed, because sharing with links is not allowed" : "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu", + "Not allowed to create a federated share with the same user" : "Aynı kullanıcı ile bir birleşik paylaşım oluşturulamaz", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s paylaşımı başarısız. %s bulunamadı veya sunucu şu anda ulaşılamıyor olabilir.", "Share type %s is not valid for %s" : "%s paylaşım türü %s için geçerli değil", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı", @@ -111,7 +118,9 @@ "Sharing %s failed, because the file could not be found in the file cache" : "%s paylaşımı, dosyanın dosya önbelleğinde bulunamamasınndan dolayı başarısız oldu", "Could not find category \"%s\"" : "\"%s\" kategorisi bulunamadı", "Apps" : "Uygulamalar", + "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Kullanıcı adında sadece bu karakterlere izin verilmektedir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-'\"", "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı", + "Username contains whitespace at the beginning or at the end" : "Kullanıcı adı başlangıç veya sonda boşluk içeriyor", "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı", "The username is already being used" : "Bu kullanıcı adı zaten kullanımda", "No database drivers (sqlite, mysql, or postgresql) installed." : "Yüklü veritabanı sürücüsü (sqlite, mysql veya postgresql) yok.", @@ -121,6 +130,7 @@ "Cannot write into \"apps\" directory" : "\"apps\" dizinine yazılamıyor", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Bu genellikle, %sweb sunucusuna apps dizinine yazma erişimi verilerek%s veya yapılandırma dosyasında appstore (uygulama mağazası) devre dışı bırakılarak çözülebilir.", "Cannot create \"data\" directory (%s)" : "\"Veri\" dizini oluşturulamıyor (%s)", + "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "Bu genellikle, <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">web sunucusuna kök dizinine yazma erişimi verilerek</a> çözülebilir.", "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "İzinler genellikle, %sweb sunucusuna kök dizinine yazma erişimi verilerek%s çözülebilir", "Setting locale to %s failed" : "Dili %s olarak ayarlama başarısız", "Please install one of these locales on your system and restart your webserver." : "Lütfen bu yerellerden birini sisteminize yükleyin ve web sunucunuzu yeniden başlatın.", @@ -130,6 +140,8 @@ "Adjusting this setting in php.ini will make ownCloud run again" : "Bu ayarı php.ini içerisinde ayarlamak ownCloud'ı tekrar çalıştıracak.", "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload, beklenen \"0\" değerinin aksine \"%s\" olarak ayarlanmış", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Bu hatayı düzeltmek için php.ini içerisindeki <code>mbstring.func_overload</code> ayarını <code>0</code> olarak ayarlayın", + "libxml2 2.7.0 is at least required. Currently %s is installed." : "En düşük libxml2 2.7.0 gerekli. Şu anda %s kurulu.", + "To fix this issue update your libxml2 version and restart your web server." : "Bu sorunu çözmek için libxml2 sürümünüzü güncelleyin ve web sunucusunu yeniden başlatın.", "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satıriçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek uygulamalarını erişilemez yapacak.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle meydana gelir.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modülleri yüklü, ancak hala eksik olarak mı görünüyorlar?", @@ -143,6 +155,10 @@ "Data directory (%s) is invalid" : "Veri dizini (%s) geçersiz", "Please check that the data directory contains a file \".ocdata\" in its root." : "Lütfen veri dizininin kökünde \".ocdata\" adlı bir dosyanın bulunduğunu denetleyin.", "Could not obtain lock type %d on \"%s\"." : "\"%s\" üzerinde %d kilit türü alınamadı.", - "Storage not available" : "Depolama mevcut değil" + "Storage unauthorized. %s" : "Depolamaya erişim izni yok. %s", + "Storage incomplete configuration. %s" : "Depolamada tamamlanmamış yapılandırma. %s", + "Storage connection error. %s" : "Depolama bağlantı hatası. %s", + "Storage not available" : "Depolama mevcut değil", + "Storage connection timeout. %s" : "Depolama bağlantı zaman aşımı. %s" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/lib/private/Server.php b/lib/private/Server.php index 392b2b17b9c..581a2b44cea 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -59,6 +59,7 @@ use OC\Lock\DBLockingProvider; use OC\Lock\MemcacheLockingProvider; use OC\Lock\NoopLockingProvider; use OC\Mail\Mailer; +use OC\Memcache\ArrayCache; use OC\Notification\Manager; use OC\Security\CertificateManager; use OC\Security\CSP\ContentSecurityPolicyManager; @@ -117,7 +118,8 @@ class Server extends ServerContainer implements IServerContainer { $c->getLogger(), $c->getL10N('core'), new View(), - $util + $util, + new ArrayCache() ); }); diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 4737de002cb..1c9d4d82277 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -23,6 +23,7 @@ namespace OC\Share20; +use OC\Files\Mount\MoveableMount; use OCP\Files\IRootFolder; use OCP\Files\NotFoundException; use OCP\IUserManager; @@ -215,8 +216,19 @@ class Manager implements IManager { throw new \InvalidArgumentException('A share requires permissions'); } + /* + * Quick fix for #23536 + * Non moveable mount points do not have update and delete permissions + * while we 'most likely' do have that on the storage. + */ + $permissions = $share->getNode()->getPermissions(); + $mount = $share->getNode()->getMountPoint(); + if (!($mount instanceof MoveableMount)) { + $permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE; + } + // Check that we do not share with more permissions than we have - if ($share->getPermissions() & ~$share->getNode()->getPermissions()) { + if ($share->getPermissions() & ~$permissions) { $message_t = $this->l->t('Cannot increase permissions of %s', [$share->getNode()->getPath()]); throw new GenericShareException($message_t, $message_t, 404); } diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index 4cb1ac71a88..96203104f74 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -144,9 +144,7 @@ class ProviderFactory implements IProviderFactory { public function getProviderForType($shareType) { $provider = null; - //FIXME we should not report type 2 if ($shareType === \OCP\Share::SHARE_TYPE_USER || - $shareType === 2 || $shareType === \OCP\Share::SHARE_TYPE_GROUP || $shareType === \OCP\Share::SHARE_TYPE_LINK) { $provider = $this->defaultShareProvider(); diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php index 6edd0e6886a..c361f01216f 100644 --- a/lib/private/Share20/Share.php +++ b/lib/private/Share20/Share.php @@ -26,6 +26,7 @@ use OCP\Files\Node; use OCP\Files\NotFoundException; use OCP\IUser; use OCP\IGroup; +use OCP\Share\Exceptions\IllegalIDChangeException; class Share implements \OCP\Share\IShare { @@ -75,7 +76,19 @@ class Share implements \OCP\Share\IShare { * @inheritdoc */ public function setId($id) { - $this->id = $id; + if (is_int($id)) { + $id = (string)$id; + } + + if(!is_string($id)) { + throw new \InvalidArgumentException('String expected.'); + } + + if ($this->id !== null) { + throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share'); + } + + $this->id = trim($id); return $this; } @@ -100,7 +113,15 @@ class Share implements \OCP\Share\IShare { * @inheritdoc */ public function setProviderId($id) { - $this->providerId = $id; + if(!is_string($id)) { + throw new \InvalidArgumentException('String expected.'); + } + + if ($this->providerId !== null) { + throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share'); + } + + $this->providerId = trim($id); return $this; } diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php index 9258b7298cc..e522dca9e3b 100644 --- a/lib/private/activitymanager.php +++ b/lib/private/activitymanager.php @@ -49,6 +49,9 @@ class ActivityManager implements IManager { /** @var int */ protected $formattingObjectId; + /** @var string */ + protected $currentUserId; + /** * constructor of the controller * @@ -321,7 +324,8 @@ class ActivityManager implements IManager { * @return bool */ public function isFormattingFilteredObject() { - return $this->formattingObjectType === $this->request->getParam('object_type') + return $this->formattingObjectType !== null && $this->formattingObjectId !== null + && $this->formattingObjectType === $this->request->getParam('object_type') && $this->formattingObjectId === $this->request->getParam('object_id'); } @@ -475,6 +479,19 @@ class ActivityManager implements IManager { } /** + * Set the user we need to use + * + * @param string|null $currentUserId + * @throws \UnexpectedValueException If the user is invalid + */ + public function setCurrentUserId($currentUserId) { + if (!is_string($currentUserId) && $currentUserId !== null) { + throw new \UnexpectedValueException('The given current user is invalid'); + } + $this->currentUserId = $currentUserId; + } + + /** * Get the user we need to use * * Either the user is logged in, or we try to get it from the token @@ -483,7 +500,9 @@ class ActivityManager implements IManager { * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique */ public function getCurrentUserId() { - if (!$this->session->isLoggedIn()) { + if ($this->currentUserId !== null) { + return $this->currentUserId; + } else if (!$this->session->isLoggedIn()) { return $this->getUserFromToken(); } else { return $this->session->getUser()->getUID(); diff --git a/lib/private/app.php b/lib/private/app.php index 3b8cbba3898..05d220f7d38 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -207,6 +207,9 @@ class OC_App { */ public static function setAppTypes($app) { $appData = self::getAppInfo($app); + if(!is_array($appData)) { + return; + } if (isset($appData['types'])) { $appTypes = implode(',', $appData['types']); @@ -783,6 +786,10 @@ class OC_App { if (array_search($app, $blacklist) === false) { $info = OC_App::getAppInfo($app); + if (!is_array($info)) { + \OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', \OCP\Util::ERROR); + continue; + } if (!isset($info['name'])) { \OCP\Util::writeLog('core', 'App id "' . $app . '" has no name in appinfo', \OCP\Util::ERROR); @@ -1081,6 +1088,14 @@ class OC_App { if ($app !== false) { // check if the app is compatible with this version of ownCloud $info = self::getAppInfo($app); + if(!is_array($info)) { + throw new \Exception( + $l->t('App "%s" cannot be installed because appinfo file cannot be read.', + [$info['name']] + ) + ); + } + $version = \OCP\Util::getVersion(); if (!self::isAppCompatible($version, $info)) { throw new \Exception( diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index f4cbb6384ba..c8525d1d141 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -56,6 +56,14 @@ class Request implements \ArrayAccess, \Countable, IRequest { const USER_AGENT_IE = '/(MSIE)|(Trident)/'; const USER_AGENT_IE_8 = '/MSIE 8.0/'; + // Microsoft Edge User Agent from https://msdn.microsoft.com/en-us/library/hh869301(v=vs.85).aspx + const USER_AGENT_MS_EDGE = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+ Edge\/[0-9.]+$/'; + // Firefox User Agent from https://developer.mozilla.org/en-US/docs/Web/HTTP/Gecko_user_agent_string_reference + const USER_AGENT_FIREFOX = '/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/[0-9.]+$/'; + // Chrome User Agent from https://developer.chrome.com/multidevice/user-agent + const USER_AGENT_CHROME = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+$/'; + // Safari User Agent from http://www.useragentstring.com/pages/Safari/ + const USER_AGENT_SAFARI = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/[0-9.]+ Safari\/[0-9.A-Z]+$/'; // Android Chrome user agent: https://developers.google.com/chrome/mobile/docs/user-agent const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#'; const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#'; diff --git a/lib/private/avatar.php b/lib/private/avatar.php index 4b9d3d82404..3f8038360a4 100644 --- a/lib/private/avatar.php +++ b/lib/private/avatar.php @@ -134,7 +134,7 @@ class Avatar implements IAvatar { */ public function remove () { $regex = '/^avatar\.([0-9]+\.)?(jpg|png)$/'; - $avatars = $this->folder->search('avatar'); + $avatars = $this->folder->getDirectoryListing(); foreach ($avatars as $avatar) { if (preg_match($regex, $avatar->getName())) { diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php index bcabb6fe57a..f73f6b4351a 100644 --- a/lib/private/db/mdb2schemamanager.php +++ b/lib/private/db/mdb2schemamanager.php @@ -32,15 +32,14 @@ use Doctrine\DBAL\Platforms\MySqlPlatform; use Doctrine\DBAL\Platforms\OraclePlatform; use Doctrine\DBAL\Platforms\PostgreSqlPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; +use OCP\IDBConnection; class MDB2SchemaManager { - /** - * @var \OC\DB\Connection $conn - */ + /** @var \OC\DB\Connection $conn */ protected $conn; /** - * @param \OCP\IDBConnection $conn + * @param IDBConnection $conn */ public function __construct($conn) { $this->conn = $conn; @@ -77,16 +76,17 @@ class MDB2SchemaManager { $random = \OC::$server->getSecureRandom(); $platform = $this->conn->getDatabasePlatform(); $config = \OC::$server->getConfig(); + $dispatcher = \OC::$server->getEventDispatcher(); if ($platform instanceof SqlitePlatform) { - return new SQLiteMigrator($this->conn, $random, $config); + return new SQLiteMigrator($this->conn, $random, $config, $dispatcher); } else if ($platform instanceof OraclePlatform) { - return new OracleMigrator($this->conn, $random, $config); + return new OracleMigrator($this->conn, $random, $config, $dispatcher); } else if ($platform instanceof MySqlPlatform) { - return new MySQLMigrator($this->conn, $random, $config); + return new MySQLMigrator($this->conn, $random, $config, $dispatcher); } else if ($platform instanceof PostgreSqlPlatform) { - return new Migrator($this->conn, $random, $config); + return new Migrator($this->conn, $random, $config, $dispatcher); } else { - return new NoCheckMigrator($this->conn, $random, $config); + return new NoCheckMigrator($this->conn, $random, $config, $dispatcher); } } @@ -94,6 +94,7 @@ class MDB2SchemaManager { * Reads database schema from file * * @param string $file file to read from + * @return \Doctrine\DBAL\Schema\Schema */ private function readSchemaFromFile($file) { $platform = $this->conn->getDatabasePlatform(); diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php index 7ca3f981358..8b8a34d9865 100644 --- a/lib/private/db/migrator.php +++ b/lib/private/db/migrator.php @@ -35,6 +35,8 @@ use \Doctrine\DBAL\Schema\SchemaConfig; use \Doctrine\DBAL\Schema\Comparator; use OCP\IConfig; use OCP\Security\ISecureRandom; +use Symfony\Component\EventDispatcher\EventDispatcher; +use Symfony\Component\EventDispatcher\GenericEvent; class Migrator { @@ -51,21 +53,33 @@ class Migrator { /** @var IConfig */ protected $config; + /** @var EventDispatcher */ + private $dispatcher; + + /** @var bool */ + private $noEmit = false; + /** - * @param Connection $connection + * @param \Doctrine\DBAL\Connection|Connection $connection * @param ISecureRandom $random * @param IConfig $config + * @param EventDispatcher $dispatcher */ - public function __construct(\Doctrine\DBAL\Connection $connection, ISecureRandom $random, IConfig $config) { + public function __construct(\Doctrine\DBAL\Connection $connection, + ISecureRandom $random, + IConfig $config, + EventDispatcher $dispatcher = null) { $this->connection = $connection; $this->random = $random; $this->config = $config; + $this->dispatcher = $dispatcher; } /** * @param \Doctrine\DBAL\Schema\Schema $targetSchema */ public function migrate(Schema $targetSchema) { + $this->noEmit = true; $this->applySchema($targetSchema); } @@ -90,21 +104,22 @@ class Migrator { * @throws \OC\DB\MigrationException */ public function checkMigrate(Schema $targetSchema) { - /** - * @var \Doctrine\DBAL\Schema\Table[] $tables - */ + $this->noEmit = true; + /**@var \Doctrine\DBAL\Schema\Table[] $tables */ $tables = $targetSchema->getTables(); $filterExpression = $this->getFilterExpression(); $this->connection->getConfiguration()-> setFilterSchemaAssetsExpression($filterExpression); $existingTables = $this->connection->getSchemaManager()->listTableNames(); + $step = 0; foreach ($tables as $table) { if (strpos($table->getName(), '.')) { list(, $tableName) = explode('.', $table->getName()); } else { $tableName = $table->getName(); } + $this->emitCheckStep($tableName, $step++, count($tables)); // don't need to check for new tables if (array_search($tableName, $existingTables) !== false) { $this->checkTableMigrate($table); @@ -215,7 +230,10 @@ class Migrator { $schemaDiff = $this->getDiff($targetSchema, $connection); $connection->beginTransaction(); - foreach ($schemaDiff->toSql($connection->getDatabasePlatform()) as $sql) { + $sqls = $schemaDiff->toSql($connection->getDatabasePlatform()); + $step = 0; + foreach ($sqls as $sql) { + $this->emit($sql, $step++, count($sqls)); $connection->query($sql); } $connection->commit(); @@ -254,4 +272,21 @@ class Migrator { protected function getFilterExpression() { return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/'; } + + protected function emit($sql, $step, $max) { + if ($this->noEmit) { + return; + } + if(is_null($this->dispatcher)) { + return; + } + $this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max])); + } + + private function emitCheckStep($tableName, $step, $max) { + if(is_null($this->dispatcher)) { + return; + } + $this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step+1, $max])); + } } diff --git a/lib/private/encryption/encryptionwrapper.php b/lib/private/encryption/encryptionwrapper.php new file mode 100644 index 00000000000..11beb0cd6b1 --- /dev/null +++ b/lib/private/encryption/encryptionwrapper.php @@ -0,0 +1,124 @@ +<?php +/** + * @author Björn Schießle <schiessle@owncloud.com> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + + +namespace OC\Encryption; + + +use OC\Memcache\ArrayCache; +use OC\Files\Filesystem; +use OC\Files\Storage\Wrapper\Encryption; +use OCP\Files\Mount\IMountPoint; +use OC\Files\View; +use OCP\Files\Storage; +use OCP\ILogger; + +/** + * Class EncryptionWrapper + * + * applies the encryption storage wrapper + * + * @package OC\Encryption + */ +class EncryptionWrapper { + + /** @var ArrayCache */ + private $arrayCache; + + /** @var Manager */ + private $manager; + + /** @var ILogger */ + private $logger; + + /** + * EncryptionWrapper constructor. + * + * @param ArrayCache $arrayCache + * @param Manager $manager + * @param ILogger $logger + */ + public function __construct(ArrayCache $arrayCache, + Manager $manager, + ILogger $logger + ) { + $this->arrayCache = $arrayCache; + $this->manager = $manager; + $this->logger = $logger; + } + + /** + * Wraps the given storage when it is not a shared storage + * + * @param string $mountPoint + * @param Storage $storage + * @param IMountPoint $mount + * @return Encryption|Storage + */ + public function wrapStorage($mountPoint, Storage $storage, IMountPoint $mount) { + $parameters = [ + 'storage' => $storage, + 'mountPoint' => $mountPoint, + 'mount' => $mount + ]; + + if (!$storage->instanceOfStorage('OC\Files\Storage\Shared') + && !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') + && !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) { + + $user = \OC::$server->getUserSession()->getUser(); + $mountManager = Filesystem::getMountManager(); + $uid = $user ? $user->getUID() : null; + $fileHelper = \OC::$server->getEncryptionFilesHelper(); + $keyStorage = \OC::$server->getEncryptionKeyStorage(); + + $util = new Util( + new View(), + \OC::$server->getUserManager(), + \OC::$server->getGroupManager(), + \OC::$server->getConfig() + ); + $update = new Update( + new View(), + $util, + Filesystem::getMountManager(), + $this->manager, + $fileHelper, + $uid + ); + return new Encryption( + $parameters, + $this->manager, + $util, + $this->logger, + $fileHelper, + $uid, + $keyStorage, + $update, + $mountManager, + $this->arrayCache + ); + } else { + return $storage; + } + } + +} diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index d1d17a92887..d45bbf07ee9 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -27,6 +27,7 @@ namespace OC\Encryption; use OC\Encryption\Keys\Storage; use OC\Files\Filesystem; use OC\Files\View; +use OC\Memcache\ArrayCache; use OC\ServiceUnavailableException; use OCP\Encryption\IEncryptionModule; use OCP\Encryption\IManager; @@ -54,20 +55,25 @@ class Manager implements IManager { /** @var Util */ protected $util; + /** @var ArrayCache */ + protected $arrayCache; + /** * @param IConfig $config * @param ILogger $logger * @param IL10N $l10n * @param View $rootView * @param Util $util + * @param ArrayCache $arrayCache */ - public function __construct(IConfig $config, ILogger $logger, IL10N $l10n, View $rootView, Util $util) { + public function __construct(IConfig $config, ILogger $logger, IL10N $l10n, View $rootView, Util $util, ArrayCache $arrayCache) { $this->encryptionModules = array(); $this->config = $config; $this->logger = $logger; $this->l = $l10n; $this->rootView = $rootView; $this->util = $util; + $this->arrayCache = $arrayCache; } /** @@ -227,14 +233,9 @@ class Manager implements IManager { /** * Add storage wrapper */ - public static function setupStorage() { - $util = new Util( - new View(), - \OC::$server->getUserManager(), - \OC::$server->getGroupManager(), - \OC::$server->getConfig() - ); - Filesystem::addStorageWrapper('oc_encryption', array($util, 'wrapStorage'), 2); + public function setupStorage() { + $encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger); + Filesystem::addStorageWrapper('oc_encryption', array($encryptionWrapper, 'wrapStorage'), 2); } diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php index 860c541934a..9e0cfca830d 100644 --- a/lib/private/encryption/util.php +++ b/lib/private/encryption/util.php @@ -28,10 +28,8 @@ use OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException; use OC\Encryption\Exceptions\EncryptionHeaderToLargeException; use OC\Encryption\Exceptions\ModuleDoesNotExistsException; use OC\Files\Filesystem; -use OC\Files\Storage\Wrapper\Encryption; use OC\Files\View; use OCP\Encryption\IEncryptionModule; -use OCP\Files\Mount\IMountPoint; use OCP\Files\Storage; use OCP\IConfig; @@ -392,52 +390,4 @@ class Util { return $this->config->getAppValue('core', 'encryption_key_storage_root', ''); } - /** - * Wraps the given storage when it is not a shared storage - * - * @param string $mountPoint - * @param Storage $storage - * @param IMountPoint $mount - * @return Encryption|Storage - */ - public function wrapStorage($mountPoint, Storage $storage, IMountPoint $mount) { - $parameters = [ - 'storage' => $storage, - 'mountPoint' => $mountPoint, - 'mount' => $mount]; - - if (!$storage->instanceOfStorage('OC\Files\Storage\Shared') - && !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') - && !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) { - - $manager = \OC::$server->getEncryptionManager(); - $user = \OC::$server->getUserSession()->getUser(); - $logger = \OC::$server->getLogger(); - $mountManager = Filesystem::getMountManager(); - $uid = $user ? $user->getUID() : null; - $fileHelper = \OC::$server->getEncryptionFilesHelper(); - $keyStorage = \OC::$server->getEncryptionKeyStorage(); - $update = new Update( - new View(), - $this, - Filesystem::getMountManager(), - $manager, - $fileHelper, - $uid - ); - return new Encryption( - $parameters, - $manager, - $this, - $logger, - $fileHelper, - $uid, - $keyStorage, - $update, - $mountManager - ); - } else { - return $storage; - } - } } diff --git a/lib/private/filechunking.php b/lib/private/filechunking.php index 604a607336c..f2cef275458 100644 --- a/lib/private/filechunking.php +++ b/lib/private/filechunking.php @@ -90,7 +90,7 @@ class OC_FileChunking { * Assembles the chunks into the file specified by the path. * Chunks are deleted afterwards. * - * @param string $f target path + * @param resource $f target path * * @return integer assembled file size * @@ -106,6 +106,8 @@ class OC_FileChunking { // remove after reading to directly save space $cache->remove($prefix.$i); $count += fwrite($f, $chunk); + // let php release the memory to work around memory exhausted error with php 5.6 + $chunk = null; } return $count; diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index f6f5a8cc130..b6d0ec3fb34 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -176,7 +176,12 @@ class Local extends \OC\Files\Storage\Common { } public function file_get_contents($path) { - return file_get_contents($this->getSourcePath($path)); + // file_get_contents() has a memory leak: https://bugs.php.net/bug.php?id=61961 + $filename = $this->getSourcePath($path); + $handle = fopen($filename,'rb'); + $content = fread($handle, filesize($filename)); + fclose($handle); + return $content; } public function file_put_contents($path, $data) { diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 81eea9944f8..1add4d7fd0a 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -33,6 +33,7 @@ use OC\Files\Cache\CacheEntry; use OC\Files\Filesystem; use OC\Files\Mount\Manager; use OC\Files\Storage\LocalTempFileTrait; +use OC\Memcache\ArrayCache; use OCP\Encryption\Exceptions\GenericEncryptionException; use OCP\Encryption\IFile; use OCP\Encryption\IManager; @@ -82,6 +83,9 @@ class Encryption extends Wrapper { /** @var array remember for which path we execute the repair step to avoid recursions */ private $fixUnencryptedSizeOf = array(); + /** @var ArrayCache */ + private $arrayCache; + /** * @param array $parameters * @param IManager $encryptionManager @@ -92,6 +96,7 @@ class Encryption extends Wrapper { * @param IStorage $keyStorage * @param Update $update * @param Manager $mountManager + * @param ArrayCache $arrayCache */ public function __construct( $parameters, @@ -102,9 +107,10 @@ class Encryption extends Wrapper { $uid = null, IStorage $keyStorage = null, Update $update = null, - Manager $mountManager = null + Manager $mountManager = null, + ArrayCache $arrayCache = null ) { - + $this->mountPoint = $parameters['mountPoint']; $this->mount = $parameters['mount']; $this->encryptionManager = $encryptionManager; @@ -116,6 +122,7 @@ class Encryption extends Wrapper { $this->unencryptedSize = array(); $this->update = $update; $this->mountManager = $mountManager; + $this->arrayCache = $arrayCache; parent::__construct($parameters); } @@ -167,20 +174,25 @@ class Encryption extends Wrapper { return null; } $fullPath = $this->getFullPath($path); + $info = $this->getCache()->get($path); if (isset($this->unencryptedSize[$fullPath])) { $data['encrypted'] = true; $data['size'] = $this->unencryptedSize[$fullPath]; } else { - $info = $this->getCache()->get($path); if (isset($info['fileid']) && $info['encrypted']) { $data['size'] = $this->verifyUnencryptedSize($path, $info['size']); $data['encrypted'] = true; } } + if (isset($info['encryptedVersion']) && $info['encryptedVersion'] > 1) { + $data['encryptedVersion'] = $info['encryptedVersion']; + } + return $data; } + /** * see http://php.net/manual/en/function.file_get_contents.php * @@ -352,6 +364,14 @@ class Encryption extends Wrapper { */ public function fopen($path, $mode) { + // check if the file is stored in the array cache, this means that we + // copy a file over to the versions folder, in this case we don't want to + // decrypt it + if ($this->arrayCache->hasKey('encryption_copy_version_' . $path)) { + $this->arrayCache->remove('encryption_copy_version_' . $path); + return $this->storage->fopen($path, $mode); + } + $encryptionEnabled = $this->encryptionManager->isEnabled(); $shouldEncrypt = false; $encryptionModule = null; @@ -674,7 +694,12 @@ class Encryption extends Wrapper { // key from the original file. Just create a 1:1 copy and done if ($this->isVersion($targetInternalPath) || $this->isVersion($sourceInternalPath)) { + // remember that we try to create a version so that we can detect it during + // fopen($sourceInternalPath) and by-pass the encryption in order to + // create a 1:1 copy of the file + $this->arrayCache->set('encryption_copy_version_' . $sourceInternalPath, true); $result = $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); + $this->arrayCache->remove('encryption_copy_version_' . $sourceInternalPath); if ($result) { $info = $this->getCache('', $sourceStorage)->get($sourceInternalPath); // make sure that we update the unencrypted size for the version @@ -841,7 +866,7 @@ class Encryption extends Wrapper { $firstBlock = $this->readFirstBlock($path); if (substr($firstBlock, 0, strlen(Util::HEADER_START)) === Util::HEADER_START) { - $headerSize = strlen($firstBlock); + $headerSize = $this->util->getHeaderSize(); } return $headerSize; diff --git a/lib/private/installer.php b/lib/private/installer.php index c026383e26e..421e281e56b 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -342,6 +342,9 @@ class OC_Installer{ } $info = OC_App::getAppInfo($extractDir.'/appinfo/info.xml', true); + if(!is_array($info)) { + throw new \Exception($l->t('App cannot be installed because appinfo file cannot be read.')); + } // We can't trust the parsed info.xml file as it may have been tampered // with by an attacker and thus we need to use the local data to check diff --git a/lib/private/log.php b/lib/private/log.php index addefe6e53d..9a2a2da906e 100644 --- a/lib/private/log.php +++ b/lib/private/log.php @@ -284,7 +284,7 @@ class Log implements ILogger { 'File' => $exception->getFile(), 'Line' => $exception->getLine(), ); - $exception['Trace'] = preg_replace('!(login|checkPassword)\(.*\)!', '$1(*** username and password replaced ***)', $exception['Trace']); + $exception['Trace'] = preg_replace('!(login|checkPassword|updatePrivateKeyPassword)\(.*\)!', '$1(*** username and password replaced ***)', $exception['Trace']); $msg = isset($context['message']) ? $context['message'] : 'Exception'; $msg .= ': ' . json_encode($exception); $this->error($msg, $context); diff --git a/lib/private/memcache/xcache.php b/lib/private/memcache/xcache.php index eea55fefc4d..e80901faadc 100644 --- a/lib/private/memcache/xcache.php +++ b/lib/private/memcache/xcache.php @@ -125,7 +125,7 @@ class XCache extends Cache implements IMemcache { // AND administration functions are password-protected. return false; } - $var_size = \OC::$server->getIniWrapper()->getNumeric('xcache.var_size'); + $var_size = \OC::$server->getIniWrapper()->getBytes('xcache.var_size'); if (!$var_size) { return false; } diff --git a/lib/private/systemconfig.php b/lib/private/systemconfig.php index d80d9067c06..449a2dc50b2 100644 --- a/lib/private/systemconfig.php +++ b/lib/private/systemconfig.php @@ -44,7 +44,19 @@ class SystemConfig { 'secret' => true, 'updater.secret' => true, 'ldap_agent_password' => true, - 'objectstore' => ['arguments' => ['password' => true]], + 'proxyuserpwd' => true, + 'log.condition' => [ + 'shared_secret' => true, + ], + 'license-key' => true, + 'redis' => [ + 'password' => true, + ], + 'objectstore' => [ + 'arguments' => [ + 'password' => true, + ], + ], ]; /** @var Config */ diff --git a/lib/private/template.php b/lib/private/template.php index bc706e29344..d39abdcd378 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -69,7 +69,7 @@ class OC_Template extends \OC\Template\Base { public function __construct( $app, $name, $renderAs = "", $registerCall = true ) { // Read the selected theme from the config file self::initTemplateEngine($renderAs); - + $theme = OC_Util::getTheme(); $requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : ''; @@ -93,7 +93,7 @@ class OC_Template extends \OC\Template\Base { */ public static function initTemplateEngine($renderAs) { if (self::$initTemplateEngineFirstRun){ - + //apps that started before the template initialization can load their own scripts/styles //so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true //meaning the last script/style in this list will be loaded first @@ -106,13 +106,13 @@ class OC_Template extends \OC\Template\Base { OC_Util::addStyle("tooltip",null,true); OC_Util::addStyle('jquery-ui-fixes',null,true); OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true); + OC_Util::addStyle("mobile",null,true); OC_Util::addStyle("multiselect",null,true); OC_Util::addStyle("fixes",null,true); OC_Util::addStyle("global",null,true); OC_Util::addStyle("apps",null,true); OC_Util::addStyle("fonts",null,true); OC_Util::addStyle("icons",null,true); - OC_Util::addStyle("mobile",null,true); OC_Util::addStyle("header",null,true); OC_Util::addStyle("inputs",null,true); OC_Util::addStyle("styles",null,true); @@ -169,10 +169,10 @@ class OC_Template extends \OC\Template\Base { self::$initTemplateEngineFirstRun = false; } - + } - - + + /** * find the template with the given name * @param string $name of the template file (without suffix) @@ -333,7 +333,7 @@ class OC_Template extends \OC\Template\Base { * print error page using Exception details * @param Exception $exception */ - public static function printExceptionErrorPage($exception) { + public static function printExceptionErrorPage($exception, $fetchPage = false) { try { $request = \OC::$server->getRequest(); $content = new \OC_Template('', 'exception', 'error', false); @@ -346,6 +346,9 @@ class OC_Template extends \OC\Template\Base { $content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false)); $content->assign('remoteAddr', $request->getRemoteAddress()); $content->assign('requestID', $request->getId()); + if ($fetchPage) { + return $content->fetchPage(); + } $content->printPage(); } catch (\Exception $e) { $logger = \OC::$server->getLogger(); diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 5afbd4495c4..fe7638f399d 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -156,11 +156,16 @@ class TemplateLayout extends \OC_Template { // Add the css files $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); $this->assign('cssfiles', array()); + $this->assign('printcssfiles', []); foreach($cssFiles as $info) { $web = $info[1]; $file = $info[2]; - $this->append( 'cssfiles', $web.'/'.$file . '?v=' . self::$versionHash); + if (substr($file, -strlen('print.css')) === 'print.css') { + $this->append( 'printcssfiles', $web.'/'.$file . '?v=' . self::$versionHash); + } else { + $this->append( 'cssfiles', $web.'/'.$file . '?v=' . self::$versionHash); + } } } } @@ -227,10 +232,35 @@ class TemplateLayout extends \OC_Template { } $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); - $cssHash = self::hashFileNames($cssFiles); - if (!file_exists("$assetDir/assets/$cssHash.css")) { - $cssFiles = array_map(function ($item) { + // differentiate between screen stylesheets and printer stylesheets + $screenCssFiles = array_filter($cssFiles, function($cssFile) { + return substr_compare($cssFile[2], 'print.css', -strlen('print.css')) !== 0; + }); + $screenCssAsset = $this->generateCssAsset($screenCssFiles); + + $printCssFiles = array_filter($cssFiles, function($cssFile) { + return substr_compare($cssFile[2], 'print.css', -strlen('print.css')) === 0; + }); + $printCssAsset = $this->generateCssAsset($printCssFiles); + + $this->append('jsfiles', \OC::$server->getURLGenerator()->linkTo('assets', "$jsHash.js")); + $this->append('cssfiles', $screenCssAsset); + $this->append('printcssfiles', $printCssAsset); + } + + /** + * generates a single css asset file from an array of css files if at least one of them has changed + * otherwise it just returns the path to the old asset file + * @param $files + * @return string + */ + private function generateCssAsset($files) { + $assetDir = \OC::$server->getConfig()->getSystemValue('assetdirectory', \OC::$SERVERROOT); + $hash = self::hashFileNames($files); + + if (!file_exists("$assetDir/assets/$hash.css")) { + $files = array_map(function ($item) { $root = $item[0]; $file = $item[2]; $assetPath = $root . '/' . $file; @@ -246,16 +276,17 @@ class TemplateLayout extends \OC_Template { $sourceRoot, $sourcePath ); - }, $cssFiles); - $cssCollection = new AssetCollection($cssFiles); - $cssCollection->setTargetPath("assets/$cssHash.css"); + }, $files); + + $cssCollection = new AssetCollection($files); + $cssCollection->setTargetPath("assets/$hash.css"); $writer = new AssetWriter($assetDir); $writer->writeAsset($cssCollection); + } - $this->append('jsfiles', \OC::$server->getURLGenerator()->linkTo('assets', "$jsHash.js")); - $this->append('cssfiles', \OC::$server->getURLGenerator()->linkTo('assets', "$cssHash.css")); + return \OC::$server->getURLGenerator()->linkTo('assets', "$hash.css"); } /** diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index e2486a9ff1d..7967f877024 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -33,6 +33,7 @@ namespace OC\User; use OC\Hooks\PublicEmitter; +use OCP\IUserBackend; use OCP\IUserManager; use OCP\IConfig; @@ -170,24 +171,24 @@ class Manager extends PublicEmitter implements IUserManager { /** * Check if the password is valid for the user * - * @param string $loginname + * @param string $loginName * @param string $password * @return mixed the User object on success, false otherwise */ - public function checkPassword($loginname, $password) { - $loginname = str_replace("\0", '', $loginname); + public function checkPassword($loginName, $password) { + $loginName = str_replace("\0", '', $loginName); $password = str_replace("\0", '', $password); foreach ($this->backends as $backend) { if ($backend->implementsActions(\OC_User_Backend::CHECK_PASSWORD)) { - $uid = $backend->checkPassword($loginname, $password); + $uid = $backend->checkPassword($loginName, $password); if ($uid !== false) { return $this->getUserObject($uid, $backend); } } } - \OC::$server->getLogger()->warning('Login failed: \''. $loginname .'\' (Remote IP: \''. \OC::$server->getRequest()->getRemoteAddress(). '\')', ['app' => 'core']); + \OC::$server->getLogger()->warning('Login failed: \''. $loginName .'\' (Remote IP: \''. \OC::$server->getRequest()->getRemoteAddress(). '\')', ['app' => 'core']); return false; } @@ -304,7 +305,7 @@ class Manager extends PublicEmitter implements IUserManager { if ($backend->implementsActions(\OC_User_Backend::COUNT_USERS)) { $backendUsers = $backend->countUsers(); if($backendUsers !== false) { - if($backend instanceof \OCP\IUserBackend) { + if($backend instanceof IUserBackend) { $name = $backend->getBackendName(); } else { $name = get_class($backend); @@ -325,7 +326,7 @@ class Manager extends PublicEmitter implements IUserManager { * If the callback returns false no further users will be retrieved. * * @param \Closure $callback - * @return void + * @param string $search * @since 9.0.0 */ public function callForAllUsers(\Closure $callback, $search = '') { @@ -336,6 +337,9 @@ class Manager extends PublicEmitter implements IUserManager { $users = $backend->getUsers($search, $limit, $offset); foreach ($users as $user) { $user = $this->get($user); + if (is_null($user)) { + continue; + } $return = $callback($user); if ($return === false) { break; diff --git a/lib/public/share/exceptions/genericshareexception.php b/lib/public/Share/Exceptions/GenericShareException.php index b32c2f26574..b32c2f26574 100644 --- a/lib/public/share/exceptions/genericshareexception.php +++ b/lib/public/Share/Exceptions/GenericShareException.php diff --git a/lib/public/Share/Exceptions/IllegalIDChangeException.php b/lib/public/Share/Exceptions/IllegalIDChangeException.php new file mode 100644 index 00000000000..6cd887c386b --- /dev/null +++ b/lib/public/Share/Exceptions/IllegalIDChangeException.php @@ -0,0 +1,27 @@ +<?php +/** + * @author Roeland Jago Douma <rullzer@owncloud.com> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ +namespace OCP\Share\Exceptions; + +/** + * Exception for illegal attempts to modify an id of a share + * @since 9.1.0 + */ +class IllegalIDChangeException extends GenericShareException {} diff --git a/lib/public/share/exceptions/sharenotfound.php b/lib/public/Share/Exceptions/ShareNotFound.php index 96e7c096492..96e7c096492 100644 --- a/lib/public/share/exceptions/sharenotfound.php +++ b/lib/public/Share/Exceptions/ShareNotFound.php diff --git a/lib/public/share/imanager.php b/lib/public/Share/IManager.php index 64e5b554de9..64e5b554de9 100644 --- a/lib/public/share/imanager.php +++ b/lib/public/Share/IManager.php diff --git a/lib/public/share/iproviderfactory.php b/lib/public/Share/IProviderFactory.php index 3a8baccf33b..3a8baccf33b 100644 --- a/lib/public/share/iproviderfactory.php +++ b/lib/public/Share/IProviderFactory.php diff --git a/lib/public/share/ishare.php b/lib/public/Share/IShare.php index fdf40f19e56..ee71715f436 100644 --- a/lib/public/share/ishare.php +++ b/lib/public/Share/IShare.php @@ -25,6 +25,7 @@ use OCP\Files\File; use OCP\Files\Folder; use OCP\Files\Node; use OCP\Files\NotFoundException; +use OCP\Share\Exceptions\IllegalIDChangeException; /** * Interface IShare @@ -35,6 +36,19 @@ use OCP\Files\NotFoundException; interface IShare { /** + * Set the internal id of the share + * It is only allowed to set the internal id of a share once. + * Attempts to override the internal id will result in an IllegalIDChangeException + * + * @param string $id + * @return \OCP\Share\IShare + * @throws IllegalIDChangeException + * @throws \InvalidArgumentException + * @since 9.1.0 + */ + public function setId($id); + + /** * Get the internal id of the share. * * @return string @@ -53,6 +67,19 @@ interface IShare { public function getFullId(); /** + * Set the provider id of the share + * It is only allowed to set the provider id of a share once. + * Attempts to override the provider id will result in an IllegalIDChangeException + * + * @param string $id + * @return \OCP\Share\IShare + * @throws IllegalIDChangeException + * @throws \InvalidArgumentException + * @since 9.1.0 + */ + public function setProviderId($id); + + /** * Set the node of the file/folder that is shared * * @param Node $node diff --git a/lib/public/share/ishareprovider.php b/lib/public/Share/IShareProvider.php index d00b9da7b59..d00b9da7b59 100644 --- a/lib/public/share/ishareprovider.php +++ b/lib/public/Share/IShareProvider.php diff --git a/lib/public/activity/imanager.php b/lib/public/activity/imanager.php index 0b97f8a07ed..cbd08722410 100644 --- a/lib/public/activity/imanager.php +++ b/lib/public/activity/imanager.php @@ -204,6 +204,16 @@ interface IManager { */ public function getQueryForFilter($filter); + + /** + * Set the user we need to use + * + * @param string|null $currentUserId + * @throws \UnexpectedValueException If the user is invalid + * @since 9.0.1 + */ + public function setCurrentUserId($currentUserId); + /** * Get the user we need to use * diff --git a/lib/public/app.php b/lib/public/app.php index 032116eb43f..c3ba90cea41 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -112,7 +112,7 @@ class App { * Read app metadata from the info.xml file * @param string $app id of the app or the path of the info.xml file * @param boolean $path (optional) - * @return array + * @return array|null * @since 4.0.0 */ public static function getAppInfo( $app, $path=false ) { diff --git a/lib/public/appframework/db/mapper.php b/lib/public/appframework/db/mapper.php index 3bc9fbcefc6..2e97b06802a 100644 --- a/lib/public/appframework/db/mapper.php +++ b/lib/public/appframework/db/mapper.php @@ -282,18 +282,43 @@ abstract class Mapper { if($row === false || $row === null){ $stmt->closeCursor(); - throw new DoesNotExistException('No matching entry found'); + $msg = $this->buildDebugMessage( + 'Did expect one result but found none when executing', $sql, $params, $limit, $offset + ); + throw new DoesNotExistException($msg); } $row2 = $stmt->fetch(); $stmt->closeCursor(); //MDB2 returns null, PDO and doctrine false when no row is available if( ! ($row2 === false || $row2 === null )) { - throw new MultipleObjectsReturnedException('More than one result'); + $msg = $this->buildDebugMessage( + 'Did not expect more than one result when executing', $sql, $params, $limit, $offset + ); + throw new MultipleObjectsReturnedException($msg); } else { return $row; } } + /** + * Builds an error message by prepending the $msg to an error message which + * has the parameters + * @see findEntity + * @param string $sql the sql query + * @param array $params the parameters of the sql query + * @param int $limit the maximum number of rows + * @param int $offset from which row we want to start + * @return string formatted error message string + * @since 9.1.0 + */ + private function buildDebugMessage($msg, $sql, array $params=[], $limit=null, $offset=null) { + return $msg . + ': query "' . $sql . '"; ' . + 'parameters ' . print_r($params, true) . '; ' . + 'limit "' . $limit . '"; '. + 'offset "' . $offset . '"'; + } + /** * Creates an entity from a row. Automatically determines the entity class diff --git a/lib/public/iusermanager.php b/lib/public/iusermanager.php index 057bd8e89fb..6442938a99b 100644 --- a/lib/public/iusermanager.php +++ b/lib/public/iusermanager.php @@ -90,12 +90,12 @@ interface IUserManager { /** * Check if the password is valid for the user * - * @param string $loginname + * @param string $loginName * @param string $password * @return mixed the User object on success, false otherwise * @since 8.0.0 */ - public function checkPassword($loginname, $password); + public function checkPassword($loginName, $password); /** * search by user id @@ -138,7 +138,7 @@ interface IUserManager { /** * @param \Closure $callback - * @return void + * @param string $search * @since 9.0.0 */ public function callForAllUsers (\Closure $callback, $search = ''); diff --git a/remote.php b/remote.php index df229eb675a..86b47629d73 100644 --- a/remote.php +++ b/remote.php @@ -84,6 +84,27 @@ function handleException(Exception $e) { } } +/** + * @param $service + * @return string + */ +function resolveService($service) { + $services = [ + 'webdav' => 'dav/appinfo/v1/webdav.php', + 'dav' => 'dav/appinfo/v2/remote.php', + 'caldav' => 'dav/appinfo/v1/caldav.php', + 'calendar' => 'dav/appinfo/v1/caldav.php', + 'carddav' => 'dav/appinfo/v1/carddav.php', + 'contacts' => 'dav/appinfo/v1/carddav.php', + 'files' => 'dav/appinfo/v1/webdav.php', + ]; + if (isset($services[$service])) { + return $services[$service]; + } + + return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service); +} + try { require_once 'lib/base.php'; @@ -103,7 +124,7 @@ try { } $service=substr($pathInfo, 1, $pos-1); - $file = \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service); + $file = resolveService($service); if(is_null($file)) { throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND); diff --git a/settings/application.php b/settings/Application.php index 5b84d028abf..5b84d028abf 100644 --- a/settings/application.php +++ b/settings/Application.php diff --git a/settings/changepassword/controller.php b/settings/ChangePassword/Controller.php index 8469ec1423a..8469ec1423a 100644 --- a/settings/changepassword/controller.php +++ b/settings/ChangePassword/Controller.php diff --git a/settings/controller/appsettingscontroller.php b/settings/Controller/AppSettingsController.php index cc69d3130d9..cc69d3130d9 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/Controller/AppSettingsController.php diff --git a/settings/controller/certificatecontroller.php b/settings/Controller/CertificateController.php index 90d0c664d84..90d0c664d84 100644 --- a/settings/controller/certificatecontroller.php +++ b/settings/Controller/CertificateController.php diff --git a/settings/controller/checksetupcontroller.php b/settings/Controller/CheckSetupController.php index cfdfa5021bc..cfdfa5021bc 100644 --- a/settings/controller/checksetupcontroller.php +++ b/settings/Controller/CheckSetupController.php diff --git a/settings/controller/encryptioncontroller.php b/settings/Controller/EncryptionController.php index 504448a5a2c..504448a5a2c 100644 --- a/settings/controller/encryptioncontroller.php +++ b/settings/Controller/EncryptionController.php diff --git a/settings/controller/groupscontroller.php b/settings/Controller/GroupsController.php index bb8e6755d41..bb8e6755d41 100644 --- a/settings/controller/groupscontroller.php +++ b/settings/Controller/GroupsController.php diff --git a/settings/controller/logsettingscontroller.php b/settings/Controller/LogSettingsController.php index c0c9ee04ca3..c0c9ee04ca3 100644 --- a/settings/controller/logsettingscontroller.php +++ b/settings/Controller/LogSettingsController.php diff --git a/settings/controller/mailsettingscontroller.php b/settings/Controller/MailSettingsController.php index dbba4bd9bc0..dbba4bd9bc0 100644 --- a/settings/controller/mailsettingscontroller.php +++ b/settings/Controller/MailSettingsController.php diff --git a/settings/controller/securitysettingscontroller.php b/settings/Controller/SecuritySettingsController.php index d7274d6bcb2..d7274d6bcb2 100644 --- a/settings/controller/securitysettingscontroller.php +++ b/settings/Controller/SecuritySettingsController.php diff --git a/settings/controller/userscontroller.php b/settings/Controller/UsersController.php index f5b7f2d2e5d..f5b7f2d2e5d 100644 --- a/settings/controller/userscontroller.php +++ b/settings/Controller/UsersController.php diff --git a/settings/middleware/subadminmiddleware.php b/settings/Middleware/SubadminMiddleware.php index 8e138bdc1a8..8e138bdc1a8 100644 --- a/settings/middleware/subadminmiddleware.php +++ b/settings/Middleware/SubadminMiddleware.php diff --git a/settings/css/settings.css b/settings/css/settings.css index 2e7b6d213a5..edc4939d2d8 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -194,6 +194,14 @@ span.usersLastLoginTooltip { white-space: nowrap; } color: #000000; } +#userlist .mailAddress .loading-small { + width: 16px; + height: 16px; + margin-left: -26px; + position: relative; + top: 3px; +} + tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:pointer; } tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; } td.remove { diff --git a/settings/js/apps.js b/settings/js/apps.js index 9322319d4ba..e052a9ee9d3 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -506,7 +506,7 @@ OC.Settings.Apps = OC.Settings.Apps || { if (apps.length === 0) { $appList.addClass('hidden'); $emptyList.removeClass('hidden'); - $emptyList.removeClass('hidden').find('h2').text(t('settings', 'No apps found for "{query}"', { + $emptyList.removeClass('hidden').find('h2').text(t('settings', 'No apps found for {query}', { query: query })); } else { diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 261d9a8eb52..9706ac9fbcd 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -728,31 +728,46 @@ $(document).ready(function () { var mailAddress = escapeHTML(UserList.getMailAddress($td)); var $input = $('<input type="text">').val(mailAddress); $td.children('span').replaceWith($input); + $td.find('img').hide(); $input .focus() .keypress(function (event) { if (event.keyCode === 13) { - $tr.data('mailAddress', $input.val()); - $input.blur(); + // enter key + + var mailAddress = $input.val(); + $td.find('.loading-small').css('display', 'inline-block'); + $input.css('padding-right', '26px'); + $input.attr('disabled', 'disabled'); $.ajax({ type: 'PUT', url: OC.generateUrl('/settings/users/{id}/mailAddress', {id: uid}), data: { mailAddress: $(this).val() } - }).fail(function (result) { - OC.Notification.show(result.responseJSON.data.message); - // reset the values + }).success(function () { + // set data attribute to new value + // will in blur() be used to show the text instead of the input field $tr.data('mailAddress', mailAddress); - $tr.children('.mailAddress').children('span').text(mailAddress); + $td.find('.loading-small').css('display', ''); + $input.removeAttr('disabled') + .triggerHandler('blur'); // needed instead of $input.blur() for Firefox + }).fail(function (result) { + OC.Notification.showTemporary(result.responseJSON.data.message); + $td.find('.loading-small').css('display', ''); + $input.removeAttr('disabled') + .css('padding-right', '6px'); }); } }) .blur(function () { - var mailAddress = $tr.data('mailAddress'); - var $span = $('<span>').text(mailAddress); - $tr.data('mailAddress', mailAddress); + if($td.find('.loading-small').css('display') === 'inline-block') { + // in Chrome the blur event is fired too early by the browser - even if the request is still running + return; + } + var $span = $('<span>').text($tr.data('mailAddress')); $input.replaceWith($span); + $td.find('img').show(); }); }); diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 8abde86dd17..d6eb0ecf843 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "Odinstalovat", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikace byla povolena ale je třeba ji aktualizovat. Za 5 sekund budete přesměrování na stránku pro aktualizaci.", "App update" : "Aktualizace aplikace", - "No apps found for \"{query}\"" : "Nebyly nalezeny žádné aplikace pro \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.", "Valid until {date}" : "Platný do {date}", "Delete" : "Smazat", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index 25a70e6cb57..e5aa853f62e 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -82,7 +82,6 @@ "Uninstall" : "Odinstalovat", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikace byla povolena ale je třeba ji aktualizovat. Za 5 sekund budete přesměrování na stránku pro aktualizaci.", "App update" : "Aktualizace aplikace", - "No apps found for \"{query}\"" : "Nebyly nalezeny žádné aplikace pro \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.", "Valid until {date}" : "Platný do {date}", "Delete" : "Smazat", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 5d65aa08b9b..70b183d355a 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -28,9 +28,9 @@ OC.L10N.register( "Unable to change password" : "Passwort konnte nicht geändert werden", "Enabled" : "Aktiviert", "Not enabled" : "Nicht aktiviert", - "installing and updating apps via the app store or Federated Cloud Sharing" : "das Installieren und Aktualisieren von Apps durch den App-Store oder durch Federated Cloud Sharing", + "installing and updating apps via the app store or Federated Cloud Sharing" : "Das Installieren und Aktualisieren von Apps durch den App-Store oder durch Federated Cloud Sharing", "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisiere dein Betriebsystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.", + "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisiere dein Betriebssystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.", "A problem occurred, please check your log files (Error: %s)" : "Es ist ein Problem aufgetreten, bitte überprüfe Deine Logdateien (Fehler: %s)", "Migration Completed" : "Migration komplett", "Group already exists." : "Gruppe existiert bereits.", @@ -67,7 +67,7 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", - "_You have %n app update pending_::_You have %n app updates pending_" : ["Sie haben %n Aktualisierung verfügbar","Sie haben %n Aktualisierungen verfügbar"], + "_You have %n app update pending_::_You have %n app updates pending_" : ["Du hast %n Aktualisierung verfügbar","Du hast %n Aktualisierungen verfügbar"], "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", @@ -84,7 +84,7 @@ OC.L10N.register( "Uninstall" : "Deinstallieren", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, muss aber aktualisiert werden. Du wirst in 5 Sekunden zu Aktualisierungsseite weitergeleitet", "App update" : "App aktualisiert", - "No apps found for \"{query}\"" : "Es wurden keine Apps für \"{query}\"", + "No apps found for {query}" : "Keine Applikationen für {query} gefunden", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.", "Valid until {date}" : "Gültig bis {date}", "Delete" : "Löschen", @@ -126,17 +126,20 @@ OC.L10N.register( "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schau in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s ist in einer älteren Version als %2$s installiert. Aus Stabilitäts- und Performancegründen empfehlen wir eine Aktualisierung auf eine neuere %1$s-Version", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. Aktiviere 'filelocking.enabled' in der config.php diese Probleme zu vermeiden. Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass es zu Problemen mit bestimmten Zeichen in Dateinamen kommen kann.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eines der folgenden Gebietsschemata unterstützt wird: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die „overwrite.cli.url“-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: „%s“).", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfe noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrolliere das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.", "All checks passed." : "Alle Überprüfungen bestanden.", "Open documentation" : "Dokumentation öffnen", "Allow apps to use the Share API" : "Apps die Benutzung der Share-API erlauben", @@ -166,7 +169,7 @@ OC.L10N.register( "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.", "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung an sich garantiert nicht die Sicherheit des Systems. Bitte schau in die ownCloud Dokumentation für weitere Informationen wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.", "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.", - "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu machen. Falls du die Verschlüsselung nutzt, solltest du auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit deinen Daten machen .", + "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu machen. Falls du die Verschlüsselung nutzt, solltest du auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit deinen Daten machen.", "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?", "Enable encryption" : "Verschlüsselung aktivieren", "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.", @@ -196,6 +199,7 @@ OC.L10N.register( "What to log" : "Was für ein Protokoll", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.", "How to do backups" : "Wie man Backups anlegt", "Advanced monitoring" : "Erweitertes Monitoring", "Performance tuning" : "Leistungsoptimierung", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 4ba71842eb1..3d9095a7204 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -26,9 +26,9 @@ "Unable to change password" : "Passwort konnte nicht geändert werden", "Enabled" : "Aktiviert", "Not enabled" : "Nicht aktiviert", - "installing and updating apps via the app store or Federated Cloud Sharing" : "das Installieren und Aktualisieren von Apps durch den App-Store oder durch Federated Cloud Sharing", + "installing and updating apps via the app store or Federated Cloud Sharing" : "Das Installieren und Aktualisieren von Apps durch den App-Store oder durch Federated Cloud Sharing", "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisiere dein Betriebsystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.", + "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisiere dein Betriebssystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.", "A problem occurred, please check your log files (Error: %s)" : "Es ist ein Problem aufgetreten, bitte überprüfe Deine Logdateien (Fehler: %s)", "Migration Completed" : "Migration komplett", "Group already exists." : "Gruppe existiert bereits.", @@ -65,7 +65,7 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", - "_You have %n app update pending_::_You have %n app updates pending_" : ["Sie haben %n Aktualisierung verfügbar","Sie haben %n Aktualisierungen verfügbar"], + "_You have %n app update pending_::_You have %n app updates pending_" : ["Du hast %n Aktualisierung verfügbar","Du hast %n Aktualisierungen verfügbar"], "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", @@ -82,7 +82,7 @@ "Uninstall" : "Deinstallieren", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, muss aber aktualisiert werden. Du wirst in 5 Sekunden zu Aktualisierungsseite weitergeleitet", "App update" : "App aktualisiert", - "No apps found for \"{query}\"" : "Es wurden keine Apps für \"{query}\"", + "No apps found for {query}" : "Keine Applikationen für {query} gefunden", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.", "Valid until {date}" : "Gültig bis {date}", "Delete" : "Löschen", @@ -124,17 +124,20 @@ "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schau in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s ist in einer älteren Version als %2$s installiert. Aus Stabilitäts- und Performancegründen empfehlen wir eine Aktualisierung auf eine neuere %1$s-Version", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. Aktiviere 'filelocking.enabled' in der config.php diese Probleme zu vermeiden. Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass es zu Problemen mit bestimmten Zeichen in Dateinamen kommen kann.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eines der folgenden Gebietsschemata unterstützt wird: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die „overwrite.cli.url“-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: „%s“).", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfe noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrolliere das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.", "All checks passed." : "Alle Überprüfungen bestanden.", "Open documentation" : "Dokumentation öffnen", "Allow apps to use the Share API" : "Apps die Benutzung der Share-API erlauben", @@ -164,7 +167,7 @@ "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.", "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung an sich garantiert nicht die Sicherheit des Systems. Bitte schau in die ownCloud Dokumentation für weitere Informationen wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.", "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.", - "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu machen. Falls du die Verschlüsselung nutzt, solltest du auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit deinen Daten machen .", + "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von deinen Daten zu machen. Falls du die Verschlüsselung nutzt, solltest du auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit deinen Daten machen.", "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?", "Enable encryption" : "Verschlüsselung aktivieren", "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.", @@ -194,6 +197,7 @@ "What to log" : "Was für ein Protokoll", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.", "How to do backups" : "Wie man Backups anlegt", "Advanced monitoring" : "Erweitertes Monitoring", "Performance tuning" : "Leistungsoptimierung", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index d97f9b16c04..64c1978f908 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -28,7 +28,9 @@ OC.L10N.register( "Unable to change password" : "Passwort konnte nicht geändert werden", "Enabled" : "Aktiviert", "Not enabled" : "Nicht aktiviert", + "installing and updating apps via the app store or Federated Cloud Sharing" : "Das Installieren und Aktualisieren von Apps durch den App-Store oder durch Federated Cloud Sharing", "Federated Cloud Sharing" : "Federated-Cloud-Sharing", + "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisieren Sie ihr Betriebssystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.", "A problem occurred, please check your log files (Error: %s)" : "Es ist ein Problem aufgetreten, bitte überprüfen Sie Ihre Logdateien (Fehler: %s)", "Migration Completed" : "Migration abgeschlossen", "Group already exists." : "Gruppe existiert bereits.", @@ -65,12 +67,14 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Sie haben %n Aktualisierung verfügbar","Sie haben %n Aktualisierungen verfügbar"], "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", "Enable" : "Aktivieren", "Error while enabling app" : "Beim Aktivieren der App ist ein Fehler aufgetreten", "Error: this app cannot be enabled because it makes the server unstable" : "Fehler: Diese App kann nicht aktiviert werden, da es den Server instabil macht.", + "Error: could not disable broken app" : "Fehler: Die beschädigte Anwendung konnte nicht deaktiviert werden", "Error while disabling broken app" : "Beim Deaktivieren der defekten App ist ein Fehler aufgetreten", "Updating...." : "Update…", "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten", @@ -80,7 +84,7 @@ OC.L10N.register( "Uninstall" : "Deinstallieren", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, aber sie benötigt ein Update. Sie werden zur Update Seite in 5 Sekunden weitergeleitet.", "App update" : "App aktualisieren", - "No apps found for \"{query}\"" : "Es wurden keine Apps gefunden für \"{query}\"", + "No apps found for {query}" : "Keine Applikationen für {query} gefunden", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.", "Valid until {date}" : "Gültig bis {date}", "Delete" : "Löschen", @@ -122,16 +126,20 @@ OC.L10N.register( "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schauen Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzten.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s ist in einer älteren Version als %2$s installiert. Aus Stabilitäts- und Performancegründen empfehlen wir eine Aktualisierung auf eine neuere %1$s-Version", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. Aktivieren Sie 'filelocking.enabled' in der config.php diese Probleme zu vermeiden. Weitere Informationen findest Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass es zu Problemen mit bestimmten Zeichen in Dateinamen kommen kann.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eines der folgenden Gebietsschemata unterstützt wird: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setzen Sie bitte die „overwrite.cli.url“-Option in Ihrer config.php auf das Web-Wurzelverzeichnis Ihrer Installation (Vorschlag: „%s“).", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfen Sie noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrollieren Sie das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.", "All checks passed." : "Alle checks erfolgreich gepfüft.", "Open documentation" : "Dokumentation öffnen", "Allow apps to use the Share API" : "Apps die Benutzung der Share-API erlauben", @@ -144,6 +152,7 @@ OC.L10N.register( "days" : "Tagen", "Enforce expiration date" : "Ablaufdatum erzwingen", "Allow resharing" : "Weiterverteilen erlauben", + "Allow sharing with groups" : "Mit Gruppen teilen erlauben", "Restrict users to only share with users in their groups" : "Benutzer auf das Teilen innerhalb ihrer Gruppen beschränken", "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen", @@ -157,7 +166,10 @@ OC.L10N.register( "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.", "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren", "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die Serverseite Verschlüsselung aktivieren:", + "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.", + "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung an sich garantiert nicht die Sicherheit des Systems. Bitte schauen Sie in die ownCloud Dokumentation für weitere Informationen wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.", "Be aware that encryption always increases the file size." : "Bedenke das durch die Verschlüsselung die Dateigröße zunimmt. ", + "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von ihren Daten zu machen. Falls Sie die Verschlüsselung nutzen, sollten Sie auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit ihren Daten machen.", "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?", "Enable encryption" : "Verschlüsselung aktivieren", "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.", @@ -187,6 +199,7 @@ OC.L10N.register( "What to log" : "Was geloggt wird", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.", "How to do backups" : "Wie man Backups anlegt", "Advanced monitoring" : "Erweitertes Monitoring", "Performance tuning" : "Leistungsoptimierung", @@ -206,6 +219,7 @@ OC.L10N.register( "Hide description …" : "Beschreibung ausblenden…", "This app has an update available." : "Es ist eine Aktualisierung für diese Anwendung verfügbar.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Dieser App ist keine minimum ownCloud Version zugewiesen. Dies wird ein Fehler in ownCloud 11 und später sein.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine maximale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Diese App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:", "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren", "Uninstall App" : "App deinstallieren", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 3940d5b3be9..5b267b9bf7c 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -26,7 +26,9 @@ "Unable to change password" : "Passwort konnte nicht geändert werden", "Enabled" : "Aktiviert", "Not enabled" : "Nicht aktiviert", + "installing and updating apps via the app store or Federated Cloud Sharing" : "Das Installieren und Aktualisieren von Apps durch den App-Store oder durch Federated Cloud Sharing", "Federated Cloud Sharing" : "Federated-Cloud-Sharing", + "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisieren Sie ihr Betriebssystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.", "A problem occurred, please check your log files (Error: %s)" : "Es ist ein Problem aufgetreten, bitte überprüfen Sie Ihre Logdateien (Fehler: %s)", "Migration Completed" : "Migration abgeschlossen", "Group already exists." : "Gruppe existiert bereits.", @@ -63,12 +65,14 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Sie haben %n Aktualisierung verfügbar","Sie haben %n Aktualisierungen verfügbar"], "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", "Disable" : "Deaktivieren", "Enable" : "Aktivieren", "Error while enabling app" : "Beim Aktivieren der App ist ein Fehler aufgetreten", "Error: this app cannot be enabled because it makes the server unstable" : "Fehler: Diese App kann nicht aktiviert werden, da es den Server instabil macht.", + "Error: could not disable broken app" : "Fehler: Die beschädigte Anwendung konnte nicht deaktiviert werden", "Error while disabling broken app" : "Beim Deaktivieren der defekten App ist ein Fehler aufgetreten", "Updating...." : "Update…", "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten", @@ -78,7 +82,7 @@ "Uninstall" : "Deinstallieren", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, aber sie benötigt ein Update. Sie werden zur Update Seite in 5 Sekunden weitergeleitet.", "App update" : "App aktualisieren", - "No apps found for \"{query}\"" : "Es wurden keine Apps gefunden für \"{query}\"", + "No apps found for {query}" : "Keine Applikationen für {query} gefunden", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.", "Valid until {date}" : "Gültig bis {date}", "Delete" : "Löschen", @@ -120,16 +124,20 @@ "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schauen Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzten.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s ist in einer älteren Version als %2$s installiert. Aus Stabilitäts- und Performancegründen empfehlen wir eine Aktualisierung auf eine neuere %1$s-Version", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. Aktivieren Sie 'filelocking.enabled' in der config.php diese Probleme zu vermeiden. Weitere Informationen findest Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a>.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass es zu Problemen mit bestimmten Zeichen in Dateinamen kommen kann.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eines der folgenden Gebietsschemata unterstützt wird: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setzen Sie bitte die „overwrite.cli.url“-Option in Ihrer config.php auf das Web-Wurzelverzeichnis Ihrer Installation (Vorschlag: „%s“).", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfen Sie noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrollieren Sie das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.", "All checks passed." : "Alle checks erfolgreich gepfüft.", "Open documentation" : "Dokumentation öffnen", "Allow apps to use the Share API" : "Apps die Benutzung der Share-API erlauben", @@ -142,6 +150,7 @@ "days" : "Tagen", "Enforce expiration date" : "Ablaufdatum erzwingen", "Allow resharing" : "Weiterverteilen erlauben", + "Allow sharing with groups" : "Mit Gruppen teilen erlauben", "Restrict users to only share with users in their groups" : "Benutzer auf das Teilen innerhalb ihrer Gruppen beschränken", "Allow users to send mail notification for shared files to other users" : "Benutzern erlauben, E-Mail-Benachrichtigungen für freigegebene Dateien an andere Benutzer zu senden", "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen", @@ -155,7 +164,10 @@ "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.", "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren", "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die Serverseite Verschlüsselung aktivieren:", + "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Wird die Verschlüsselung einmal aktiviert, so werden alle ab diesem Zeitpunkt hochgeladene Dateien verschlüsselt. Sie kann nur wieder deaktiviert werden, wenn das Verschlüsselungsmodul dies unterstützt und alle Voraussetzungen (wie das Setzen eines Wiederherstellungsschlüssels) im Vorhinein erfüllt wurden.", + "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung an sich garantiert nicht die Sicherheit des Systems. Bitte schauen Sie in die ownCloud Dokumentation für weitere Informationen wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.", "Be aware that encryption always increases the file size." : "Bedenke das durch die Verschlüsselung die Dateigröße zunimmt. ", + "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Es ist immer gut, regelmäßig Sicherungskopien von ihren Daten zu machen. Falls Sie die Verschlüsselung nutzen, sollten Sie auch eine Sicherung der Verschlüsselungsschlüssel zusammen mit ihren Daten machen.", "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?", "Enable encryption" : "Verschlüsselung aktivieren", "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.", @@ -185,6 +197,7 @@ "What to log" : "Was geloggt wird", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.", "How to do backups" : "Wie man Backups anlegt", "Advanced monitoring" : "Erweitertes Monitoring", "Performance tuning" : "Leistungsoptimierung", @@ -204,6 +217,7 @@ "Hide description …" : "Beschreibung ausblenden…", "This app has an update available." : "Es ist eine Aktualisierung für diese Anwendung verfügbar.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Dieser App ist keine minimum ownCloud Version zugewiesen. Dies wird ein Fehler in ownCloud 11 und später sein.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Diese App hat keine maximale ownCloud Version zugeordnet. Dies wird ein Fehler in ownCloud 11 und später sein.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Diese App kann nicht installiert werden, weil die folgenden Abhängigkeiten nicht erfüllt sind:", "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren", "Uninstall App" : "App deinstallieren", diff --git a/settings/l10n/el.js b/settings/l10n/el.js index 1f76f4c1494..05710d0659d 100644 --- a/settings/l10n/el.js +++ b/settings/l10n/el.js @@ -80,7 +80,6 @@ OC.L10N.register( "Uninstall" : "Απεγκατάσταση", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Η εφαρμογή έχει ενεργοποιηθεί αλλά χρειάζεται ενημέρωση. Θα μεταφερθείτε στη σελίδα ενημέρωσης σε 5 δευτερόλεπτα.", "App update" : "Ενημέρωση εφαρμογής", - "No apps found for \"{query}\"" : "Δεν βρέθηκαν εφαρμογές για \"{query\"}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.", "Valid until {date}" : "Έγκυρο έως {date}", "Delete" : "Διαγραφή", diff --git a/settings/l10n/el.json b/settings/l10n/el.json index 52629cc1893..0e2b9c41a18 100644 --- a/settings/l10n/el.json +++ b/settings/l10n/el.json @@ -78,7 +78,6 @@ "Uninstall" : "Απεγκατάσταση", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Η εφαρμογή έχει ενεργοποιηθεί αλλά χρειάζεται ενημέρωση. Θα μεταφερθείτε στη σελίδα ενημέρωσης σε 5 δευτερόλεπτα.", "App update" : "Ενημέρωση εφαρμογής", - "No apps found for \"{query}\"" : "Δεν βρέθηκαν εφαρμογές για \"{query\"}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.", "Valid until {date}" : "Έγκυρο έως {date}", "Delete" : "Διαγραφή", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index ba88d8fb7e5..a34bca4a417 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "Uninstall", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds.", "App update" : "App update", - "No apps found for \"{query}\"" : "No apps found for \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.", "Valid until {date}" : "Valid until {date}", "Delete" : "Delete", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index c183192cb2a..8048816c62e 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -82,7 +82,6 @@ "Uninstall" : "Uninstall", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds.", "App update" : "App update", - "No apps found for \"{query}\"" : "No apps found for \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.", "Valid until {date}" : "Valid until {date}", "Delete" : "Delete", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index cc445819b5d..1a9764228a4 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "Desinstalar", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "La aplicación ha sido activada pero necesita ser actualizada. Seras redirigido a la pagina de actualizariones en 5 segundos.", "App update" : "Actualización de aplicación", - "No apps found for \"{query}\"" : "No se han encontrado aplicaciones para \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.", "Valid until {date}" : "Válido hasta {date}", "Delete" : "Eliminar", @@ -126,17 +125,20 @@ OC.L10N.register( "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor revisa la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación de instalación ↗</a> para notas de configuración PHP y la configuración PHP de tu servidor, especialmente cuando se está usando php-fpm", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita tener que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s una versión inferior %2$s está instalada, por razones de estabilidad y rendimiento, se recomienda actualizar a la versión %1$s más reciente .", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "El bloqueo de archivos transaccional está desactivado, esto podría conducir a problemas con 'race conditions'. Activa 'filelocking.enabled' en 'config.php' para solucionar esos problemas. Mira la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación ↗</a> para más información.", "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.", "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, compruebe de nuevo las <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guías de instalación ↗</a>, y comprueba por cualquier error o advertencia en el <a href=\"#log-section\">Registro</a>", "All checks passed." : "Ha pasado todos los controles", "Open documentation" : "Documentación abierta", "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición", @@ -149,6 +151,7 @@ OC.L10N.register( "days" : "días", "Enforce expiration date" : "Imponer fecha de caducidad", "Allow resharing" : "Permitir recompartición", + "Allow sharing with groups" : "Permitir compartir con grupos", "Restrict users to only share with users in their groups" : "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos", "Allow users to send mail notification for shared files to other users" : "Permitir a los usuarios enviar notificaciones por correo electrónico de los archivos compartidos a otros usuarios", "Exclude groups from sharing" : "Excluye grupos de compartir", @@ -195,6 +198,7 @@ OC.L10N.register( "What to log" : "Que registrar", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar a otra base de datos usa la herramienta de línea de comandos 'occ db:convert-type' o mira la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación ↗</a>.", "How to do backups" : "Cómo hacer copias de seguridad", "Advanced monitoring" : "Monitorización avanzada", "Performance tuning" : "Ajuste de rendimiento", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index a2d70fa0693..3396804b76b 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -82,7 +82,6 @@ "Uninstall" : "Desinstalar", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "La aplicación ha sido activada pero necesita ser actualizada. Seras redirigido a la pagina de actualizariones en 5 segundos.", "App update" : "Actualización de aplicación", - "No apps found for \"{query}\"" : "No se han encontrado aplicaciones para \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.", "Valid until {date}" : "Válido hasta {date}", "Delete" : "Eliminar", @@ -124,17 +123,20 @@ "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor revisa la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación de instalación ↗</a> para notas de configuración PHP y la configuración PHP de tu servidor, especialmente cuando se está usando php-fpm", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita tener que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s una versión inferior %2$s está instalada, por razones de estabilidad y rendimiento, se recomienda actualizar a la versión %1$s más reciente .", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "El bloqueo de archivos transaccional está desactivado, esto podría conducir a problemas con 'race conditions'. Activa 'filelocking.enabled' en 'config.php' para solucionar esos problemas. Mira la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación ↗</a> para más información.", "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.", "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, compruebe de nuevo las <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guías de instalación ↗</a>, y comprueba por cualquier error o advertencia en el <a href=\"#log-section\">Registro</a>", "All checks passed." : "Ha pasado todos los controles", "Open documentation" : "Documentación abierta", "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición", @@ -147,6 +149,7 @@ "days" : "días", "Enforce expiration date" : "Imponer fecha de caducidad", "Allow resharing" : "Permitir recompartición", + "Allow sharing with groups" : "Permitir compartir con grupos", "Restrict users to only share with users in their groups" : "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos", "Allow users to send mail notification for shared files to other users" : "Permitir a los usuarios enviar notificaciones por correo electrónico de los archivos compartidos a otros usuarios", "Exclude groups from sharing" : "Excluye grupos de compartir", @@ -193,6 +196,7 @@ "What to log" : "Que registrar", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar a otra base de datos usa la herramienta de línea de comandos 'occ db:convert-type' o mira la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentación ↗</a>.", "How to do backups" : "Cómo hacer copias de seguridad", "Advanced monitoring" : "Monitorización avanzada", "Performance tuning" : "Ajuste de rendimiento", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index c17122ce207..157ddab53cb 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -83,7 +83,7 @@ OC.L10N.register( "Uninstall" : "Poista asennus", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Tämä sovellus on otettu käyttöön, mutta se vaatii päivityksen. Sinut ohjataan päivityssivulle viiden sekunnin kuluttua.", "App update" : "Sovelluspäivitys", - "No apps found for \"{query}\"" : "Haulla \"{query}\" ei löytynyt sovelluksia", + "No apps found for {query}" : "Haulla {query} ei löytynyt sovelluksia", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.", "Valid until {date}" : "Kelvollinen {date} asti", "Delete" : "Poista", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index ebe9b434b89..0a0c2c36740 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -81,7 +81,7 @@ "Uninstall" : "Poista asennus", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Tämä sovellus on otettu käyttöön, mutta se vaatii päivityksen. Sinut ohjataan päivityssivulle viiden sekunnin kuluttua.", "App update" : "Sovelluspäivitys", - "No apps found for \"{query}\"" : "Haulla \"{query}\" ei löytynyt sovelluksia", + "No apps found for {query}" : "Haulla {query} ei löytynyt sovelluksia", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.", "Valid until {date}" : "Kelvollinen {date} asti", "Delete" : "Poista", diff --git a/settings/l10n/fil.js b/settings/l10n/fil.js index 3f3dd8557ce..ee89a47a5d3 100644 --- a/settings/l10n/fil.js +++ b/settings/l10n/fil.js @@ -1,7 +1,9 @@ OC.L10N.register( "settings", { + "Cancel" : "I-cancel", "Password" : "Password", + "Change password" : "Palitan ang password", "Username" : "Username" }, "nplurals=2; plural=(n > 1);"); diff --git a/settings/l10n/fil.json b/settings/l10n/fil.json index 0d8a8effb23..74208ffe336 100644 --- a/settings/l10n/fil.json +++ b/settings/l10n/fil.json @@ -1,5 +1,7 @@ { "translations": { + "Cancel" : "I-cancel", "Password" : "Password", + "Change password" : "Palitan ang password", "Username" : "Username" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index 53a502b62fb..6486a686b98 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -84,7 +84,7 @@ OC.L10N.register( "Uninstall" : "Désinstaller", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'application a été activée mais doit être mise à jour. Vous allez être redirigé vers la page des mises à jour dans 5 secondes.", "App update" : "Mise à jour", - "No apps found for \"{query}\"" : "Aucune application trouvée pour \"{query}\"", + "No apps found for {query}" : "Aucune application trouvée pour {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.", "Valid until {date}" : "Valide jusqu'au {date}", "Delete" : "Supprimer", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index 6acae56d266..f9e2365489a 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -82,7 +82,7 @@ "Uninstall" : "Désinstaller", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'application a été activée mais doit être mise à jour. Vous allez être redirigé vers la page des mises à jour dans 5 secondes.", "App update" : "Mise à jour", - "No apps found for \"{query}\"" : "Aucune application trouvée pour \"{query}\"", + "No apps found for {query}" : "Aucune application trouvée pour {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.", "Valid until {date}" : "Valide jusqu'au {date}", "Delete" : "Supprimer", diff --git a/settings/l10n/he.js b/settings/l10n/he.js index cbe7cba15f4..c0aa6a02b3f 100644 --- a/settings/l10n/he.js +++ b/settings/l10n/he.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "הסרת התקנה", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "היישום הופעל אך יש לעדכן אותו. בעוד 5 שניות הדף ינותב לעמוד העדכון.", "App update" : "עדכון יישום", - "No apps found for \"{query}\"" : "לא נמצא יישום עבור \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "אירעה שגיאה. יש להעלות תעודת ASCII-encoded PEM.", "Valid until {date}" : "בתוקף עד ל- {date}", "Delete" : "מחיקה", diff --git a/settings/l10n/he.json b/settings/l10n/he.json index e48e837f8cc..af790f3f4d7 100644 --- a/settings/l10n/he.json +++ b/settings/l10n/he.json @@ -82,7 +82,6 @@ "Uninstall" : "הסרת התקנה", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "היישום הופעל אך יש לעדכן אותו. בעוד 5 שניות הדף ינותב לעמוד העדכון.", "App update" : "עדכון יישום", - "No apps found for \"{query}\"" : "לא נמצא יישום עבור \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "אירעה שגיאה. יש להעלות תעודת ASCII-encoded PEM.", "Valid until {date}" : "בתוקף עד ל- {date}", "Delete" : "מחיקה", diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js index 8014f48eda5..95e547f3c5d 100644 --- a/settings/l10n/hu_HU.js +++ b/settings/l10n/hu_HU.js @@ -77,7 +77,6 @@ OC.L10N.register( "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben", "Uninstall" : "Eltávolítás", "App update" : "Alkalmazás frissítése", - "No apps found for \"{query}\"" : "Nem található alkalmazás a „{query}” lekérdezésre.", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Hiba történt! Kérem töltsön fel egy, ASCII karakterekkel kódolt PEM tanusítványt!", "Valid until {date}" : "Érvényes: {date}", "Delete" : "Törlés", diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json index 1869a2d85cf..fdf956e0b7a 100644 --- a/settings/l10n/hu_HU.json +++ b/settings/l10n/hu_HU.json @@ -75,7 +75,6 @@ "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben", "Uninstall" : "Eltávolítás", "App update" : "Alkalmazás frissítése", - "No apps found for \"{query}\"" : "Nem található alkalmazás a „{query}” lekérdezésre.", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Hiba történt! Kérem töltsön fel egy, ASCII karakterekkel kódolt PEM tanusítványt!", "Valid until {date}" : "Érvényes: {date}", "Delete" : "Törlés", diff --git a/settings/l10n/id.js b/settings/l10n/id.js index 6468a0d612e..a0b1dcaf004 100644 --- a/settings/l10n/id.js +++ b/settings/l10n/id.js @@ -80,7 +80,6 @@ OC.L10N.register( "Uninstall" : "Copot", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikasi sudah diaktifkan tetapi perlu diperbarui. Anda akan dialihkan ke halaman pembaruan dalam 5 detik.", "App update" : "Pembaruan Aplikasi", - "No apps found for \"{query}\"" : "Tidak ada aplikasi yang ditemukan untuk \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.", "Valid until {date}" : "Berlaku sampai {date}", "Delete" : "Hapus", diff --git a/settings/l10n/id.json b/settings/l10n/id.json index b35c05c0ca4..690ca0fbc36 100644 --- a/settings/l10n/id.json +++ b/settings/l10n/id.json @@ -78,7 +78,6 @@ "Uninstall" : "Copot", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikasi sudah diaktifkan tetapi perlu diperbarui. Anda akan dialihkan ke halaman pembaruan dalam 5 detik.", "App update" : "Pembaruan Aplikasi", - "No apps found for \"{query}\"" : "Tidak ada aplikasi yang ditemukan untuk \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.", "Valid until {date}" : "Berlaku sampai {date}", "Delete" : "Hapus", diff --git a/settings/l10n/is.js b/settings/l10n/is.js index 6ba4f05e5e3..26e5866a27f 100644 --- a/settings/l10n/is.js +++ b/settings/l10n/is.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "Henda út", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Forritið hefur verið virkjað, en það þarf að uppfæra það. Þú verður áframsendur á uppfærslusíðuna eftir 5 sekúndur.", "App update" : "Uppfærsla forrits", - "No apps found for \"{query}\"" : "Engin forrit fundust fyrir \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Villa kom upp. Sendu inn ASCII-kóðað PEM-skilríki.", "Valid until {date}" : "Gildir til {date}", "Delete" : "Eyða", @@ -125,6 +124,7 @@ OC.L10N.register( "NT LAN Manager" : "NT LAN stjórnun", "SSL" : "SSL", "TLS" : "TLS", + "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Þjónninn þinn er keyrandi á Microsoft Windows. Við mælum sterklega með Linux til að njóta sem best allra eiginleika fyrir notendurna.", "System locale can not be set to a one which supports UTF-8." : "Ekki var hægt að setja staðfærslu kerfisins á neina sem styður UTF-8.", "All checks passed." : "Stóðst allar prófanir.", "Open documentation" : "Opna hjálparskjöl", @@ -138,6 +138,7 @@ OC.L10N.register( "days" : "daga", "Enforce expiration date" : "Krefjast dagsetningar á gildistíma", "Allow resharing" : "Leyfa endurdeilingu", + "Allow sharing with groups" : "Leyfa deilingu með hópum", "Restrict users to only share with users in their groups" : "Takmarka notendur við að deila með notendum í þeirra eigin hópum", "Allow users to send mail notification for shared files to other users" : "Leyfa notendum að senda tilkynningar til annarra notenda í tölvupósti vegna deildra skráa", "Exclude groups from sharing" : "Undanskilja hópa frá því að deila", diff --git a/settings/l10n/is.json b/settings/l10n/is.json index 191129e6375..95157e1247e 100644 --- a/settings/l10n/is.json +++ b/settings/l10n/is.json @@ -82,7 +82,6 @@ "Uninstall" : "Henda út", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Forritið hefur verið virkjað, en það þarf að uppfæra það. Þú verður áframsendur á uppfærslusíðuna eftir 5 sekúndur.", "App update" : "Uppfærsla forrits", - "No apps found for \"{query}\"" : "Engin forrit fundust fyrir \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Villa kom upp. Sendu inn ASCII-kóðað PEM-skilríki.", "Valid until {date}" : "Gildir til {date}", "Delete" : "Eyða", @@ -123,6 +122,7 @@ "NT LAN Manager" : "NT LAN stjórnun", "SSL" : "SSL", "TLS" : "TLS", + "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Þjónninn þinn er keyrandi á Microsoft Windows. Við mælum sterklega með Linux til að njóta sem best allra eiginleika fyrir notendurna.", "System locale can not be set to a one which supports UTF-8." : "Ekki var hægt að setja staðfærslu kerfisins á neina sem styður UTF-8.", "All checks passed." : "Stóðst allar prófanir.", "Open documentation" : "Opna hjálparskjöl", @@ -136,6 +136,7 @@ "days" : "daga", "Enforce expiration date" : "Krefjast dagsetningar á gildistíma", "Allow resharing" : "Leyfa endurdeilingu", + "Allow sharing with groups" : "Leyfa deilingu með hópum", "Restrict users to only share with users in their groups" : "Takmarka notendur við að deila með notendum í þeirra eigin hópum", "Allow users to send mail notification for shared files to other users" : "Leyfa notendum að senda tilkynningar til annarra notenda í tölvupósti vegna deildra skráa", "Exclude groups from sharing" : "Undanskilja hópa frá því að deila", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index f35b9b911da..5752bbc8282 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -84,7 +84,7 @@ OC.L10N.register( "Uninstall" : "Disinstalla", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'applicazione è stata abilitata, ma deve essere aggiornata. Sarai rediretto alla pagina di aggiornamento in 5 secondi.", "App update" : "Aggiornamento applicazione", - "No apps found for \"{query}\"" : "Nessuna applicazione trovata per \"{query}\"", + "No apps found for {query}" : "Nessuna applicazione trovata per {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.", "Valid until {date}" : "Valido fino al {date}", "Delete" : "Elimina", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index bdce62590cf..8a96ae1dd9e 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -82,7 +82,7 @@ "Uninstall" : "Disinstalla", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'applicazione è stata abilitata, ma deve essere aggiornata. Sarai rediretto alla pagina di aggiornamento in 5 secondi.", "App update" : "Aggiornamento applicazione", - "No apps found for \"{query}\"" : "Nessuna applicazione trovata per \"{query}\"", + "No apps found for {query}" : "Nessuna applicazione trovata per {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.", "Valid until {date}" : "Valido fino al {date}", "Delete" : "Elimina", diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js index 55106a99399..a559d922f7e 100644 --- a/settings/l10n/ja.js +++ b/settings/l10n/ja.js @@ -81,7 +81,6 @@ OC.L10N.register( "Uninstall" : "アンインストール", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "アプリは有効ですが、更新が必要です。5秒後に更新ページにリダイレクトします。", "App update" : "アプリのアップデート", - "No apps found for \"{query}\"" : "\"{query}\" に対応するアプリはありません", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "エラーが発生しました。ASCIIコードのPEM証明書をアップロードしてください。", "Valid until {date}" : "{date} まで有効", "Delete" : "削除", diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json index 211b8d7259b..260b76300b3 100644 --- a/settings/l10n/ja.json +++ b/settings/l10n/ja.json @@ -79,7 +79,6 @@ "Uninstall" : "アンインストール", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "アプリは有効ですが、更新が必要です。5秒後に更新ページにリダイレクトします。", "App update" : "アプリのアップデート", - "No apps found for \"{query}\"" : "\"{query}\" に対応するアプリはありません", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "エラーが発生しました。ASCIIコードのPEM証明書をアップロードしてください。", "Valid until {date}" : "{date} まで有効", "Delete" : "削除", diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js index 2e602db29c8..73fa8ca1603 100644 --- a/settings/l10n/ko.js +++ b/settings/l10n/ko.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "제거", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "앱이 활성화되었지만, 앱을 업데이트해야 합니다. 5초 후 앱 업데이트 페이지로 넘어갑니다.", "App update" : "앱 업데이트", - "No apps found for \"{query}\"" : "\"{query}\"에 해당하는 앱을 찾을 수 없음", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생했습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.", "Valid until {date}" : "{date}까지 유효함", "Delete" : "삭제", diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json index 3284f57fb62..070aaa164b1 100644 --- a/settings/l10n/ko.json +++ b/settings/l10n/ko.json @@ -82,7 +82,6 @@ "Uninstall" : "제거", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "앱이 활성화되었지만, 앱을 업데이트해야 합니다. 5초 후 앱 업데이트 페이지로 넘어갑니다.", "App update" : "앱 업데이트", - "No apps found for \"{query}\"" : "\"{query}\"에 해당하는 앱을 찾을 수 없음", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생했습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.", "Valid until {date}" : "{date}까지 유효함", "Delete" : "삭제", diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js index 24e010f230c..7c49081c5b0 100644 --- a/settings/l10n/mk.js +++ b/settings/l10n/mk.js @@ -80,6 +80,7 @@ OC.L10N.register( "Strong password" : "Јака лозинка", "Groups" : "Групи", "Unable to delete {objName}" : "Не можам да избришам {objName}", + "Error creating group: {message}" : "Грешка при креирање на група: {message}", "A valid group name must be provided" : "Мора да се обезбеди валидно име на група", "deleted {groupName}" : "избришано {groupName}", "undo" : "врати", @@ -88,7 +89,9 @@ OC.L10N.register( "deleted {userName}" : "избришан {userName}", "add group" : "додади група", "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ", + "Error creating user: {message}" : "Грешка при креирање на корисник: {message}", "A valid password must be provided" : "Мора да се обезбеди валидна лозинка", + "A valid email must be provided" : "Мора да се обезбеди валидна електронска пошта", "__language_name__" : "__language_name__", "Unlimited" : "Неограничено", "Personal info" : "Лични податоци", @@ -103,6 +106,7 @@ OC.L10N.register( "NT LAN Manager" : "NT LAN Менаџер", "SSL" : "SSL", "TLS" : "TLS", + "All checks passed." : "Сите проверки се поминати.", "Open documentation" : "Отвори ја документацијата", "Allow apps to use the Share API" : "Дозволете апликациите да го користат API-то за споделување", "Allow users to share via link" : "Допушти корисниците да споделуваат со линкови", @@ -113,9 +117,13 @@ OC.L10N.register( "days" : "денови", "Enforce expiration date" : "Наметни датум на траење", "Allow resharing" : "Овозможи повторно споделување", + "Allow sharing with groups" : "Овозможи споделување со групи", "Restrict users to only share with users in their groups" : "Ограничи корисниците да споделуваат со корисници во своите групи", "Exclude groups from sharing" : "Исклучи групи од споделување", "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница", + "Enable server-side encryption" : "Овозможи енкрипција на страна на серверот", + "Enable encryption" : "Овозможи енкрипција", + "Start migration" : "Започни ја миграцијата", "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.", "Send mode" : "Мод на испраќање", "Encryption" : "Енкрипција", @@ -130,9 +138,18 @@ OC.L10N.register( "SMTP Password" : "SMTP лозинка", "Test email settings" : "Провери ги нагодувањаа за електронска пошта", "Send email" : "Испрати пошта", + "Download logfile" : "Преземи ја датотеката со логови", "More" : "Повеќе", "Less" : "Помалку", + "What to log" : "Што да логирам", + "How to do backups" : "Како да правам резервни копии", + "Advanced monitoring" : "Напредно мониторирање", + "Performance tuning" : "Нагодување на перформансите", + "Improving the config.php" : "Подобруваер на config.php", + "Theming" : "Поставување на тема", + "Hardening and security guidance" : "Заштита и насоки за безбедност", "Version" : "Верзија", + "Developer documentation" : "Документација за програмери", "Documentation:" : "Документација:", "Enable only for specific groups" : "Овозможи само на специфицирани групи", "Cheers!" : "Поздрав!", diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json index a5ddac631e3..7dd4902c284 100644 --- a/settings/l10n/mk.json +++ b/settings/l10n/mk.json @@ -78,6 +78,7 @@ "Strong password" : "Јака лозинка", "Groups" : "Групи", "Unable to delete {objName}" : "Не можам да избришам {objName}", + "Error creating group: {message}" : "Грешка при креирање на група: {message}", "A valid group name must be provided" : "Мора да се обезбеди валидно име на група", "deleted {groupName}" : "избришано {groupName}", "undo" : "врати", @@ -86,7 +87,9 @@ "deleted {userName}" : "избришан {userName}", "add group" : "додади група", "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ", + "Error creating user: {message}" : "Грешка при креирање на корисник: {message}", "A valid password must be provided" : "Мора да се обезбеди валидна лозинка", + "A valid email must be provided" : "Мора да се обезбеди валидна електронска пошта", "__language_name__" : "__language_name__", "Unlimited" : "Неограничено", "Personal info" : "Лични податоци", @@ -101,6 +104,7 @@ "NT LAN Manager" : "NT LAN Менаџер", "SSL" : "SSL", "TLS" : "TLS", + "All checks passed." : "Сите проверки се поминати.", "Open documentation" : "Отвори ја документацијата", "Allow apps to use the Share API" : "Дозволете апликациите да го користат API-то за споделување", "Allow users to share via link" : "Допушти корисниците да споделуваат со линкови", @@ -111,9 +115,13 @@ "days" : "денови", "Enforce expiration date" : "Наметни датум на траење", "Allow resharing" : "Овозможи повторно споделување", + "Allow sharing with groups" : "Овозможи споделување со групи", "Restrict users to only share with users in their groups" : "Ограничи корисниците да споделуваат со корисници во своите групи", "Exclude groups from sharing" : "Исклучи групи од споделување", "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница", + "Enable server-side encryption" : "Овозможи енкрипција на страна на серверот", + "Enable encryption" : "Овозможи енкрипција", + "Start migration" : "Започни ја миграцијата", "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.", "Send mode" : "Мод на испраќање", "Encryption" : "Енкрипција", @@ -128,9 +136,18 @@ "SMTP Password" : "SMTP лозинка", "Test email settings" : "Провери ги нагодувањаа за електронска пошта", "Send email" : "Испрати пошта", + "Download logfile" : "Преземи ја датотеката со логови", "More" : "Повеќе", "Less" : "Помалку", + "What to log" : "Што да логирам", + "How to do backups" : "Како да правам резервни копии", + "Advanced monitoring" : "Напредно мониторирање", + "Performance tuning" : "Нагодување на перформансите", + "Improving the config.php" : "Подобруваер на config.php", + "Theming" : "Поставување на тема", + "Hardening and security guidance" : "Заштита и насоки за безбедност", "Version" : "Верзија", + "Developer documentation" : "Документација за програмери", "Documentation:" : "Документација:", "Enable only for specific groups" : "Овозможи само на специфицирани групи", "Cheers!" : "Поздрав!", diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js index a81d53f70b2..e115c20de04 100644 --- a/settings/l10n/nb_NO.js +++ b/settings/l10n/nb_NO.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "Avinstaller", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Appen er aktivert men må oppdateres. Du vil bli omdirigert til oppdateringssiden om 5 sekunder.", "App update" : "Oppdatering av applikasjon", - "No apps found for \"{query}\"" : "Ingen apper funnet for \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.", "Valid until {date}" : "Gyldig til {date}", "Delete" : "Slett", diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json index 367bba7fc2d..752f57c50a6 100644 --- a/settings/l10n/nb_NO.json +++ b/settings/l10n/nb_NO.json @@ -82,7 +82,6 @@ "Uninstall" : "Avinstaller", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Appen er aktivert men må oppdateres. Du vil bli omdirigert til oppdateringssiden om 5 sekunder.", "App update" : "Oppdatering av applikasjon", - "No apps found for \"{query}\"" : "Ingen apper funnet for \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.", "Valid until {date}" : "Gyldig til {date}", "Delete" : "Slett", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index c38f2b82ff5..c069b98e203 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "De-installeren", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "De app is geactiveerd maar moet worden bijgewerkt. U wordt over 5 seconden doorgeleid naar de bijwerkpagina.", "App update" : "App update", - "No apps found for \"{query}\"" : "Geen apps gevonden voor \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.", "Valid until {date}" : "Geldig tot {date}", "Delete" : "Verwijder", @@ -126,17 +125,20 @@ OC.L10N.register( "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren wij om %1$s te upgraden naar een nieuwere versie.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandlocking is gedeactiveerd, dat zou kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentatie ↗</a> voor meer informatie.", "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.", "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.", "All checks passed." : "Alle checks geslaagd", "Open documentation" : "Open documentatie", "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken", @@ -149,6 +151,7 @@ OC.L10N.register( "days" : "dagen", "Enforce expiration date" : "Verplicht de vervaldatum", "Allow resharing" : "Toestaan opnieuw delen", + "Allow sharing with groups" : "Sta delen met groepen toe", "Restrict users to only share with users in their groups" : "Laat gebruikers alleen delen met andere gebruikers in hun groepen", "Allow users to send mail notification for shared files to other users" : "Sta gebruikers toe om e-mailnotificaties aan andere gebruikers te versturen voor gedeelde bestanden", "Exclude groups from sharing" : "Sluit groepen uit van delen", @@ -195,6 +198,7 @@ OC.L10N.register( "What to log" : "Wat loggen", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentatie ↗</a>.", "How to do backups" : "Hoe maak je back-ups", "Advanced monitoring" : "Geavanceerde monitoring", "Performance tuning" : "Prestatie afstelling", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index b7e6b023aee..09ed6852d31 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -82,7 +82,6 @@ "Uninstall" : "De-installeren", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "De app is geactiveerd maar moet worden bijgewerkt. U wordt over 5 seconden doorgeleid naar de bijwerkpagina.", "App update" : "App update", - "No apps found for \"{query}\"" : "Geen apps gevonden voor \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.", "Valid until {date}" : "Geldig tot {date}", "Delete" : "Verwijder", @@ -124,17 +123,20 @@ "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren wij om %1$s te upgraden naar een nieuwere versie.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandlocking is gedeactiveerd, dat zou kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentatie ↗</a> voor meer informatie.", "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.", "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.", "All checks passed." : "Alle checks geslaagd", "Open documentation" : "Open documentatie", "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken", @@ -147,6 +149,7 @@ "days" : "dagen", "Enforce expiration date" : "Verplicht de vervaldatum", "Allow resharing" : "Toestaan opnieuw delen", + "Allow sharing with groups" : "Sta delen met groepen toe", "Restrict users to only share with users in their groups" : "Laat gebruikers alleen delen met andere gebruikers in hun groepen", "Allow users to send mail notification for shared files to other users" : "Sta gebruikers toe om e-mailnotificaties aan andere gebruikers te versturen voor gedeelde bestanden", "Exclude groups from sharing" : "Sluit groepen uit van delen", @@ -193,6 +196,7 @@ "What to log" : "Wat loggen", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentatie ↗</a>.", "How to do backups" : "Hoe maak je back-ups", "Advanced monitoring" : "Geavanceerde monitoring", "Performance tuning" : "Prestatie afstelling", diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js index f5c83114ff0..06b939725b5 100644 --- a/settings/l10n/oc.js +++ b/settings/l10n/oc.js @@ -80,7 +80,6 @@ OC.L10N.register( "Uninstall" : "Desinstallar", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'aplicacion es estada activada mas deu èsser mesa a jorn. Seretz redirigit cap a la pagina de las mesas a jorn dins 5 segondas.", "App update" : "Mesa a jorn", - "No apps found for \"{query}\"" : "Cap d'aplicacion pas trobada per \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.", "Valid until {date}" : "Valid fins al {date}", "Delete" : "Suprimir", diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json index b80dd5409ef..08894868bf6 100644 --- a/settings/l10n/oc.json +++ b/settings/l10n/oc.json @@ -78,7 +78,6 @@ "Uninstall" : "Desinstallar", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'aplicacion es estada activada mas deu èsser mesa a jorn. Seretz redirigit cap a la pagina de las mesas a jorn dins 5 segondas.", "App update" : "Mesa a jorn", - "No apps found for \"{query}\"" : "Cap d'aplicacion pas trobada per \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.", "Valid until {date}" : "Valid fins al {date}", "Delete" : "Suprimir", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 22220b4dac1..43dbec597f3 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -84,7 +84,7 @@ OC.L10N.register( "Uninstall" : "Desinstalar", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "O aplicativo foi habilitado, mas precisa ser atualizado. Você será redirecionado para a página de atualização em 5 segundos.", "App update" : "Atualização de aplicativo", - "No apps found for \"{query}\"" : "Nenhum aplicativo encontrado para \"{query}\"", + "No apps found for {query}" : "Nenhum aplicativo encontrados para {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM", "Valid until {date}" : "Vádido até {date}", "Delete" : "Excluir", @@ -126,17 +126,20 @@ OC.L10N.register( "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação de instalação ↗</a> para notas configuração do PHP e a configuração do PHP do seu servidor, especialmente quando se utiliza php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s abaixo da versão %2$s está instalado, por razões de estabilidade e desempenho recomendamos a atualização para uma nova versão %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivo transacional está desativado, isso pode levar a problemas com as condições de corrida. Ativar 'filelocking.enabled' em config.php para evitar esses problemas. Veja a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação ↗</a> para mais informações.", "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.", "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nós sugerimos a instalação dos pacotes necessários em seu sistema para suportar um dos seguintes locais: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique o <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.", "All checks passed." : "Todas as verificações passaram.", "Open documentation" : "Abrir documentação", "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento", @@ -149,6 +152,7 @@ OC.L10N.register( "days" : "dias", "Enforce expiration date" : "Fazer cumprir a data de expiração", "Allow resharing" : "Permitir recompartilhamento", + "Allow sharing with groups" : "Permitir o compartilhamento com grupos", "Restrict users to only share with users in their groups" : "Restringir os usuários a compartilhar somente com os usuários em seus grupos", "Allow users to send mail notification for shared files to other users" : "Permitir aos usuários enviar notificação de email de arquivos compartilhados para outros usuários", "Exclude groups from sharing" : "Excluir grupos de compartilhamento", @@ -195,6 +199,7 @@ OC.L10N.register( "What to log" : "O que colocar no log", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db:convert-type', ou consulte a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação ↗</a>.", "How to do backups" : "Como fazer backups", "Advanced monitoring" : "Monitoramento avançado", "Performance tuning" : "Aprimorando performance", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index ced67eb4b86..6c9071b1b4e 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -82,7 +82,7 @@ "Uninstall" : "Desinstalar", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "O aplicativo foi habilitado, mas precisa ser atualizado. Você será redirecionado para a página de atualização em 5 segundos.", "App update" : "Atualização de aplicativo", - "No apps found for \"{query}\"" : "Nenhum aplicativo encontrado para \"{query}\"", + "No apps found for {query}" : "Nenhum aplicativo encontrados para {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM", "Valid until {date}" : "Vádido até {date}", "Delete" : "Excluir", @@ -124,17 +124,20 @@ "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação de instalação ↗</a> para notas configuração do PHP e a configuração do PHP do seu servidor, especialmente quando se utiliza php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s abaixo da versão %2$s está instalado, por razões de estabilidade e desempenho recomendamos a atualização para uma nova versão %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivo transacional está desativado, isso pode levar a problemas com as condições de corrida. Ativar 'filelocking.enabled' em config.php para evitar esses problemas. Veja a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação ↗</a> para mais informações.", "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.", "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nós sugerimos a instalação dos pacotes necessários em seu sistema para suportar um dos seguintes locais: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique o <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.", "All checks passed." : "Todas as verificações passaram.", "Open documentation" : "Abrir documentação", "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento", @@ -147,6 +150,7 @@ "days" : "dias", "Enforce expiration date" : "Fazer cumprir a data de expiração", "Allow resharing" : "Permitir recompartilhamento", + "Allow sharing with groups" : "Permitir o compartilhamento com grupos", "Restrict users to only share with users in their groups" : "Restringir os usuários a compartilhar somente com os usuários em seus grupos", "Allow users to send mail notification for shared files to other users" : "Permitir aos usuários enviar notificação de email de arquivos compartilhados para outros usuários", "Exclude groups from sharing" : "Excluir grupos de compartilhamento", @@ -193,6 +197,7 @@ "What to log" : "O que colocar no log", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db:convert-type', ou consulte a <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação ↗</a>.", "How to do backups" : "Como fazer backups", "Advanced monitoring" : "Monitoramento avançado", "Performance tuning" : "Aprimorando performance", diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js index c041f93fe5a..70c74762477 100644 --- a/settings/l10n/pt_PT.js +++ b/settings/l10n/pt_PT.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "Desinstalar", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "A aplicação foi ativada, mas precisa de ser atualizada. Você será redirecionado para a página de atualização em 5 segundos.", "App update" : "Atualizar App", - "No apps found for \"{query}\"" : "Não foram encontradas aplicações para \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor, envie um certificado PEM codificado em ASCII.", "Valid until {date}" : "Válida até {date}", "Delete" : "Apagar", diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json index 37b947c2f6f..5fc36b71bcd 100644 --- a/settings/l10n/pt_PT.json +++ b/settings/l10n/pt_PT.json @@ -82,7 +82,6 @@ "Uninstall" : "Desinstalar", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "A aplicação foi ativada, mas precisa de ser atualizada. Você será redirecionado para a página de atualização em 5 segundos.", "App update" : "Atualizar App", - "No apps found for \"{query}\"" : "Não foram encontradas aplicações para \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor, envie um certificado PEM codificado em ASCII.", "Valid until {date}" : "Válida até {date}", "Delete" : "Apagar", diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js index 9cbcebb1473..b372180d745 100644 --- a/settings/l10n/ru.js +++ b/settings/l10n/ru.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "Удалить", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Приложение было включено и нуждается в обновлении. Вас перенаправит на страницу обновления через 5 секунд.", "App update" : "Обновить приложения", - "No apps found for \"{query}\"" : "Не найдено приложений по вашему \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.", "Valid until {date}" : "Действительно до {дата}", "Delete" : "Удалить", diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json index fb4c1bcfa8a..160dbe8167d 100644 --- a/settings/l10n/ru.json +++ b/settings/l10n/ru.json @@ -82,7 +82,6 @@ "Uninstall" : "Удалить", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Приложение было включено и нуждается в обновлении. Вас перенаправит на страницу обновления через 5 секунд.", "App update" : "Обновить приложения", - "No apps found for \"{query}\"" : "Не найдено приложений по вашему \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.", "Valid until {date}" : "Действительно до {дата}", "Delete" : "Удалить", diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js index b59c8d21b9c..3f41d38d7fc 100644 --- a/settings/l10n/sl.js +++ b/settings/l10n/sl.js @@ -78,7 +78,6 @@ OC.L10N.register( "Uninstall" : "Odstrani namestitev", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Vstavek je omogočen, vendar zahteva posodobitev. Samodejno bo izvedena preusmeritev na stran za posodobitev v 5 sekundah.", "App update" : "Posodabljanje vstavkov", - "No apps found for \"{query}\"" : "Za \"{query}\" ni na voljo nobenega vstavka.", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Prišlo je do napake. Uvoziti je treba ustrezno ASCII kodirano potrdilo PEM.", "Valid until {date}" : "Veljavno do {date}", "Delete" : "Izbriši", diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json index 9531946bbe0..55406ef3a30 100644 --- a/settings/l10n/sl.json +++ b/settings/l10n/sl.json @@ -76,7 +76,6 @@ "Uninstall" : "Odstrani namestitev", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Vstavek je omogočen, vendar zahteva posodobitev. Samodejno bo izvedena preusmeritev na stran za posodobitev v 5 sekundah.", "App update" : "Posodabljanje vstavkov", - "No apps found for \"{query}\"" : "Za \"{query}\" ni na voljo nobenega vstavka.", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Prišlo je do napake. Uvoziti je treba ustrezno ASCII kodirano potrdilo PEM.", "Valid until {date}" : "Veljavno do {date}", "Delete" : "Izbriši", diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js index cd5d1f8a6f4..82d6bc8780b 100644 --- a/settings/l10n/sq.js +++ b/settings/l10n/sq.js @@ -84,7 +84,7 @@ OC.L10N.register( "Uninstall" : "Çinstaloje", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikacioni është aktivizuar, por lyp të përditësohet. Do të ridrejtoheni te faqja e përditësimeve brenda 5 sekondash.", "App update" : "Përditësim aplikacioni", - "No apps found for \"{query}\"" : "S’u gjetën aplikacione për \"{query}\"", + "No apps found for {query}" : "S’u gjetën aplikacione për {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ndodhi një gabim. Ju lutemi, ngarkoni një dëshmi PEM të koduar me ASCII.", "Valid until {date}" : "E vlefshme deri më {date}", "Delete" : "Fshije", diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json index 62e576c00e5..ab88d0f67df 100644 --- a/settings/l10n/sq.json +++ b/settings/l10n/sq.json @@ -82,7 +82,7 @@ "Uninstall" : "Çinstaloje", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikacioni është aktivizuar, por lyp të përditësohet. Do të ridrejtoheni te faqja e përditësimeve brenda 5 sekondash.", "App update" : "Përditësim aplikacioni", - "No apps found for \"{query}\"" : "S’u gjetën aplikacione për \"{query}\"", + "No apps found for {query}" : "S’u gjetën aplikacione për {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ndodhi një gabim. Ju lutemi, ngarkoni një dëshmi PEM të koduar me ASCII.", "Valid until {date}" : "E vlefshme deri më {date}", "Delete" : "Fshije", diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js index 038a65a761a..82dfa175973 100644 --- a/settings/l10n/sv.js +++ b/settings/l10n/sv.js @@ -24,18 +24,26 @@ OC.L10N.register( "No user supplied" : "Ingen användare angiven", "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras", "Wrong admin recovery password. Please check the password and try again." : "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Backend stödjer ej lösenordsbyte, men användarens ändring av krypteringsnyckel lyckades.", "Unable to change password" : "Kunde inte ändra lösenord", "Enabled" : "Aktiverad", "Not enabled" : "Inte aktiverad", + "installing and updating apps via the app store or Federated Cloud Sharing" : "installering och uppdatering utav applikationer eller Federate Cloud delning.", + "Federated Cloud Sharing" : "Federate Cloud delning", + "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL använder en föråldrad %s version (%s). Var god uppdatera ditt operativsystem annars kan funktioner som %s sluta fungera pålitligt.", + "A problem occurred, please check your log files (Error: %s)" : "Ett problem uppstod, var god kontrollera loggfiler (Error: %s)", + "Migration Completed" : "Migrering Färdigställd", "Group already exists." : "Gruppen finns redan.", "Unable to add group." : "Lyckades inte lägga till grupp.", "Unable to delete group." : "Lyckades inte radera grupp.", "log-level out of allowed range" : "logg-nivå utanför tillåtet område", "Saved" : "Sparad", "test email settings" : "Testa e-post inställningar", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ett problem uppstod när mail försökte skickas. Var god kontrollera dina inställningar. (Error: %s)", "Email sent" : "E-post skickad", "You need to set your user email before being able to send test emails." : "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.", "Invalid mail address" : "Ogiltig e-postadress", + "A user with that name already exists." : "En användare med det namnet existerar redan.", "Unable to create user." : "Kan inte skapa användare.", "Your %s account was created" : "Ditt %s konto skapades", "Unable to delete user." : "Kan inte radera användare.", @@ -47,24 +55,36 @@ OC.L10N.register( "Unable to change full name" : "Kunde inte ändra hela namnet", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?", "Add trusted domain" : "Lägg till betrodd domän", + "Migration in progress. Please wait until the migration is finished" : "Migrering pågår. Var god vänta tills migreringen är färdigställd.", + "Migration started …" : "Migrering påbörjad ...", "Sending..." : "Skickar ...", "Official" : "Officiell", "Approved" : "Godkänd", "Experimental" : "Experimentiell", "All" : "Alla", + "No apps found for your version" : "Inga appar funna för din version", + "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiella appar är utvecklade av Owncloud's community. De erbjuder funtionalitet som är centralt för owncloud och redo för användning i produktion.", + "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkända appar är utvecklade av betrodda utvecklare och har genomgått enklare säkerhetstester. De är aktivt utvecklade i ett öppet kodbibliotek och deras underhållare anser dom stabila nog för enklare till normalt användande.", + "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denna applikation är ej kontrollerad för säkerhetsbrister och är ny eller känd att orsaka instabilitetsproblem. Installera på egen risk.", "Update to %s" : "Uppdatera till %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Du har %n applikationsuppdatering väntandes.","Du har %n applikationsuppdateringar väntandes."], "Please wait...." : "Var god vänta ...", "Error while disabling app" : "Fel vid inaktivering av app", "Disable" : "Deaktivera", "Enable" : "Aktivera", "Error while enabling app" : "Fel vid aktivering av app", + "Error: this app cannot be enabled because it makes the server unstable" : "Fel uppstod: Denna applikation kan ej startas för det gör servern ostabil.", + "Error: could not disable broken app" : "Fel: Gick ej att inaktivera trasig applikation.", + "Error while disabling broken app" : "Fel under inaktivering av trasig applikation.", "Updating...." : "Uppdaterar ...", "Error while updating app" : "Fel uppstod vid uppdatering av appen", "Updated" : "Uppdaterad", "Uninstalling ...." : "Avinstallerar ...", "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades", "Uninstall" : "Avinstallera", + "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Applikationen har aktiverats men behöver uppdateras. Du kommer bli omdirigerad till uppdateringssidan inom 5 sekunder.", "App update" : "Uppdatering av app", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ett fel uppstod. Var god ladda upp ett ASCII-kodad PEM certifikat.", "Valid until {date}" : "Giltig t.o.m. {date}", "Delete" : "Radera", "An error occurred: {message}" : "Ett fel inträffade: {message}", @@ -76,6 +96,7 @@ OC.L10N.register( "Strong password" : "Starkt lösenord", "Groups" : "Grupper", "Unable to delete {objName}" : "Kunde inte radera {objName}", + "Error creating group: {message}" : "Fel uppstod vid skapande av grupp: {message}", "A valid group name must be provided" : "Ett giltigt gruppnamn måste anges", "deleted {groupName}" : "raderade {groupName} ", "undo" : "ångra", @@ -83,7 +104,9 @@ OC.L10N.register( "never" : "aldrig", "deleted {userName}" : "raderade {userName}", "add group" : "lägg till grupp", + "Changing the password will result in data loss, because data recovery is not available for this user" : "Ändring utav lösenord kommer resultera i förlorad data, eftersom dataåterställning ej är tillgängligt för denna användare.", "A valid username must be provided" : "Ett giltigt användarnamn måste anges", + "Error creating user: {message}" : "Fel uppstod när användare skulle skapas: {message}", "A valid password must be provided" : "Ett giltigt lösenord måste anges", "A valid email must be provided" : "En giltig e-postadress måste anges", "__language_name__" : "__language_name__", @@ -101,16 +124,23 @@ OC.L10N.register( "NT LAN Manager" : "NT LAN Manager", "SSL" : "SSL", "TLS" : "TLS", + "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php verkar ej vara konfigurerat för att kunna skicka förfrågan om systemmiljövariabler. Testet med getenv(\"PATH\") returnerade bara ett tomt svar.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Var god kontrollera <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> installationsdokumentationen ↗</a> för konfigurationsanteckningar för php och för php konfigurationen för din server, speciellt när php-fpm används.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Läs-bara konfigureringen har blivit aktiv. Detta förhindrar att några konfigureringar kan sättas via web-gränssnittet.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställd för att rensa inline doc block. Detta kommer att göra flera kärnapplikationer otillgängliga.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server använder Microsoft Windows. Vi rekommenderar starkt Linux för en optimal användarerfarenhet.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s under version %2$s är installerad, för stabilitet och prestanda rekommenderar vi uppdatering till en nyare %1$s version.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transactional file locking är inaktiverad, detta kan innebära konkurrenstillstånd. Aktivera \"filelocking.enabled' i config.php för att undvika dessa problem. Se <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentationen ↗</a> för mer information.", "System locale can not be set to a one which supports UTF-8." : "Systemspråk kan inte ställas in till ett som stödjer UTF-8.", "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de nödvändiga paketen på ditt system för att stödja en av följande språkversioner: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Om din installation inte installerades på roten av domänen och använder system cron så kan det uppstå problem med URL-genereringen. För att undvika dessa problem, var vänlig sätt \"overwrite.cli.url\"-inställningen i din config.php-fil till webbrotsökvägen av din installation (Föreslagen: \"%s\")", + "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ej möjligt att exekvera cronjob via CLI. Följande tekniska fel har uppstått:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Var god dubbelkontrollera <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> installationsguiden ↗</a>, och kontrollera efter några fel eller varningar i <a href=\"#log-section\"> logfilen</a>.", "All checks passed." : "Alla kontroller lyckades!", + "Open documentation" : "Öppna dokumentation", "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API", "Allow users to share via link" : "Tillåt användare att dela via länk", "Enforce password protection" : "Tillämpa lösenordskydd", @@ -121,17 +151,31 @@ OC.L10N.register( "days" : "dagar", "Enforce expiration date" : "Tillämpa förfallodatum", "Allow resharing" : "Tillåt vidaredelning", + "Allow sharing with groups" : "Tilåt delning med grupper", "Restrict users to only share with users in their groups" : "Begränsa användare till att enbart kunna dela med användare i deras grupper", "Allow users to send mail notification for shared files to other users" : "Tillåt användare att skicka mejlnotifiering för delade filer till andra användare", "Exclude groups from sharing" : "Exkludera grupp från att dela", "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.", + "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Tillåt användarnamn att autokompletteras i delningsfönstret. Om det är inaktiverat krävs fullständigt användarnamn i rutan.", "Last cron job execution: %s." : "Sista cron kördes %s", "Last cron job execution: %s. Something seems wrong." : "Sista cron kördes %s. Något verkar vara fel.", "Cron was not executed yet!" : "Cron har inte körts ännu!", "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Använd systemets cron-tjänst för att anropa cron.php var 15:e minut.", + "Enable server-side encryption" : "Aktivera kryptering på server.", + "Please read carefully before activating server-side encryption: " : "OBS: Var god läs noga innan kryptering aktiveras på servern.", + "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "När kryptering är aktiverat, så kommer alla filer som laddas upp till servern från den tidpunkt och frammåt bli krypterad på servern. Det kommer bara vara möjligt att inaktivera kryptering vid ett senare tillfälle om krypteringsmodulen stödjer den funktionen och alla förvillkor (exempelvis använder återställningsnyckel) är mötta.", + "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Kryptering ensamt garanterar inte säkerhet av själva systemet. Var god see Owncloud's dokumentation för mer information om hur krypteringsapplikationen fungerar, och de användarfallen som stöds.", + "Be aware that encryption always increases the file size." : "OBS! Observera att kryptering alltid ökar filstorleken", + "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det är alltid en god ide att skapa regelbundna säkerhetskopior av din data, om kryptering används var säker på att även krypteringsnycklarna säkerhetskopieras tillsammans med din data.", + "This is the final warning: Do you really want to enable encryption?" : "Detta är en slutgiltig varning: Vill du verkligen aktivera kryptering?", "Enable encryption" : "Aktivera kryptering", + "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul laddad, var god aktivera krypteringsmodulen i applikationsmenyn.", + "Select default encryption module:" : "Välj standard krypteringsmodul:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya. Var god aktivera \"Default encryption module\" och kör 'occ encryption:migrate'.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya.", + "Start migration" : "Starta migrering", "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.", "Send mode" : "Sändningsläge", "Encryption" : "Kryptering", @@ -150,34 +194,65 @@ OC.L10N.register( "Download logfile" : "Ladda ner loggfil", "More" : "Mer", "Less" : "Mindre", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen är större än 100 MB. Nerladdningen kan ta en stund!", "What to log" : "Vad som ska loggas", + "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite används som databas. För större installationer så rekommenderar vi ett byte till en annan databasmotor.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när desktop klienten för filsynkronisering används så avråds användande av SQLite.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "För att migrera till en annan databas använd kommandoverktyget 'occ db:convert-type' eller se <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> dokumentationen ↗</a>", + "How to do backups" : "Hur man skapar säkerhetskopior", + "Advanced monitoring" : "Advancerad bevakning", + "Performance tuning" : "Prestanda inställningar", + "Improving the config.php" : "Förbättra config.php", + "Theming" : "Teman", + "Hardening and security guidance" : "Säkerhetsriktlinjer", "Version" : "Version", + "Developer documentation" : "Utvecklar dokumentation", + "Experimental applications ahead" : "Experimentiella applikationer framför", + "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentella applikationer är ej kontrollerade för säkerhetsproblem, nya eller kända att vara instabila och under föränderlig utveckling. Installation utav dessa kan orsaka dataförlust eller säkerhetsbrott.", + "by %s" : "av %s", "%s-licensed" : "%s-licensierad.", "Documentation:" : "Dokumentation:", + "User documentation" : "Användardokumentation", + "Admin documentation" : "Administratörsdokumentation", + "Show description …" : "Visa beskrivning", + "Hide description …" : "Dölj beskrivning", + "This app has an update available." : "Denna applikation har en uppdatering tillgänglig.", + "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denna applikation har ingen minimum version av Owncloud tilldelad. Detta kommer rapporteras som ett fel i Owncloud 11 och senare.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denna applikation har ingen maximal version av Owncloud tilldelad. Detta kommer rapporteras som ett fel i Owncloud 11 och senare.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Denna applikation kan inte installeras då följande beroenden inte är uppfyllda: %s", "Enable only for specific groups" : "Aktivera endast för specifika grupper", "Uninstall App" : "Avinstallera applikation", + "Enable experimental apps" : "Aktivera experimentiella applikationer", + "SSL Root Certificates" : "SSL Root certifikat", "Common Name" : "Vanligt namn", "Valid until" : "Giltigt till", "Issued By" : "Utfärdat av", "Valid until %s" : "Giltigt till %s", + "Import root certificate" : "Importera root certifikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej där,<br><br>vill bara informera dig om att du nu har ett %s konto.<br><br>Ditt användarnamn: %s<br>Accessa det genom: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ha de fint!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hej där,\n\nvill bara informera dig om att du nu har ett %s konto.\n\nDitt användarnamn: %s\nAccessa det genom: %s\n", + "Administrator documentation" : "Administratörsdokumentation", + "Online documentation" : "Online dokumentation", "Forum" : "Forum", + "Issue tracker" : "Felsökare", + "Commercial support" : "Kommersiell support", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Du använder <strong>%s</strong> av <strong>%s</strong>", "Profile picture" : "Profilbild", "Upload new" : "Ladda upp ny", "Select from Files" : "Välj från Filer", "Remove image" : "Radera bild", "png or jpg, max. 20 MB" : "png eller jpg, max 20 MB", + "Picture provided by original account" : "Bild gjordes tillgänglig av orginal konto", "Cancel" : "Avbryt", "Choose as profile picture" : "Välj som profilbild", "Full name" : "Fullständigt namn", "No display name set" : "Inget visningsnamn angivet", "Email" : "E-post", "Your email address" : "Din e-postadress", + "For password recovery and notifications" : "För lösenordsåterställning och notifieringar", "No email address set" : "Ingen e-postadress angiven", + "You are member of the following groups:" : "Du är medlem i följande grupper:", "Password" : "Lösenord", "Unable to change your password" : "Kunde inte ändra ditt lösenord", "Current password" : "Nuvarande lösenord", diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json index 59c639ccb68..a4e687f891d 100644 --- a/settings/l10n/sv.json +++ b/settings/l10n/sv.json @@ -22,18 +22,26 @@ "No user supplied" : "Ingen användare angiven", "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras", "Wrong admin recovery password. Please check the password and try again." : "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.", + "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Backend stödjer ej lösenordsbyte, men användarens ändring av krypteringsnyckel lyckades.", "Unable to change password" : "Kunde inte ändra lösenord", "Enabled" : "Aktiverad", "Not enabled" : "Inte aktiverad", + "installing and updating apps via the app store or Federated Cloud Sharing" : "installering och uppdatering utav applikationer eller Federate Cloud delning.", + "Federated Cloud Sharing" : "Federate Cloud delning", + "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL använder en föråldrad %s version (%s). Var god uppdatera ditt operativsystem annars kan funktioner som %s sluta fungera pålitligt.", + "A problem occurred, please check your log files (Error: %s)" : "Ett problem uppstod, var god kontrollera loggfiler (Error: %s)", + "Migration Completed" : "Migrering Färdigställd", "Group already exists." : "Gruppen finns redan.", "Unable to add group." : "Lyckades inte lägga till grupp.", "Unable to delete group." : "Lyckades inte radera grupp.", "log-level out of allowed range" : "logg-nivå utanför tillåtet område", "Saved" : "Sparad", "test email settings" : "Testa e-post inställningar", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Ett problem uppstod när mail försökte skickas. Var god kontrollera dina inställningar. (Error: %s)", "Email sent" : "E-post skickad", "You need to set your user email before being able to send test emails." : "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.", "Invalid mail address" : "Ogiltig e-postadress", + "A user with that name already exists." : "En användare med det namnet existerar redan.", "Unable to create user." : "Kan inte skapa användare.", "Your %s account was created" : "Ditt %s konto skapades", "Unable to delete user." : "Kan inte radera användare.", @@ -45,24 +53,36 @@ "Unable to change full name" : "Kunde inte ändra hela namnet", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?", "Add trusted domain" : "Lägg till betrodd domän", + "Migration in progress. Please wait until the migration is finished" : "Migrering pågår. Var god vänta tills migreringen är färdigställd.", + "Migration started …" : "Migrering påbörjad ...", "Sending..." : "Skickar ...", "Official" : "Officiell", "Approved" : "Godkänd", "Experimental" : "Experimentiell", "All" : "Alla", + "No apps found for your version" : "Inga appar funna för din version", + "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiella appar är utvecklade av Owncloud's community. De erbjuder funtionalitet som är centralt för owncloud och redo för användning i produktion.", + "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkända appar är utvecklade av betrodda utvecklare och har genomgått enklare säkerhetstester. De är aktivt utvecklade i ett öppet kodbibliotek och deras underhållare anser dom stabila nog för enklare till normalt användande.", + "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denna applikation är ej kontrollerad för säkerhetsbrister och är ny eller känd att orsaka instabilitetsproblem. Installera på egen risk.", "Update to %s" : "Uppdatera till %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Du har %n applikationsuppdatering väntandes.","Du har %n applikationsuppdateringar väntandes."], "Please wait...." : "Var god vänta ...", "Error while disabling app" : "Fel vid inaktivering av app", "Disable" : "Deaktivera", "Enable" : "Aktivera", "Error while enabling app" : "Fel vid aktivering av app", + "Error: this app cannot be enabled because it makes the server unstable" : "Fel uppstod: Denna applikation kan ej startas för det gör servern ostabil.", + "Error: could not disable broken app" : "Fel: Gick ej att inaktivera trasig applikation.", + "Error while disabling broken app" : "Fel under inaktivering av trasig applikation.", "Updating...." : "Uppdaterar ...", "Error while updating app" : "Fel uppstod vid uppdatering av appen", "Updated" : "Uppdaterad", "Uninstalling ...." : "Avinstallerar ...", "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades", "Uninstall" : "Avinstallera", + "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Applikationen har aktiverats men behöver uppdateras. Du kommer bli omdirigerad till uppdateringssidan inom 5 sekunder.", "App update" : "Uppdatering av app", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ett fel uppstod. Var god ladda upp ett ASCII-kodad PEM certifikat.", "Valid until {date}" : "Giltig t.o.m. {date}", "Delete" : "Radera", "An error occurred: {message}" : "Ett fel inträffade: {message}", @@ -74,6 +94,7 @@ "Strong password" : "Starkt lösenord", "Groups" : "Grupper", "Unable to delete {objName}" : "Kunde inte radera {objName}", + "Error creating group: {message}" : "Fel uppstod vid skapande av grupp: {message}", "A valid group name must be provided" : "Ett giltigt gruppnamn måste anges", "deleted {groupName}" : "raderade {groupName} ", "undo" : "ångra", @@ -81,7 +102,9 @@ "never" : "aldrig", "deleted {userName}" : "raderade {userName}", "add group" : "lägg till grupp", + "Changing the password will result in data loss, because data recovery is not available for this user" : "Ändring utav lösenord kommer resultera i förlorad data, eftersom dataåterställning ej är tillgängligt för denna användare.", "A valid username must be provided" : "Ett giltigt användarnamn måste anges", + "Error creating user: {message}" : "Fel uppstod när användare skulle skapas: {message}", "A valid password must be provided" : "Ett giltigt lösenord måste anges", "A valid email must be provided" : "En giltig e-postadress måste anges", "__language_name__" : "__language_name__", @@ -99,16 +122,23 @@ "NT LAN Manager" : "NT LAN Manager", "SSL" : "SSL", "TLS" : "TLS", + "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php verkar ej vara konfigurerat för att kunna skicka förfrågan om systemmiljövariabler. Testet med getenv(\"PATH\") returnerade bara ett tomt svar.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Var god kontrollera <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> installationsdokumentationen ↗</a> för konfigurationsanteckningar för php och för php konfigurationen för din server, speciellt när php-fpm används.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Läs-bara konfigureringen har blivit aktiv. Detta förhindrar att några konfigureringar kan sättas via web-gränssnittet.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställd för att rensa inline doc block. Detta kommer att göra flera kärnapplikationer otillgängliga.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server använder Microsoft Windows. Vi rekommenderar starkt Linux för en optimal användarerfarenhet.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s under version %2$s är installerad, för stabilitet och prestanda rekommenderar vi uppdatering till en nyare %1$s version.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transactional file locking är inaktiverad, detta kan innebära konkurrenstillstånd. Aktivera \"filelocking.enabled' i config.php för att undvika dessa problem. Se <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentationen ↗</a> för mer information.", "System locale can not be set to a one which supports UTF-8." : "Systemspråk kan inte ställas in till ett som stödjer UTF-8.", "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de nödvändiga paketen på ditt system för att stödja en av följande språkversioner: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Om din installation inte installerades på roten av domänen och använder system cron så kan det uppstå problem med URL-genereringen. För att undvika dessa problem, var vänlig sätt \"overwrite.cli.url\"-inställningen i din config.php-fil till webbrotsökvägen av din installation (Föreslagen: \"%s\")", + "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ej möjligt att exekvera cronjob via CLI. Följande tekniska fel har uppstått:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Var god dubbelkontrollera <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> installationsguiden ↗</a>, och kontrollera efter några fel eller varningar i <a href=\"#log-section\"> logfilen</a>.", "All checks passed." : "Alla kontroller lyckades!", + "Open documentation" : "Öppna dokumentation", "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API", "Allow users to share via link" : "Tillåt användare att dela via länk", "Enforce password protection" : "Tillämpa lösenordskydd", @@ -119,17 +149,31 @@ "days" : "dagar", "Enforce expiration date" : "Tillämpa förfallodatum", "Allow resharing" : "Tillåt vidaredelning", + "Allow sharing with groups" : "Tilåt delning med grupper", "Restrict users to only share with users in their groups" : "Begränsa användare till att enbart kunna dela med användare i deras grupper", "Allow users to send mail notification for shared files to other users" : "Tillåt användare att skicka mejlnotifiering för delade filer till andra användare", "Exclude groups from sharing" : "Exkludera grupp från att dela", "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.", + "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Tillåt användarnamn att autokompletteras i delningsfönstret. Om det är inaktiverat krävs fullständigt användarnamn i rutan.", "Last cron job execution: %s." : "Sista cron kördes %s", "Last cron job execution: %s. Something seems wrong." : "Sista cron kördes %s. Något verkar vara fel.", "Cron was not executed yet!" : "Cron har inte körts ännu!", "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Använd systemets cron-tjänst för att anropa cron.php var 15:e minut.", + "Enable server-side encryption" : "Aktivera kryptering på server.", + "Please read carefully before activating server-side encryption: " : "OBS: Var god läs noga innan kryptering aktiveras på servern.", + "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "När kryptering är aktiverat, så kommer alla filer som laddas upp till servern från den tidpunkt och frammåt bli krypterad på servern. Det kommer bara vara möjligt att inaktivera kryptering vid ett senare tillfälle om krypteringsmodulen stödjer den funktionen och alla förvillkor (exempelvis använder återställningsnyckel) är mötta.", + "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Kryptering ensamt garanterar inte säkerhet av själva systemet. Var god see Owncloud's dokumentation för mer information om hur krypteringsapplikationen fungerar, och de användarfallen som stöds.", + "Be aware that encryption always increases the file size." : "OBS! Observera att kryptering alltid ökar filstorleken", + "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Det är alltid en god ide att skapa regelbundna säkerhetskopior av din data, om kryptering används var säker på att även krypteringsnycklarna säkerhetskopieras tillsammans med din data.", + "This is the final warning: Do you really want to enable encryption?" : "Detta är en slutgiltig varning: Vill du verkligen aktivera kryptering?", "Enable encryption" : "Aktivera kryptering", + "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul laddad, var god aktivera krypteringsmodulen i applikationsmenyn.", + "Select default encryption module:" : "Välj standard krypteringsmodul:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya. Var god aktivera \"Default encryption module\" och kör 'occ encryption:migrate'.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du behöver migrera dina krypteringsnycklar från den gamla krypteringen (owncloud <= 8.0) till den nya.", + "Start migration" : "Starta migrering", "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.", "Send mode" : "Sändningsläge", "Encryption" : "Kryptering", @@ -148,34 +192,65 @@ "Download logfile" : "Ladda ner loggfil", "More" : "Mer", "Less" : "Mindre", + "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen är större än 100 MB. Nerladdningen kan ta en stund!", "What to log" : "Vad som ska loggas", + "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite används som databas. För större installationer så rekommenderar vi ett byte till en annan databasmotor.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när desktop klienten för filsynkronisering används så avråds användande av SQLite.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "För att migrera till en annan databas använd kommandoverktyget 'occ db:convert-type' eller se <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\"> dokumentationen ↗</a>", + "How to do backups" : "Hur man skapar säkerhetskopior", + "Advanced monitoring" : "Advancerad bevakning", + "Performance tuning" : "Prestanda inställningar", + "Improving the config.php" : "Förbättra config.php", + "Theming" : "Teman", + "Hardening and security guidance" : "Säkerhetsriktlinjer", "Version" : "Version", + "Developer documentation" : "Utvecklar dokumentation", + "Experimental applications ahead" : "Experimentiella applikationer framför", + "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentella applikationer är ej kontrollerade för säkerhetsproblem, nya eller kända att vara instabila och under föränderlig utveckling. Installation utav dessa kan orsaka dataförlust eller säkerhetsbrott.", + "by %s" : "av %s", "%s-licensed" : "%s-licensierad.", "Documentation:" : "Dokumentation:", + "User documentation" : "Användardokumentation", + "Admin documentation" : "Administratörsdokumentation", + "Show description …" : "Visa beskrivning", + "Hide description …" : "Dölj beskrivning", + "This app has an update available." : "Denna applikation har en uppdatering tillgänglig.", + "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denna applikation har ingen minimum version av Owncloud tilldelad. Detta kommer rapporteras som ett fel i Owncloud 11 och senare.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Denna applikation har ingen maximal version av Owncloud tilldelad. Detta kommer rapporteras som ett fel i Owncloud 11 och senare.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Denna applikation kan inte installeras då följande beroenden inte är uppfyllda: %s", "Enable only for specific groups" : "Aktivera endast för specifika grupper", "Uninstall App" : "Avinstallera applikation", + "Enable experimental apps" : "Aktivera experimentiella applikationer", + "SSL Root Certificates" : "SSL Root certifikat", "Common Name" : "Vanligt namn", "Valid until" : "Giltigt till", "Issued By" : "Utfärdat av", "Valid until %s" : "Giltigt till %s", + "Import root certificate" : "Importera root certifikat", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej där,<br><br>vill bara informera dig om att du nu har ett %s konto.<br><br>Ditt användarnamn: %s<br>Accessa det genom: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Ha de fint!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hej där,\n\nvill bara informera dig om att du nu har ett %s konto.\n\nDitt användarnamn: %s\nAccessa det genom: %s\n", + "Administrator documentation" : "Administratörsdokumentation", + "Online documentation" : "Online dokumentation", "Forum" : "Forum", + "Issue tracker" : "Felsökare", + "Commercial support" : "Kommersiell support", "You are using <strong>%s</strong> of <strong>%s</strong>" : "Du använder <strong>%s</strong> av <strong>%s</strong>", "Profile picture" : "Profilbild", "Upload new" : "Ladda upp ny", "Select from Files" : "Välj från Filer", "Remove image" : "Radera bild", "png or jpg, max. 20 MB" : "png eller jpg, max 20 MB", + "Picture provided by original account" : "Bild gjordes tillgänglig av orginal konto", "Cancel" : "Avbryt", "Choose as profile picture" : "Välj som profilbild", "Full name" : "Fullständigt namn", "No display name set" : "Inget visningsnamn angivet", "Email" : "E-post", "Your email address" : "Din e-postadress", + "For password recovery and notifications" : "För lösenordsåterställning och notifieringar", "No email address set" : "Ingen e-postadress angiven", + "You are member of the following groups:" : "Du är medlem i följande grupper:", "Password" : "Lösenord", "Unable to change your password" : "Kunde inte ändra ditt lösenord", "Current password" : "Nuvarande lösenord", diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js index 03bef84b609..81055ec3bd8 100644 --- a/settings/l10n/th_TH.js +++ b/settings/l10n/th_TH.js @@ -80,7 +80,6 @@ OC.L10N.register( "Uninstall" : "ถอนการติดตั้ง", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "แอพฯจะต้องเปิดใช้งานก่อนทำการอัพเดท คุณจะถูกนำไปยังหน้าอัพเดทใน 5 วินาที", "App update" : "อัพเดทแอพฯ", - "No apps found for \"{query}\"" : "ไม่พบแอพฯสำหรับ \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM", "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}", "Delete" : "ลบ", diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json index ed1bf94abb1..4e4e56ec0f9 100644 --- a/settings/l10n/th_TH.json +++ b/settings/l10n/th_TH.json @@ -78,7 +78,6 @@ "Uninstall" : "ถอนการติดตั้ง", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "แอพฯจะต้องเปิดใช้งานก่อนทำการอัพเดท คุณจะถูกนำไปยังหน้าอัพเดทใน 5 วินาที", "App update" : "อัพเดทแอพฯ", - "No apps found for \"{query}\"" : "ไม่พบแอพฯสำหรับ \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM", "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}", "Delete" : "ลบ", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index e451f3fb9cd..8013439c267 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -67,11 +67,15 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.", "Update to %s" : "%s sürümüne güncelle", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Bekleyen %n uygulama güncellemesi var","Bekleyen %n uygulama güncellemesi var"], "Please wait...." : "Lütfen bekleyin....", "Error while disabling app" : "Uygulama devre dışı bırakılırken hata", "Disable" : "Devre Dışı Bırak", "Enable" : "Etkinleştir", "Error while enabling app" : "Uygulama etkinleştirilirken hata", + "Error: this app cannot be enabled because it makes the server unstable" : "Hata: bu uygulama etkinleştirilemez çünkü sunucuyu kararsız yapıyor", + "Error: could not disable broken app" : "Hata: bozuk uygulama devre dışı bırakılamadı", + "Error while disabling broken app" : "Bozuk uygulama devre dışı bırakılırken hata", "Updating...." : "Güncelleniyor....", "Error while updating app" : "Uygulama güncellenirken hata", "Updated" : "Güncellendi", @@ -80,7 +84,7 @@ OC.L10N.register( "Uninstall" : "Kaldır", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Uygulama etkinleştirildi fakat güncellenmesi gerekiyor. 5 saniye içinde güncelleme sayfasına yönlendirileceksiniz.", "App update" : "Uygulama güncellemesi", - "No apps found for \"{query}\"" : "\"{query}\" için uygulama bulunamadı", + "No apps found for {query}" : "sorgulayabilmeniz için hiçbir uygulama bulunmamakta", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.", "Valid until {date}" : "{date} tarihine kadar geçerli", "Delete" : "Sil", @@ -93,6 +97,7 @@ OC.L10N.register( "Strong password" : "Güçlü parola", "Groups" : "Gruplar", "Unable to delete {objName}" : "{objName} silinemiyor", + "Error creating group: {message}" : "Grup oluşturulurken hata: {message}", "A valid group name must be provided" : "Geçerli bir grup adı mutlaka sağlanmalı", "deleted {groupName}" : "{groupName} silindi", "undo" : "geri al", @@ -102,6 +107,7 @@ OC.L10N.register( "add group" : "grup ekle", "Changing the password will result in data loss, because data recovery is not available for this user" : "Parolayı değiştirmek, bu kullanıcı için veri kurtarması kullanılamadığından veri kaybına sebep olacak", "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı", + "Error creating user: {message}" : "Kullanıcı oluşturulurken hata: {message}", "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı", "A valid email must be provided" : "Geçerli bir e-posta belirtilmeli", "__language_name__" : "Türkçe", @@ -120,16 +126,20 @@ OC.L10N.register( "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen php yapılandırma notları ve özellikler php-fpm kullanırken sunucu php yapılandırması için <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">kurulum belgelendirmesine ↗</a> bakın.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sunucunuz, Microsoft Windows ile çalışıyor. En uygun kullanıcı deneyimi için şiddetle Linux'u öneriyoruz.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s, %2$s sürümü altı kurulu. Kararlılık ve performans için daha yeni bir %1$s sürümüne güncellemenizi öneririz.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "İşlemsel dosya kilidi devre dışı. Bu yarış koşulu (race condition) sorunlarına neden olabilir. Bu sorunlardan kaçınmak için config.php içindeki 'filelocking.enabled' ayarını etkinleştirin. Daha fazla bilgi için <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">belgelendirmeye ↗</a> bakın.", "System locale can not be set to a one which supports UTF-8." : "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.", "This means that there might be problems with certain characters in file names." : "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">kurulum rehberlerine ↗</a> ve <a href=\"#log-section\">günlük</a> kısmındaki hata ve uyarılara bakın.", "All checks passed." : "Tüm kontroller geçildi.", "Open documentation" : "Belgelendirmeyi aç", "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver", @@ -142,6 +152,7 @@ OC.L10N.register( "days" : "gün sonra dolsun", "Enforce expiration date" : "Son kullanma tarihini zorla", "Allow resharing" : "Yeniden paylaşıma izin ver", + "Allow sharing with groups" : "Grouplar ile paylaşıma izin ver", "Restrict users to only share with users in their groups" : "Kullanıcıların, dosyaları sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver", "Allow users to send mail notification for shared files to other users" : "Kullanıcıların diğer kullanıcılara, paylaşılmış dosyalar için posta bildirimi göndermesine izin ver", "Exclude groups from sharing" : "Grupları paylaşma eyleminden hariç tut", @@ -188,6 +199,7 @@ OC.L10N.register( "What to log" : "Neler günlüklenmeli", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">belgelendirmeye ↗</a> bakın.", "How to do backups" : "Nasıl yedekleme yapılır", "Advanced monitoring" : "Gelişmiş izleme", "Performance tuning" : "Performans ayarlama", @@ -205,6 +217,7 @@ OC.L10N.register( "Admin documentation" : "Yönetici belgelendirmesi", "Show description …" : "Açıklamayı göster...", "Hide description …" : "Açıklamayı gizle...", + "This app has an update available." : "Bu uygulamanın bir güncellemesi var.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Bu uygulama atanmış bir en düşük ownCloud sürümü içermiyor. ownCloud 11 ve sonrasında bu bir hata olacaktır.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Bu uygulama atanmış bir en yüksek ownCloud sürümü içermiyor. ownCloud 11 ve sonrasında bu bir hata olacaktır.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index 98f63aa95c5..753d22ef65c 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -65,11 +65,15 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.", "Update to %s" : "%s sürümüne güncelle", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Bekleyen %n uygulama güncellemesi var","Bekleyen %n uygulama güncellemesi var"], "Please wait...." : "Lütfen bekleyin....", "Error while disabling app" : "Uygulama devre dışı bırakılırken hata", "Disable" : "Devre Dışı Bırak", "Enable" : "Etkinleştir", "Error while enabling app" : "Uygulama etkinleştirilirken hata", + "Error: this app cannot be enabled because it makes the server unstable" : "Hata: bu uygulama etkinleştirilemez çünkü sunucuyu kararsız yapıyor", + "Error: could not disable broken app" : "Hata: bozuk uygulama devre dışı bırakılamadı", + "Error while disabling broken app" : "Bozuk uygulama devre dışı bırakılırken hata", "Updating...." : "Güncelleniyor....", "Error while updating app" : "Uygulama güncellenirken hata", "Updated" : "Güncellendi", @@ -78,7 +82,7 @@ "Uninstall" : "Kaldır", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Uygulama etkinleştirildi fakat güncellenmesi gerekiyor. 5 saniye içinde güncelleme sayfasına yönlendirileceksiniz.", "App update" : "Uygulama güncellemesi", - "No apps found for \"{query}\"" : "\"{query}\" için uygulama bulunamadı", + "No apps found for {query}" : "sorgulayabilmeniz için hiçbir uygulama bulunmamakta", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.", "Valid until {date}" : "{date} tarihine kadar geçerli", "Delete" : "Sil", @@ -91,6 +95,7 @@ "Strong password" : "Güçlü parola", "Groups" : "Gruplar", "Unable to delete {objName}" : "{objName} silinemiyor", + "Error creating group: {message}" : "Grup oluşturulurken hata: {message}", "A valid group name must be provided" : "Geçerli bir grup adı mutlaka sağlanmalı", "deleted {groupName}" : "{groupName} silindi", "undo" : "geri al", @@ -100,6 +105,7 @@ "add group" : "grup ekle", "Changing the password will result in data loss, because data recovery is not available for this user" : "Parolayı değiştirmek, bu kullanıcı için veri kurtarması kullanılamadığından veri kaybına sebep olacak", "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı", + "Error creating user: {message}" : "Kullanıcı oluşturulurken hata: {message}", "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı", "A valid email must be provided" : "Geçerli bir e-posta belirtilmeli", "__language_name__" : "Türkçe", @@ -118,16 +124,20 @@ "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen php yapılandırma notları ve özellikler php-fpm kullanırken sunucu php yapılandırması için <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">kurulum belgelendirmesine ↗</a> bakın.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sunucunuz, Microsoft Windows ile çalışıyor. En uygun kullanıcı deneyimi için şiddetle Linux'u öneriyoruz.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s, %2$s sürümü altı kurulu. Kararlılık ve performans için daha yeni bir %1$s sürümüne güncellemenizi öneririz.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "İşlemsel dosya kilidi devre dışı. Bu yarış koşulu (race condition) sorunlarına neden olabilir. Bu sorunlardan kaçınmak için config.php içindeki 'filelocking.enabled' ayarını etkinleştirin. Daha fazla bilgi için <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">belgelendirmeye ↗</a> bakın.", "System locale can not be set to a one which supports UTF-8." : "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.", "This means that there might be problems with certain characters in file names." : "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">kurulum rehberlerine ↗</a> ve <a href=\"#log-section\">günlük</a> kısmındaki hata ve uyarılara bakın.", "All checks passed." : "Tüm kontroller geçildi.", "Open documentation" : "Belgelendirmeyi aç", "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver", @@ -140,6 +150,7 @@ "days" : "gün sonra dolsun", "Enforce expiration date" : "Son kullanma tarihini zorla", "Allow resharing" : "Yeniden paylaşıma izin ver", + "Allow sharing with groups" : "Grouplar ile paylaşıma izin ver", "Restrict users to only share with users in their groups" : "Kullanıcıların, dosyaları sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver", "Allow users to send mail notification for shared files to other users" : "Kullanıcıların diğer kullanıcılara, paylaşılmış dosyalar için posta bildirimi göndermesine izin ver", "Exclude groups from sharing" : "Grupları paylaşma eyleminden hariç tut", @@ -186,6 +197,7 @@ "What to log" : "Neler günlüklenmeli", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">belgelendirmeye ↗</a> bakın.", "How to do backups" : "Nasıl yedekleme yapılır", "Advanced monitoring" : "Gelişmiş izleme", "Performance tuning" : "Performans ayarlama", @@ -203,6 +215,7 @@ "Admin documentation" : "Yönetici belgelendirmesi", "Show description …" : "Açıklamayı göster...", "Hide description …" : "Açıklamayı gizle...", + "This app has an update available." : "Bu uygulamanın bir güncellemesi var.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Bu uygulama atanmış bir en düşük ownCloud sürümü içermiyor. ownCloud 11 ve sonrasında bu bir hata olacaktır.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Bu uygulama atanmış bir en yüksek ownCloud sürümü içermiyor. ownCloud 11 ve sonrasında bu bir hata olacaktır.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:", diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js index 53cf77ae8b7..594e0de326a 100644 --- a/settings/l10n/uk.js +++ b/settings/l10n/uk.js @@ -78,7 +78,6 @@ OC.L10N.register( "Error while uninstalling app" : "Помилка видалення додатка", "Uninstall" : "Видалити", "App update" : "Оновлення додатку", - "No apps found for \"{query}\"" : "Не знайдено додатків для \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.", "Valid until {date}" : "Дійсно до {date}", "Delete" : "Видалити", diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json index 13d1470c6e9..aebf8b206cf 100644 --- a/settings/l10n/uk.json +++ b/settings/l10n/uk.json @@ -76,7 +76,6 @@ "Error while uninstalling app" : "Помилка видалення додатка", "Uninstall" : "Видалити", "App update" : "Оновлення додатку", - "No apps found for \"{query}\"" : "Не знайдено додатків для \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.", "Valid until {date}" : "Дійсно до {date}", "Delete" : "Видалити", diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js index efe9690cae0..c3ec2ebea0e 100644 --- a/settings/l10n/zh_CN.js +++ b/settings/l10n/zh_CN.js @@ -84,7 +84,6 @@ OC.L10N.register( "Uninstall" : "卸载", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "该应用已启用，但是需要更新。5秒后将跳转到更新页面。", "App update" : "应用更新", - "No apps found for \"{query}\"" : "未找到应用适合 \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。", "Valid until {date}" : "有效期至 {date}", "Delete" : "删除", diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json index ed821b524b2..aa5827bbac6 100644 --- a/settings/l10n/zh_CN.json +++ b/settings/l10n/zh_CN.json @@ -82,7 +82,6 @@ "Uninstall" : "卸载", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "该应用已启用，但是需要更新。5秒后将跳转到更新页面。", "App update" : "应用更新", - "No apps found for \"{query}\"" : "未找到应用适合 \"{query}\"", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。", "Valid until {date}" : "有效期至 {date}", "Delete" : "删除", diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js index 9877f3b3133..d3ee2579aba 100644 --- a/settings/l10n/zh_TW.js +++ b/settings/l10n/zh_TW.js @@ -80,7 +80,6 @@ OC.L10N.register( "Uninstall" : "解除安裝", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "這個應用程式已啟用但是需要更新，您將會在 5 秒後被引導至更新頁面", "App update" : "應用程式更新", - "No apps found for \"{query}\"" : "\"{query}\" 並未找到任何應用程式", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "發生錯誤，請您上傳 ASCII 編碼的 PEM 憑證", "Valid until {date}" : "{date} 前有效", "Delete" : "刪除", @@ -120,16 +119,19 @@ OC.L10N.register( "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 看起來沒有設定完成，無法正確取得系統環境變數，getenv(\"PATH\") 回傳資料為空值", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "請您參考 <a target=\\\"_blank\\\" href=\\\"%s\\\">安裝文件手冊 ↗</a> 來確認php的設定值以及伺服器端的php設定，特別是當您使用php-fpm。", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "「唯讀設定檔」已經啟用，這樣可以防止來自網頁端的設定操作，每次需要更改設定時，都需要手動將設定檔暫時改為可讀寫。", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 已經設定成「剪除 inline doc block」模式，這將會使幾個核心應用程式無法使用", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "這大概是由快取或是加速器像是 Zend OPcache, eAccelerator 造成的", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "您使用的伺服器是微軟的 Windows，我們強烈建議您改用 Linux 以求最好的使用者體驗", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "未偵測到 PHP 模組 'fileinfo'。我們強烈建議啟用這個模組以取得最好的 mime-type 支援。", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "事務型文件鎖定的功能已經取消，這可能會造成競態條件，請在 config.php 中啟用 'filelocking.enabled' 以避免出現這樣的問題，請參考<a target=\\\"_blank\\\" href=\\\"%s\\\">文件手冊 ↗</a> 來了解更多的資訊。", "System locale can not be set to a one which supports UTF-8." : "無法設定為一個支援 UTF-8 的系統語系", "This means that there might be problems with certain characters in file names." : "這表示檔名中使用一些特殊字元可能會造成問題", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "我們強烈建議在您的系統上安裝必要的套件來支援以下的語系：%s", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果您的安裝不在網域的最上層，並且使用 cron 作為排程器，URL 的生成可能會有問題，為了避免這樣的狀況，請您在 config.php 檔案裡設定 overwrite.cli.url 為您安裝的 webroot 路徑（建議值：\"%s\"）", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : " 無法透過 CLI 來執行排程工作，發生以下技術性錯誤：", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "請再次檢查 <a target=\"_blank\" href=\"%s\">安裝手冊 ↗</a>，並且確定沒有任何的錯誤或是警告訊息在 <a href=\"#log-section\">記錄檔</a>", "All checks passed." : "所有檢查正常", "Open documentation" : "開啟說明文件", "Allow apps to use the Share API" : "允許 apps 使用分享 API", diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json index b3f237107b8..69ae4855d7c 100644 --- a/settings/l10n/zh_TW.json +++ b/settings/l10n/zh_TW.json @@ -78,7 +78,6 @@ "Uninstall" : "解除安裝", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "這個應用程式已啟用但是需要更新，您將會在 5 秒後被引導至更新頁面", "App update" : "應用程式更新", - "No apps found for \"{query}\"" : "\"{query}\" 並未找到任何應用程式", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "發生錯誤，請您上傳 ASCII 編碼的 PEM 憑證", "Valid until {date}" : "{date} 前有效", "Delete" : "刪除", @@ -118,16 +117,19 @@ "SSL" : "SSL", "TLS" : "TLS", "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 看起來沒有設定完成，無法正確取得系統環境變數，getenv(\"PATH\") 回傳資料為空值", + "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "請您參考 <a target=\\\"_blank\\\" href=\\\"%s\\\">安裝文件手冊 ↗</a> 來確認php的設定值以及伺服器端的php設定，特別是當您使用php-fpm。", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "「唯讀設定檔」已經啟用，這樣可以防止來自網頁端的設定操作，每次需要更改設定時，都需要手動將設定檔暫時改為可讀寫。", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 已經設定成「剪除 inline doc block」模式，這將會使幾個核心應用程式無法使用", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "這大概是由快取或是加速器像是 Zend OPcache, eAccelerator 造成的", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "您使用的伺服器是微軟的 Windows，我們強烈建議您改用 Linux 以求最好的使用者體驗", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "未偵測到 PHP 模組 'fileinfo'。我們強烈建議啟用這個模組以取得最好的 mime-type 支援。", + "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "事務型文件鎖定的功能已經取消，這可能會造成競態條件，請在 config.php 中啟用 'filelocking.enabled' 以避免出現這樣的問題，請參考<a target=\\\"_blank\\\" href=\\\"%s\\\">文件手冊 ↗</a> 來了解更多的資訊。", "System locale can not be set to a one which supports UTF-8." : "無法設定為一個支援 UTF-8 的系統語系", "This means that there might be problems with certain characters in file names." : "這表示檔名中使用一些特殊字元可能會造成問題", "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "我們強烈建議在您的系統上安裝必要的套件來支援以下的語系：%s", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果您的安裝不在網域的最上層，並且使用 cron 作為排程器，URL 的生成可能會有問題，為了避免這樣的狀況，請您在 config.php 檔案裡設定 overwrite.cli.url 為您安裝的 webroot 路徑（建議值：\"%s\"）", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : " 無法透過 CLI 來執行排程工作，發生以下技術性錯誤：", + "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "請再次檢查 <a target=\"_blank\" href=\"%s\">安裝手冊 ↗</a>，並且確定沒有任何的錯誤或是警告訊息在 <a href=\"#log-section\">記錄檔</a>", "All checks passed." : "所有檢查正常", "Open documentation" : "開啟說明文件", "Allow apps to use the Share API" : "允許 apps 使用分享 API", diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 4ae1022585d..47d1eff463e 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -167,7 +167,7 @@ script( </div> <div id="app-content"> <div id="apps-list" class="icon-loading"></div> - <div id="apps-list-empty" class="hidden emptycontent"> + <div id="apps-list-empty" class="hidden emptycontent emptycontent-search"> <div class="icon-search"></div> <h2><?php p($l->t('No apps found for your version')) ?></h2> </div> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 5e929bc33ff..29bf240e7e3 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -160,7 +160,7 @@ if($_['passwordChangeSupported']) { <?php endforeach;?> </select> <?php if (OC_Util::getEditionString() === ''): ?> - <a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/" + <a href="https://www.transifex.com/projects/p/owncloud/" target="_blank" rel="noreferrer"> <em><?php p($l->t('Help translate'));?></em> </a> @@ -170,15 +170,15 @@ if($_['passwordChangeSupported']) { <div id="clientsbox" class="section clientsbox"> <h2><?php p($l->t('Get the apps to sync your files'));?></h2> <a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank"> - <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.svg')); ?>" + <img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>" alt="<?php p($l->t('Desktop client'));?>" /> </a> <a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank"> - <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'googleplay.png')); ?>" + <img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>" alt="<?php p($l->t('Android app'));?>" /> </a> <a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank"> - <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.svg')); ?>" + <img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>" alt="<?php p($l->t('iOS app'));?>" /> </a> diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php index 15b7cb4abd7..697d0f3f142 100644 --- a/settings/templates/users/part.userlist.php +++ b/settings/templates/users/part.userlist.php @@ -34,7 +34,7 @@ src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>" alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/> </td> - <td class="mailAddress"><span></span> <img class="svg action" + <td class="mailAddress"><span></span><div class="loading-small hidden"></div> <img class="svg action" src="<?php p(image_path('core', 'actions/rename.svg'))?>" alt="<?php p($l->t('change email address'))?>" title="<?php p($l->t('change email address'))?>"/> </td> diff --git a/tests/acceptance/.gitignore b/tests/acceptance/.gitignore deleted file mode 100644 index 3c3629e647f..00000000000 --- a/tests/acceptance/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/tests/acceptance/package.json b/tests/acceptance/package.json deleted file mode 100644 index daeb245b51a..00000000000 --- a/tests/acceptance/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "specs", - "version": "0.0.0", - "description": "ownCloud specs for automated acceptance tests", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "Felix Böhm", - "dependencies": { - "protractor": "^1.1.1", - "request": "^2.40.0", - "xml2js": "^0.4.4", - "jasmine-spec-reporter": "^0.6.0", - "phantomjs": "^1.9.7-15" - }, - "devDependencies": { - } -} diff --git a/tests/acceptance/protractor_conf.js b/tests/acceptance/protractor_conf.js deleted file mode 100644 index e89e79e5478..00000000000 --- a/tests/acceptance/protractor_conf.js +++ /dev/null @@ -1,103 +0,0 @@ -// An example configuration file. -exports.config = { - // Do not start a Selenium Standalone sever - only run this using chrome. - chromeOnly: true, - chromeDriver: './node_modules/protractor/selenium/chromedriver', - - // Capabilities to be passed to the webdriver instance. - // See https://sites.google.com/a/chromium.org/chromedriver/capabilities - capabilities: { - 'browserName': 'chrome', - 'chromeOptions': { - 'args': ['show-fps-counter=true', '--test-type', '--ignore-certificate-errors'] - } - }, - - // Use on Commmandline: - // protractor ... --params.login.user=abc --params.login.password=123 - params: { - baseUrl: "http://127.0.0.1/", - login: { - user: 'admin', - password: 'password' - } - }, - - suites: { - install: 'tests/install/**/*_spec.js', - login: 'tests/login/**/*_spec.js', - apps: 'tests/apps/**/*_spec.js', - files: 'tests/files/**/*_spec.js', - share: 'tests/share/**/*_spec.js', - }, - - // seleniumAddress: 'http://0.0.0.0:4444/wd/hub', - - // Options to be passed to Jasmine-node. - jasmineNodeOpts: { - silent: true, - showColors: true, - onComplete: null, - isVerbose: true, - includeStackTrace: true, - defaultTimeoutInterval: 180000 - }, - - onPrepare: function(){ - global.isAngularSite = function(flag){ - browser.ignoreSynchronization = !flag; - }; - browser.driver.manage().window().setSize(1000, 800); - browser.driver.manage().window().maximize(); - - require('jasmine-spec-reporter'); - // add jasmine spec reporter - var spec_reporter = new jasmine.SpecReporter({ - displayStacktrace: false, // display stacktrace for each failed assertion - displayFailuresSummary: false, // display summary of all failures after execution - displaySuccessfulSpec: true, // display each successful spec - displayFailedSpec: true, // display each failed spec - displaySkippedSpec: false, // display each skipped spec - displaySpecDuration: true, // display each spec duration - colors: { - success: 'green', - failure: 'red', - skipped: 'cyan' - }, - prefixes: { - success: '✓ ', - failure: '✗ ', - skipped: '- ' - } - }); - global.display = spec_reporter.display; - jasmine.getEnv().addReporter(spec_reporter); - } -}; - - -// Headless testing with Phantomjs -// capabilities: { -// 'browserName': 'phantomjs', -// -// /* -// * Can be used to specify the phantomjs binary path. -// * This can generally be ommitted if you installed phantomjs globally. -// */ -// 'phantomjs.binary.path':'./node_modules/phantomjs/bin/phantomjs', -// -// /* -// * Command line arugments to pass to phantomjs. -// * Can be ommitted if no arguments need to be passed. -// * Acceptable cli arugments: https://github.com/ariya/phantomjs/wiki/API-Reference#wiki-command-line-options -// */ -// 'phantomjs.cli.args':['--logfile=PATH', '--loglevel=DEBUG'] -// }, - -// TODO: Mobile? See: https://github.com/angular/protractor/blob/master/docs/browser-setup.md#setting-up-protractor-with-appium---androidchrome -// multiCapabilities: [{ -// 'browserName': 'firefox' -// }, { -// 'browserName': 'chrome' -// }] - diff --git a/tests/acceptance/readme.md b/tests/acceptance/readme.md deleted file mode 100644 index 2bf42c70a0f..00000000000 --- a/tests/acceptance/readme.md +++ /dev/null @@ -1,80 +0,0 @@ -ownCloud Acceptance Tests -========================= - - -Setup ------ - -Install node.js and run the following to install the dependencies - -``` -npm install -``` - -Install the webdriver -``` -./node_modules/protractor/bin/webdriver-manager update -``` - -Install protractor as global command ( optional ) -``` -npm install -g protractor -``` - -Run ---- - -Run the tests with protractor -``` -protractor protractor_conf.js -``` - -Run only a specific test suite or spec -``` -protractor protractor_conf.js --suite install -protractor protractor_conf.js --params.baseUrl="http://127.0.0.1/ownClouds/test-community-7.0.1/" --suite=login -protractor protractor_conf.js --params.baseUrl="http://127.0.0.1/ownClouds/test-community-7.0.1/" --specs tests/login/newUser_spec.js -``` - -More Test Suites ----------------- - -You can find and define suites in ```protractor_conf.js``` - -Install suite: Run this suite on a not yet installed ownCloud, it will install during the tests - -After installation tests should run without the "First Run Wizard" app because of timing issues. -Disable the app on the server with - -``` -php occ app:disable firstrunwizard -``` - -Page Objects ------------- - -The ```tests/pages``` folder contains page objects. -A page object describes a webpage, gathers selectors and provides functions for actions on the page. - -In the specs these higher level functionality can be reused and the tests become nice and readable. - -Development ------------ - -A good starting point is the login suite in the login folder and the login page object. - -If you want to start only a single test (it) or collection of tests (describe) use: - -* iit to run a single test -* ddescribe to run only this collection - -You can also use - -* xit to exclude this test -* xdescribe to exclude this collection - -For deeper insights and api docs have a look at - -* Protractor, [https://github.com/angular/protractor](https://github.com/angular/protractor) -* Jasmine, [https://github.com/pivotal/jasmine](https://github.com/pivotal/jasmine) - diff --git a/tests/acceptance/screenshots/.gitignore b/tests/acceptance/screenshots/.gitignore deleted file mode 100644 index bc7947beb62..00000000000 --- a/tests/acceptance/screenshots/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* - -!.gitignore
\ No newline at end of file diff --git a/tests/acceptance/tests/apps/apps_spec.js b/tests/acceptance/tests/apps/apps_spec.js deleted file mode 100644 index 0b7937f97ab..00000000000 --- a/tests/acceptance/tests/apps/apps_spec.js +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2014 - * - * This file is licensed under the Affero General Public License version 3 - * or later. - * - * See the COPYING-README file. - * - */ - -/* global element, browser, require */ -var Page = require('../helper/page.js'); -var AppsPage = require('../pages/apps.page.js'); -var LoginPage = require('../pages/login.page.js'); - -describe('Enabling apps', function() { - var testApp; - var params = browser.params; - var loginPage; - var appsPage; - var testGroup; - - beforeEach(function() { - isAngularSite(false); - // app to test, must have a navigation entry and allow group restriction - testApp = 'calendar'; - // group to test, additionally to "admin" - testGroup = 'group1'; - loginPage = new LoginPage(params.baseUrl); - appsPage = new AppsPage(params.baseUrl); - - loginPage.get(); - loginPage.login(params.login.user, params.login.password); - appsPage.get(); - }); - - afterEach(function() { - Page.logout(); - }); - - it('user should see enabled app', function() { - appsPage.enableApp(testApp, true, null).then(function() { - // reload page - appsPage.get(); - Page.toggleAppsMenu(); - expect(element(Page.appMenuEntryId(testApp + '_index')).isPresent()).toBe(true); - }); - }); - - it('user should not see disabled app', function() { - appsPage.enableApp(testApp, false, null).then(function() { - // reload page - appsPage.get(); - Page.toggleAppsMenu(); - expect(element(Page.appMenuEntryId(testApp + '_index')).isPresent()).toBe(false); - }); - }); - - it('group member should see app when enabled in that group', function() { - appsPage.enableApp(testApp, true, ['admin']).then(function() { - // reload page - appsPage.get(); - Page.toggleAppsMenu(); - expect(element(Page.appMenuEntryId(testApp + '_index')).isPresent()).toBe(true); - }); - }); - - it('group member should not see app when enabled in another group', function() { - appsPage.enableApp(testApp, true, ['group1']).then(function() { - // reload page - appsPage.get(); - Page.toggleAppsMenu(); - expect(element(Page.appMenuEntryId(testApp + '_index')).isPresent()).toBe(false); - }); - }); - - it('group member should see app when all groups deselected (all case)', function() { - // when selecting no groups, it will show "All" even though the checkboxes - // are not checked - appsPage.enableApp(testApp, true, []).then(function() { - // reload page - appsPage.get(); - Page.toggleAppsMenu(); - expect(element(Page.appMenuEntryId(testApp + '_index')).isPresent()).toBe(false); - }); - }); -}); diff --git a/tests/acceptance/tests/files/folder_spec.js b/tests/acceptance/tests/files/folder_spec.js deleted file mode 100644 index 0b143ea0d33..00000000000 --- a/tests/acceptance/tests/files/folder_spec.js +++ /dev/null @@ -1,86 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var FilesPage = require('../pages/files.page.js'); - - -// ============================ FOLDERS ============================================================== // -// =================================================================================================== // - -describe('Folders', function() { - var params = browser.params; - var filesPage; - - beforeEach(function() { - isAngularSite(false); - filesPage = new FilesPage(params.baseUrl); - filesPage.getAsUser(params.login.user, params.login.password); - }); - - it('should create a new folder', function() { - filesPage.createNewFolder('testFolder'); - expect(filesPage.listFiles()).toContain('testFolder'); - }); - - it('should not create new folder if foldername already exists', function() { - filesPage.createNewFolder('testFolder'); - var warning = by.css('.tipsy-inner'); - expect(filesPage.alertWarning.isDisplayed()).toBeTruthy(); - }); - - it('should delete a folder', function() { - filesPage.get(); // TODO: reload cause warning alerts don't disappear - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - filesPage.deleteFile('testFolder'); - browser.sleep(800); - expect(filesPage.listFiles()).not.toContain('testFolder'); - }); -}); - -// ============================== SUB FOLDERS ======================================================== // -// =================================================================================================== // - -describe('Subfolders', function() { - var params = browser.params; - var filesPage; - - beforeEach(function() { - isAngularSite(false); - filesPage = new FilesPage(params.baseUrl); - filesPage.getAsUser(params.login.user, params.login.password); - }); - - - it('should go into folder and create subfolder', function() { - var folder = 'hasSubFolder'; - filesPage.createNewFolder(folder); - filesPage.goInToFolder(folder); - filesPage.createNewFolder('SubFolder'); - filesPage.createNewFolder('SubFolder2'); - expect(filesPage.listFiles()).toContain('SubFolder', 'SubFolder2'); - }); - - it('should rename a subfolder', function() { - filesPage.renameFile('SubFolder2', 'NewSubFolder'); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.listFiles()).toContain('NewSubFolder'); - }); - - it('should delete a subfolder', function() { - filesPage.deleteFile('SubFolder'); - browser.sleep(800); - expect(filesPage.listFiles()).not.toContain('SubFolder'); - }); - - it('should delete a folder containing a subfolder', function() { - filesPage.get(); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - filesPage.deleteFile('hasSubFolder'); - browser.sleep(800); - expect(filesPage.listFiles()).not.toContain('hasSubFolder'); - }); -});
\ No newline at end of file diff --git a/tests/acceptance/tests/files/rename_spec.js b/tests/acceptance/tests/files/rename_spec.js deleted file mode 100644 index a4dfdfa9613..00000000000 --- a/tests/acceptance/tests/files/rename_spec.js +++ /dev/null @@ -1,140 +0,0 @@ -var Page = require('../helper/page.js') -var LoginPage = require('../pages/login.page.js'); -var FilesPage = require('../pages/files.page.js'); - -// =============================================== RENAME FOLDER =================================== // -// ================================================================================================= // - -describe('Rename Folder', function() { - var params = browser.params; - var page; - var filesPage; - - beforeEach(function() { - isAngularSite(false); - page = new Page(); - filesPage = new FilesPage(params.baseUrl); - filesPage.getAsUser(params.login.user, params.login.password); - }); - - it('should rename a folder', function() { - filesPage.createNewFolder('testFolder'); - filesPage.renameFile('testFolder', 'newFolder'); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.listFiles()).toContain('newFolder'); - }); - - it('should show alert message if foldername already in use', function() { - filesPage.createNewFolder('testFolder'); - filesPage.renameFile('testFolder', 'newFolder'); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.alertWarning.isDisplayed()).toBeTruthy(); - }); - - it('should show alert message if using forbidden characters', function() { - filesPage.renameFile('newFolder', 'new:Folder'); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.alertWarning.isDisplayed()).toBeTruthy(); - }); - - it('should rename a file using special characters', function() { - filesPage.get(); // TODO: reload cause warning alerts don't disappear - filesPage.renameFile('testFolder', 'sP€c!@L B-)'); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.listFiles()).toContain('sP€c!@L B-)'); - }); - - it('should show alert message if newName is empty', function() { - filesPage.renameFile('newFolder', ""); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.alertWarning.isDisplayed()).toBeTruthy(); - filesPage.deleteFile('newFolder'); - filesPage.deleteFile('sP€c!@L B-)'); - }); -}); - -// =============================================== RENAME FILES ==================================== // -// ================================================================================================= // - -describe('Rename Files', function() { - var params = browser.params; - var page; - var filesPage; - - beforeEach(function() { - isAngularSite(false); - page = new Page(); - filesPage = new FilesPage(params.baseUrl); - filesPage.getAsUser(params.login.user, params.login.password); - }); - - it('should rename a txt file', function() { - filesPage.createNewTxtFile('testText'); - filesPage.renameFile('testText.txt', 'newText.txt'); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.listFiles()).toContain('newText'); - }); - - it('should show alert message if filename is already in use', function() { - filesPage.createNewTxtFile('testText'); - filesPage.renameFile('testText.txt', 'newText.txt'); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.alertWarning.isDisplayed()).toBeTruthy(); - }); - - // it('should rename a file with the same name but changed capitalization', function() { - // browser.takeScreenshot().then(function (png) { - - // new Screenshot(png, 'SameNameCapitalization1.png'); - // filesPage.renameFile('testText.txt', 'NewText.txt'); - // browser.wait(function() { - // return(filesPage.listFiles()); - // }, 3000); - // }); - // browser.takeScreenshot().then(function (png) { - // new Screenshot(png, 'SameNameCapitalization2.png'); - // }); - // expect(filesPage.listFiles()).toContain('NewText.txt'); - // }); - - it('should rename a file using special characters', function() { - filesPage.renameFile('newText.txt', 'sP€c!@L B-).txt'); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.listFiles()).toContain('sP€c!@L B-)'); - }); - - it('should show alert message if newName is empty', function() { - filesPage.get(); // TODO: reload cause warning alerts don't disappear - filesPage.renameFile('sP€c!@L B-).txt', ''); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.alertWarning.isDisplayed()).toBeTruthy(); - }); - - it('should rename a file by taking off the file extension', function() { - filesPage.renameFile('testText.txt', 'Without Subfix'); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - expect(filesPage.listFiles()).toContain('Without Subfix'); - filesPage.deleteFile('Without Subfix'); - filesPage.deleteFile('sP€c!@L B-).txt'); - }); -});
\ No newline at end of file diff --git a/tests/acceptance/tests/files/restore_spec.js b/tests/acceptance/tests/files/restore_spec.js deleted file mode 100644 index 3179c92835f..00000000000 --- a/tests/acceptance/tests/files/restore_spec.js +++ /dev/null @@ -1,151 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var FilesPage = require('../pages/files.page.js'); - -// ============================ RESTORE FOLDERS ====================================================== // -// =================================================================================================== // - -describe('Restore Folders', function() { - var params = browser.params; - var filesPage; - - beforeEach(function() { - isAngularSite(false); - filesPage = new FilesPage(params.baseUrl); - filesPage.getAsUser(params.login.user, params.login.password); - }); - - - it('should restore a emtpy folder that has been deleted', function() { - filesPage.createNewFolder('Empty'); - filesPage.deleteFile('Empty'); - filesPage.trashbinButton.click(); - browser.wait(function() { - return filesPage.listFiles(); - }, 5000); - filesPage.restoreFile(0); - filesPage.get(); - - - expect(filesPage.listFiles()).toContain('Empty'); - filesPage.deleteFile('Empty'); - }); - - it('should restore a folder including special characters', function() { - filesPage.createNewFolder('Sp€c!@l FölD€r'); - filesPage.deleteFile('Sp€c!@l FölD€r'); - filesPage.trashbinButton.click(); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - - filesPage.restoreFile(0); - filesPage.get(); - - expect(filesPage.listFiles()).toContain('Sp€c!@l FölD€r'); - filesPage.deleteFile('Sp€c!@l FölD€r'); - }); - - it('should restore a non empty folder that has been deleted', function() { - filesPage.createNewFolder('nonEmpty'); - filesPage.createSubFolder('nonEmpty', 'Subfolder'); - filesPage.createNewTxtFile('TextFile'); - filesPage.get(); - filesPage.deleteFile('nonEmpty'); - filesPage.trashbinButton.click(); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - filesPage.restoreFile(0); - filesPage.get(); - expect(filesPage.listFiles()).toContain('nonEmpty'); - }); - - it('should restore a folder whose name is currently in use', function() { - - // create and delete non empty folder - filesPage.createNewFolder('sameFolderName'); - filesPage.deleteFile('sameFolderName'); - filesPage.createNewFolder('sameFolderName'); - filesPage.trashbinButton.click(); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - filesPage.restoreFile(0); - filesPage.get(); - expect(filesPage.listFiles()).toContain('sameFolderName (Wiederhergestellt)'); //for german ownclouds - filesPage.deleteFile('sameFolderName'); - filesPage.deleteFile('sameFolderName (Wiederhergestellt)'); - }); - - it('should restore a sub folder when the root folder has been deleted separately', function() { - filesPage.getSubFolder('nonEmpty', 'Subfolder'); - filesPage.createNewTxtFile('IsInSub'); - filesPage.getFolder('nonEmpty'); - filesPage.deleteFile('Subfolder'); - filesPage.get() - filesPage.deleteFile('nonEmpty'); - filesPage.trashbinButton.click(); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - filesPage.restoreFile(1); - filesPage.get(); - expect(filesPage.listFiles()).toContain('Subfolder'); - }); -}); - - -// ============================ RESTORE FOLDERS ====================================================== // -// =================================================================================================== // - -describe('Restore Files', function() { - var params = browser.params; - var filesPage; - - beforeEach(function() { - isAngularSite(false); - filesPage = new FilesPage(params.baseUrl); - filesPage.getAsUser(params.login.user, params.login.password); - }); - - it('should restore a file thas has been deleted', function() { - filesPage.createNewTxtFile('restoreMe'); - filesPage.deleteFile('restoreMe.txt'); - filesPage.trashbinButton.click(); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - filesPage.restoreFile(0); - filesPage.get(); - expect(filesPage.listFiles()).toContain('restoreMe'); - filesPage.deleteFile('restoreMe.txt'); - }); - - it('should restore a file including special characters', function() { - filesPage.createNewTxtFile('Sp€c!@L RésTör€'); - filesPage.deleteFile('Sp€c!@L RésTör€.txt'); - filesPage.trashbinButton.click(); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - filesPage.restoreFile(0); - filesPage.get(); - expect(filesPage.listFiles()).toContain('Sp€c!@L RésTör€'); - filesPage.deleteFile('Sp€c!@L RésTör€.txt'); - }); - - it('should restore a file whose name is currently in use', function() { - filesPage.createNewTxtFile('sameFileName'); - filesPage.deleteFile('sameFileName.txt'); - filesPage.createNewTxtFile('sameFileName'); - filesPage.trashbinButton.click(); - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - filesPage.restoreFile(0); - filesPage.get(); - expect(filesPage.listFiles()).toContain('sameFileName (Wiederhergestellt)'); //for german ownclouds - filesPage.deleteFile('sameFileName.txt'); - filesPage.deleteFile('sameFileName (Wiederhergestellt).txt'); - }); -});
\ No newline at end of file diff --git a/tests/acceptance/tests/files/search_spec.js b/tests/acceptance/tests/files/search_spec.js deleted file mode 100644 index 4df5415612c..00000000000 --- a/tests/acceptance/tests/files/search_spec.js +++ /dev/null @@ -1,26 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var FilesPage = require('../pages/files.page.js'); - -// ============================ SEARCH =============================================================== // -// =================================================================================================== // - -describe('Search', function() { - var params = browser.params; - var filesPage; - - beforeEach(function() { - isAngularSite(false); - filesPage = new FilesPage(params.baseUrl); - filesPage.getAsUser(params.login.user, params.login.password); - }); - - it('should search files by name', function() { - filesPage.createNewTxtFile('searchFile'); - filesPage.createNewFolder('searchFolder'); - filesPage.searchInput.click(); - filesPage.searchInput.sendKeys('search'); - expect(filesPage.listSelctedFiles()).toContain('searchFile', 'searchFolder'); - filesPage.deleteFile('searchFile.txt'); - filesPage.deleteFile('searchFolder'); - }); -});
\ No newline at end of file diff --git a/tests/acceptance/tests/files/sort_spec.js b/tests/acceptance/tests/files/sort_spec.js deleted file mode 100644 index b2abce59a37..00000000000 --- a/tests/acceptance/tests/files/sort_spec.js +++ /dev/null @@ -1,35 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var FilesPage = require('../pages/files.page.js'); - -// ============================ SORT ================================================================= // -// =================================================================================================== // - -describe('Sort', function() { - var params = browser.params; - var filesPage; - - beforeEach(function() { - isAngularSite(false); - filesPage = new FilesPage(params.baseUrl); - filesPage.getAsUser(params.login.user, params.login.password); - }); - - it('shloud sort files by name', function() { - expect(filesPage.firstListElem == element(filesPage.fileListElemId("documents"))).toBeTruthy; - filesPage.nameSortArrow.click(); - expect(filesPage.firstListElem == element(filesPage.fileListElemId("ownCloudUserManual.pdf"))).toBeTruthy; - }); - - it('should sort files by size', function() { - expect(filesPage.firstListElem == element(filesPage.fileListElemId("documents"))).toBeTruthy; - filesPage.sizeSortArrow.click(); - expect(filesPage.firstListElem == element(filesPage.fileListElemId("music"))).toBeTruthy; - }); - - it('should sort files by modified date', function() { - expect(filesPage.firstListElem == element(filesPage.fileListElemId("documents"))).toBeTruthy; - filesPage.createNewTxtFile('newText') - filesPage.modifiedSortArrow.click(); - expect(filesPage.firstListElem == element(filesPage.fileListElemId("newText.txt"))).toBeTruthy; - }); -});
\ No newline at end of file diff --git a/tests/acceptance/tests/files/txt_spec.js b/tests/acceptance/tests/files/txt_spec.js deleted file mode 100644 index 4e0165b18dc..00000000000 --- a/tests/acceptance/tests/files/txt_spec.js +++ /dev/null @@ -1,36 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var FilesPage = require('../pages/files.page.js'); -var Screenshot = require('../helper/screenshot.js'); - -// ============================ TXT FILES ============================================================ // -// =================================================================================================== // - -describe('Txt Files', function() { - var params = browser.params; - var filesPage; - - beforeEach(function() { - isAngularSite(false); - filesPage = new FilesPage(params.baseUrl); - filesPage.getAsUser(params.login.user, params.login.password); - }); - - it('should create a new txt file', function() { - filesPage.createNewTxtFile('testText'); - expect(filesPage.listFiles()).toContain('testText'); - }); - - it('should not create new file if filename already exists', function() { - filesPage.createNewTxtFile('testText'); - expect(filesPage.alertWarning.isDisplayed()).toBeTruthy(); - }); - - it('should delete a txt file', function() { - browser.wait(function() { - return(filesPage.listFiles()); - }, 3000); - filesPage.deleteFile('testText.txt'); - filesPage.get(); - expect(filesPage.listFiles()).not.toContain('testText') - }); -});
\ No newline at end of file diff --git a/tests/acceptance/tests/helper/page.js b/tests/acceptance/tests/helper/page.js deleted file mode 100644 index 98545032bea..00000000000 --- a/tests/acceptance/tests/helper/page.js +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2014 - * - * This file is licensed under the Affero General Public License version 3 - * or later. - * - * See the COPYING-README file. - * - */ - -/* global protractor, module, element, by, browser */ -(function() { - var Page = function() { - - }; - - Page.prototype.moveMouseTo = function(locator) { - var ele = element(locator); - return browser.actions().mouseMove(ele).perform(); - }; - - Page.toggleAppsMenu = function() { - var el = element(this.appsMenuId()); - return el.click(); - }; - - Page.logout = function() { - element(Page.settingsMenuId()).click(); - element(by.id('logout')).click(); - browser.sleep(300); - }; - - //================ LOCATOR FUNCTIONS ====================================// - Page.appsMenuId = function() { - return by.css('#header .menutoggle'); - }; - - Page.appMenuEntryId = function(appId) { - return by.css('nav #apps [data-id=\'' + appId + '\']'); - }; - - Page.settingsMenuId = function() { - return by.css('#header #settings'); - }; - - //================ UTILITY FUNCTIONS ====================================// - - /** - * Sets the selection of a multiselect element - * - * @param el select element of the multiselect - * @param {Array} id of the values to select - */ - Page.multiSelectSetSelection = function(el, selection) { - var d = protractor.promise.defer(); - var dropDownEl = element(by.css('.multiselectoptions.down')); - - el.click(); - - function processEntry(entry) { - entry.isSelected().then(function(selected) { - entry.getAttribute('id').then(function(inputId) { - // format is "ms0-option-theid", we extract that id - var dataId = inputId.split('-')[2]; - var mustBeSelected = selection.indexOf(dataId) >= 0; - // if state doesn't match what we want, toggle - - if (selected !== mustBeSelected) { - // need to click on the label, not input - entry.element(by.xpath('following-sibling::label')).click(); - // confirm that the checkbox was set - browser.wait(function() { - return entry.isSelected().then(function(newSelection) { - return newSelection === mustBeSelected; - }); - }); - } - }); - }); - } - - browser.wait(function() { - return dropDownEl.isPresent(); - }, 1000).then(function() { - dropDownEl.all(by.css('[type=checkbox]')).then(function(entries) { - for (var i = 0; i < entries.length; i++) { - processEntry(entries[i]); - } - // give it some time to save changes - browser.sleep(300).then(function() { - d.fulfill(true); - }); - }); - }); - - return d.promise; - }; - - module.exports = Page; -})(); diff --git a/tests/acceptance/tests/helper/screenshot.js b/tests/acceptance/tests/helper/screenshot.js deleted file mode 100644 index cd3a38b3143..00000000000 --- a/tests/acceptance/tests/helper/screenshot.js +++ /dev/null @@ -1,16 +0,0 @@ -(function() { - - var fs = require('fs'); - - var Screenshot = function(data, filename) { - this.screenshotPath = __dirname + '/../../screenshots/'; - - display.log('Created screenshot: ' + this.screenshotPath + filename); - var stream = fs.createWriteStream(this.screenshotPath + filename); - - stream.write(new Buffer(data, 'base64')); - stream.end(); - }; - - module.exports = Screenshot; -})();
\ No newline at end of file diff --git a/tests/acceptance/tests/install/install_spec.js b/tests/acceptance/tests/install/install_spec.js deleted file mode 100644 index ffb4e678dfe..00000000000 --- a/tests/acceptance/tests/install/install_spec.js +++ /dev/null @@ -1,63 +0,0 @@ -var InstallPage = require('../pages/install.page.js'); -var Screenshot = require('../helper/screenshot.js'); - -describe('Installation', function() { - var params = browser.params; - var installPage; - - beforeEach(function() { - isAngularSite(false); - installPage = new InstallPage(params.baseUrl); - installPage.get(); - }); - - it('should load the install page with logo', function() { - expect(installPage.installField.getAttribute('name')).toEqual("install"); - expect(installPage.installField.getAttribute('value')).toEqual('true'); - - expect(element(by.css('.logo'))).toBeDefined(); - browser.takeScreenshot().then(function (png) { - new Screenshot(png, 'InstallPage.png'); - }); - }); - - it('should not show any warnings or errors', function() { - if (installPage.warningField.isDisplayed()) { - installPage.warningField.getText().then(function(text) { - display.log(text); - }); - } - expect(installPage.warningField.isDisplayed()).toBeFalsy(); - }); - - it('should show more config after clicking the advanced config link ', function() { - // TODO: Check not displayed in a proper way - // expect(installPage.dataDirectoryConfig.isDisplayed()).toBeFalsy(); - // expect(installPage.dbConfig.isDisplayed()).toBeFalsy(); - - installPage.advancedConfigLink.click(); - - expect(installPage.dataDirectoryConfig.isDisplayed()).toBeTruthy(); - expect(installPage.dbConfig.isDisplayed()).toBeTruthy(); - - browser.takeScreenshot().then(function (png) { - new Screenshot(png, 'InstallConfig.png'); - }); - }); - - it('should install as admin with sqlite', function() { - installPage.fillAdminAccount(params.login.user, params.login.password); - - browser.takeScreenshot().then(function (png) { - new Screenshot(png, 'Credentials.png'); - }); - - installPage.installButton.click().then(function() { - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - browser.takeScreenshot().then(function (png) { - new Screenshot(png, 'InstallFinished.png'); - }); - }); - }); - -});
\ No newline at end of file diff --git a/tests/acceptance/tests/login/authentication_spec.js b/tests/acceptance/tests/login/authentication_spec.js deleted file mode 100644 index ad02db40922..00000000000 --- a/tests/acceptance/tests/login/authentication_spec.js +++ /dev/null @@ -1,88 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var UserPage = require('../pages/user.page.js'); -var FirstRunWizardPage = require('../pages/firstRunWizard.page.js'); -var Screenshot = require('../helper/screenshot.js'); - -ddescribe('Authentication', function() { - var params = browser.params; - var loginPage; - - beforeEach(function() { - isAngularSite(false); - loginPage = new LoginPage(params.baseUrl); - browser.manage().deleteAllCookies(); // logout the hard way - loginPage.get(); - - // Skip tests after first failed test - // if (this.results_.failedCount > 0) { - // // Hack: Quit by filtering upcoming tests - // this.env.specFilter = function(spec) { - // return false; - // }; - // } - }); - - it('should show a logo', function() { - expect(element(by.css('.logo'))).toBeDefined(); - }); - - it('should load the login page', function() { - browser.takeScreenshot().then(function (png) { - new Screenshot(png, 'LoginPage.png'); - }); - - expect(loginPage.isCurrentPage()).toBeTruthy(); - }); - - it('should meet the locator dependencies', function() { - expect(loginPage.loginForm.isDisplayed()).toBeTruthy(); - expect(loginPage.userInput.isDisplayed()).toBeTruthy(); - expect(loginPage.passwordInput.isDisplayed()).toBeTruthy(); - expect(loginPage.loginButton.isDisplayed()).toBeTruthy(); - }); - - it('should not load the files page url', function() { - expect(browser.getCurrentUrl()).not.toContain('index.php/apps/files/'); - }); - - it('should login admin user', function() { - // Assumes FirstRunWizard to be disabled - loginPage.login(params.login.user, params.login.password); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login with admin account', function() { - loginPage.login(params.login.user, params.login.password); - browser.takeScreenshot().then(function (png) { - new Screenshot(png, 'LoginAsAdmin.png'); - }); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - expect(loginPage.isCurrentPage()).toBeFalsy(); - }); - - it('should return to the login page after logout', function() { - loginPage.login(params.login.user, params.login.password); - expect(browser.getCurrentUrl()).not.toEqual(loginPage.url); - - loginPage.logout(); - expect(browser.getCurrentUrl()).toEqual(loginPage.url); - }); - - it('should not login with wrong credentials', function() { - loginPage.fillUserCredentilas('wrongName', 'wrongPass'); - loginPage.loginButton.click(); - browser.takeScreenshot().then(function (png) { - new Screenshot(png, 'LoginWrong.png'); - }); - expect(browser.getCurrentUrl()).not.toContain('index.php/apps/files/'); - expect(loginPage.isCurrentPage()).toBeTruthy(); - }); - - it('should have rights to visit user management after admin login', function() { - loginPage.login(params.login.user, params.login.password); - userPage = new UserPage(params.baseUrl); - userPage.get(); - expect(browser.getCurrentUrl()).toEqual(userPage.url); - }); - -});
\ No newline at end of file diff --git a/tests/acceptance/tests/login/change_password_spec.js b/tests/acceptance/tests/login/change_password_spec.js deleted file mode 100644 index 8eef444aadc..00000000000 --- a/tests/acceptance/tests/login/change_password_spec.js +++ /dev/null @@ -1,104 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var UserPage = require('../pages/user.page.js'); -var PersonalPage = require('../pages/personal.page.js'); - -describe('Change Password - Valid Usernames', function() { - var params = browser.params; - var loginPage; - var long_pass = 'newNEW123!"§$%&()=?öüß'; - var special_pass = 'special%&@/1234!-+='; - - beforeEach(function() { - isAngularSite(false); - loginPage = new LoginPage(params.baseUrl); - browser.manage().deleteAllCookies(); // logout the hard way - loginPage.get(); - }); - - it('should login as admin and create a test users ', function() { - loginPage.fillUserCredentilas(params.login.user, params.login.password); - loginPage.loginButton.click(); - userPage = new UserPage(params.baseUrl); - userPage.get(); - userPage.createNewUser('demo', 'password'); - userPage.get(); - expect(userPage.listUser()).toContain('demo'); - }); - - it('should login test user', function() { - // workaround: Test needed to close firstrunwizard - loginPage.login('demo', 'password'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login and change password in personal settings', function() { - loginPage.login('demo', 'password'); - var personalPage = new PersonalPage(params.baseUrl); - personalPage.get(); - personalPage.changePassword('password', 'newpassword') - - expect(personalPage.passwordChanged.isDisplayed()).toBeTruthy(); - expect(personalPage.passwordError.isDisplayed()).toBeFalsy(); - }); - - it('should login and change password to super save password in personal settings', function() { - loginPage.login('demo', 'newpassword'); - var personalPage = new PersonalPage(params.baseUrl); - personalPage.get(); - personalPage.changePassword('newpassword', long_pass); - browser.wait(function () { - return personalPage.passwordChanged.isDisplayed(); - }, 3000); - expect(personalPage.passwordChanged.isDisplayed()).toBeTruthy(); - expect(personalPage.passwordError.isDisplayed()).toBeFalsy(); - }); - - it('should login and not change password with wrong old password in personal settings', function() { - loginPage.login('demo', long_pass); - var personalPage = new PersonalPage(params.baseUrl); - personalPage.get(); - personalPage.changePassword('wrongpassword', 'newpassword'); - expect(personalPage.passwordChanged.isDisplayed()).toBeFalsy(); - expect(personalPage.passwordError.isDisplayed()).toBeTruthy(); - }); - - // %, &, @ and / - it('should change password including specialcharacters in personal settings', function() { - loginPage.login('demo', long_pass); - var personalPage = new PersonalPage(params.baseUrl); - personalPage.get(); - personalPage.changePassword(long_pass, special_pass); - expect(personalPage.passwordChanged.isDisplayed()).toBeTruthy(); - expect(personalPage.passwordError.isDisplayed()).toBeFalsy(); - }); - - it('should login with password including specialcharacters', function() { - loginPage.login('demo', special_pass); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login as admin and change password for test users ', function() { - loginPage.login(params.login.user, params.login.password); - userPage = new UserPage(params.baseUrl); - userPage.get(); - element(by.css('#userlist tr[data-displayname="demo"] td.password')).click().then(function() { - element(by.css('#userlist tr[data-displayname="demo"] td.password input')).sendKeys("password"); - element(by.css('#userlist tr[data-displayname="demo"] td.password input')).sendKeys(protractor.Key.ENTER); - }); - }); - - it('should login with password changed by admin', function() { - loginPage.login('demo', 'password'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login as admin and delete test user', function() { - // Cleanup prev tests - loginPage.login(params.login.user, params.login.password); - userPage.get(); - userPage.deleteUser('demo'); - userPage.get(); - expect(userPage.listUser()).not.toContain('demo'); - }); - -});
\ No newline at end of file diff --git a/tests/acceptance/tests/login/new_user_spec.js b/tests/acceptance/tests/login/new_user_spec.js deleted file mode 100644 index 06df5d69ea1..00000000000 --- a/tests/acceptance/tests/login/new_user_spec.js +++ /dev/null @@ -1,43 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var UserPage = require('../pages/user.page.js'); -var Screenshot = require('../helper/screenshot.js'); - -describe('New User', function() { - var params = browser.params; - var loginPage; - - beforeEach(function() { - isAngularSite(false); - loginPage = new LoginPage(params.baseUrl); - browser.manage().deleteAllCookies(); // logout the hard way - loginPage.get(); - }); - - it('should login as admin and create a new user ', function() { - loginPage.login(params.login.user, params.login.password); - userPage = new UserPage(params.baseUrl); - userPage.get(); - userPage.createNewUser('demo', 'demo'); - userPage.get(); - expect(userPage.listUser()).toContain('demo'); - }); - - it('should login with a new user', function() { - loginPage.login('demo', 'demo'); - - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - browser.takeScreenshot().then(function (png) { - new Screenshot(png, 'LoginAsNewUser.png'); - }); - }); - - it('should login as admin and delete new user', function() { - // Cleanup prev test - loginPage.login(params.login.user, params.login.password); - userPage.get(); - userPage.deleteUser('demo'); - userPage.get(); - expect(userPage.listUser()).not.toContain('demo'); - }); - -});
\ No newline at end of file diff --git a/tests/acceptance/tests/login/username_cases_spec.js b/tests/acceptance/tests/login/username_cases_spec.js deleted file mode 100644 index fe7e95b02b4..00000000000 --- a/tests/acceptance/tests/login/username_cases_spec.js +++ /dev/null @@ -1,88 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var UserPage = require('../pages/user.page.js'); - -describe('Username Cases', function() { - var params = browser.params; - var loginPage; - - beforeEach(function() { - isAngularSite(false); - loginPage = new LoginPage(params.baseUrl); - browser.manage().deleteAllCookies(); // logout the hard way - loginPage.get(); - }); - - it('should login as admin and create test users ', function() { - loginPage.fillUserCredentilas(params.login.user, params.login.password); - loginPage.loginButton.click(); - userPage = new UserPage(params.baseUrl); - userPage.get(); - userPage.createNewUser('demo1', 'demo'); - userPage.createNewUser('Demo2', 'demo'); - userPage.createNewUser('DEMO3', 'demo'); - - userPage.get(); - expect(userPage.listUser()).toContain('demo1'); - expect(userPage.listUser()).toContain('Demo2'); - expect(userPage.listUser()).toContain('DEMO3' ); - }); - - it('should login lowercase username with test user in lowercase', function() { - loginPage.login('demo1', 'demo'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login camelcase username with test user in lowercase', function() { - loginPage.login('demo2', 'demo'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login uppercase username with test user in lowercase', function() { - loginPage.login('demo3', 'demo'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login with lowercase username in camelcase', function() { - loginPage.login('Demo1', 'demo'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login with camelcase username in camelcase', function() { - loginPage.login('Demo2', 'demo'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login with uppercase username in camelcase', function() { - loginPage.login('Demo3', 'demo'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login with lowercase username in uppercase', function() { - loginPage.login('DEMO1', 'demo'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login with lowercase username in uppercase', function() { - loginPage.login('DEMO2', 'demo'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login with lowercase username in uppercase', function() { - loginPage.login('DEMO3', 'demo'); - expect(browser.getCurrentUrl()).toContain('index.php/apps/files/'); - }); - - it('should login as admin and delete test user', function() { - // Cleanup prev tests - loginPage.login(params.login.user, params.login.password); - userPage.get(); - userPage.deleteUser('demo1'); - userPage.deleteUser('Demo2'); - userPage.deleteUser('DEMO3'); - userPage.get(); - expect(userPage.listUser()).not.toContain('demo1'); - expect(userPage.listUser()).not.toContain('Demo2'); - expect(userPage.listUser()).not.toContain('DEMO3' ); - }); - -});
\ No newline at end of file diff --git a/tests/acceptance/tests/pages/apps.page.js b/tests/acceptance/tests/pages/apps.page.js deleted file mode 100644 index eb018979c90..00000000000 --- a/tests/acceptance/tests/pages/apps.page.js +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2014 - * - * This file is licensed under the Affero General Public License version 3 - * or later. - * - * See the COPYING-README file. - * - */ - -/* global module, protractor, element, by, browser, require */ -(function() { - var Page = require('../helper/page.js'); - - var AppsPage = function(baseUrl) { - this.baseUrl = baseUrl; - this.path = 'index.php/settings/apps'; - this.url = baseUrl + this.path; - - this.appList = element(by.css('#app-navigation .applist')); - }; - - //================ LOCATOR FUNCTIONS ====================================// - AppsPage.prototype.appId = function(appId) { - return by.css('#app-navigation .applist [data-id=\'' + appId + '\']'); - }; - - AppsPage.prototype.enableButtonId = function() { - return by.css('#app-content .appinfo .enable'); - }; - - AppsPage.prototype.groupsEnableCheckboxId = function() { - return by.id('groups_enable'); - }; - - AppsPage.prototype.groupsEnableListId = function() { - return by.css('#app-content .multiselect.button'); - }; - //================ SHARED ===============================================// - - AppsPage.prototype.get = function() { - browser.get(this.url); - - var appList = this.appList; - browser.wait(function() { - return appList.isDisplayed(); - }, 5000, 'load app page'); - }; - - /** - * Enables or disables the given app. - * - * @param {String} appId app id - * @param {bool} [state] true (default) to enable the app, false otherwise - * @param {Array} [groups] groups for which to enable the app or null to disable - * group selection. If not specified (undefined), the group checkbox, if it exists, - * will be left as is. - */ - AppsPage.prototype.enableApp = function(appId, state, groups) { - var d = protractor.promise.defer(); - if (state === undefined) { - state = true; - } - - var enableButton = element(this.enableButtonId()); - - element(this.appId(appId)).click(); - browser.wait(function() { - return enableButton.isPresent(); - }, 800); - - // an app is already enabled if the button value is "Disable" - enableButton.getAttribute('value').then(function(attr) { - if (state !== (attr === 'Disable')) { - enableButton.click(); - } - }); - - // wait for the button to change its attribute - browser.wait(function() { - return enableButton.getAttribute('value').then(function(attr) { - return attr === state ? 'Disable' : 'Enable'; - }); - }, 800); - - if (state && groups !== undefined) { - var groupsCheckbox = element(this.groupsEnableCheckboxId()); - var hasGroups = false; - - if (groups && groups.length > 0) { - hasGroups = true; - } - - // check/uncheck checkbox to match desired state - groupsCheckbox.isSelected().then(function(checkboxState) { - if (hasGroups !== checkboxState) { - groupsCheckbox.click(); - } - }); - - // wait for checkbox to change state - browser.wait(function() { - return groupsCheckbox.isSelected().then(function(checkboxState) { - return hasGroups === checkboxState; - }); - }, 800); - - if (hasGroups) { - var groupsList = element(this.groupsEnableListId()); - Page.multiSelectSetSelection(groupsList, groups).then(function() { - d.fulfill(true); - }); - } else { - d.fulfill(true); - } - } - return d.promise; - }; - - module.exports = AppsPage; -})(); diff --git a/tests/acceptance/tests/pages/files.page.js b/tests/acceptance/tests/pages/files.page.js deleted file mode 100644 index e5445309b26..00000000000 --- a/tests/acceptance/tests/pages/files.page.js +++ /dev/null @@ -1,317 +0,0 @@ -(function() { - var Page = require('../helper/page.js'); - var LoginPage = require('../pages/login.page.js'); - - var FilesPage = function(baseUrl) { - this.baseUrl = baseUrl; - this.path = 'index.php/apps/files'; - this.url = baseUrl + this.path; - - var url = this.url - this.folderUrl = function(folder) { - return url + '/?dir=%2F' + folder - } - - // topbar - this.UserActionDropdown = element(by.id("expandDisplayName")); - - // filelist - this.selectedFileListId = by.css('tr.searchresult td.filename .innernametext'); - this.firstListElem = element(by.css('#fileList tr:first-child')); - - // new Button and sublist - this.newButton = element(by.css('#new a')); - this.newTextButton = element(by.css('li.icon-filetype-text.svg')); - this.newFolderButton = element(by.css('li.icon-filetype-folder.svg')); - this.newTextnameForm = element(by.css('li.icon-filetype-text form input')); - this.newFoldernameForm = element(by.css('li.icon-filetype-folder form input')); - - this.alertWarning = element(by.css('.tipsy-inner')); - - this.trashbinButton = element(by.css('#app-navigation li.nav-trashbin a')); - - // sort arrows - this.nameSortArrow = element(by.css('a.name.sort')); - this.sizeSortArrow = element(by.css('a.size.sort')); - this.modifiedSortArrow = element(by.id('modified')); - - this.searchInput = element(by.id('searchbox')); - - this.shareWithForm = element(by.id('shareWith')); - this.sharedWithDropdown = element(by.id('ui-id-1')); - // this.textArea = element(by.css('.ace_content')); - // this.textLine = element(by.css('.ace_content .ace_line')); - // this.saveButton = element(by.id('editor_save')); - }; - -//================ LOCATOR FUNCTIONS ====================================// - FilesPage.prototype.fileListId = function() { - return by.css('td.filename .innernametext'); - } - - FilesPage.prototype.fileListElemId = function(fileName) { - return by.css("tr[data-file='" + fileName + "']"); - }; - - FilesPage.prototype.fileListElemNameId = function(fileName) { - return by.css("tr[data-file='" + fileName + "'] span.innernametext"); - }; - - FilesPage.prototype.restoreListElemId = function(id) { - return (by.css("#fileList tr[data-id='" + id + "']")); - }; - - FilesPage.prototype.restoreButtonId = function(id) { - return (by.css("#fileList tr[data-id='" + id + "'] .action.action-restore")); - }; - - FilesPage.prototype.renameButtonId = function(fileName) { - return by.css("tr[data-file='" + fileName + "'] .action.action-rename"); - }; - - FilesPage.prototype.renameFormId = function(fileName) { - return by.css("tr[data-file='" + fileName + "'] form input"); - }; - - FilesPage.prototype.shareButtonId = function(fileName) { - return by.css("tr[data-file='" + fileName + "'] .action.action-share"); - }; - - FilesPage.prototype.deleteButtonId = function(fileName) { - return by.css("tr[data-file='" + fileName + "'] .action.delete.icon-delete"); - }; - -//================ SHARED ===============================================// - - FilesPage.prototype.isLoggedIn = function() { - return this.UserActionDropdown.isPresent().then(function(isLoggedIn) { - return isLoggedIn; - }); - } - - FilesPage.prototype.get = function() { - browser.get(this.url); - - var button = this.newButton; - browser.wait(function() { - return button.isDisplayed(); - }, 5000, 'load files content'); - }; - - FilesPage.prototype.getAsUser = function(name, pass) { - var loginPage; - loginPage = new LoginPage(this.baseUrl); - - this.isLoggedIn().then(function(isLoggedIn) { - if(isLoggedIn) { - // console.log('isLoggedIn: ' + isLoggedIn); - return false - } else { - console.log('isLoggedIn: ' + isLoggedIn); - browser.manage().deleteAllCookies(); // logout the hard way - loginPage.get(); - loginPage.login(name, pass); - } - }); - }; - - FilesPage.prototype.getFolder = function(folder) { - folderUrl = this.folderUrl(folder); - browser.get(folderUrl); - var button = this.newButton; - browser.wait(function() { - return button.isDisplayed(); - }, 5000, 'load files content'); - } - FilesPage.prototype.getSubFolder = function(folder, subFolder) { - folderUrl = this.folderUrl(folder) + '%2F' + subFolder; - console.log(folderUrl); - browser.get(folderUrl); - var button = this.newButton; - browser.wait(function() { - return button.isDisplayed(); - }, 5000, 'load files content'); - } - - FilesPage.prototype.listFiles = function() { - // TODO: waiting to avoid "index out of bound error" - browser.sleep(800); - return element.all(this.fileListId()).map(function(filename) { - return filename.getText(); - }); - }; - - FilesPage.prototype.listSelctedFiles = function() { - return element.all(this.selectedFileListId).map(function(filename) { - return filename.getText(); - }); - }; - -//================ SHARED ACTIONS ========================================// - - // FilesPage.prototype.setCurrentListElem = function(name) { - // this.setCurrentListElem = element(by.css("tr[data-file='" + name + "']")); - // } - - FilesPage.prototype.openRenameForm = function(fileName) { - var page = new Page(); - var renameButton = element(this.renameButtonId(fileName)); - - return page.moveMouseTo(this.fileListElemId(fileName)).then(function() { - return renameButton.click(); - }) - }; - - FilesPage.prototype.renameFile = function(fileName, newFileName) { - var renameForm = element(this.renameFormId(fileName)); - return this.openRenameForm(fileName).then(function() { - for(var i=0; i<5; i++) { - renameForm.sendKeys(protractor.Key.DELETE) - }; - renameForm - .sendKeys(newFileName) - .sendKeys(protractor.Key.ENTER) - }); - }; - - FilesPage.prototype.deleteFile = function(fileName) { - var page = new Page(); - - page.moveMouseTo(this.fileListElemId(fileName)); - return element(this.deleteButtonId(fileName)).click(); - }; - - FilesPage.prototype.openShareForm = function(fileName) { - var page = new Page(); - - page.moveMouseTo(this.fileListElemId(fileName)); - return element(this.shareButtonId(fileName)).click(); - }; - - FilesPage.prototype.shareFile = function(fileName, userName) { - this.openShareForm(fileName); - this.shareWithForm.sendKeys(userName); - var dropdown = this.sharedWithDropdown - browser.wait(function(){ - return dropdown.isDisplayed(); - }, 3000); - this.shareWithForm.sendKeys(protractor.Key.ENTER); - } - - FilesPage.prototype.disableReshare = function(fileName, userName) { - var disableReshareButton = element(by.css("li[title='" + userName + "'] label input[name='share']")); - var dropdown = this.sharedWithDropdown - - // this.openShareForm(fileName); - - // TODO: find correct wait trigger - // browser.wait(function(){ - // return dropdown.isDisplayed(); - // }, 3000);s - - // TODO: Timing Workaround - browser.sleep(800); - disableReshareButton.click(); - }; - - FilesPage.prototype.checkReshareability = function(fileName) { - var page = new Page(); - var shareButtonLocator = this.shareButtonId(fileName); - - return page.moveMouseTo(this.fileListElemId(fileName)).then(function() { - return element(shareButtonLocator).isPresent(); - }); - }; - - // FilesPage.prototype.showFileVersions = function(name) { - // this.moveMouseTo("tr[data-file='"+name+"']"); - // var versionId = by.css("tr[data-file='"+name+"'] a.action.action-versions"); - // return element(versionId).click(); - // }; - - // FilesPage.prototype.downloadFile = function(name) { - // this.moveMouseTo("tr[data-file='"+name+"']"); - // var downloadId = by.css("tr[data-file='"+name+"'] a.action.action-download"); - // return element(downloadId).click(); - // }; - - FilesPage.prototype.restoreFile = function(id) { - var page = new Page(); - page.moveMouseTo(this.restoreListElemId(id)); - return element(this.restoreButtonId(id)).click(); - }; - -//================ TXT FILES ============================================// - - FilesPage.prototype.createNewTxtFile = function(name) { - this.newButton.click(); - this.newTextButton.click(); - this.newTextnameForm.sendKeys(name); - this.newTextnameForm.sendKeys(protractor.Key.ENTER); - - // TODO: find correct wait trigger - // browser.wait(function() { - // // return - // }); - - // TODO: Timing Workaround - browser.sleep(800); - }; - -//================ FOLDERS ==============================================// - - FilesPage.prototype.createNewFolder = function(name) { - this.newButton.click() - this.newFolderButton.click(); - this.newFoldernameForm.sendKeys(name); - this.newFoldernameForm.sendKeys(protractor.Key.ENTER); - - // TODO: find correct wait trigger - // browser.wait(function() { - // // return - // }); - - // TODO: Timing Workaround - browser.sleep(800); - }; - - FilesPage.prototype.goInToFolder = function(fileName) { - var page = new Page(); - - page.moveMouseTo(this.fileListElemId(fileName)); - element(this.fileListElemNameId(fileName)).click(); - var button = this.newButton; - browser.wait(function() { - return button.isDisplayed(); - }, 5000, 'load files content'); - }; - - FilesPage.prototype.createSubFolder = function(folderName, subFolderName) { - this.goInToFolder(folderName); - this.createNewFolder(subFolderName); - }; - -//================ NOT WORKING STUFF ====================================// - - // FilesPage.prototype.editFile = function(file) { - // var listElement = element(by.css("tr[data-file='testText.txt'] span.innernametext")); - // listElement.click(); - // var textArea = this.textArea; - // browser.pause(); - // browser.wait(function() { - // return(textArea.isDisplayed()); - // }, 3000, 'load textEditPage'); - // }; - - // FilesPage.prototype.writeInFile = function(text) { - // // this.textArea.click(); - // this.textLine.sendKeys(text); - // }; - - // FilesPage.prototype.saveFile = function() { - // this.saveButton.click(); - // }; - - - module.exports = FilesPage; -})();
\ No newline at end of file diff --git a/tests/acceptance/tests/pages/firstRunWizard.page.js b/tests/acceptance/tests/pages/firstRunWizard.page.js deleted file mode 100644 index c8f728e7f2a..00000000000 --- a/tests/acceptance/tests/pages/firstRunWizard.page.js +++ /dev/null @@ -1,36 +0,0 @@ -(function() { - var FirstRunWizardPage = function(baseUrl) { - this.firstRunWizardId = by.id('firstrunwizard'); - this.firstRunWizard = element(this.firstRunWizardId); - this.closeLink = element(by.id('cboxOverlay')); - }; - - FirstRunWizardPage.prototype.waitForDisplay = function() { - browser.wait(function() { - console.log(by.id('closeWizard')); - return by.id('closeWizard'); - // return by.id('firstrunwizard'); - }, 8000); - }; - - FirstRunWizardPage.prototype.isFirstRunWizardPage = function() { - this.waitForDisplay(); - return !!this.firstRunWizardId; - }; - - FirstRunWizardPage.prototype.waitForClose = function() { - browser.wait(function () { - return element(by.id('cboxOverlay')).isDisplayed().then(function(displayed) { - return !displayed; // Do a little Promise/Boolean dance here, since wait will resolve promises. - }); - }, 3000, 'firstrunwizard should dissappear'); - } - - FirstRunWizardPage.prototype.close = function() { - browser.executeScript('$("#closeWizard").click();'); - browser.executeScript('$("#cboxOverlay").click();'); - this.waitForClose(); - }; - - module.exports = FirstRunWizardPage; -})();
\ No newline at end of file diff --git a/tests/acceptance/tests/pages/install.page.js b/tests/acceptance/tests/pages/install.page.js deleted file mode 100644 index 67c66577d67..00000000000 --- a/tests/acceptance/tests/pages/install.page.js +++ /dev/null @@ -1,52 +0,0 @@ -(function() { - var InstallPage = function(baseUrl) { - this.baseUrl = baseUrl; - - this.installField = element(by.name('install')); - this.warningField = element(by.css('.warning')); - - this.adminAccount = element(by.id('adminaccount')); - this.adminInput = this.adminAccount.element(by.id('adminlogin')); - this.passwordInput = this.adminAccount.element(by.id('adminpass')); - this.installButton = element(by.css('form .buttons input[type="submit"]')); - - this.advancedConfigLink = element(by.id('showAdvanced')); - this.dataDirectoryConfig = element(by.id('datadirContent')); - this.dbConfig = element(by.id('databaseBackend')); - }; - - InstallPage.prototype.get = function() { - browser.get(this.baseUrl); - }; - - InstallPage.prototype.isInstallPage = function() { - return !!this.installField; - }; - - InstallPage.prototype.fillAdminAccount = function(user, pass) { - this.adminInput.sendKeys(user); - this.passwordInput.sendKeys(pass); - }; - - InstallPage.prototype.isAdvancedConfigOpen = function() { - return this.databaseBackend.isDisplayed() && this.dbConfig.isDisplayed(); - }; - - InstallPage.prototype.openAdvancedConfig = function() { - if (! this.isAdvancedConfigOpen()) { - this.advancedConfigLink.click(); - } - }; - - InstallPage.prototype.closeAdvancedConfig = function() { - if (this.isAdvancedConfigOpen()) { - this.advancedConfigLink.click(); - } - }; - - InstallPage.prototype.configDatabase = function(dbConfig) { - - }; - - module.exports = InstallPage; -})();
\ No newline at end of file diff --git a/tests/acceptance/tests/pages/login.page.js b/tests/acceptance/tests/pages/login.page.js deleted file mode 100644 index b7019fa54a6..00000000000 --- a/tests/acceptance/tests/pages/login.page.js +++ /dev/null @@ -1,46 +0,0 @@ -(function() { - var LoginPage = function(baseUrl) { - this.baseUrl = baseUrl; - this.url = baseUrl; - - this.loginForm = element(by.name('login')); - this.userInput = this.loginForm.element(by.id('user')); - this.passwordInput = this.loginForm.element(by.id('password')); - this.loginButton = element(by.id('submit')); - - // On Page when logged in - this.menuButton = element(by.id('expand')); - this.logoutButton = element(by.id('logout')); - this.newButton = element(by.id('expandDisplayName')); - }; - - LoginPage.prototype.get = function() { - browser.get(this.url); - }; - - LoginPage.prototype.isCurrentPage = function() { - - return this.loginForm.isPresent(); - }; - - LoginPage.prototype.fillUserCredentilas = function(user, pass) { - this.userInput.sendKeys(user); - this.passwordInput.sendKeys(pass); - }; - - LoginPage.prototype.login = function(user, pass) { - this.fillUserCredentilas(user, pass); - this.loginButton.click(); - var button = this.newButton; - browser.wait(function() { - return button.isPresent(); - }, 5000, 'load files content'); - }; - - LoginPage.prototype.logout = function() { - this.menuButton.click(); - this.logoutButton.click(); - }; - - module.exports = LoginPage; -})();
\ No newline at end of file diff --git a/tests/acceptance/tests/pages/personal.page.js b/tests/acceptance/tests/pages/personal.page.js deleted file mode 100644 index aa552335a38..00000000000 --- a/tests/acceptance/tests/pages/personal.page.js +++ /dev/null @@ -1,57 +0,0 @@ -(function() { - var PersonalPage = function(baseUrl) { - this.baseUrl = baseUrl; - this.path = 'index.php/settings/personal'; - this.url = baseUrl + this.path; - - this.passwordForm = element(by.css('form#passwordform')); - this.oldPasswordInput = element(by.id('pass1')); - this.newPasswordInput = element(by.id('pass2')); - this.newPasswordButton = element(by.id('passwordbutton')); - - this.passwordChanged = element(by.id('passwordchanged')); - this.passwordError = element(by.id('passworderror')); - - this.displaynameForm = element(by.id('displaynameform')); - this.displaynameInput = this.displaynameForm.element(by.id('displayName')); - - }; - - PersonalPage.prototype.get = function() { - browser.get(this.url); - }; - - PersonalPage.prototype.isUserPage = function() { - return browser.driver.getCurrentUrl() == this.url; - }; - - PersonalPage.prototype.ensurePersonalPage = function() { - // console.log(this.isUserPage()); - // if (! this.isUserPage()) { - // display.log('Warning: Auto loading UserPage'); - // this.get(); - // } - }; - - PersonalPage.prototype.changePassword = function(oldPass, newPass) { - this.ensurePersonalPage(); - this.oldPasswordInput.sendKeys(oldPass); - this.newPasswordInput.sendKeys(newPass); - this.newPasswordButton.click(); - - // result need some time to display - var changed = this.passwordChanged; - var error = this.passwordError; - var ready = false; - browser.wait(function () { - changed.isDisplayed().then(function(c) { - error.isDisplayed().then(function(e) { - ready = c || e; - }); - }); - return ready; - }, 8000, 'personal password change result not displayed'); - }; - - module.exports = PersonalPage; -})();
\ No newline at end of file diff --git a/tests/acceptance/tests/pages/shareApi.page.js b/tests/acceptance/tests/pages/shareApi.page.js deleted file mode 100644 index a1a3be8f889..00000000000 --- a/tests/acceptance/tests/pages/shareApi.page.js +++ /dev/null @@ -1,84 +0,0 @@ -(function() { - var request = require('request'); - var parseString = require('xml2js').parseString; - process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0" // Avoids DEPTH_ZERO_SELF_SIGNED_CERT error for self-signed certs - - var ShareApi = function(baseUrl) { - this.baseUrl = baseUrl; - this.path = 'ocs/v1.php/apps/files_sharing/api/v1/shares'; - this.url = baseUrl + this.path; - - this.request = { - method: "GET" - }; - }; - ShareApi.prototype.get = function () { - var url = this.url; - - var defer = protractor.promise.defer(); - console.log("Calling", this.url); - - request({ - method: "GET", - uri: url, - followRedirect: true, - auth: { - user: "admin", - password: "password", - } - }, - function(error, response) { - console.log("Done call to", url, "status:", response.statusCode); - if (error || response.statusCode >= 400) { - defer.reject({ - error : error, - response : response - }); - } else { - defer.fulfill(response); - } - }); - return defer.promise; - }; - - ShareApi.prototype.create = function (path, shareWith, shareType) { - var url = this.url; - - var defer = protractor.promise.defer(); - console.log("Calling", this.url); - - request({ - method: "POST", - uri: url, - followRedirect: true, - form: { - path: path, - shareWith: shareWith, - shareType: shareType - }, - auth: { - user: "admin", - password: "password", - } - }, - function(error, response) { - console.log("Done call to", url, "status:", response.statusCode); - if (error || response.statusCode >= 400) { - defer.reject({ - error : error, - response : response - }); - } else { - defer.fulfill(response); - } - }); - return defer.promise; - - }; - - module.exports = ShareApi; - -})(); - - - diff --git a/tests/acceptance/tests/pages/user.page.js b/tests/acceptance/tests/pages/user.page.js deleted file mode 100644 index 9a973bd42c1..00000000000 --- a/tests/acceptance/tests/pages/user.page.js +++ /dev/null @@ -1,114 +0,0 @@ -(function() { - var UserPage = function(baseUrl) { - this.baseUrl = baseUrl; - this.path = 'index.php/settings/users'; - this.url = baseUrl + this.path; - - this.newUserNameInput = element(by.id('newusername')); - this.newUserPasswordInput = element(by.id('newuserpassword')); - this.createNewUserButton = element(by.css('#newuser input[type="submit"]')); - - this.newGroupButton = element(by.css('#newgroup-init a')); - this.newGroupNameInput = element(by.css('#newgroup-form input#newgroupname')); - - }; - - UserPage.prototype.get = function() { - browser.get(this.url); - }; - - UserPage.prototype.isUserPage = function() { - return browser.driver.getCurrentUrl() == this.url; - }; - - UserPage.prototype.ensureUserPage = function() { - // console.log(this.isUserPage()); - // if (! this.isUserPage()) { - // display.log('Warning: Auto loading UserPage'); - // this.get(); - // } - }; - - UserPage.prototype.fillNewUserInput = function(user, pass) { - this.ensureUserPage(); - this.newUserNameInput.sendKeys(user); - this.newUserPasswordInput.sendKeys(pass); - }; - - UserPage.prototype.createNewUser = function(user, pass) { - this.ensureUserPage(); - this.fillNewUserInput(user, pass); - this.createNewUserButton.click(); - }; - - UserPage.prototype.deleteUser = function(user) { - this.ensureUserPage(); - - var removeId = by.css('#userlist tr[data-displayname="' + user + '"] td.remove a'); - var filter = browser.findElement(removeId); - var scrollIntoView = function () { - arguments[0].scrollIntoView(); - } - browser.executeScript(scrollIntoView, filter).then(function () { - browser.actions().mouseMove(browser.findElement(removeId)).perform(); - element(removeId).click(); - }); - }; - - UserPage.prototype.setCurrentListElem = function(name) { - return element(by.css("tr[data-uid='" + name + "']")); - } - - UserPage.prototype.renameDisplayName = function(name, newName) { - var renameDisplayNameButton = element(by.css("tr[data-uid='" + name + "'] td.displayName")); - renameDisplayNameButton.click(); - var renameDisplayNameForm = element(by.css("tr[data-uid='" + name + "'] td.displayName input")); - renameDisplayNameForm.sendKeys(newName); - renameDisplayNameForm.sendKeys(protractor.Key.ENTER); - }; - - UserPage.prototype.listUser = function() { - this.ensureUserPage(); - return element.all(by.css('td.displayName')).map(function(user) { - return user.getText(); - }); - }; - - UserPage.prototype.createNewGroup = function(name) { - this.newGroupButton.click(); - var newGroupNameInput = this.newGroupNameInput; - browser.wait(function() { - return newGroupNameInput.isDisplayed(); - }, 3000); - this.newGroupNameInput.sendKeys(name); - this.newGroupNameInput.sendKeys(protractor.Key.ENTER); - }; - -///// NOT WORKING, CLICK ON CHECKBOX RESEIVES AN OTHER ELEMENT ////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - // UserPage.prototype.setUserGroup = function(userName, groupName) { - // var renameDisplayNameButton = element(by.css("tr[data-uid='" + userName + "'] td.groups .multiselect.button")); - // renameDisplayNameButton.click(); - - // var a = 'tr[data-uid="' + userName + '"] ul.multiselectoptions.down'; - - // var dropdown = element(by.css(a)); - // browser.wait(function() { - // return dropdown.isDisplayed(); - // }, 3000); - // browser.pause(); - // var checkboxId = by.css('tr[data-uid="' + userName + '"] ul.multiselectoptions.down label'); - // element.all(checkboxId).each(function(checkbox) { - // checkbox.getText().then(function(text) { - // console.log(checkboxId); - // console.log(text); - // if(text == groupName) { - // return checkbox.click(); - // } - // }) - // }); - // }; - - module.exports = UserPage; -})();
\ No newline at end of file diff --git a/tests/acceptance/tests/pages/webdav_api.page.js b/tests/acceptance/tests/pages/webdav_api.page.js deleted file mode 100644 index e69de29bb2d..00000000000 --- a/tests/acceptance/tests/pages/webdav_api.page.js +++ /dev/null diff --git a/tests/acceptance/tests/share/share_api_spec.js b/tests/acceptance/tests/share/share_api_spec.js deleted file mode 100644 index ed41fa94021..00000000000 --- a/tests/acceptance/tests/share/share_api_spec.js +++ /dev/null @@ -1,50 +0,0 @@ -var ShareApi = require('../pages/shareApi.page.js'); -var LoginPage = require('../pages/login.page.js'); -var UserPage = require('../pages/user.page.js'); -var FilesPage = require('../pages/files.page.js'); -var parseXml = require('xml2js').parseString; - -var flow = protractor.promise.controlFlow(); - -describe('Share Api', function() { - var params = browser.params; - var shareApi; - var loginPage; - var userPage - var filesPage; - var firstRunWizardPage; - - - beforeEach(function() { - isAngularSite(false); - shareApi = new ShareApi(params.baseUrl); - }); - - it('should get all shares', function() { - var get = function () { - return shareApi.get(); - }; - - flow.execute(get).then(function(res){ - parseXml(res.body, function (err, result) { - console.dir(result.ocs.data); - }); - expect(res.statusCode).toEqual(200); - }); - }); - - it('should create a new share', function() { - var create = function () { - return shareApi.create('asdf.txt', 'demo2', 0); - }; - - flow.execute(create).then(function(res){ - parseXml(res.body, function (err, result) { - console.log(result.ocs.data, result.ocs.meta); - expect(result.ocs.meta[0].statuscode[0]).toEqual('100'); - }); - }); - }); - - -}); diff --git a/tests/acceptance/tests/share/share_spec.js b/tests/acceptance/tests/share/share_spec.js deleted file mode 100644 index 0dc12ad506d..00000000000 --- a/tests/acceptance/tests/share/share_spec.js +++ /dev/null @@ -1,198 +0,0 @@ -var LoginPage = require('../pages/login.page.js'); -var UserPage = require('../pages/user.page.js'); -var FilesPage = require('../pages/files.page.js'); - - -describe('Share', function() { - var params = browser.params; - var loginPage; - var userPage - var filesPage; - - beforeEach(function() { - isAngularSite(false); - loginPage = new LoginPage(params.baseUrl); - userPage = new UserPage(params.baseUrl); - filesPage = new FilesPage(params.baseUrl); - }); - - it('should login as admin and create 4 new users', function() { - filesPage.getAsUser(params.login.user, params.login.password); - // userPage.get(); - // userPage.createNewGroup('test_specGroup_1'); - userPage.get(); - // userPage.createNewGroup('test_specGroup_2'); - userPage.createNewUser('demo', 'password'); - userPage.createNewUser('demo2', 'password'); - userPage.createNewUser('demo3', 'password'); - userPage.createNewUser('demo4', 'password'); - userPage.get(); - userPage.renameDisplayName('demo2', ' display2'); - userPage.renameDisplayName('demo3', ' display3'); - userPage.renameDisplayName('demo4', ' display4'); - // setting Group to User fails cause click receives an other element - // userPage.setUserGroup('demo2', 'test_specGroup_1'); - // userPage.setUserGroup('demo3', 'test_specGroup_1'); - // userPage.setUserGroup('demo4', 'test_specGroup_2'); - expect(userPage.listUser()).toContain('demo', 'demo2', 'demo3', 'demo4'); - }); - - - it('should share a folder with another user by username', function() { - filesPage.getAsUser(params.login.user, params.login.password); - filesPage.createNewFolder('toShare_1'); - browser.sleep(500); - filesPage.shareFile('toShare_1', 'demo'); - - loginPage.logout(); - loginPage.login('demo', 'password'); - expect(filesPage.listFiles()).toContain('toShare_1'); - }); - - it('should share a folder including special characters', function() { - filesPage.getAsUser(params.login.user, params.login.password); - filesPage.createNewFolder('sP€c!@L'); - browser.sleep(500); - filesPage.shareFile('sP€c!@L', 'demo'); - - loginPage.logout(); - loginPage.login('demo', 'password'); - expect(filesPage.listFiles()).toContain('sP€c!@L'); - }); - - it('should share a folder with 3 another user by display name', function() { - filesPage.getAsUser(params.login.user, params.login.password); - filesPage.createNewFolder('toShare_2'); - browser.sleep(500); - filesPage.shareFile('toShare_2', 'display2'); - - filesPage.shareWithForm.sendKeys(protractor.Key.DELETE); - filesPage.shareWithForm.sendKeys('display3'); - browser.wait(function(){ - return filesPage.sharedWithDropdown.isDisplayed(); - }, 3000); - filesPage.shareWithForm.sendKeys(protractor.Key.ENTER); - - filesPage.shareWithForm.sendKeys(protractor.Key.DELETE); - filesPage.shareWithForm.sendKeys('display4'); - browser.wait(function(){ - return filesPage.sharedWithDropdown.isDisplayed(); - }, 3000); - filesPage.shareWithForm.sendKeys(protractor.Key.ENTER); - - loginPage.logout(); - loginPage.login('demo2', 'password'); - expect(filesPage.listFiles()).toContain('toShare_2'); - - loginPage.logout(); - loginPage.login('demo3', 'password'); - expect(filesPage.listFiles()).toContain('toShare_2'); - - loginPage.logout(); - loginPage.login('demo4', 'password'); - expect(filesPage.listFiles()).toContain('toShare_2'); - }); - - it('should grant second users CRUDS rights to their folder', function() { - filesPage.getAsUser('demo2', 'password'); - filesPage.getFolder('toShare_2'); - - //create file - filesPage.createNewTxtFile('inSharedBySecond'); - filesPage.createNewTxtFile('toBeDeleted'); - expect(filesPage.listFiles()).toContain('inSharedBySecond' ,'toBeDeleted'); - - //delete file - filesPage.deleteFile('toBeDeleted.txt'); - browser.sleep(800); - expect(filesPage.listFiles()).not.toContain('toBeDeleted'); - - - //share file - filesPage.shareFile('inSharedBySecond.txt', 'demo'); - - loginPage.logout(); - loginPage.login('demo', 'password'); - filesPage.renameFile('inSharedBySecond.txt', 'renamedBySecond.txt') - expect(filesPage.listFiles()).toContain('renamedBySecond'); - filesPage.deleteFile('renamedBySecond.txt'); - }); - - it('should delete the root folder shared with a user account by another user', function() { - filesPage.getAsUser('demo2', 'password'); - filesPage.deleteFile('toShare_2'); - browser.sleep(800); - expect(filesPage.listFiles()).not.toContain('toShare_2'); - - loginPage.logout(); - loginPage.login(params.login.user, params.login.password); - expect(filesPage.listFiles()).toContain('toShare_2'); - }); - - it('should delete a file shared with a user, only form user if user deletes it', function() { - filesPage.getAsUser(params.login.user, params.login.password); - filesPage.createNewTxtFile('toDeleteByUser'); - filesPage.shareFile('toDeleteByUser.txt', 'demo'); - - loginPage.logout(); - loginPage.login('demo', 'password'); - filesPage.deleteFile('toDeleteByUser.txt'); - browser.sleep(800); - expect(filesPage.listFiles()).not.toContain('inSharedBySecond'); - - loginPage.logout(); - loginPage.login(params.login.user, params.login.password); - expect(filesPage.listFiles()).toContain('toDeleteByUser'); - filesPage.deleteFile('toDeleteByUser.txt'); - }); - - it('should delete a file in a shared folder, from all', function() { - filesPage.getAsUser(params.login.user, params.login.password); - filesPage.getFolder('toShare_1'); - filesPage.createNewTxtFile('toDeleteFromAll'); - - loginPage.logout(); - loginPage.login('demo', 'password'); - filesPage.getFolder('toShare_1'); - filesPage.deleteFile('toDeleteFromAll.txt'); - browser.sleep(800); - expect(filesPage.listFiles()).not.toContain('toDeleteFormAll'); - - loginPage.logout(); - loginPage.login(params.login.user, params.login.password); - filesPage.getFolder('toShare_1'); - expect(filesPage.listFiles()).not.toContain('toDeleteFromAll'); - }); - - it('should delete a file shared with a user, form all if owner deletes it', function() { - filesPage.getAsUser(params.login.user, params.login.password); - filesPage.createNewTxtFile('toDeleteByOwner'); - filesPage.shareFile('toDeleteByOwner.txt', 'demo'); - - loginPage.logout(); - loginPage.login('demo', 'password'); - expect(filesPage.listFiles()).toContain('toDeleteByOwner'); - - loginPage.logout(); - loginPage.login(params.login.user, params.login.password); - filesPage.deleteFile('toDeleteByOwner.txt'); - - loginPage.logout(); - loginPage.login('demo', 'password'); - expect(filesPage.listFiles()).not.toContain('toDeleteByOwner'); - - }); - - it('should not be possible to reshare a folder, if the "re-share" option is removed', function() { - filesPage.getAsUser(params.login.user, params.login.password); - filesPage.createNewFolder('noReshare'); - filesPage.shareFile('noReshare', 'demo'); - filesPage.disableReshare('noReshare', 'demo'); - - loginPage.logout(); - loginPage.login('demo', 'password'); - - expect(filesPage.checkReshareability('noReshare')).toBeFalsy(); - }); - -});
\ No newline at end of file diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php index 6443d87a2e5..f93b7c33cab 100644 --- a/tests/lib/autoloader.php +++ b/tests/lib/autoloader.php @@ -77,15 +77,11 @@ class AutoLoader extends TestCase { } public function testLoadCoreNamespaceCore() { - $this->assertEquals([ - \OC::$SERVERROOT . '/core/foo/bar.php', - ], $this->loader->findClass('OC\Core\Foo\Bar')); + $this->assertEquals([], $this->loader->findClass('OC\Core\Foo\Bar')); } public function testLoadCoreNamespaceSettings() { - $this->assertEquals([ - \OC::$SERVERROOT . '/settings/foo/bar.php', - ], $this->loader->findClass('OC\Settings\Foo\Bar')); + $this->assertEquals([], $this->loader->findClass('OC\Settings\Foo\Bar')); } public function testLoadCoreNamespaceRepair() { diff --git a/tests/lib/avatartest.php b/tests/lib/avatartest.php index b2b69ac1a6c..b0ab4cb8b5c 100644 --- a/tests/lib/avatartest.php +++ b/tests/lib/avatartest.php @@ -148,8 +148,7 @@ class AvatarTest extends \Test\TestCase { ->willReturn('avatarX'); $nonAvatarFile->expects($this->never())->method('delete'); - $this->folder->method('search') - ->with('avatar') + $this->folder->method('getDirectoryListing') ->willReturn([$avatarFileJPG, $avatarFilePNG, $resizedAvatarFile, $nonAvatarFile]); $newFile = $this->getMock('\OCP\Files\File'); diff --git a/tests/lib/encryption/encryptionwrappertest.php b/tests/lib/encryption/encryptionwrappertest.php new file mode 100644 index 00000000000..909187ae43b --- /dev/null +++ b/tests/lib/encryption/encryptionwrappertest.php @@ -0,0 +1,101 @@ +<?php +/** + * @author Björn Schießle <schiessle@owncloud.com> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + + +namespace Test\Encryption; + + +use OC\Encryption\EncryptionWrapper; +use Test\TestCase; + +class EncryptionWrapperTest extends TestCase { + + /** @var EncryptionWrapper */ + private $instance; + + /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\ILogger */ + private $logger; + + /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Encryption\Manager */ + private $manager; + + /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Memcache\ArrayCache */ + private $arrayCache; + + public function setUp() { + parent::setUp(); + + $this->arrayCache = $this->getMock('OC\Memcache\ArrayCache'); + $this->manager = $this->getMockBuilder('OC\Encryption\Manager') + ->disableOriginalConstructor()->getMock(); + $this->logger = $this->getMock('OCP\ILogger'); + + $this->instance = new EncryptionWrapper($this->arrayCache, $this->manager, $this->logger); + } + + + /** + * @dataProvider provideWrapStorage + */ + public function testWrapStorage($expectedWrapped, $wrappedStorages) { + $storage = $this->getMockBuilder('OC\Files\Storage\Storage') + ->disableOriginalConstructor() + ->getMock(); + + foreach ($wrappedStorages as $wrapper) { + $storage->expects($this->any()) + ->method('instanceOfStorage') + ->willReturnMap([ + [$wrapper, true], + ]); + } + + $mount = $this->getMockBuilder('OCP\Files\Mount\IMountPoint') + ->disableOriginalConstructor() + ->getMock(); + + $returnedStorage = $this->instance->wrapStorage('mountPoint', $storage, $mount); + + $this->assertEquals( + $expectedWrapped, + $returnedStorage->instanceOfStorage('OC\Files\Storage\Wrapper\Encryption'), + 'Asserted that the storage is (not) wrapped with encryption' + ); + } + + public function provideWrapStorage() { + return [ + // Wrap when not wrapped or not wrapped with storage + [true, []], + [true, ['OCA\Files_Trashbin\Storage']], + + // Do not wrap shared storages + [false, ['OC\Files\Storage\Shared']], + [false, ['OCA\Files_Sharing\External\Storage']], + [false, ['OC\Files\Storage\OwnCloud']], + [false, ['OC\Files\Storage\Shared', 'OCA\Files_Sharing\External\Storage']], + [false, ['OC\Files\Storage\Shared', 'OC\Files\Storage\OwnCloud']], + [false, ['OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud']], + [false, ['OC\Files\Storage\Shared', 'OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud']], + ]; + } + +} diff --git a/tests/lib/encryption/managertest.php b/tests/lib/encryption/managertest.php index 6355c706b61..3dcfc949a18 100644 --- a/tests/lib/encryption/managertest.php +++ b/tests/lib/encryption/managertest.php @@ -24,6 +24,9 @@ class ManagerTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject */ private $util; + + /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Memcache\ArrayCache */ + private $arrayCache; public function setUp() { parent::setUp(); @@ -32,7 +35,8 @@ class ManagerTest extends TestCase { $this->l10n = $this->getMock('\OCP\Il10n'); $this->view = $this->getMock('\OC\Files\View'); $this->util = $this->getMockBuilder('\OC\Encryption\Util')->disableOriginalConstructor()->getMock(); - $this->manager = new Manager($this->config, $this->logger, $this->l10n, $this->view, $this->util); + $this->arrayCache = $this->getMock('OC\Memcache\ArrayCache'); + $this->manager = new Manager($this->config, $this->logger, $this->l10n, $this->view, $this->util, $this->arrayCache); } public function testManagerIsDisabled() { diff --git a/tests/lib/encryption/utiltest.php b/tests/lib/encryption/utiltest.php index 449326bb351..ec316a9f05a 100644 --- a/tests/lib/encryption/utiltest.php +++ b/tests/lib/encryption/utiltest.php @@ -188,49 +188,4 @@ class UtilTest extends TestCase { ); } - /** - * @dataProvider provideWrapStorage - */ - public function testWrapStorage($expectedWrapped, $wrappedStorages) { - $storage = $this->getMockBuilder('OC\Files\Storage\Storage') - ->disableOriginalConstructor() - ->getMock(); - - foreach ($wrappedStorages as $wrapper) { - $storage->expects($this->any()) - ->method('instanceOfStorage') - ->willReturnMap([ - [$wrapper, true], - ]); - } - - $mount = $this->getMockBuilder('OCP\Files\Mount\IMountPoint') - ->disableOriginalConstructor() - ->getMock(); - - $returnedStorage = $this->util->wrapStorage('mountPoint', $storage, $mount); - - $this->assertEquals( - $expectedWrapped, - $returnedStorage->instanceOfStorage('OC\Files\Storage\Wrapper\Encryption'), - 'Asserted that the storage is (not) wrapped with encryption' - ); - } - - public function provideWrapStorage() { - return [ - // Wrap when not wrapped or not wrapped with storage - [true, []], - [true, ['OCA\Files_Trashbin\Storage']], - - // Do not wrap shared storages - [false, ['OC\Files\Storage\Shared']], - [false, ['OCA\Files_Sharing\External\Storage']], - [false, ['OC\Files\Storage\OwnCloud']], - [false, ['OC\Files\Storage\Shared', 'OCA\Files_Sharing\External\Storage']], - [false, ['OC\Files\Storage\Shared', 'OC\Files\Storage\OwnCloud']], - [false, ['OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud']], - [false, ['OC\Files\Storage\Shared', 'OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud']], - ]; - } } diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index bde920e440e..651299a3eab 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -87,6 +87,9 @@ class Encryption extends Storage { */ private $config; + /** @var \OC\Memcache\ArrayCache | \PHPUnit_Framework_MockObject_MockObject */ + private $arrayCache; + /** @var integer dummy unencrypted size */ private $dummySize = -1; @@ -104,6 +107,7 @@ class Encryption extends Storage { ->method('getEncryptionModule') ->willReturn($mockModule); + $this->arrayCache = $this->getMock('OC\Memcache\ArrayCache'); $this->config = $this->getMockBuilder('\OCP\IConfig') ->disableOriginalConstructor() ->getMock(); @@ -111,9 +115,10 @@ class Encryption extends Storage { ->disableOriginalConstructor() ->getMock(); - $this->util = $this->getMock('\OC\Encryption\Util', + $this->util = $this->getMock( + '\OC\Encryption\Util', ['getUidAndFilename', 'isFile', 'isExcluded'], - [new View(), new \OC\User\Manager(), $this->groupManager, $this->config]); + [new View(), new \OC\User\Manager(), $this->groupManager, $this->config, $this->arrayCache]); $this->util->expects($this->any()) ->method('getUidAndFilename') ->willReturnCallback(function ($path) { @@ -168,7 +173,7 @@ class Encryption extends Storage { 'mountPoint' => '/', 'mount' => $this->mount ], - $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager + $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache ] ) ->setMethods(['getMetaData', 'getCache', 'getEncryptionModule']) @@ -245,7 +250,7 @@ class Encryption extends Storage { 'mountPoint' => '/', 'mount' => $this->mount ], - $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager + $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache ] ) ->setMethods(['getCache', 'verifyUnencryptedSize']) @@ -255,25 +260,39 @@ class Encryption extends Storage { $this->invokePrivate($this->instance, 'unencryptedSize', [[$path => $storedUnencryptedSize]]); } - + $fileEntry = $this->getMockBuilder('\OC\Files\Cache\Cache') + ->disableOriginalConstructor()->getMock(); $sourceStorage->expects($this->once())->method('getMetaData')->with($path) ->willReturn($metaData); + $sourceStorage->expects($this->any()) + ->method('getCache') + ->with($path) + ->willReturn($fileEntry); + $fileEntry->expects($this->any()) + ->method('get') + ->with($metaData['fileid']); $this->instance->expects($this->any())->method('getCache')->willReturn($cache); $this->instance->expects($this->any())->method('verifyUnencryptedSize') ->with($path, 0)->willReturn($expected['size']); $result = $this->instance->getMetaData($path); - $this->assertSame($expected['encrypted'], $result['encrypted']); + if(isset($expected['encrypted'])) { + $this->assertSame($expected['encrypted'], (bool)$result['encrypted']); + + if(isset($expected['encryptedVersion'])) { + $this->assertSame($expected['encryptedVersion'], $result['encryptedVersion']); + } + } $this->assertSame($expected['size'], $result['size']); } public function dataTestGetMetaData() { return [ - ['/test.txt', ['size' => 42, 'encrypted' => false], true, true, 12, ['size' => 12, 'encrypted' => true]], + ['/test.txt', ['size' => 42, 'encrypted' => 2, 'encryptedVersion' => 2, 'fileid' => 1], true, true, 12, ['size' => 12, 'encrypted' => true, 'encryptedVersion' => 2]], ['/test.txt', null, true, true, 12, null], - ['/test.txt', ['size' => 42, 'encrypted' => false], false, false, 12, ['size' => 42, 'encrypted' => false]], - ['/test.txt', ['size' => 42, 'encrypted' => false], true, false, 12, ['size' => 12, 'encrypted' => true]] + ['/test.txt', ['size' => 42, 'encrypted' => 0, 'fileid' => 1], false, false, 12, ['size' => 42, 'encrypted' => false]], + ['/test.txt', ['size' => 42, 'encrypted' => false, 'fileid' => 1], true, false, 12, ['size' => 12, 'encrypted' => true]] ]; } @@ -293,7 +312,7 @@ class Encryption extends Storage { 'mountPoint' => '/', 'mount' => $this->mount ], - $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager + $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache ] ) ->setMethods(['getCache', 'verifyUnencryptedSize']) @@ -331,7 +350,7 @@ class Encryption extends Storage { 'mountPoint' => '/', 'mount' => $this->mount ], - $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager + $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache ] ) ->setMethods(['fixUnencryptedSize']) @@ -521,8 +540,15 @@ class Encryption extends Storage { ->disableOriginalConstructor()->getMock(); $util = $this->getMockBuilder('\OC\Encryption\Util') - ->setConstructorArgs([new View(), new \OC\User\Manager(), $this->groupManager, $this->config]) - ->getMock(); + ->setConstructorArgs( + [ + new View(), + new \OC\User\Manager(), + $this->groupManager, + $this->config, + $this->arrayCache + ] + )->getMock(); $instance = $this->getMockBuilder('\OC\Files\Storage\Wrapper\Encryption') ->setConstructorArgs( @@ -533,7 +559,7 @@ class Encryption extends Storage { 'mountPoint' => '/', 'mount' => $this->mount ], - $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager + $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache ] ) ->setMethods(['readFirstBlock', 'parseRawHeader']) @@ -582,7 +608,7 @@ class Encryption extends Storage { ->disableOriginalConstructor()->getMock(); $util = $this->getMockBuilder('\OC\Encryption\Util') - ->setConstructorArgs([new View(), new \OC\User\Manager(), $this->groupManager, $this->config]) + ->setConstructorArgs([new View(), new \OC\User\Manager(), $this->groupManager, $this->config, $this->arrayCache]) ->getMock(); $cache = $this->getMockBuilder('\OC\Files\Cache\Cache') @@ -600,7 +626,7 @@ class Encryption extends Storage { 'mountPoint' => '/', 'mount' => $this->mount ], - $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager + $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache ] ) ->setMethods(['readFirstBlock', 'parseRawHeader', 'getCache']) @@ -636,7 +662,7 @@ class Encryption extends Storage { 'mountPoint' => '/', 'mount' => $this->mount ], - $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager + $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache ); @@ -763,6 +789,8 @@ class Encryption extends Storage { $expectedCachePut['encryptedVersion'] = 12345; } + $this->arrayCache->expects($this->never())->method('set'); + $this->cache->expects($this->once()) ->method('put') ->with($sourceInternalPath, $expectedCachePut); @@ -812,7 +840,8 @@ class Encryption extends Storage { null, $this->keyStore, $this->update, - $this->mountManager + $this->mountManager, + $this->arrayCache ] ) ->setMethods(['updateUnencryptedSize', 'getCache']) @@ -825,6 +854,9 @@ class Encryption extends Storage { $instance->expects($this->any())->method('getCache') ->willReturn($cache); + $this->arrayCache->expects($this->once())->method('set') + ->with('encryption_copy_version_' . $sourceInternalPath, true); + if ($copyResult) { $cache->expects($this->once())->method('get') ->with($sourceInternalPath) diff --git a/tests/lib/files/stream/encryption.php b/tests/lib/files/stream/encryption.php index f67dd09bc4d..afb31f2822d 100644 --- a/tests/lib/files/stream/encryption.php +++ b/tests/lib/files/stream/encryption.php @@ -31,6 +31,7 @@ class Encryption extends \Test\TestCase { $config = $this->getMockBuilder('\OCP\IConfig') ->disableOriginalConstructor() ->getMock(); + $arrayCache = $this->getMock('OC\Memcache\ArrayCache'); $groupManager = $this->getMockBuilder('\OC\Group\Manager') ->disableOriginalConstructor() ->getMock(); @@ -39,7 +40,11 @@ class Encryption extends \Test\TestCase { ->setMethods(['getAccessList']) ->getMock(); $file->expects($this->any())->method('getAccessList')->willReturn([]); - $util = $this->getMock('\OC\Encryption\Util', ['getUidAndFilename'], [new View(), new \OC\User\Manager(), $groupManager, $config]); + $util = $this->getMock( + '\OC\Encryption\Util', + ['getUidAndFilename'], + [new View(), new \OC\User\Manager(), $groupManager, $config, $arrayCache] + ); $util->expects($this->any()) ->method('getUidAndFilename') ->willReturn(['user1', $internalPath]); diff --git a/tests/lib/lock/lockingprovider.php b/tests/lib/lock/lockingprovider.php index ca72c1bb7f3..49742baa561 100644 --- a/tests/lib/lock/lockingprovider.php +++ b/tests/lib/lock/lockingprovider.php @@ -112,12 +112,14 @@ abstract class LockingProvider extends TestCase { $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED); $this->instance->acquireLock('bar', ILockingProvider::LOCK_SHARED); $this->instance->acquireLock('asd', ILockingProvider::LOCK_EXCLUSIVE); + $this->instance->acquireLock('fizz#A=23', ILockingProvider::LOCK_EXCLUSIVE); $this->instance->releaseAll(); $this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED)); $this->assertFalse($this->instance->isLocked('bar', ILockingProvider::LOCK_SHARED)); $this->assertFalse($this->instance->isLocked('asd', ILockingProvider::LOCK_EXCLUSIVE)); + $this->assertFalse($this->instance->isLocked('fizz#A=23', ILockingProvider::LOCK_EXCLUSIVE)); } public function testReleaseAllAfterChange() { diff --git a/tests/lib/share20/defaultshareprovidertest.php b/tests/lib/share20/defaultshareprovidertest.php index 610de3b6232..8d8ae8d4809 100644 --- a/tests/lib/share20/defaultshareprovidertest.php +++ b/tests/lib/share20/defaultshareprovidertest.php @@ -969,7 +969,7 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->assertCount(1, $share); $share = $share[0]; - $this->assertSame($id, $share->getId()); + $this->assertSame((string)$id, $share->getId()); $this->assertSame('sharedWith', $share->getSharedWith()); $this->assertSame('shareOwner', $share->getShareOwner()); $this->assertSame('sharedBy', $share->getSharedBy()); diff --git a/tests/lib/share20/managertest.php b/tests/lib/share20/managertest.php index 2f45de86b98..029c8cd8543 100644 --- a/tests/lib/share20/managertest.php +++ b/tests/lib/share20/managertest.php @@ -640,10 +640,21 @@ class ManagerTest extends \Test\TestCase { $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_GROUP, $limitedPermssions, $group0, $user0, $user0, null, null, null), 'A share requires permissions', true]; $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_LINK, $limitedPermssions, null, $user0, $user0, null, null, null), 'A share requires permissions', true]; + $mount = $this->getMock('OC\Files\Mount\MoveableMount'); + $limitedPermssions->method('getMountPoint')->willReturn($mount); + $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_USER, $limitedPermssions, $user2, $user0, $user0, 31, null, null), 'Cannot increase permissions of path', true]; $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_GROUP, $limitedPermssions, $group0, $user0, $user0, 17, null, null), 'Cannot increase permissions of path', true]; $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_LINK, $limitedPermssions, null, $user0, $user0, 3, null, null), 'Cannot increase permissions of path', true]; + $nonMoveableMountPermssions = $this->getMock('\OCP\Files\File'); + $nonMoveableMountPermssions->method('isShareable')->willReturn(true); + $nonMoveableMountPermssions->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_READ); + $nonMoveableMountPermssions->method('getPath')->willReturn('path'); + + $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_USER, $nonMoveableMountPermssions, $user2, $user0, $user0, 11, null, null), 'Cannot increase permissions of path', false]; + $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_GROUP, $nonMoveableMountPermssions, $group0, $user0, $user0, 11, null, null), 'Cannot increase permissions of path', false]; + $rootFolder = $this->getMock('\OCP\Files\Folder'); $rootFolder->method('isShareable')->willReturn(true); $rootFolder->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_ALL); diff --git a/tests/lib/share20/sharetest.php b/tests/lib/share20/sharetest.php new file mode 100644 index 00000000000..fdfc69f6577 --- /dev/null +++ b/tests/lib/share20/sharetest.php @@ -0,0 +1,93 @@ +<?php +/** + * @author Roeland Jago Douma <rullzer@owncloud.com> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ +namespace Test\Share20; + +use OCP\Files\IRootFolder; + +/** + * Class ShareTest + * + * @package Test\Share20 + */ +class ShareTest extends \Test\TestCase { + + /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + protected $rootFolder; + /** @var \OCP\Share\IShare */ + protected $share; + + public function setUp() { + $this->rootFolder = $this->getMock('\OCP\Files\IRootFolder'); + $this->share = new \OC\Share20\Share($this->rootFolder); + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage String expected. + */ + public function testSetIdInvalid() { + $this->share->setId(1.2); + } + + public function testSetIdInt() { + $this->share->setId(42); + $this->assertEquals('42', $this->share->getId()); + } + + + public function testSetIdString() { + $this->share->setId('foo'); + $this->assertEquals('foo', $this->share->getId()); + } + + /** + * @expectedException \OCP\Share\Exceptions\IllegalIDChangeException + * @expectedExceptionMessage Not allowed to assign a new internal id to a share + */ + public function testSetIdOnce() { + $this->share->setId('foo'); + $this->share->setId('bar'); + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage String expected. + */ + public function testSetProviderIdInt() { + $this->share->setProviderId(42); + } + + + public function testSetProviderIdString() { + $this->share->setProviderId('foo'); + $this->share->setId('bar'); + $this->assertEquals('foo:bar', $this->share->getFullId()); + } + + /** + * @expectedException \OCP\Share\Exceptions\IllegalIDChangeException + * @expectedExceptionMessage Not allowed to assign a new provider id to a share + */ + public function testSetProviderIdOnce() { + $this->share->setProviderId('foo'); + $this->share->setProviderId('bar'); + } +} diff --git a/tests/lib/traits/encryptiontrait.php b/tests/lib/traits/encryptiontrait.php index 92ba3734873..2c1c585d6d4 100644 --- a/tests/lib/traits/encryptiontrait.php +++ b/tests/lib/traits/encryptiontrait.php @@ -8,8 +8,8 @@ namespace Test\Traits; -use OC\Encryption\Util; -use OC\Files\View; +use OC\Encryption\EncryptionWrapper; +use OC\Memcache\ArrayCache; use OCA\Encryption\AppInfo\Application; use OCA\Encryption\KeyManager; use OCA\Encryption\Users\Setup; @@ -68,13 +68,13 @@ trait EncryptionTrait { } protected function postLogin() { - $util = new Util( - new View(), - \OC::$server->getUserManager(), - \OC::$server->getGroupManager(), - \OC::$server->getConfig() + $encryptionWrapper = new EncryptionWrapper( + new ArrayCache(), + \OC::$server->getEncryptionManager(), + \OC::$server->getLogger() ); - $this->registerStorageWrapper('oc_encryption', array($util, 'wrapStorage')); + + $this->registerStorageWrapper('oc_encryption', array($encryptionWrapper, 'wrapStorage')); } protected function setUpEncryptionTrait() { |
