diff options
138 files changed, 338 insertions, 236 deletions
diff --git a/apps/dashboard/l10n/cs.js b/apps/dashboard/l10n/cs.js index 6042bf43b3a..495fa460395 100644 --- a/apps/dashboard/l10n/cs.js +++ b/apps/dashboard/l10n/cs.js @@ -24,6 +24,7 @@ OC.L10N.register( "Hello" : "Dobrý den", "Hello, {name}" : "Dobrý den, {name}", "Pick from Files" : "Vybrat ze souborů", + "Default image" : "Výchozí obrázek", "Plain background" : "Jednolité pozadí", "Insert from {productName}" : "Vložit z {productName}", "Show something" : "Zobrazit něco", diff --git a/apps/dashboard/l10n/cs.json b/apps/dashboard/l10n/cs.json index b329b7fa0be..5c7300a9b71 100644 --- a/apps/dashboard/l10n/cs.json +++ b/apps/dashboard/l10n/cs.json @@ -22,6 +22,7 @@ "Hello" : "Dobrý den", "Hello, {name}" : "Dobrý den, {name}", "Pick from Files" : "Vybrat ze souborů", + "Default image" : "Výchozí obrázek", "Plain background" : "Jednolité pozadí", "Insert from {productName}" : "Vložit z {productName}", "Show something" : "Zobrazit něco", diff --git a/apps/dashboard/l10n/de_DE.js b/apps/dashboard/l10n/de_DE.js index a5df38d539a..9d866a2e5ef 100644 --- a/apps/dashboard/l10n/de_DE.js +++ b/apps/dashboard/l10n/de_DE.js @@ -24,6 +24,7 @@ OC.L10N.register( "Hello" : "Hallo", "Hello, {name}" : "Hallo, {name}", "Pick from Files" : "Aus Dateien auswählen", + "Default image" : "Standardbild", "Plain background" : "Einfacher Hintergrund", "Insert from {productName}" : "Von {productName} einfügen", "Show something" : "Etwas anzeigen", diff --git a/apps/dashboard/l10n/de_DE.json b/apps/dashboard/l10n/de_DE.json index 68da16b40f6..37d81b81b31 100644 --- a/apps/dashboard/l10n/de_DE.json +++ b/apps/dashboard/l10n/de_DE.json @@ -22,6 +22,7 @@ "Hello" : "Hallo", "Hello, {name}" : "Hallo, {name}", "Pick from Files" : "Aus Dateien auswählen", + "Default image" : "Standardbild", "Plain background" : "Einfacher Hintergrund", "Insert from {productName}" : "Von {productName} einfügen", "Show something" : "Etwas anzeigen", diff --git a/apps/dashboard/l10n/fi.js b/apps/dashboard/l10n/fi.js index 2b2659b068a..6e02e5a2f9a 100644 --- a/apps/dashboard/l10n/fi.js +++ b/apps/dashboard/l10n/fi.js @@ -23,6 +23,7 @@ OC.L10N.register( "Hello" : "Hei", "Hello, {name}" : "Hei {name}", "Pick from Files" : "Valitse tiedostoista", + "Default image" : "Oletuskuva", "Plain background" : "Yksinkertainen tausta", "Insert from {productName}" : "Aseta kohteesta {productName}", "Show something" : "Näytä jotain", diff --git a/apps/dashboard/l10n/fi.json b/apps/dashboard/l10n/fi.json index 514d13b941c..822396adae5 100644 --- a/apps/dashboard/l10n/fi.json +++ b/apps/dashboard/l10n/fi.json @@ -21,6 +21,7 @@ "Hello" : "Hei", "Hello, {name}" : "Hei {name}", "Pick from Files" : "Valitse tiedostoista", + "Default image" : "Oletuskuva", "Plain background" : "Yksinkertainen tausta", "Insert from {productName}" : "Aseta kohteesta {productName}", "Show something" : "Näytä jotain", diff --git a/apps/dashboard/l10n/lt_LT.js b/apps/dashboard/l10n/lt_LT.js index d119fe1a034..3313e553d68 100644 --- a/apps/dashboard/l10n/lt_LT.js +++ b/apps/dashboard/l10n/lt_LT.js @@ -23,6 +23,7 @@ OC.L10N.register( "Hello" : "Sveiki", "Hello, {name}" : "Sveiki, {name},", "Pick from Files" : "Pasirinkti iš Failų", + "Default image" : "Numatytasis paveikslas", "Plain background" : "Vientisas fonas", "Insert from {productName}" : "Įterpti iš {productName}", "Show something" : "Ką nors rodyti", diff --git a/apps/dashboard/l10n/lt_LT.json b/apps/dashboard/l10n/lt_LT.json index 4e7341caecb..b46bb284c7b 100644 --- a/apps/dashboard/l10n/lt_LT.json +++ b/apps/dashboard/l10n/lt_LT.json @@ -21,6 +21,7 @@ "Hello" : "Sveiki", "Hello, {name}" : "Sveiki, {name},", "Pick from Files" : "Pasirinkti iš Failų", + "Default image" : "Numatytasis paveikslas", "Plain background" : "Vientisas fonas", "Insert from {productName}" : "Įterpti iš {productName}", "Show something" : "Ką nors rodyti", diff --git a/apps/dashboard/l10n/zh_HK.js b/apps/dashboard/l10n/zh_HK.js index 8842600ac9e..5be60458c59 100644 --- a/apps/dashboard/l10n/zh_HK.js +++ b/apps/dashboard/l10n/zh_HK.js @@ -24,6 +24,7 @@ OC.L10N.register( "Hello" : "哈囉", "Hello, {name}" : "哈囉，{name}", "Pick from Files" : "從檔案選取", + "Default image" : "默認圖像", "Plain background" : "簡單背景", "Insert from {productName}" : "插入自 {productName}", "Show something" : "顯示一些東西", diff --git a/apps/dashboard/l10n/zh_HK.json b/apps/dashboard/l10n/zh_HK.json index 0b4f24cc8ac..306f7fff1f4 100644 --- a/apps/dashboard/l10n/zh_HK.json +++ b/apps/dashboard/l10n/zh_HK.json @@ -22,6 +22,7 @@ "Hello" : "哈囉", "Hello, {name}" : "哈囉，{name}", "Pick from Files" : "從檔案選取", + "Default image" : "默認圖像", "Plain background" : "簡單背景", "Insert from {productName}" : "插入自 {productName}", "Show something" : "顯示一些東西", diff --git a/apps/dashboard/l10n/zh_TW.js b/apps/dashboard/l10n/zh_TW.js index 13ef4766cc1..07daf5fce48 100644 --- a/apps/dashboard/l10n/zh_TW.js +++ b/apps/dashboard/l10n/zh_TW.js @@ -24,6 +24,7 @@ OC.L10N.register( "Hello" : "嗨", "Hello, {name}" : "嗨，{name}", "Pick from Files" : "從檔案選取", + "Default image" : "預設影像", "Plain background" : "簡單背景", "Insert from {productName}" : "插入自 {productName}", "Show something" : "顯示一些東西", diff --git a/apps/dashboard/l10n/zh_TW.json b/apps/dashboard/l10n/zh_TW.json index 0feb95683f8..eaeb0030f4c 100644 --- a/apps/dashboard/l10n/zh_TW.json +++ b/apps/dashboard/l10n/zh_TW.json @@ -22,6 +22,7 @@ "Hello" : "嗨", "Hello, {name}" : "嗨，{name}", "Pick from Files" : "從檔案選取", + "Default image" : "預設影像", "Plain background" : "簡單背景", "Insert from {productName}" : "插入自 {productName}", "Show something" : "顯示一些東西", diff --git a/apps/dav/l10n/fi.js b/apps/dav/l10n/fi.js index ac1dc646a9b..a8a70f08b89 100644 --- a/apps/dav/l10n/fi.js +++ b/apps/dav/l10n/fi.js @@ -51,6 +51,7 @@ OC.L10N.register( "Date: %s" : "Päiväys: %s", "Description: %s" : "Kuvaus: %s", "Where: %s" : "Missä: %s", + "%1$s via %2$s" : "%1$s palvelun %2$s kautta", "Cancelled: %1$s" : "Peruutettu: %1$s", "Invitation canceled" : "Kutsu peruttu", "Invitation updated" : "Kutsu päivitetty", diff --git a/apps/dav/l10n/fi.json b/apps/dav/l10n/fi.json index 2f3691370ea..d8e6f00713b 100644 --- a/apps/dav/l10n/fi.json +++ b/apps/dav/l10n/fi.json @@ -49,6 +49,7 @@ "Date: %s" : "Päiväys: %s", "Description: %s" : "Kuvaus: %s", "Where: %s" : "Missä: %s", + "%1$s via %2$s" : "%1$s palvelun %2$s kautta", "Cancelled: %1$s" : "Peruutettu: %1$s", "Invitation canceled" : "Kutsu peruttu", "Invitation updated" : "Kutsu päivitetty", diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index a9ca2eb30a3..6b60d6701d4 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -933,6 +933,12 @@ class CardDavBackend implements BackendInterface, SyncSupport { $cardData = stream_get_contents($cardData); } + // Micro optimisation + // don't loop through + if (strpos($cardData, 'PHOTO:data:') === 0) { + return $cardData; + } + $cardDataArray = explode("\r\n", $cardData); $cardDataFiltered = []; @@ -956,7 +962,6 @@ class CardDavBackend implements BackendInterface, SyncSupport { $cardDataFiltered[] = $line; } - return implode("\r\n", $cardDataFiltered); } diff --git a/apps/federatedfilesharing/l10n/fi.js b/apps/federatedfilesharing/l10n/fi.js index dc163068be2..0cdf732f3f9 100644 --- a/apps/federatedfilesharing/l10n/fi.js +++ b/apps/federatedfilesharing/l10n/fi.js @@ -13,6 +13,7 @@ OC.L10N.register( "Federated Share request sent, you will receive an invitation. Check your notifications." : "Federoidun jakamisen pyyntö lähetetty, saat kutsun. Tarkista ilmoitukset.", "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Federoitua jakoa ei voitu muodostaa. Vaikuttaa siltä, että palvelin jonka kanssa federointia yritetään, on versioltaan liian vanha (Nextcloud <= 9).", "It is not allowed to send federated group shares from this server." : "Federoitujen ryhmäjakojen lähettäminen tältä palvelimelta ei ole sallittu.", + "Sharing %1$s failed, because this item is already shared with user %2$s" : "Kohteen %1$s jakaminen epäonnistui, koska tämä kohde on jo jaettu käyttäjän %2$s kanssa", "Not allowed to create a federated share with the same user" : "Saman käyttäjän kanssa ei ole sallittua luoda federoitua jakoa", "Federated shares require read permissions" : "Federoidut jaot vaativat lukuoikeuksia", "File is already shared with %s" : "Tiedosto on jo jaettu kohteen %s kanssa", diff --git a/apps/federatedfilesharing/l10n/fi.json b/apps/federatedfilesharing/l10n/fi.json index a627009b843..78f327dba5f 100644 --- a/apps/federatedfilesharing/l10n/fi.json +++ b/apps/federatedfilesharing/l10n/fi.json @@ -11,6 +11,7 @@ "Federated Share request sent, you will receive an invitation. Check your notifications." : "Federoidun jakamisen pyyntö lähetetty, saat kutsun. Tarkista ilmoitukset.", "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Federoitua jakoa ei voitu muodostaa. Vaikuttaa siltä, että palvelin jonka kanssa federointia yritetään, on versioltaan liian vanha (Nextcloud <= 9).", "It is not allowed to send federated group shares from this server." : "Federoitujen ryhmäjakojen lähettäminen tältä palvelimelta ei ole sallittu.", + "Sharing %1$s failed, because this item is already shared with user %2$s" : "Kohteen %1$s jakaminen epäonnistui, koska tämä kohde on jo jaettu käyttäjän %2$s kanssa", "Not allowed to create a federated share with the same user" : "Saman käyttäjän kanssa ei ole sallittua luoda federoitua jakoa", "Federated shares require read permissions" : "Federoidut jaot vaativat lukuoikeuksia", "File is already shared with %s" : "Tiedosto on jo jaettu kohteen %s kanssa", diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js index 5582b3c5aa4..8ba8c5948be 100644 --- a/apps/files/l10n/ar.js +++ b/apps/files/l10n/ar.js @@ -181,7 +181,6 @@ OC.L10N.register( "Templates" : "القوالب", "Unable to initialize the templates directory" : "تعذر تهيئة دليل القوالب", "%s used" : "%s مُستخدَم", - "%s%% of %s used" : "%s%% من %s قيد الاستخدام", "%1$s of %2$s used" : "تم استخدام %1$s من %2$s", "Show hidden files" : "عرض الملفات المخفية", "Crop image previews" : "اقتصاص صورة العروض", @@ -210,6 +209,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "لا تملك الصلاحية لرفع او انشاء ملف هنا ", "New" : "جديد", "Cannot transfer ownership of a file or folder you don't own" : "لا يمكنك تحويل ملكية ملف أو مجلد ليس ملكك", + "%s%% of %s used" : "%s%% من %s قيد الاستخدام", "Settings" : "الإعدادات" }, "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"); diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json index 0ccb3c3fa2e..3730af46f20 100644 --- a/apps/files/l10n/ar.json +++ b/apps/files/l10n/ar.json @@ -179,7 +179,6 @@ "Templates" : "القوالب", "Unable to initialize the templates directory" : "تعذر تهيئة دليل القوالب", "%s used" : "%s مُستخدَم", - "%s%% of %s used" : "%s%% من %s قيد الاستخدام", "%1$s of %2$s used" : "تم استخدام %1$s من %2$s", "Show hidden files" : "عرض الملفات المخفية", "Crop image previews" : "اقتصاص صورة العروض", @@ -208,6 +207,7 @@ "You don’t have permission to upload or create files here" : "لا تملك الصلاحية لرفع او انشاء ملف هنا ", "New" : "جديد", "Cannot transfer ownership of a file or folder you don't own" : "لا يمكنك تحويل ملكية ملف أو مجلد ليس ملكك", + "%s%% of %s used" : "%s%% من %s قيد الاستخدام", "Settings" : "الإعدادات" },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;" }
\ No newline at end of file diff --git a/apps/files/l10n/bg.js b/apps/files/l10n/bg.js index 7988758bcab..35d78b4c345 100644 --- a/apps/files/l10n/bg.js +++ b/apps/files/l10n/bg.js @@ -189,7 +189,6 @@ OC.L10N.register( "Templates" : "Шаблони", "Unable to initialize the templates directory" : "Неуспешно инициализиране на директорията с шаблони", "%s used" : "%s използвани", - "%s%% of %s used" : "%s%% от %s използвани", "%1$s of %2$s used" : "%1$s от %2$s използвани", "Files settings" : "Настройки на файловете", "Show hidden files" : "Показвай и скрити файлове", @@ -219,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Нямаш разрешение да създаваш или качваш файлове тук.", "New" : "Създай", "Cannot transfer ownership of a file or folder you don't own" : "Не можете да прехвърляте собственост върху файл или папка, които не притежавате", + "%s%% of %s used" : "%s%% от %s използвани", "Settings" : "Настройки" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/bg.json b/apps/files/l10n/bg.json index fc09a12b3d1..a50ba6c3af5 100644 --- a/apps/files/l10n/bg.json +++ b/apps/files/l10n/bg.json @@ -187,7 +187,6 @@ "Templates" : "Шаблони", "Unable to initialize the templates directory" : "Неуспешно инициализиране на директорията с шаблони", "%s used" : "%s използвани", - "%s%% of %s used" : "%s%% от %s използвани", "%1$s of %2$s used" : "%1$s от %2$s използвани", "Files settings" : "Настройки на файловете", "Show hidden files" : "Показвай и скрити файлове", @@ -217,6 +216,7 @@ "You don’t have permission to upload or create files here" : "Нямаш разрешение да създаваш или качваш файлове тук.", "New" : "Създай", "Cannot transfer ownership of a file or folder you don't own" : "Не можете да прехвърляте собственост върху файл или папка, които не притежавате", + "%s%% of %s used" : "%s%% от %s използвани", "Settings" : "Настройки" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/br.js b/apps/files/l10n/br.js index 96ce8baf914..53ab9aad07b 100644 --- a/apps/files/l10n/br.js +++ b/apps/files/l10n/br.js @@ -157,7 +157,6 @@ OC.L10N.register( "Cancel" : "Arrest", "Create" : "Krouiñ", "%s used" : "%s implijet", - "%s%% of %s used" : "%s%% diwar %s implijet", "%1$s of %2$s used" : "%1$s diwar%2$s implijet", "Show hidden files" : "Diskouez ar restroù koachet", "WebDAV" : "WebDAV", @@ -184,6 +183,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "N'och ket aotreet kas pe krouiñ restroù amañ", "New" : "Nevez", "Cannot transfer ownership of a file or folder you don't own" : "N'hallit ket treuzkas perc'henniezh ur restr pe un teuliad ma n'oc'h ket e berc'henn", + "%s%% of %s used" : "%s%% diwar %s implijet", "Settings" : "Arventennoù" }, "nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"); diff --git a/apps/files/l10n/br.json b/apps/files/l10n/br.json index 5e2e26e4a9a..027510f207d 100644 --- a/apps/files/l10n/br.json +++ b/apps/files/l10n/br.json @@ -155,7 +155,6 @@ "Cancel" : "Arrest", "Create" : "Krouiñ", "%s used" : "%s implijet", - "%s%% of %s used" : "%s%% diwar %s implijet", "%1$s of %2$s used" : "%1$s diwar%2$s implijet", "Show hidden files" : "Diskouez ar restroù koachet", "WebDAV" : "WebDAV", @@ -182,6 +181,7 @@ "You don’t have permission to upload or create files here" : "N'och ket aotreet kas pe krouiñ restroù amañ", "New" : "Nevez", "Cannot transfer ownership of a file or folder you don't own" : "N'hallit ket treuzkas perc'henniezh ur restr pe un teuliad ma n'oc'h ket e berc'henn", + "%s%% of %s used" : "%s%% diwar %s implijet", "Settings" : "Arventennoù" },"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);" }
\ No newline at end of file diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js index ede0a52f5ec..5eba7206698 100644 --- a/apps/files/l10n/ca.js +++ b/apps/files/l10n/ca.js @@ -187,7 +187,6 @@ OC.L10N.register( "Templates" : "Plantilles", "Unable to initialize the templates directory" : "No s'ha pogut inicialitzar la carpeta de plantilles", "%s used" : "%s en ús", - "%s%% of %s used" : "%s%% de %s en ús", "%1$s of %2$s used" : "%1$s de %2$s en ús", "Show hidden files" : "Mostra els fitxers ocults", "Crop image previews" : "Retalla les previsualitzacions de les imatges", @@ -216,6 +215,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "No teniu permís per a pujar o crear fitxers aquí", "New" : "Nou", "Cannot transfer ownership of a file or folder you don't own" : "No es pot transferir la propietat d'un fitxer o carpeta que no és vostre", + "%s%% of %s used" : "%s%% de %s en ús", "Settings" : "Paràmetres" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json index 0b188ae2794..22398f75b8c 100644 --- a/apps/files/l10n/ca.json +++ b/apps/files/l10n/ca.json @@ -185,7 +185,6 @@ "Templates" : "Plantilles", "Unable to initialize the templates directory" : "No s'ha pogut inicialitzar la carpeta de plantilles", "%s used" : "%s en ús", - "%s%% of %s used" : "%s%% de %s en ús", "%1$s of %2$s used" : "%1$s de %2$s en ús", "Show hidden files" : "Mostra els fitxers ocults", "Crop image previews" : "Retalla les previsualitzacions de les imatges", @@ -214,6 +213,7 @@ "You don’t have permission to upload or create files here" : "No teniu permís per a pujar o crear fitxers aquí", "New" : "Nou", "Cannot transfer ownership of a file or folder you don't own" : "No es pot transferir la propietat d'un fitxer o carpeta que no és vostre", + "%s%% of %s used" : "%s%% de %s en ús", "Settings" : "Paràmetres" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/cs.js b/apps/files/l10n/cs.js index c1d53d6ac91..b1c43617130 100644 --- a/apps/files/l10n/cs.js +++ b/apps/files/l10n/cs.js @@ -189,7 +189,6 @@ OC.L10N.register( "Templates" : "Šablony", "Unable to initialize the templates directory" : "Nepodařilo se vytvořit složku pro šablony", "%s used" : "%s použito", - "%s%% of %s used" : "%s%% z %s použito", "%1$s of %2$s used" : "%1$s z %2$s použito", "Files settings" : "Nastavení pro Soubory", "Show hidden files" : "Zobrazit skryté soubory", @@ -219,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo zde vytvářet soubory", "New" : "Nový", "Cannot transfer ownership of a file or folder you don't own" : "Není možné převést vlastnictví souboru či složky, které nejste vlastníky", + "%s%% of %s used" : "%s%% z %s použito", "Settings" : "Nastavení" }, "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"); diff --git a/apps/files/l10n/cs.json b/apps/files/l10n/cs.json index c7b6c551293..d2e99c4a7af 100644 --- a/apps/files/l10n/cs.json +++ b/apps/files/l10n/cs.json @@ -187,7 +187,6 @@ "Templates" : "Šablony", "Unable to initialize the templates directory" : "Nepodařilo se vytvořit složku pro šablony", "%s used" : "%s použito", - "%s%% of %s used" : "%s%% z %s použito", "%1$s of %2$s used" : "%1$s z %2$s použito", "Files settings" : "Nastavení pro Soubory", "Show hidden files" : "Zobrazit skryté soubory", @@ -217,6 +216,7 @@ "You don’t have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo zde vytvářet soubory", "New" : "Nový", "Cannot transfer ownership of a file or folder you don't own" : "Není možné převést vlastnictví souboru či složky, které nejste vlastníky", + "%s%% of %s used" : "%s%% z %s použito", "Settings" : "Nastavení" },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;" }
\ No newline at end of file diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js index b27617a3708..edfc696ff8d 100644 --- a/apps/files/l10n/da.js +++ b/apps/files/l10n/da.js @@ -188,7 +188,6 @@ OC.L10N.register( "Templates" : "Skabeloner", "Unable to initialize the templates directory" : "Kan ikke initialisere skabelonmappen", "%s used" : "%s brugt", - "%s%% of %s used" : "%s%% af %s brugt", "%1$s of %2$s used" : "%1$s af %2$s brugt", "Show hidden files" : "Vis skjulte filer", "Crop image previews" : "Beskær forhåndsvisninger af billeder", @@ -217,6 +216,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her", "New" : "Ny", "Cannot transfer ownership of a file or folder you don't own" : "Kan ikke overføre ejerskab af en fil eller mappe, du ikke ejer", + "%s%% of %s used" : "%s%% af %s brugt", "Settings" : "Indstillinger" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json index b817a81e7c1..ba0b0d1ff0e 100644 --- a/apps/files/l10n/da.json +++ b/apps/files/l10n/da.json @@ -186,7 +186,6 @@ "Templates" : "Skabeloner", "Unable to initialize the templates directory" : "Kan ikke initialisere skabelonmappen", "%s used" : "%s brugt", - "%s%% of %s used" : "%s%% af %s brugt", "%1$s of %2$s used" : "%1$s af %2$s brugt", "Show hidden files" : "Vis skjulte filer", "Crop image previews" : "Beskær forhåndsvisninger af billeder", @@ -215,6 +214,7 @@ "You don’t have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her", "New" : "Ny", "Cannot transfer ownership of a file or folder you don't own" : "Kan ikke overføre ejerskab af en fil eller mappe, du ikke ejer", + "%s%% of %s used" : "%s%% af %s brugt", "Settings" : "Indstillinger" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index b7219502eb3..47ccddca591 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -188,7 +188,6 @@ OC.L10N.register( "Templates" : "Vorlagen", "Unable to initialize the templates directory" : "Der Vorlagenordner konnte nicht initialisiert werden", "%s used" : "%s verwendet", - "%s%% of %s used" : "%s%% von %s verwendet", "%1$s of %2$s used" : "%1$s von %2$s verwendet", "Show hidden files" : "Versteckte Dateien anzeigen", "Crop image previews" : "Bildvorschauen zuschneiden", @@ -217,6 +216,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen", "New" : "Neu", "Cannot transfer ownership of a file or folder you don't own" : "Der Besitz einer Datei oder eines Ordners, den du nicht besitzt, kann nicht übertragen werden", + "%s%% of %s used" : "%s%% von %s verwendet", "Settings" : "Einstellungen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 04e7e303c7e..7236cca21d9 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -186,7 +186,6 @@ "Templates" : "Vorlagen", "Unable to initialize the templates directory" : "Der Vorlagenordner konnte nicht initialisiert werden", "%s used" : "%s verwendet", - "%s%% of %s used" : "%s%% von %s verwendet", "%1$s of %2$s used" : "%1$s von %2$s verwendet", "Show hidden files" : "Versteckte Dateien anzeigen", "Crop image previews" : "Bildvorschauen zuschneiden", @@ -215,6 +214,7 @@ "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen", "New" : "Neu", "Cannot transfer ownership of a file or folder you don't own" : "Der Besitz einer Datei oder eines Ordners, den du nicht besitzt, kann nicht übertragen werden", + "%s%% of %s used" : "%s%% von %s verwendet", "Settings" : "Einstellungen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 34c0c66e3ee..2e6eba6cefe 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -79,6 +79,7 @@ OC.L10N.register( "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hochgeladen"], "New file/folder menu" : "Menü für neue Datei/Ordner", "Select file range" : "Dateibereich auswählen", + "{used}%" : "{used}%", "{used} of {quota} used" : "{used} von {quota} verwendet", "{used} used" : "{used} verwendet", "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.", @@ -189,7 +190,7 @@ OC.L10N.register( "Templates" : "Vorlagen", "Unable to initialize the templates directory" : "Der Vorlagenordner kann nicht initialisiert werden", "%s used" : "%s verwendet", - "%s%% of %s used" : "%s%% von %s verwendet", + "%s%%" : "%s%%", "%1$s of %2$s used" : "%1$s von %2$s verwendet", "Files settings" : "Dateien-Einstellungen", "Show hidden files" : "Versteckte Dateien anzeigen", @@ -219,6 +220,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen", "New" : "Neu", "Cannot transfer ownership of a file or folder you don't own" : "Der Besitz einer Datei oder eines Ordners, den Sie nicht besitzen, kann nicht übertragen werden", + "%s%% of %s used" : "%s%% von %s verwendet", "Settings" : "Einstellungen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index b0422b12e10..2be92831370 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -77,6 +77,7 @@ "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hochgeladen"], "New file/folder menu" : "Menü für neue Datei/Ordner", "Select file range" : "Dateibereich auswählen", + "{used}%" : "{used}%", "{used} of {quota} used" : "{used} von {quota} verwendet", "{used} used" : "{used} verwendet", "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.", @@ -187,7 +188,7 @@ "Templates" : "Vorlagen", "Unable to initialize the templates directory" : "Der Vorlagenordner kann nicht initialisiert werden", "%s used" : "%s verwendet", - "%s%% of %s used" : "%s%% von %s verwendet", + "%s%%" : "%s%%", "%1$s of %2$s used" : "%1$s von %2$s verwendet", "Files settings" : "Dateien-Einstellungen", "Show hidden files" : "Versteckte Dateien anzeigen", @@ -217,6 +218,7 @@ "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen", "New" : "Neu", "Cannot transfer ownership of a file or folder you don't own" : "Der Besitz einer Datei oder eines Ordners, den Sie nicht besitzen, kann nicht übertragen werden", + "%s%% of %s used" : "%s%% von %s verwendet", "Settings" : "Einstellungen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js index 230ae9b6ff0..a21867c5fb8 100644 --- a/apps/files/l10n/el.js +++ b/apps/files/l10n/el.js @@ -186,7 +186,6 @@ OC.L10N.register( "Templates" : "Πρότυπα", "Unable to initialize the templates directory" : "Δεν είναι δυνατή η προετοιμασία του καταλόγου προτύπων", "%s used" : "%s σε χρήση", - "%s%% of %s used" : "%s%% από %s σε χρήση", "%1$s of %2$s used" : "χρησιμοποιούνται %1$s από %2$s", "Show hidden files" : "Εμφάνιση κρυφών αρχείων", "Crop image previews" : "Περικοπή προεπισκόπησης εικόνας", @@ -215,6 +214,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Δεν έχετε δικαιώματα μεταφόρτωσης ή δημιουργίας αρχείων εδώ", "New" : "Νέο", "Cannot transfer ownership of a file or folder you don't own" : "Δεν μπορεί να μεταβιβαστεί η κυριότητα αρχείου ή φακέλου που δεν σας ανήκει", + "%s%% of %s used" : "%s%% από %s σε χρήση", "Settings" : "Ρυθμίσεις" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json index 02130d5b321..c6c4c1f3fbb 100644 --- a/apps/files/l10n/el.json +++ b/apps/files/l10n/el.json @@ -184,7 +184,6 @@ "Templates" : "Πρότυπα", "Unable to initialize the templates directory" : "Δεν είναι δυνατή η προετοιμασία του καταλόγου προτύπων", "%s used" : "%s σε χρήση", - "%s%% of %s used" : "%s%% από %s σε χρήση", "%1$s of %2$s used" : "χρησιμοποιούνται %1$s από %2$s", "Show hidden files" : "Εμφάνιση κρυφών αρχείων", "Crop image previews" : "Περικοπή προεπισκόπησης εικόνας", @@ -213,6 +212,7 @@ "You don’t have permission to upload or create files here" : "Δεν έχετε δικαιώματα μεταφόρτωσης ή δημιουργίας αρχείων εδώ", "New" : "Νέο", "Cannot transfer ownership of a file or folder you don't own" : "Δεν μπορεί να μεταβιβαστεί η κυριότητα αρχείου ή φακέλου που δεν σας ανήκει", + "%s%% of %s used" : "%s%% από %s σε χρήση", "Settings" : "Ρυθμίσεις" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/eo.js b/apps/files/l10n/eo.js index fa1295d4c40..777d56fbd62 100644 --- a/apps/files/l10n/eo.js +++ b/apps/files/l10n/eo.js @@ -134,7 +134,6 @@ OC.L10N.register( "Cancel" : "Nuligi", "Create" : "Krei", "%s used" : "%s uzataj", - "%s%% of %s used" : "%s%% el %s uzataj", "%1$s of %2$s used" : "%1$s uzataj el %2$s", "Show hidden files" : "Montri kaŝitajn dosierojn", "WebDAV" : "WebDAV", @@ -158,6 +157,7 @@ OC.L10N.register( "Select" : "Elekti", "You don’t have permission to upload or create files here" : "Vi ne permesatas alŝuti aŭ krei dosierojn ĉi tie", "New" : "Nova", + "%s%% of %s used" : "%s%% el %s uzataj", "Settings" : "Agordo" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/eo.json b/apps/files/l10n/eo.json index 6412b0c265a..8be2f50b3ff 100644 --- a/apps/files/l10n/eo.json +++ b/apps/files/l10n/eo.json @@ -132,7 +132,6 @@ "Cancel" : "Nuligi", "Create" : "Krei", "%s used" : "%s uzataj", - "%s%% of %s used" : "%s%% el %s uzataj", "%1$s of %2$s used" : "%1$s uzataj el %2$s", "Show hidden files" : "Montri kaŝitajn dosierojn", "WebDAV" : "WebDAV", @@ -156,6 +155,7 @@ "Select" : "Elekti", "You don’t have permission to upload or create files here" : "Vi ne permesatas alŝuti aŭ krei dosierojn ĉi tie", "New" : "Nova", + "%s%% of %s used" : "%s%% el %s uzataj", "Settings" : "Agordo" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index e6ec7d73fd9..1ea07d7d2fc 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -188,7 +188,6 @@ OC.L10N.register( "Templates" : "Plantillas", "Unable to initialize the templates directory" : "No se ha podido iniciar la carpeta de plantillas", "%s used" : "usado %s", - "%s%% of %s used" : "%s%% de %s usado", "%1$s of %2$s used" : "%1$s de %2$s usados", "Show hidden files" : "Mostrar archivos ocultos", "Crop image previews" : "Recortar la previsualización de las imágenes", @@ -217,6 +216,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "No tiene permisos para subir o crear archivos aquí", "New" : "Nuevo", "Cannot transfer ownership of a file or folder you don't own" : "No se puede transferir la propiedad de un archivo o carpeta que no te pertenece", + "%s%% of %s used" : "%s%% de %s usado", "Settings" : "Ajustes" }, "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index cc48cb86139..9954c892b88 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -186,7 +186,6 @@ "Templates" : "Plantillas", "Unable to initialize the templates directory" : "No se ha podido iniciar la carpeta de plantillas", "%s used" : "usado %s", - "%s%% of %s used" : "%s%% de %s usado", "%1$s of %2$s used" : "%1$s de %2$s usados", "Show hidden files" : "Mostrar archivos ocultos", "Crop image previews" : "Recortar la previsualización de las imágenes", @@ -215,6 +214,7 @@ "You don’t have permission to upload or create files here" : "No tiene permisos para subir o crear archivos aquí", "New" : "Nuevo", "Cannot transfer ownership of a file or folder you don't own" : "No se puede transferir la propiedad de un archivo o carpeta que no te pertenece", + "%s%% of %s used" : "%s%% de %s usado", "Settings" : "Ajustes" },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js index 1622506a4bb..920da597cbb 100644 --- a/apps/files/l10n/eu.js +++ b/apps/files/l10n/eu.js @@ -189,7 +189,6 @@ OC.L10N.register( "Templates" : "Txantiloia", "Unable to initialize the templates directory" : "Ezin da txantiloien direktorioa hasieratu", "%s used" : "%s erabilita", - "%s%% of %s used" : "%s%% / %s erabilita", "%1$s of %2$s used" : "%1$s / %2$s erabilita", "Files settings" : "FItxategien ezarpenak", "Show hidden files" : "Erakutsi ezkutuko fitxategiak", @@ -219,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Ez duzu baimenik fitxategiak hona kargatu edo hemen sortzeko", "New" : "Berria", "Cannot transfer ownership of a file or folder you don't own" : "Ezin da zurea ez den fitxategi edo karpeta baten jabetza transferitu", + "%s%% of %s used" : "%s%% / %s erabilita", "Settings" : "Ezarpenak" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json index 4763964b426..2038cbf9d9e 100644 --- a/apps/files/l10n/eu.json +++ b/apps/files/l10n/eu.json @@ -187,7 +187,6 @@ "Templates" : "Txantiloia", "Unable to initialize the templates directory" : "Ezin da txantiloien direktorioa hasieratu", "%s used" : "%s erabilita", - "%s%% of %s used" : "%s%% / %s erabilita", "%1$s of %2$s used" : "%1$s / %2$s erabilita", "Files settings" : "FItxategien ezarpenak", "Show hidden files" : "Erakutsi ezkutuko fitxategiak", @@ -217,6 +216,7 @@ "You don’t have permission to upload or create files here" : "Ez duzu baimenik fitxategiak hona kargatu edo hemen sortzeko", "New" : "Berria", "Cannot transfer ownership of a file or folder you don't own" : "Ezin da zurea ez den fitxategi edo karpeta baten jabetza transferitu", + "%s%% of %s used" : "%s%% / %s erabilita", "Settings" : "Ezarpenak" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/fi.js b/apps/files/l10n/fi.js index 3556b2e4ebb..09c19528cc8 100644 --- a/apps/files/l10n/fi.js +++ b/apps/files/l10n/fi.js @@ -77,7 +77,9 @@ OC.L10N.register( "_including %n hidden_::_including %n hidden_" : ["Sisältäen %n piilotetun","Sisältäen %n piilotettua"], "You do not have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai luomiseen tähän sijaintiin", "_Uploading %n file_::_Uploading %n files_" : ["Lähetetään %n tiedosto","Lähetetään %n tiedostoa"], + "New file/folder menu" : "Uusi tiedosto/kansio -valikko", "Select file range" : "Valitse tiedostojoukko", + "{used}%" : "{used} %", "{used} of {quota} used" : "{used}/{quota} käytetty", "{used} used" : "{used} käytetty", "\"{name}\" is an invalid file name." : "\"{name}\" on virheellinen tiedostonimi.", @@ -188,8 +190,9 @@ OC.L10N.register( "Templates" : "Mallipohjat", "Unable to initialize the templates directory" : "Mallipohjien kansiota ei voitu alustaa", "%s used" : "%s käytetty", - "%s%% of %s used" : "%s%% / %s käytetty", + "%s%%" : "%s%%", "%1$s of %2$s used" : "%1$s/%2$s käytetty", + "Files settings" : "Tiedostojen asetukset", "Show hidden files" : "Näytä piilotetut tiedostot", "Crop image previews" : "Rajaa kuvien esikatseluja", "WebDAV" : "WebDAV", @@ -216,6 +219,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin", "New" : "Uusi", "Cannot transfer ownership of a file or folder you don't own" : "Et voi siirtää sellaisen tiedoston tai kansion omistajuutta, jota et itse omista", + "%s%% of %s used" : "%s%% / %s käytetty", "Settings" : "Asetukset" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/fi.json b/apps/files/l10n/fi.json index 98e0a5994d0..73e01467522 100644 --- a/apps/files/l10n/fi.json +++ b/apps/files/l10n/fi.json @@ -75,7 +75,9 @@ "_including %n hidden_::_including %n hidden_" : ["Sisältäen %n piilotetun","Sisältäen %n piilotettua"], "You do not have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai luomiseen tähän sijaintiin", "_Uploading %n file_::_Uploading %n files_" : ["Lähetetään %n tiedosto","Lähetetään %n tiedostoa"], + "New file/folder menu" : "Uusi tiedosto/kansio -valikko", "Select file range" : "Valitse tiedostojoukko", + "{used}%" : "{used} %", "{used} of {quota} used" : "{used}/{quota} käytetty", "{used} used" : "{used} käytetty", "\"{name}\" is an invalid file name." : "\"{name}\" on virheellinen tiedostonimi.", @@ -186,8 +188,9 @@ "Templates" : "Mallipohjat", "Unable to initialize the templates directory" : "Mallipohjien kansiota ei voitu alustaa", "%s used" : "%s käytetty", - "%s%% of %s used" : "%s%% / %s käytetty", + "%s%%" : "%s%%", "%1$s of %2$s used" : "%1$s/%2$s käytetty", + "Files settings" : "Tiedostojen asetukset", "Show hidden files" : "Näytä piilotetut tiedostot", "Crop image previews" : "Rajaa kuvien esikatseluja", "WebDAV" : "WebDAV", @@ -214,6 +217,7 @@ "You don’t have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin", "New" : "Uusi", "Cannot transfer ownership of a file or folder you don't own" : "Et voi siirtää sellaisen tiedoston tai kansion omistajuutta, jota et itse omista", + "%s%% of %s used" : "%s%% / %s käytetty", "Settings" : "Asetukset" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index f276ef20103..5728e87e955 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -21,6 +21,7 @@ OC.L10N.register( "Target folder \"{dir}\" does not exist any more" : "Le dossier cible \"{dir}\" n'existe plus", "Not enough free space" : "Espace disponible insuffisant", "An unknown error has occurred" : "Une erreur inconnue est survenue", + "File could not be uploaded" : "Le fichier n'a pas pu être téléversé", "Uploading …" : "Envoi en cours...", "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})", "Uploading that item is not supported" : "L'envoi de cet élément n'est pas supporté", @@ -74,7 +75,9 @@ OC.L10N.register( "_%n file_::_%n files_" : ["%n fichier","%n fichiers","%n fichiers"], "{dirs} and {files}" : "{dirs} et {files}", "_including %n hidden_::_including %n hidden_" : ["inclus %n masqué","dont %n masqués","dont %n masqués"], + "You do not have permission to upload or create files here" : "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici", "_Uploading %n file_::_Uploading %n files_" : ["Téléversement de %n fichier","Envoi de %n fichiers","Envoi de %n fichiers"], + "New file/folder menu" : "Menu nouveau fichier/dossier", "Select file range" : "Activer la sélection d'une plage de fichiers", "{used} of {quota} used" : "{used} utilisés sur {quota}", "{used} used" : "{used} utilisés", @@ -171,6 +174,7 @@ OC.L10N.register( "Transfer {path} to {userid}" : "Transférer {path} à {userid}", "Invalid path selected" : "Chemin sélectionné non valide", "Ownership transfer request sent" : "Requête de transfert de propriété envoyée", + "Cannot transfer ownership of a file or folder you do not own" : "Impossible de transférer la propriété d'un fichier ou d'un dossier que vous ne possédez pas", "Tags" : "Étiquettes", "Unable to change the favourite state of the file" : "Impossible de modifier l'état favori du fichier", "Error while loading the file data" : "Erreur lors du chargement du fichier de données", @@ -185,8 +189,8 @@ OC.L10N.register( "Templates" : "Modèles", "Unable to initialize the templates directory" : "Impossible d'initialiser le répertoire des modèles", "%s used" : "%s utilisés", - "%s%% of %s used" : "%s%% de %s utilisé", "%1$s of %2$s used" : "%1$s utilisés sur %2$s", + "Files settings" : "Paramètres des fichiers", "Show hidden files" : "Afficher les fichiers masqués", "Crop image previews" : "Activer l'affichage en miniatures carrées", "WebDAV" : "WebDAV", @@ -214,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Vous n'avez pas la permission d'envoyer ou de créer des fichiers ici", "New" : "Nouveau", "Cannot transfer ownership of a file or folder you don't own" : "Impossible de transférer la propriété d’un fichier ou d’un dossier dont vous n'êtes pas le propriétaire", + "%s%% of %s used" : "%s%% de %s utilisés", "Settings" : "Paramètres" }, "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index 487e098d615..4f68b38fbb2 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -19,6 +19,7 @@ "Target folder \"{dir}\" does not exist any more" : "Le dossier cible \"{dir}\" n'existe plus", "Not enough free space" : "Espace disponible insuffisant", "An unknown error has occurred" : "Une erreur inconnue est survenue", + "File could not be uploaded" : "Le fichier n'a pas pu être téléversé", "Uploading …" : "Envoi en cours...", "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})", "Uploading that item is not supported" : "L'envoi de cet élément n'est pas supporté", @@ -72,7 +73,9 @@ "_%n file_::_%n files_" : ["%n fichier","%n fichiers","%n fichiers"], "{dirs} and {files}" : "{dirs} et {files}", "_including %n hidden_::_including %n hidden_" : ["inclus %n masqué","dont %n masqués","dont %n masqués"], + "You do not have permission to upload or create files here" : "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici", "_Uploading %n file_::_Uploading %n files_" : ["Téléversement de %n fichier","Envoi de %n fichiers","Envoi de %n fichiers"], + "New file/folder menu" : "Menu nouveau fichier/dossier", "Select file range" : "Activer la sélection d'une plage de fichiers", "{used} of {quota} used" : "{used} utilisés sur {quota}", "{used} used" : "{used} utilisés", @@ -169,6 +172,7 @@ "Transfer {path} to {userid}" : "Transférer {path} à {userid}", "Invalid path selected" : "Chemin sélectionné non valide", "Ownership transfer request sent" : "Requête de transfert de propriété envoyée", + "Cannot transfer ownership of a file or folder you do not own" : "Impossible de transférer la propriété d'un fichier ou d'un dossier que vous ne possédez pas", "Tags" : "Étiquettes", "Unable to change the favourite state of the file" : "Impossible de modifier l'état favori du fichier", "Error while loading the file data" : "Erreur lors du chargement du fichier de données", @@ -183,8 +187,8 @@ "Templates" : "Modèles", "Unable to initialize the templates directory" : "Impossible d'initialiser le répertoire des modèles", "%s used" : "%s utilisés", - "%s%% of %s used" : "%s%% de %s utilisé", "%1$s of %2$s used" : "%1$s utilisés sur %2$s", + "Files settings" : "Paramètres des fichiers", "Show hidden files" : "Afficher les fichiers masqués", "Crop image previews" : "Activer l'affichage en miniatures carrées", "WebDAV" : "WebDAV", @@ -212,6 +216,7 @@ "You don’t have permission to upload or create files here" : "Vous n'avez pas la permission d'envoyer ou de créer des fichiers ici", "New" : "Nouveau", "Cannot transfer ownership of a file or folder you don't own" : "Impossible de transférer la propriété d’un fichier ou d’un dossier dont vous n'êtes pas le propriétaire", + "%s%% of %s used" : "%s%% de %s utilisés", "Settings" : "Paramètres" },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js index 6d0da2de257..c3acf2f4d02 100644 --- a/apps/files/l10n/gl.js +++ b/apps/files/l10n/gl.js @@ -180,7 +180,6 @@ OC.L10N.register( "Templates" : "Modelos", "Unable to initialize the templates directory" : "Non é posíbel iniciar o directorio de modelos", "%s used" : "%s utilizado", - "%s%% of %s used" : "%s%% de %s utilizado", "%1$s of %2$s used" : "%s de %s utilizado", "Show hidden files" : "Amosar os ficheiros agochados", "Crop image previews" : "Recortar a vista previa das imaxes", @@ -208,6 +207,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Non ten permiso para enviar ou crear ficheiros aquí.", "New" : "Novo", "Cannot transfer ownership of a file or folder you don't own" : "Non é posíbel transferir a propiedade dun ficheiro ou cartafol que non é de seu", + "%s%% of %s used" : "%s%% de %s utilizado", "Settings" : "Axustes" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json index 8acdf1b7474..14f9739c94d 100644 --- a/apps/files/l10n/gl.json +++ b/apps/files/l10n/gl.json @@ -178,7 +178,6 @@ "Templates" : "Modelos", "Unable to initialize the templates directory" : "Non é posíbel iniciar o directorio de modelos", "%s used" : "%s utilizado", - "%s%% of %s used" : "%s%% de %s utilizado", "%1$s of %2$s used" : "%s de %s utilizado", "Show hidden files" : "Amosar os ficheiros agochados", "Crop image previews" : "Recortar a vista previa das imaxes", @@ -206,6 +205,7 @@ "You don’t have permission to upload or create files here" : "Non ten permiso para enviar ou crear ficheiros aquí.", "New" : "Novo", "Cannot transfer ownership of a file or folder you don't own" : "Non é posíbel transferir a propiedade dun ficheiro ou cartafol que non é de seu", + "%s%% of %s used" : "%s%% de %s utilizado", "Settings" : "Axustes" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js index 4185647b920..df8ffe82fde 100644 --- a/apps/files/l10n/he.js +++ b/apps/files/l10n/he.js @@ -160,7 +160,6 @@ OC.L10N.register( "Cancel" : "ביטול", "Create" : "יצירה", "%s used" : "%s בשימוש", - "%s%% of %s used" : "%s%% מתוך %s בשימוש", "%1$s of %2$s used" : "%1$s מתוך %2$s בשימוש", "Show hidden files" : "הצגת קבצים נסתרים", "Crop image previews" : "חיתוך תצוגות מקדימות של תמונות", @@ -188,6 +187,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "אין לך הרשאות להעלות או ליצור קבצים כאן", "New" : "חדש", "Cannot transfer ownership of a file or folder you don't own" : "אין לך אפשרות להעביר בעלות על קובץ או תיקייה שאין לך בעלות עליהם", + "%s%% of %s used" : "%s%% מתוך %s בשימוש", "Settings" : "הגדרות" }, "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"); diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json index 8b662d22106..f02e7fadc41 100644 --- a/apps/files/l10n/he.json +++ b/apps/files/l10n/he.json @@ -158,7 +158,6 @@ "Cancel" : "ביטול", "Create" : "יצירה", "%s used" : "%s בשימוש", - "%s%% of %s used" : "%s%% מתוך %s בשימוש", "%1$s of %2$s used" : "%1$s מתוך %2$s בשימוש", "Show hidden files" : "הצגת קבצים נסתרים", "Crop image previews" : "חיתוך תצוגות מקדימות של תמונות", @@ -186,6 +185,7 @@ "You don’t have permission to upload or create files here" : "אין לך הרשאות להעלות או ליצור קבצים כאן", "New" : "חדש", "Cannot transfer ownership of a file or folder you don't own" : "אין לך אפשרות להעביר בעלות על קובץ או תיקייה שאין לך בעלות עליהם", + "%s%% of %s used" : "%s%% מתוך %s בשימוש", "Settings" : "הגדרות" },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;" }
\ No newline at end of file diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js index 8049db8434f..e0e62276cc4 100644 --- a/apps/files/l10n/hr.js +++ b/apps/files/l10n/hr.js @@ -179,7 +179,6 @@ OC.L10N.register( "Templates" : "Predlošci", "Unable to initialize the templates directory" : "Nije moguće inicijalizirati direktorij predložaka", "%s used" : "Iskorišteno %s", - "%s%% of %s used" : "Iskorišteno %s%% od %s", "%1$s of %2$s used" : "Iskorišteno %1$s od %2$s", "Show hidden files" : "Prikaz skrivenih datoteka", "Crop image previews" : "Obreži pretpreglede slika", @@ -208,6 +207,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Ovdje ne smijete otpremati ili stvarati datoteke", "New" : "Novo", "Cannot transfer ownership of a file or folder you don't own" : "Ne možete prenijeti vlasništvo nad datotekom ili mapom koja nije u vašem vlasništvu", + "%s%% of %s used" : "Iskorišteno %s%% od %s", "Settings" : "Postavke" }, "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"); diff --git a/apps/files/l10n/hr.json b/apps/files/l10n/hr.json index 900f8b9e398..f9e2b745e42 100644 --- a/apps/files/l10n/hr.json +++ b/apps/files/l10n/hr.json @@ -177,7 +177,6 @@ "Templates" : "Predlošci", "Unable to initialize the templates directory" : "Nije moguće inicijalizirati direktorij predložaka", "%s used" : "Iskorišteno %s", - "%s%% of %s used" : "Iskorišteno %s%% od %s", "%1$s of %2$s used" : "Iskorišteno %1$s od %2$s", "Show hidden files" : "Prikaz skrivenih datoteka", "Crop image previews" : "Obreži pretpreglede slika", @@ -206,6 +205,7 @@ "You don’t have permission to upload or create files here" : "Ovdje ne smijete otpremati ili stvarati datoteke", "New" : "Novo", "Cannot transfer ownership of a file or folder you don't own" : "Ne možete prenijeti vlasništvo nad datotekom ili mapom koja nije u vašem vlasništvu", + "%s%% of %s used" : "Iskorišteno %s%% od %s", "Settings" : "Postavke" },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files/l10n/hu.js b/apps/files/l10n/hu.js index f956da10e23..54bba845f19 100644 --- a/apps/files/l10n/hu.js +++ b/apps/files/l10n/hu.js @@ -189,7 +189,6 @@ OC.L10N.register( "Templates" : "Sablonok", "Unable to initialize the templates directory" : "A sablonkönyvtár előkészítése sikertelen", "%s used" : "%s használt", - "%s%% of %s used" : "%s %% / %s felhasználva", "%1$s of %2$s used" : "%1$s / %2$s felhasználva", "Files settings" : "Fájlok beállításai", "Show hidden files" : "Rejtett fájlok megjelenítése", @@ -219,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Nincs jogosultsága fájlok ide feltöltéséhez vagy létrehozásához", "New" : "Új", "Cannot transfer ownership of a file or folder you don't own" : "Nem ruházható át olyan fájl vagy mappa tulajdonjoga, amely nem Öné", + "%s%% of %s used" : "%s %% / %s felhasználva", "Settings" : "Beállítások" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/hu.json b/apps/files/l10n/hu.json index 8992691a25e..fa718eea7a0 100644 --- a/apps/files/l10n/hu.json +++ b/apps/files/l10n/hu.json @@ -187,7 +187,6 @@ "Templates" : "Sablonok", "Unable to initialize the templates directory" : "A sablonkönyvtár előkészítése sikertelen", "%s used" : "%s használt", - "%s%% of %s used" : "%s %% / %s felhasználva", "%1$s of %2$s used" : "%1$s / %2$s felhasználva", "Files settings" : "Fájlok beállításai", "Show hidden files" : "Rejtett fájlok megjelenítése", @@ -217,6 +216,7 @@ "You don’t have permission to upload or create files here" : "Nincs jogosultsága fájlok ide feltöltéséhez vagy létrehozásához", "New" : "Új", "Cannot transfer ownership of a file or folder you don't own" : "Nem ruházható át olyan fájl vagy mappa tulajdonjoga, amely nem Öné", + "%s%% of %s used" : "%s %% / %s felhasználva", "Settings" : "Beállítások" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js index 9f93e2c51cc..20f211e5336 100644 --- a/apps/files/l10n/id.js +++ b/apps/files/l10n/id.js @@ -152,7 +152,6 @@ OC.L10N.register( "Cancel" : "Membatalkan", "Create" : "Buat", "%s used" : "%s digunakan", - "%s%% of %s used" : "%s%% dari %s terpakai", "%1$s of %2$s used" : "%1$s dari %2$s sudah digunakan", "Show hidden files" : "Lihat berkas tersembunyi", "Crop image previews" : "Pangkas pratinjau gambar", @@ -180,6 +179,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini", "New" : "Baru", "Cannot transfer ownership of a file or folder you don't own" : "Tidak dapat melakukan transfer kepemilikan dari berkas dan folder yang tidak Anda miliki", + "%s%% of %s used" : "%s%% dari %s terpakai", "Settings" : "Pengaturan" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json index f6055e37a04..e265326b74f 100644 --- a/apps/files/l10n/id.json +++ b/apps/files/l10n/id.json @@ -150,7 +150,6 @@ "Cancel" : "Membatalkan", "Create" : "Buat", "%s used" : "%s digunakan", - "%s%% of %s used" : "%s%% dari %s terpakai", "%1$s of %2$s used" : "%1$s dari %2$s sudah digunakan", "Show hidden files" : "Lihat berkas tersembunyi", "Crop image previews" : "Pangkas pratinjau gambar", @@ -178,6 +177,7 @@ "You don’t have permission to upload or create files here" : "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini", "New" : "Baru", "Cannot transfer ownership of a file or folder you don't own" : "Tidak dapat melakukan transfer kepemilikan dari berkas dan folder yang tidak Anda miliki", + "%s%% of %s used" : "%s%% dari %s terpakai", "Settings" : "Pengaturan" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js index 00744363070..fddbb7c3f5f 100644 --- a/apps/files/l10n/is.js +++ b/apps/files/l10n/is.js @@ -156,7 +156,6 @@ OC.L10N.register( "Templates" : "Sniðmát", "Unable to initialize the templates directory" : "Tókst ekki að frumstilla sniðmátamöppuna", "%s used" : "%s notað", - "%s%% of %s used" : "%s%% af %s notað", "%1$s of %2$s used" : "%1$s af %2$s notað", "Show hidden files" : "Sýna faldar skrár", "Crop image previews" : "Skera utan af forskoðun mynda", @@ -184,6 +183,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Þú hefur ekki heimild til að hlaða inn eða búa til skjöl hér", "New" : "Nýtt", "Cannot transfer ownership of a file or folder you don't own" : "Ekki er hægt að millifæra eignarhald á skrá eða möppu sem þú átt ekki", + "%s%% of %s used" : "%s%% af %s notað", "Settings" : "Stillingar" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json index 83411a1e39b..7c03875661a 100644 --- a/apps/files/l10n/is.json +++ b/apps/files/l10n/is.json @@ -154,7 +154,6 @@ "Templates" : "Sniðmát", "Unable to initialize the templates directory" : "Tókst ekki að frumstilla sniðmátamöppuna", "%s used" : "%s notað", - "%s%% of %s used" : "%s%% af %s notað", "%1$s of %2$s used" : "%1$s af %2$s notað", "Show hidden files" : "Sýna faldar skrár", "Crop image previews" : "Skera utan af forskoðun mynda", @@ -182,6 +181,7 @@ "You don’t have permission to upload or create files here" : "Þú hefur ekki heimild til að hlaða inn eða búa til skjöl hér", "New" : "Nýtt", "Cannot transfer ownership of a file or folder you don't own" : "Ekki er hægt að millifæra eignarhald á skrá eða möppu sem þú átt ekki", + "%s%% of %s used" : "%s%% af %s notað", "Settings" : "Stillingar" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index 882f9c45a77..5eae3186e76 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -185,7 +185,6 @@ OC.L10N.register( "Templates" : "Modelli", "Unable to initialize the templates directory" : "Impossibile inizializzare la cartella dei modelli", "%s used" : "%s utilizzato", - "%s%% of %s used" : "%s%% di %s utilizzati", "%1$s of %2$s used" : "%1$s di %2$s utilizzati", "Show hidden files" : "Mostra i file nascosti", "Crop image previews" : "Ritaglia le anteprime delle immagini", @@ -214,6 +213,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Qui non hai i permessi per caricare o creare file", "New" : "Nuovo", "Cannot transfer ownership of a file or folder you don't own" : "Impossibile trasferire la proprietà di un file o di una cartella di altri", + "%s%% of %s used" : "%s%% di %s utilizzati", "Settings" : "Impostazioni" }, "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 12013bb4fae..dd9c9935900 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -183,7 +183,6 @@ "Templates" : "Modelli", "Unable to initialize the templates directory" : "Impossibile inizializzare la cartella dei modelli", "%s used" : "%s utilizzato", - "%s%% of %s used" : "%s%% di %s utilizzati", "%1$s of %2$s used" : "%1$s di %2$s utilizzati", "Show hidden files" : "Mostra i file nascosti", "Crop image previews" : "Ritaglia le anteprime delle immagini", @@ -212,6 +211,7 @@ "You don’t have permission to upload or create files here" : "Qui non hai i permessi per caricare o creare file", "New" : "Nuovo", "Cannot transfer ownership of a file or folder you don't own" : "Impossibile trasferire la proprietà di un file o di una cartella di altri", + "%s%% of %s used" : "%s%% di %s utilizzati", "Settings" : "Impostazioni" },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index 0e2e542d472..2d028217e65 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -188,7 +188,6 @@ OC.L10N.register( "Templates" : "テンプレート", "Unable to initialize the templates directory" : "テンプレートディレクトリを初期化できませんでした", "%s used" : "%s 使用中", - "%s%% of %s used" : "%s%% 使用中、全体は%s", "%1$s of %2$s used" : "%2$s 中%1$s 使用中", "Show hidden files" : "隠しファイルを表示", "Crop image previews" : "プレビュー画像を切り抜く", @@ -217,6 +216,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "ここにファイルをアップロードまたは作成する権限がありません", "New" : "新規作成", "Cannot transfer ownership of a file or folder you don't own" : "所有していないファイルまたはフォルダーの所有権を譲渡することはできません", + "%s%% of %s used" : "%s%% 使用中、全体は%s", "Settings" : "設定" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index d259d4c1774..65fc84d3bf0 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -186,7 +186,6 @@ "Templates" : "テンプレート", "Unable to initialize the templates directory" : "テンプレートディレクトリを初期化できませんでした", "%s used" : "%s 使用中", - "%s%% of %s used" : "%s%% 使用中、全体は%s", "%1$s of %2$s used" : "%2$s 中%1$s 使用中", "Show hidden files" : "隠しファイルを表示", "Crop image previews" : "プレビュー画像を切り抜く", @@ -215,6 +214,7 @@ "You don’t have permission to upload or create files here" : "ここにファイルをアップロードまたは作成する権限がありません", "New" : "新規作成", "Cannot transfer ownership of a file or folder you don't own" : "所有していないファイルまたはフォルダーの所有権を譲渡することはできません", + "%s%% of %s used" : "%s%% 使用中、全体は%s", "Settings" : "設定" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js index ec4c6fb72cb..8d506421f76 100644 --- a/apps/files/l10n/lt_LT.js +++ b/apps/files/l10n/lt_LT.js @@ -170,7 +170,6 @@ OC.L10N.register( "Templates" : "Šablonai", "Unable to initialize the templates directory" : "Nepavyko inicijuoti šablonų katalogo", "%s used" : "%s panaudota", - "%s%% of %s used" : "naudojama %s%% iš %s", "%1$s of %2$s used" : "naudojama %1$s iš %2$s", "Show hidden files" : "Rodyti paslėptus failus", "Crop image previews" : "Apkirpti paveikslų peržiūras", @@ -198,6 +197,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Jūs neturite leidimo čia įkelti arba kurti failus", "New" : "Naujas", "Cannot transfer ownership of a file or folder you don't own" : "Negalima perduoti, failo aplanko, kuris jums nepriklauso, nuosavybės", + "%s%% of %s used" : "naudojama %s%% iš %s", "Settings" : "Nustatymai" }, "nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"); diff --git a/apps/files/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json index 5e5e2e078f1..afa8178c45a 100644 --- a/apps/files/l10n/lt_LT.json +++ b/apps/files/l10n/lt_LT.json @@ -168,7 +168,6 @@ "Templates" : "Šablonai", "Unable to initialize the templates directory" : "Nepavyko inicijuoti šablonų katalogo", "%s used" : "%s panaudota", - "%s%% of %s used" : "naudojama %s%% iš %s", "%1$s of %2$s used" : "naudojama %1$s iš %2$s", "Show hidden files" : "Rodyti paslėptus failus", "Crop image previews" : "Apkirpti paveikslų peržiūras", @@ -196,6 +195,7 @@ "You don’t have permission to upload or create files here" : "Jūs neturite leidimo čia įkelti arba kurti failus", "New" : "Naujas", "Cannot transfer ownership of a file or folder you don't own" : "Negalima perduoti, failo aplanko, kuris jums nepriklauso, nuosavybės", + "%s%% of %s used" : "naudojama %s%% iš %s", "Settings" : "Nustatymai" },"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);" }
\ No newline at end of file diff --git a/apps/files/l10n/mk.js b/apps/files/l10n/mk.js index 227d49d1c12..5ea848ec5a1 100644 --- a/apps/files/l10n/mk.js +++ b/apps/files/l10n/mk.js @@ -189,7 +189,6 @@ OC.L10N.register( "Templates" : "Шаблони", "Unable to initialize the templates directory" : "Не може да се иницијализира папка за шаблони", "%s used" : "Искористено %s", - "%s%% of %s used" : "Искорестено%s%% од %s ", "%1$s of %2$s used" : "Искористено %1$s од %2$s", "Files settings" : "Параметри за датотеки", "Show hidden files" : "Прикажи сокриени датотеки", @@ -219,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Немате дозвола да прикачувате или да креирате датотеки", "New" : "Ново", "Cannot transfer ownership of a file or folder you don't own" : "Неможете да направите трансвер на сопственот на папка која не е ваша", + "%s%% of %s used" : "Искорестено%s%% од %s ", "Settings" : "Параметри" }, "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"); diff --git a/apps/files/l10n/mk.json b/apps/files/l10n/mk.json index cd1d384ca65..1d422eb77ba 100644 --- a/apps/files/l10n/mk.json +++ b/apps/files/l10n/mk.json @@ -187,7 +187,6 @@ "Templates" : "Шаблони", "Unable to initialize the templates directory" : "Не може да се иницијализира папка за шаблони", "%s used" : "Искористено %s", - "%s%% of %s used" : "Искорестено%s%% од %s ", "%1$s of %2$s used" : "Искористено %1$s од %2$s", "Files settings" : "Параметри за датотеки", "Show hidden files" : "Прикажи сокриени датотеки", @@ -217,6 +216,7 @@ "You don’t have permission to upload or create files here" : "Немате дозвола да прикачувате или да креирате датотеки", "New" : "Ново", "Cannot transfer ownership of a file or folder you don't own" : "Неможете да направите трансвер на сопственот на папка која не е ваша", + "%s%% of %s used" : "Искорестено%s%% од %s ", "Settings" : "Параметри" },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;" }
\ No newline at end of file diff --git a/apps/files/l10n/nb.js b/apps/files/l10n/nb.js index db9d9768034..0ac83989a7e 100644 --- a/apps/files/l10n/nb.js +++ b/apps/files/l10n/nb.js @@ -174,7 +174,6 @@ OC.L10N.register( "Create" : "Opprett", "Creating file" : "Oppretter fil", "%s used" : "%s brukt", - "%s%% of %s used" : "%s%% av %s brukt", "%1$s of %2$s used" : "%1$s av %2$s brukt", "Files settings" : "Filinnstillinger", "Show hidden files" : "Vis skjulte filer", @@ -202,6 +201,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Du har ikke tillatelse til å laste opp eller opprette filer her", "New" : "Ny", "Cannot transfer ownership of a file or folder you don't own" : "Kan ikke overføre eierskap til en fil eller mappe du ikke eier", + "%s%% of %s used" : "%s%% av %s brukt", "Settings" : "Innstillinger" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/nb.json b/apps/files/l10n/nb.json index 4ee2ee68f9a..b5e79e7c226 100644 --- a/apps/files/l10n/nb.json +++ b/apps/files/l10n/nb.json @@ -172,7 +172,6 @@ "Create" : "Opprett", "Creating file" : "Oppretter fil", "%s used" : "%s brukt", - "%s%% of %s used" : "%s%% av %s brukt", "%1$s of %2$s used" : "%1$s av %2$s brukt", "Files settings" : "Filinnstillinger", "Show hidden files" : "Vis skjulte filer", @@ -200,6 +199,7 @@ "You don’t have permission to upload or create files here" : "Du har ikke tillatelse til å laste opp eller opprette filer her", "New" : "Ny", "Cannot transfer ownership of a file or folder you don't own" : "Kan ikke overføre eierskap til en fil eller mappe du ikke eier", + "%s%% of %s used" : "%s%% av %s brukt", "Settings" : "Innstillinger" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index dd7627bf65b..af8a9735201 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -181,7 +181,6 @@ OC.L10N.register( "Templates" : "Sjablonen", "Unable to initialize the templates directory" : "Kon de sjablonenmap niet instellen", "%s used" : "%s gebruikt", - "%s%% of %s used" : "%s%% van %s gebruikt", "%1$s of %2$s used" : "%1$s van %2$s gebruikt", "Show hidden files" : "Toon verborgen bestanden", "Crop image previews" : "Snij afbeeldingvoorbeelden bij", @@ -210,6 +209,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Je hebt geen toestemming om hier te uploaden of bestanden te maken", "New" : "Nieuw", "Cannot transfer ownership of a file or folder you don't own" : "Kan de eigendom van een bestand of map waarvan u niet de eigenaar bent, niet overdragen", + "%s%% of %s used" : "%s%% van %s gebruikt", "Settings" : "Instellingen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index 12f0b820751..9c5e6780d12 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -179,7 +179,6 @@ "Templates" : "Sjablonen", "Unable to initialize the templates directory" : "Kon de sjablonenmap niet instellen", "%s used" : "%s gebruikt", - "%s%% of %s used" : "%s%% van %s gebruikt", "%1$s of %2$s used" : "%1$s van %2$s gebruikt", "Show hidden files" : "Toon verborgen bestanden", "Crop image previews" : "Snij afbeeldingvoorbeelden bij", @@ -208,6 +207,7 @@ "You don’t have permission to upload or create files here" : "Je hebt geen toestemming om hier te uploaden of bestanden te maken", "New" : "Nieuw", "Cannot transfer ownership of a file or folder you don't own" : "Kan de eigendom van een bestand of map waarvan u niet de eigenaar bent, niet overdragen", + "%s%% of %s used" : "%s%% van %s gebruikt", "Settings" : "Instellingen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js index f782ae5700e..c6d560d10a4 100644 --- a/apps/files/l10n/pl.js +++ b/apps/files/l10n/pl.js @@ -189,7 +189,6 @@ OC.L10N.register( "Templates" : "Szablony", "Unable to initialize the templates directory" : "Nie można zainicjować katalogu szablonów", "%s used" : "Wykorzystane: %s", - "%s%% of %s used" : "Wykorzystane: %s%% z %s", "%1$s of %2$s used" : "Wykorzystane: %1$s z %2$s", "Files settings" : "Ustawienia Plików", "Show hidden files" : "Pokaż ukryte pliki", @@ -219,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Nie masz uprawnień do wysyłania lub tworzenia plików w tym miejscu", "New" : "Nowy", "Cannot transfer ownership of a file or folder you don't own" : "Nie można przenieść prawa własności do pliku lub katalogu, którego nie jesteś właścicielem", + "%s%% of %s used" : "Wykorzystane: %s%% z %s", "Settings" : "Ustawienia" }, "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"); diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json index 56ddb07cc23..8beb7a15223 100644 --- a/apps/files/l10n/pl.json +++ b/apps/files/l10n/pl.json @@ -187,7 +187,6 @@ "Templates" : "Szablony", "Unable to initialize the templates directory" : "Nie można zainicjować katalogu szablonów", "%s used" : "Wykorzystane: %s", - "%s%% of %s used" : "Wykorzystane: %s%% z %s", "%1$s of %2$s used" : "Wykorzystane: %1$s z %2$s", "Files settings" : "Ustawienia Plików", "Show hidden files" : "Pokaż ukryte pliki", @@ -217,6 +216,7 @@ "You don’t have permission to upload or create files here" : "Nie masz uprawnień do wysyłania lub tworzenia plików w tym miejscu", "New" : "Nowy", "Cannot transfer ownership of a file or folder you don't own" : "Nie można przenieść prawa własności do pliku lub katalogu, którego nie jesteś właścicielem", + "%s%% of %s used" : "Wykorzystane: %s%% z %s", "Settings" : "Ustawienia" },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index 07bbb8a5cf6..5ac451632cc 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -189,7 +189,6 @@ OC.L10N.register( "Templates" : "Modelos ", "Unable to initialize the templates directory" : "Não foi possível inicializar o diretório de modelos ", "%s used" : "%s usado", - "%s%% of %s used" : "%s%% usados de %s", "%1$s of %2$s used" : "%1$s usados de %2$s", "Files settings" : "Configurações de arquivos", "Show hidden files" : "Mostrar arquivos ocultos", @@ -219,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar arquivos aqui", "New" : "Novo", "Cannot transfer ownership of a file or folder you don't own" : "Não é possível transferir a propriedade de um arquivo ou pasta que você não possui", + "%s%% of %s used" : "%s%% usados de %s", "Settings" : "Configurações" }, "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index d588fe33a46..50f46cf16bf 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -187,7 +187,6 @@ "Templates" : "Modelos ", "Unable to initialize the templates directory" : "Não foi possível inicializar o diretório de modelos ", "%s used" : "%s usado", - "%s%% of %s used" : "%s%% usados de %s", "%1$s of %2$s used" : "%1$s usados de %2$s", "Files settings" : "Configurações de arquivos", "Show hidden files" : "Mostrar arquivos ocultos", @@ -217,6 +216,7 @@ "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar arquivos aqui", "New" : "Novo", "Cannot transfer ownership of a file or folder you don't own" : "Não é possível transferir a propriedade de um arquivo ou pasta que você não possui", + "%s%% of %s used" : "%s%% usados de %s", "Settings" : "Configurações" },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js index 4554cbe3e40..32bb7298d19 100644 --- a/apps/files/l10n/ro.js +++ b/apps/files/l10n/ro.js @@ -188,7 +188,6 @@ OC.L10N.register( "Templates" : "Șabloane", "Unable to initialize the templates directory" : "Nu s-a putut inițializa dosarul cu șabloane", "%s used" : "%s folosiți", - "%s%% of %s used" : "%s%%din %sfolosiți", "%1$s of %2$s used" : "%1$s din %2$s utilizat", "Show hidden files" : "Arată fișierele ascunse", "Crop image previews" : "Previzualizarea imaginii decupate", @@ -217,6 +216,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Nu aveți permisiunea de a încărca sau crea fișiere aici", "New" : "Nou", "Cannot transfer ownership of a file or folder you don't own" : "Nu se poate transfera proprietatea unui fișier sau dosar ce nu le deții", + "%s%% of %s used" : "%s%%din %sfolosiți", "Settings" : "Setări" }, "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json index db7652905ed..535479473b5 100644 --- a/apps/files/l10n/ro.json +++ b/apps/files/l10n/ro.json @@ -186,7 +186,6 @@ "Templates" : "Șabloane", "Unable to initialize the templates directory" : "Nu s-a putut inițializa dosarul cu șabloane", "%s used" : "%s folosiți", - "%s%% of %s used" : "%s%%din %sfolosiți", "%1$s of %2$s used" : "%1$s din %2$s utilizat", "Show hidden files" : "Arată fișierele ascunse", "Crop image previews" : "Previzualizarea imaginii decupate", @@ -215,6 +214,7 @@ "You don’t have permission to upload or create files here" : "Nu aveți permisiunea de a încărca sau crea fișiere aici", "New" : "Nou", "Cannot transfer ownership of a file or folder you don't own" : "Nu se poate transfera proprietatea unui fișier sau dosar ce nu le deții", + "%s%% of %s used" : "%s%%din %sfolosiți", "Settings" : "Setări" },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" }
\ No newline at end of file diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js index 8ec6d3f529b..60b69e1b82f 100644 --- a/apps/files/l10n/ru.js +++ b/apps/files/l10n/ru.js @@ -188,7 +188,6 @@ OC.L10N.register( "Templates" : "Шаблоны", "Unable to initialize the templates directory" : "Не удалось инициализировать каталог шаблонов", "%s used" : "%s использовано", - "%s%% of %s used" : "использовано %s%% из %s", "%1$s of %2$s used" : "использовано %1$s из %2$s ", "Show hidden files" : "Показывать скрытые файлы", "Crop image previews" : "Обрезать пред. просмотр", @@ -217,6 +216,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "У вас нет прав на создание или загрузку файлов в эту папку.", "New" : "Новый", "Cannot transfer ownership of a file or folder you don't own" : "Изменение владельца возможно только для своих файлов и папок", + "%s%% of %s used" : "использовано %s%% из %s", "Settings" : "Настройки" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json index 934b7ee40b7..fa74f9035a4 100644 --- a/apps/files/l10n/ru.json +++ b/apps/files/l10n/ru.json @@ -186,7 +186,6 @@ "Templates" : "Шаблоны", "Unable to initialize the templates directory" : "Не удалось инициализировать каталог шаблонов", "%s used" : "%s использовано", - "%s%% of %s used" : "использовано %s%% из %s", "%1$s of %2$s used" : "использовано %1$s из %2$s ", "Show hidden files" : "Показывать скрытые файлы", "Crop image previews" : "Обрезать пред. просмотр", @@ -215,6 +214,7 @@ "You don’t have permission to upload or create files here" : "У вас нет прав на создание или загрузку файлов в эту папку.", "New" : "Новый", "Cannot transfer ownership of a file or folder you don't own" : "Изменение владельца возможно только для своих файлов и папок", + "%s%% of %s used" : "использовано %s%% из %s", "Settings" : "Настройки" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files/l10n/sc.js b/apps/files/l10n/sc.js index a1156779133..7ca4b9ca3e2 100644 --- a/apps/files/l10n/sc.js +++ b/apps/files/l10n/sc.js @@ -181,7 +181,6 @@ OC.L10N.register( "Templates" : "Modellos", "Unable to initialize the templates directory" : "Non faghet a initzializare sa cartella de is modellos", "%s used" : "%s impreadu", - "%s%% of %s used" : "%s%% de %s impreadu", "%1$s of %2$s used" : "%1$s de %2$s impreadu", "Show hidden files" : "Mustra archìvios cuados", "Crop image previews" : "Retàllia anteprimas de s'imàgine", @@ -210,6 +209,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Non tenes su permissu pro carrigare o creare archìvios inoghe", "New" : "Nou", "Cannot transfer ownership of a file or folder you don't own" : "Non faghet a tramudare sa propriedade de un'archìviu o cartella de is chi non ses mere", + "%s%% of %s used" : "%s%% de %s impreadu", "Settings" : "Impostatziones" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/sc.json b/apps/files/l10n/sc.json index 378695dbe6a..3173a78a395 100644 --- a/apps/files/l10n/sc.json +++ b/apps/files/l10n/sc.json @@ -179,7 +179,6 @@ "Templates" : "Modellos", "Unable to initialize the templates directory" : "Non faghet a initzializare sa cartella de is modellos", "%s used" : "%s impreadu", - "%s%% of %s used" : "%s%% de %s impreadu", "%1$s of %2$s used" : "%1$s de %2$s impreadu", "Show hidden files" : "Mustra archìvios cuados", "Crop image previews" : "Retàllia anteprimas de s'imàgine", @@ -208,6 +207,7 @@ "You don’t have permission to upload or create files here" : "Non tenes su permissu pro carrigare o creare archìvios inoghe", "New" : "Nou", "Cannot transfer ownership of a file or folder you don't own" : "Non faghet a tramudare sa propriedade de un'archìviu o cartella de is chi non ses mere", + "%s%% of %s used" : "%s%% de %s impreadu", "Settings" : "Impostatziones" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/sk.js b/apps/files/l10n/sk.js index c3b77f05ac6..15d840c8c4a 100644 --- a/apps/files/l10n/sk.js +++ b/apps/files/l10n/sk.js @@ -187,7 +187,6 @@ OC.L10N.register( "Templates" : "Šablóny", "Unable to initialize the templates directory" : "Nemôžem inicializovať priečinok so šablónami", "%s used" : "%s použitých", - "%s%% of %s used" : "Využité %s%% z %s", "%1$s of %2$s used" : "Využité: %1$s z %2$s", "Show hidden files" : "Zobraziť skryté súbory", "Crop image previews" : "Orezať náhľady obrázkov", @@ -216,6 +215,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory", "New" : "Nový", "Cannot transfer ownership of a file or folder you don't own" : "Nie je možné preniesť vlastníctvo súboru alebo priečinka, ktorý nevlastníte", + "%s%% of %s used" : "Využité %s%% z %s", "Settings" : "Nastavenia" }, "nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"); diff --git a/apps/files/l10n/sk.json b/apps/files/l10n/sk.json index 234e950182e..52d5bc2f4e4 100644 --- a/apps/files/l10n/sk.json +++ b/apps/files/l10n/sk.json @@ -185,7 +185,6 @@ "Templates" : "Šablóny", "Unable to initialize the templates directory" : "Nemôžem inicializovať priečinok so šablónami", "%s used" : "%s použitých", - "%s%% of %s used" : "Využité %s%% z %s", "%1$s of %2$s used" : "Využité: %1$s z %2$s", "Show hidden files" : "Zobraziť skryté súbory", "Crop image previews" : "Orezať náhľady obrázkov", @@ -214,6 +213,7 @@ "You don’t have permission to upload or create files here" : "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory", "New" : "Nový", "Cannot transfer ownership of a file or folder you don't own" : "Nie je možné preniesť vlastníctvo súboru alebo priečinka, ktorý nevlastníte", + "%s%% of %s used" : "Využité %s%% z %s", "Settings" : "Nastavenia" },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);" }
\ No newline at end of file diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js index 2462c86c629..8fd7d6d39a1 100644 --- a/apps/files/l10n/sl.js +++ b/apps/files/l10n/sl.js @@ -181,7 +181,6 @@ OC.L10N.register( "Templates" : "Predloge", "Unable to initialize the templates directory" : "Ni mogoče začeti mape predlog", "%s used" : "Uporabljeno %s", - "%s%% of %s used" : "Uporabljeno %s%% od %s", "%1$s of %2$s used" : "Uporabljeno %1$s od %2$s", "Show hidden files" : "Pokaži skrite datoteke", "Crop image previews" : "Obreži slike predogleda", @@ -210,6 +209,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Ni ustreznih dovoljenj za pošiljanje in ustvarjanje datotek na tem mestu.", "New" : "Novo", "Cannot transfer ownership of a file or folder you don't own" : "Ni mogoče prenesti lastništva datotek in map, katerih niste lastnik", + "%s%% of %s used" : "Uporabljeno %s%% od %s", "Settings" : "Nastavitve" }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json index a35417cdbb0..c71ac6312d5 100644 --- a/apps/files/l10n/sl.json +++ b/apps/files/l10n/sl.json @@ -179,7 +179,6 @@ "Templates" : "Predloge", "Unable to initialize the templates directory" : "Ni mogoče začeti mape predlog", "%s used" : "Uporabljeno %s", - "%s%% of %s used" : "Uporabljeno %s%% od %s", "%1$s of %2$s used" : "Uporabljeno %1$s od %2$s", "Show hidden files" : "Pokaži skrite datoteke", "Crop image previews" : "Obreži slike predogleda", @@ -208,6 +207,7 @@ "You don’t have permission to upload or create files here" : "Ni ustreznih dovoljenj za pošiljanje in ustvarjanje datotek na tem mestu.", "New" : "Novo", "Cannot transfer ownership of a file or folder you don't own" : "Ni mogoče prenesti lastništva datotek in map, katerih niste lastnik", + "%s%% of %s used" : "Uporabljeno %s%% od %s", "Settings" : "Nastavitve" },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js index 5fd58cd83eb..e15f9846c3f 100644 --- a/apps/files/l10n/sr.js +++ b/apps/files/l10n/sr.js @@ -162,7 +162,6 @@ OC.L10N.register( "Cancel" : "Поништи", "Create" : "Направи", "%s used" : "%s искоришћено", - "%s%% of %s used" : "%s%% од %s искоришћено", "%1$s of %2$s used" : "Заузето %1$s од %2$s", "Show hidden files" : "Прикажи скривене фајлове", "WebDAV" : "ВебДАВ", @@ -189,6 +188,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Немате дозволе да овде отпремате или стварате фајлове", "New" : "Ново", "Cannot transfer ownership of a file or folder you don't own" : "Не можете пренети власништво фајла или фасцикле које нису Ваше", + "%s%% of %s used" : "%s%% од %s искоришћено", "Settings" : "Поставке" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json index 47a46dab255..d7c377c802d 100644 --- a/apps/files/l10n/sr.json +++ b/apps/files/l10n/sr.json @@ -160,7 +160,6 @@ "Cancel" : "Поништи", "Create" : "Направи", "%s used" : "%s искоришћено", - "%s%% of %s used" : "%s%% од %s искоришћено", "%1$s of %2$s used" : "Заузето %1$s од %2$s", "Show hidden files" : "Прикажи скривене фајлове", "WebDAV" : "ВебДАВ", @@ -187,6 +186,7 @@ "You don’t have permission to upload or create files here" : "Немате дозволе да овде отпремате или стварате фајлове", "New" : "Ново", "Cannot transfer ownership of a file or folder you don't own" : "Не можете пренети власништво фајла или фасцикле које нису Ваше", + "%s%% of %s used" : "%s%% од %s искоришћено", "Settings" : "Поставке" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js index c9951a7d894..143f6eddef1 100644 --- a/apps/files/l10n/sv.js +++ b/apps/files/l10n/sv.js @@ -181,7 +181,6 @@ OC.L10N.register( "Templates" : "Mallar", "Unable to initialize the templates directory" : "Kunde inte initialisera mall-mappen", "%s used" : "%s använt", - "%s%% of %s used" : "%s%% av %s använt", "%1$s of %2$s used" : "%1$s av %2$s använt", "Show hidden files" : "Visa dolda filer", "Crop image previews" : "Beskär förhandsgranskningar för bilder", @@ -210,6 +209,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Du har inte tillåtelse att ladda upp eller skapa filer här", "New" : "Ny", "Cannot transfer ownership of a file or folder you don't own" : "Det går inte att överföra ägarskap av en fil eller mapp som du inte äger", + "%s%% of %s used" : "%s%% av %s använt", "Settings" : "Inställningar" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json index 1d65272e94a..fc3bd29fd0d 100644 --- a/apps/files/l10n/sv.json +++ b/apps/files/l10n/sv.json @@ -179,7 +179,6 @@ "Templates" : "Mallar", "Unable to initialize the templates directory" : "Kunde inte initialisera mall-mappen", "%s used" : "%s använt", - "%s%% of %s used" : "%s%% av %s använt", "%1$s of %2$s used" : "%1$s av %2$s använt", "Show hidden files" : "Visa dolda filer", "Crop image previews" : "Beskär förhandsgranskningar för bilder", @@ -208,6 +207,7 @@ "You don’t have permission to upload or create files here" : "Du har inte tillåtelse att ladda upp eller skapa filer här", "New" : "Ny", "Cannot transfer ownership of a file or folder you don't own" : "Det går inte att överföra ägarskap av en fil eller mapp som du inte äger", + "%s%% of %s used" : "%s%% av %s använt", "Settings" : "Inställningar" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/th.js b/apps/files/l10n/th.js index 53fdeab8488..8a2a35654a6 100644 --- a/apps/files/l10n/th.js +++ b/apps/files/l10n/th.js @@ -188,7 +188,6 @@ OC.L10N.register( "Templates" : "เทมเพลต", "Unable to initialize the templates directory" : "ไม่สามารถเตรียมไดเรกทอรีเทมเพลต", "%s used" : "ใช้ไป %s", - "%s%% of %s used" : "ใช้ไป %s%% จาก %s", "%1$s of %2$s used" : "ใช้ไป %1$s จาก %2$s", "Files settings" : "การตั้งค่าไฟล์", "Show hidden files" : "แสดงไฟล์ที่ซ่อนอยู่", @@ -218,6 +217,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "คุณไม่ได้รับอนุญาตให้อัปโหลดหรือสร้างไฟล์ที่นี่", "New" : "สร้างใหม่", "Cannot transfer ownership of a file or folder you don't own" : "ไม่สามารถโอนย้ายความเป็นเจ้าของไฟล์หรือโฟลเดอร์ที่คุณไม่ได้เป็นเจ้าของ", + "%s%% of %s used" : "ใช้ไป %s%% จาก %s", "Settings" : "การตั้งค่า" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/th.json b/apps/files/l10n/th.json index 4fc08fdc75b..f4836a2d044 100644 --- a/apps/files/l10n/th.json +++ b/apps/files/l10n/th.json @@ -186,7 +186,6 @@ "Templates" : "เทมเพลต", "Unable to initialize the templates directory" : "ไม่สามารถเตรียมไดเรกทอรีเทมเพลต", "%s used" : "ใช้ไป %s", - "%s%% of %s used" : "ใช้ไป %s%% จาก %s", "%1$s of %2$s used" : "ใช้ไป %1$s จาก %2$s", "Files settings" : "การตั้งค่าไฟล์", "Show hidden files" : "แสดงไฟล์ที่ซ่อนอยู่", @@ -216,6 +215,7 @@ "You don’t have permission to upload or create files here" : "คุณไม่ได้รับอนุญาตให้อัปโหลดหรือสร้างไฟล์ที่นี่", "New" : "สร้างใหม่", "Cannot transfer ownership of a file or folder you don't own" : "ไม่สามารถโอนย้ายความเป็นเจ้าของไฟล์หรือโฟลเดอร์ที่คุณไม่ได้เป็นเจ้าของ", + "%s%% of %s used" : "ใช้ไป %s%% จาก %s", "Settings" : "การตั้งค่า" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js index 018e99652f3..db4b2534bd4 100644 --- a/apps/files/l10n/tr.js +++ b/apps/files/l10n/tr.js @@ -189,7 +189,6 @@ OC.L10N.register( "Templates" : "Kalıplar", "Unable to initialize the templates directory" : "Kalıp klasörü hazırlanamadı", "%s used" : "%s kullanılıyor", - "%s%% of %s used" : "%s%%/%s kullanılmış", "%1$s of %2$s used" : "%1$s / %2$s kullanıldı", "Files settings" : "Dosyalar ayarları", "Show hidden files" : "Gizli dosyaları görüntüle", @@ -219,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Buraya dosya yükleme ya da ekleme izniniz yok", "New" : "Yeni", "Cannot transfer ownership of a file or folder you don't own" : "Sahibi olmadığınız bir dosya ya da klasörün sahipliğini aktaramazsınız", + "%s%% of %s used" : "%s%%/%s kullanılmış", "Settings" : "Ayarlar" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json index abb3466b05d..914941797c7 100644 --- a/apps/files/l10n/tr.json +++ b/apps/files/l10n/tr.json @@ -187,7 +187,6 @@ "Templates" : "Kalıplar", "Unable to initialize the templates directory" : "Kalıp klasörü hazırlanamadı", "%s used" : "%s kullanılıyor", - "%s%% of %s used" : "%s%%/%s kullanılmış", "%1$s of %2$s used" : "%1$s / %2$s kullanıldı", "Files settings" : "Dosyalar ayarları", "Show hidden files" : "Gizli dosyaları görüntüle", @@ -217,6 +216,7 @@ "You don’t have permission to upload or create files here" : "Buraya dosya yükleme ya da ekleme izniniz yok", "New" : "Yeni", "Cannot transfer ownership of a file or folder you don't own" : "Sahibi olmadığınız bir dosya ya da klasörün sahipliğini aktaramazsınız", + "%s%% of %s used" : "%s%%/%s kullanılmış", "Settings" : "Ayarlar" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js index 379c0f55e89..5b12aa12682 100644 --- a/apps/files/l10n/uk.js +++ b/apps/files/l10n/uk.js @@ -154,7 +154,6 @@ OC.L10N.register( "Cancel" : "Скасувати", "Create" : "Створити", "%s used" : "%s використано", - "%s%% of %s used" : "%s%% з %s використано", "%1$s of %2$s used" : "Використано %1$s з %2$s", "Show hidden files" : "Показувати приховані файли", "WebDAV" : "WebDAV", @@ -181,6 +180,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "У вас недостатньо прав для завантаження або створення тут файлів", "New" : "Створити", "Cannot transfer ownership of a file or folder you don't own" : "Неможливо передати права власності на файл або теку, що вам не належить", + "%s%% of %s used" : "%s%% з %s використано", "Settings" : "Налаштування" }, "nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"); diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json index d3f6704fbc1..41a14da8d70 100644 --- a/apps/files/l10n/uk.json +++ b/apps/files/l10n/uk.json @@ -152,7 +152,6 @@ "Cancel" : "Скасувати", "Create" : "Створити", "%s used" : "%s використано", - "%s%% of %s used" : "%s%% з %s використано", "%1$s of %2$s used" : "Використано %1$s з %2$s", "Show hidden files" : "Показувати приховані файли", "WebDAV" : "WebDAV", @@ -179,6 +178,7 @@ "You don’t have permission to upload or create files here" : "У вас недостатньо прав для завантаження або створення тут файлів", "New" : "Створити", "Cannot transfer ownership of a file or folder you don't own" : "Неможливо передати права власності на файл або теку, що вам не належить", + "%s%% of %s used" : "%s%% з %s використано", "Settings" : "Налаштування" },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);" }
\ No newline at end of file diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js index 58cb29bf2ef..981f6dffe83 100644 --- a/apps/files/l10n/vi.js +++ b/apps/files/l10n/vi.js @@ -181,7 +181,6 @@ OC.L10N.register( "Templates" : "Mẫu", "Unable to initialize the templates directory" : "Không thể khởi tạo thư mục mẫu", "%s used" : "%s đã sử dụng", - "%s%% of %s used" : "%s%% trong %s đã sử dụng", "%1$s of %2$s used" : "%1$s trên %2$s đã sử dụng", "Show hidden files" : "Hiển thị các file bị ẩn", "Crop image previews" : "Xén ảnh bản xem trước", @@ -209,6 +208,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "Bạn không có quyền upload hoặc tạo files ở đây", "New" : "Tạo mới", "Cannot transfer ownership of a file or folder you don't own" : "Không thể chuyển quyền sở hữu tệp hoặc thư mục bạn không sở hữu", + "%s%% of %s used" : "%s%% trong %s đã sử dụng", "Settings" : "Cài đặt" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json index e1740c0b786..cd77d5a9fbc 100644 --- a/apps/files/l10n/vi.json +++ b/apps/files/l10n/vi.json @@ -179,7 +179,6 @@ "Templates" : "Mẫu", "Unable to initialize the templates directory" : "Không thể khởi tạo thư mục mẫu", "%s used" : "%s đã sử dụng", - "%s%% of %s used" : "%s%% trong %s đã sử dụng", "%1$s of %2$s used" : "%1$s trên %2$s đã sử dụng", "Show hidden files" : "Hiển thị các file bị ẩn", "Crop image previews" : "Xén ảnh bản xem trước", @@ -207,6 +206,7 @@ "You don’t have permission to upload or create files here" : "Bạn không có quyền upload hoặc tạo files ở đây", "New" : "Tạo mới", "Cannot transfer ownership of a file or folder you don't own" : "Không thể chuyển quyền sở hữu tệp hoặc thư mục bạn không sở hữu", + "%s%% of %s used" : "%s%% trong %s đã sử dụng", "Settings" : "Cài đặt" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js index dd6cb686dd9..9e9d00658e3 100644 --- a/apps/files/l10n/zh_CN.js +++ b/apps/files/l10n/zh_CN.js @@ -185,7 +185,6 @@ OC.L10N.register( "Templates" : "模板", "Unable to initialize the templates directory" : "无法初始化模板目录", "%s used" : "已使用 %s", - "%s%% of %s used" : "%s 已使用 %s 中的 %%", "%1$s of %2$s used" : "已使用 %2$s 中的 %1$s", "Show hidden files" : "显示隐藏文件", "Crop image previews" : "裁剪图片预览", @@ -214,6 +213,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "您没有权限在此上传或创建文件", "New" : "新建", "Cannot transfer ownership of a file or folder you don't own" : "无法转让您未拥有的文件或文件夹的所有权", + "%s%% of %s used" : "%s 已使用 %s 中的 %%", "Settings" : "设置" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json index aa69845ddd3..66794063055 100644 --- a/apps/files/l10n/zh_CN.json +++ b/apps/files/l10n/zh_CN.json @@ -183,7 +183,6 @@ "Templates" : "模板", "Unable to initialize the templates directory" : "无法初始化模板目录", "%s used" : "已使用 %s", - "%s%% of %s used" : "%s 已使用 %s 中的 %%", "%1$s of %2$s used" : "已使用 %2$s 中的 %1$s", "Show hidden files" : "显示隐藏文件", "Crop image previews" : "裁剪图片预览", @@ -212,6 +211,7 @@ "You don’t have permission to upload or create files here" : "您没有权限在此上传或创建文件", "New" : "新建", "Cannot transfer ownership of a file or folder you don't own" : "无法转让您未拥有的文件或文件夹的所有权", + "%s%% of %s used" : "%s 已使用 %s 中的 %%", "Settings" : "设置" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/zh_HK.js b/apps/files/l10n/zh_HK.js index 94277b9b3fb..c8dc7ec08c6 100644 --- a/apps/files/l10n/zh_HK.js +++ b/apps/files/l10n/zh_HK.js @@ -189,7 +189,6 @@ OC.L10N.register( "Templates" : "模板", "Unable to initialize the templates directory" : "無法初始化模板目錄", "%s used" : "使用了 %s 的存儲空間", - "%s%% of %s used" : "%s 在 %s 中使用了 %%", "%1$s of %2$s used" : "在 %2$s 中使用了 %1$s", "Files settings" : "檔案設定", "Show hidden files" : "顯示隱藏檔", @@ -219,6 +218,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "您無權限上傳或建立檔案", "New" : "新增", "Cannot transfer ownership of a file or folder you don't own" : "無法轉移您未擁有的檔案或是資料夾所有權。", + "%s%% of %s used" : "%s 在 %s 中使用了 %%", "Settings" : "設定" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/zh_HK.json b/apps/files/l10n/zh_HK.json index fd0ac3c2469..8b6756ee28f 100644 --- a/apps/files/l10n/zh_HK.json +++ b/apps/files/l10n/zh_HK.json @@ -187,7 +187,6 @@ "Templates" : "模板", "Unable to initialize the templates directory" : "無法初始化模板目錄", "%s used" : "使用了 %s 的存儲空間", - "%s%% of %s used" : "%s 在 %s 中使用了 %%", "%1$s of %2$s used" : "在 %2$s 中使用了 %1$s", "Files settings" : "檔案設定", "Show hidden files" : "顯示隱藏檔", @@ -217,6 +216,7 @@ "You don’t have permission to upload or create files here" : "您無權限上傳或建立檔案", "New" : "新增", "Cannot transfer ownership of a file or folder you don't own" : "無法轉移您未擁有的檔案或是資料夾所有權。", + "%s%% of %s used" : "%s 在 %s 中使用了 %%", "Settings" : "設定" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js index 764ddfee398..cab6a8d102f 100644 --- a/apps/files/l10n/zh_TW.js +++ b/apps/files/l10n/zh_TW.js @@ -79,6 +79,7 @@ OC.L10N.register( "_Uploading %n file_::_Uploading %n files_" : ["正在上傳 %n 個檔案"], "New file/folder menu" : "新檔案/資料夾選單", "Select file range" : "選取多個檔案", + "{used}%" : "{used}%", "{used} of {quota} used" : "已使用 {quota} 當中的 {used}", "{used} used" : "已使用 {used}", "\"{name}\" is an invalid file name." : "{name} 是無效的檔名。", @@ -189,7 +190,7 @@ OC.L10N.register( "Templates" : "範本", "Unable to initialize the templates directory" : "無法初始化範本目錄", "%s used" : "%s 已使用", - "%s%% of %s used" : "%s 在 %s 中使用了 %%", + "%s%%" : "%s%%", "%1$s of %2$s used" : "在 %2$s 中使用了 %1$s ", "Files settings" : "檔案設定", "Show hidden files" : "顯示隱藏檔", @@ -219,6 +220,7 @@ OC.L10N.register( "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案", "New" : "新增", "Cannot transfer ownership of a file or folder you don't own" : "無法轉移您未擁有的檔案或是資料夾所有權", + "%s%% of %s used" : "%s 在 %s 中使用了 %%", "Settings" : "設定" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json index 893c233e5be..f37917512fa 100644 --- a/apps/files/l10n/zh_TW.json +++ b/apps/files/l10n/zh_TW.json @@ -77,6 +77,7 @@ "_Uploading %n file_::_Uploading %n files_" : ["正在上傳 %n 個檔案"], "New file/folder menu" : "新檔案/資料夾選單", "Select file range" : "選取多個檔案", + "{used}%" : "{used}%", "{used} of {quota} used" : "已使用 {quota} 當中的 {used}", "{used} used" : "已使用 {used}", "\"{name}\" is an invalid file name." : "{name} 是無效的檔名。", @@ -187,7 +188,7 @@ "Templates" : "範本", "Unable to initialize the templates directory" : "無法初始化範本目錄", "%s used" : "%s 已使用", - "%s%% of %s used" : "%s 在 %s 中使用了 %%", + "%s%%" : "%s%%", "%1$s of %2$s used" : "在 %2$s 中使用了 %1$s ", "Files settings" : "檔案設定", "Show hidden files" : "顯示隱藏檔", @@ -217,6 +218,7 @@ "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案", "New" : "新增", "Cannot transfer ownership of a file or folder you don't own" : "無法轉移您未擁有的檔案或是資料夾所有權", + "%s%% of %s used" : "%s 在 %s 中使用了 %%", "Settings" : "設定" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 587f75f3f02..82f56be9f18 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -46,6 +46,7 @@ use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Services\IInitialState; +use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as ResourcesLoadAdditionalScriptsEvent; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Folder; use OCP\Files\IRootFolder; @@ -294,6 +295,7 @@ class ViewController extends Controller { ]; } + $this->eventDispatcher->dispatchTyped(new ResourcesLoadAdditionalScriptsEvent()); $event = new LoadAdditionalScriptsEvent(); $this->eventDispatcher->dispatchTyped($event); $this->eventDispatcher->dispatchTyped(new LoadSidebar()); @@ -301,6 +303,7 @@ class ViewController extends Controller { if (class_exists(LoadViewer::class)) { $this->eventDispatcher->dispatchTyped(new LoadViewer()); } + $this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : false); $this->initialState->provideInitialState('templates', $this->templateManager->listCreators()); diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php index 9f11431008f..707b64b79d7 100644 --- a/apps/files_sharing/lib/Cache.php +++ b/apps/files_sharing/lib/Cache.php @@ -170,7 +170,7 @@ class Cache extends CacheJail { private function getOwnerDisplayName() { if (!$this->ownerDisplayName) { $uid = $this->storage->getOwner(''); - $this->ownerDisplayName = $this->displayNameCache->getDisplayName($uid); + $this->ownerDisplayName = $this->displayNameCache->getDisplayName($uid) ?? $uid; } return $this->ownerDisplayName; } diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index a4667ad17ad..f43aed21427 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -23,18 +23,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -use OCA\Files\Event\LoadAdditionalScriptsEvent; -use OCA\Files\Event\LoadSidebar; -use OCA\Viewer\Event\LoadViewer; -use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as ResourcesLoadAdditionalScriptsEvent; -use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; use OCP\IUserSession; use OCP\Server; $config = Server::get(IConfig::class); $userSession = Server::get(IUserSession::class); -$eventDispatcher = Server::get(IEventDispatcher::class); $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false); @@ -43,14 +37,4 @@ $tmpl = new OCP\Template('files_sharing', 'list', ''); // gridview not available for ie $tmpl->assign('showgridview', $showgridview); -// fire script events -$eventDispatcher->dispatchTyped(new ResourcesLoadAdditionalScriptsEvent()); -$eventDispatcher->dispatchTyped(new LoadAdditionalScriptsEvent()); -$eventDispatcher->dispatchTyped(new LoadSidebar()); - -// Load Viewer scripts -if (class_exists(LoadViewer::class)) { - $eventDispatcher->dispatchTyped(new LoadViewer()); -} - $tmpl->printPage(); diff --git a/apps/settings/l10n/fi.js b/apps/settings/l10n/fi.js index 6de23e0d397..3f96701d00b 100644 --- a/apps/settings/l10n/fi.js +++ b/apps/settings/l10n/fi.js @@ -58,6 +58,7 @@ OC.L10N.register( "Unable to change personal password" : "Henkilökohtaista salasanaa ei voitu vaihtaa", "Saved" : "Tallennettu", "No user supplied" : "Käyttäjää ei määritetty", + "Unable to change password. Password too long." : "Salasanaa ei voitu vaihtaa. Salasana on liian pitkä.", "Authentication error" : "Tunnistautumisvirhe", "Please provide an admin recovery password; otherwise, all user data will be lost." : "Anna ylläpitäjän palautussalasana; muuten kaikki käyttäjien data menetetään.", "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.", @@ -214,6 +215,7 @@ OC.L10N.register( "Server-side encryption" : "Palvelinpään salaus", "Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed." : "Palvelimelle ladatut tiedostot voidaan salata. Salaus aiheuttaa muun muassa palvelimen suorituskyvyn laskua, joten ota salaus käyttöön vain tarvittaessa.", "Enable server-side encryption" : "Käytä palvelinpään salausta", + "Please read carefully before activating server-side encryption:" : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:", "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." : "Kun salaus on otettu käyttöön, käyttöönoton jälkeen palvelimelle ladatut tiedostot salataan palvelimen ollessa lepotilassa. Salauksen ottaminen pois päältä myöhemmin on mahdollista vain, jos aktiivinen salausmoduuli tukee toiminta ja kaikki muut vaatimukset (kuten palautusavaimen asettaminen) täyttyvät.", "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Salaus sellaisenaan ei takaa järjestelmäsi turvallisuutta. Tutustu dokumentaation saadaksesi lisätietoja, miten salaussovellus toimii ja nähdäksesi tuettuja käyttötapauksia.", "Be aware that encryption always increases the file size." : "Ota huomioon, että salaus kasvattaa aina tiedostojen kokoa.", @@ -350,6 +352,7 @@ OC.L10N.register( "An error occured during the request. Unable to proceed." : "Pyynnön aikana tapahtui virhe. Jatkaminen ei onnistu.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Sovellus on käytössä, mutta se tulee päivittää. Sinut ohjataan sovelluksen päivityssivulle viiden sekunnin kuluttua.", "Error: This app cannot be enabled because it makes the server unstable" : "Virhe: Sovellusta ei voida ottaa käyttöön, koska se aiheuttaa palvelimen epävakauden", + "User already exists." : "Käyttäjä on jo olemassa.", "Administrator documentation" : "Ylläpidon dokumentaatio", "Documentation" : "Dokumentaatio", "Forum" : "Keskustelupalsta", diff --git a/apps/settings/l10n/fi.json b/apps/settings/l10n/fi.json index 12c0a92029e..94ae2043385 100644 --- a/apps/settings/l10n/fi.json +++ b/apps/settings/l10n/fi.json @@ -56,6 +56,7 @@ "Unable to change personal password" : "Henkilökohtaista salasanaa ei voitu vaihtaa", "Saved" : "Tallennettu", "No user supplied" : "Käyttäjää ei määritetty", + "Unable to change password. Password too long." : "Salasanaa ei voitu vaihtaa. Salasana on liian pitkä.", "Authentication error" : "Tunnistautumisvirhe", "Please provide an admin recovery password; otherwise, all user data will be lost." : "Anna ylläpitäjän palautussalasana; muuten kaikki käyttäjien data menetetään.", "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.", @@ -212,6 +213,7 @@ "Server-side encryption" : "Palvelinpään salaus", "Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed." : "Palvelimelle ladatut tiedostot voidaan salata. Salaus aiheuttaa muun muassa palvelimen suorituskyvyn laskua, joten ota salaus käyttöön vain tarvittaessa.", "Enable server-side encryption" : "Käytä palvelinpään salausta", + "Please read carefully before activating server-side encryption:" : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:", "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." : "Kun salaus on otettu käyttöön, käyttöönoton jälkeen palvelimelle ladatut tiedostot salataan palvelimen ollessa lepotilassa. Salauksen ottaminen pois päältä myöhemmin on mahdollista vain, jos aktiivinen salausmoduuli tukee toiminta ja kaikki muut vaatimukset (kuten palautusavaimen asettaminen) täyttyvät.", "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Salaus sellaisenaan ei takaa järjestelmäsi turvallisuutta. Tutustu dokumentaation saadaksesi lisätietoja, miten salaussovellus toimii ja nähdäksesi tuettuja käyttötapauksia.", "Be aware that encryption always increases the file size." : "Ota huomioon, että salaus kasvattaa aina tiedostojen kokoa.", @@ -348,6 +350,7 @@ "An error occured during the request. Unable to proceed." : "Pyynnön aikana tapahtui virhe. Jatkaminen ei onnistu.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Sovellus on käytössä, mutta se tulee päivittää. Sinut ohjataan sovelluksen päivityssivulle viiden sekunnin kuluttua.", "Error: This app cannot be enabled because it makes the server unstable" : "Virhe: Sovellusta ei voida ottaa käyttöön, koska se aiheuttaa palvelimen epävakauden", + "User already exists." : "Käyttäjä on jo olemassa.", "Administrator documentation" : "Ylläpidon dokumentaatio", "Documentation" : "Dokumentaatio", "Forum" : "Keskustelupalsta", diff --git a/apps/settings/l10n/fr.js b/apps/settings/l10n/fr.js index 3e388243dab..85944a4678f 100644 --- a/apps/settings/l10n/fr.js +++ b/apps/settings/l10n/fr.js @@ -225,11 +225,13 @@ OC.L10N.register( "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "Pour l'exécuter, vous devez avoir l'extension PHP POSIX. Regarder la {linkstart}documentation PHP{linkend} pour plus de détails.", "Use system cron service to call the cron.php file every 5 minutes. Recommended for all instances." : "Utiliser le service cron du système pour appeler le fichier 'cron.php' toutes les 5 minutes.", "Profile" : "Profil", - "Enable or disable profile by default for new users." : "Activer ou désactiver par défaut le profil pour les nouveaux utilisateurs.", + "Enable or disable profile by default for new users." : "Activer ou désactiver le profil par défaut pour les nouveaux utilisateurs.", "Enable" : "Activer", + "Unable to update profile default setting" : "Impossible de mettre à jour les paramètres par défaut du profil", "Server-side encryption" : "Chiffrement côté serveur", "Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed." : "Le chiffrement côté serveur permet de chiffrer les fichiers qui sont téléversés sur ce serveur. Cela implique des limitations comme une performance moindre, donc activez-le seulement si nécessaire.", "Enable server-side encryption" : "Activer le chiffrement côté serveur", + "Please read carefully before activating server-side encryption:" : "Veuillez lire attentivement avant d’activer le chiffrement côté serveur :", "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." : "Une fois le chiffrement activé, les fichiers téléversés sur le serveur à partir de ce moment seront stockés sous forme chiffrée. Il n'est possible de désactiver le chiffrement que si le module utilisé le permet spécifiquement, et que toutes les conditions préalables sont réunies pour ce faire (par exemple la création d'une clef de récupération).", "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne garantit pas la sécurité du système. Veuillez consulter la documentation pour plus d'informations à propos du fonction de l'application de chiffrement, et des cas d'utilisations supportés.", "Be aware that encryption always increases the file size." : "Veuillez noter que le chiffrement augmente toujours la taille des fichiers.", @@ -237,6 +239,8 @@ OC.L10N.register( "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?", "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.", "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :", + "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 {command}" : "Vous devez migrer vos clés de cryptage de l’ancien cryptage (ownCloud <= 8.0) vers le nouveau. Veuillez activer le \"module de cryptage par défaut\" et exécuter {command}", + "Unable to update server side encryption config" : "Impossible de mettre à jour la configuration du chiffrement côté serveur", "Rename group" : "Renommer le groupe", "Remove group" : "Supprimer le groupe", "You are about to remove the group {group}. The users will NOT be deleted." : "Vous êtes sur le point de supprimer le groupe {group}. Les utilisateurs ne seront PAS supprimés.", @@ -270,7 +274,7 @@ OC.L10N.register( "No language set" : "Aucune langue définie", "Your organisation" : "Votre organisation", "Unable to update organisation" : "Impossible de modifier l'organisation", - "Edit your Profile visibility" : "Modifier la visibilité de votre profil", + "Edit your Profile visibility" : "Modifier la visibilité du profil", "Enable Profile" : "Activer le profil", "Unable to update profile enabled state" : "Impossible de mettre à jour l'état du profil", "The more restrictive setting of either visibility or scope is respected on your Profile. For example, if visibility is set to \"Show to everyone\" and scope is set to \"Private\", \"Private\" is respected." : "Le paramètre le plus restrictif entre la visibilité et la confidentialité est respecté. Par exemple, si la visibilité est définie à \"Montrer à tout le monde\" et que la confidentialité est \"Privée\", \"Privée\" est respecté.", @@ -303,7 +307,7 @@ OC.L10N.register( "Welcome mail sent!" : "E-mail de bienvenue envoyé !", "Edit User" : "Modifier l'utilisateur", "Toggle user actions menu" : "Basculer le menu des actions de l'utilisateur", - "{size} used" : "{size} utilisé", + "{size} used" : "{size} utilisés", "New user" : "Nouvel utilisateur", "Will be autogenerated" : "Sera généré automatiquement", "Display name" : "Nom à afficher", @@ -383,7 +387,7 @@ OC.L10N.register( "An error occured during the request. Unable to proceed." : "Une erreur est survenue durant la requête. Impossible de traiter la demande.", "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.", "Error: This app cannot be enabled because it makes the server unstable" : "Erreur : cette application ne peut être activée car elle rend le serveur instable", - "User already exists." : "L'utilisateur existe déjà.", + "User already exists." : "Cet utilisateur existe déjà.", "Administrator documentation" : "Documentation administrateur", "Documentation" : "Documentation", "Forum" : "Forum", diff --git a/apps/settings/l10n/fr.json b/apps/settings/l10n/fr.json index c0d0fd17698..38d337117da 100644 --- a/apps/settings/l10n/fr.json +++ b/apps/settings/l10n/fr.json @@ -223,11 +223,13 @@ "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "Pour l'exécuter, vous devez avoir l'extension PHP POSIX. Regarder la {linkstart}documentation PHP{linkend} pour plus de détails.", "Use system cron service to call the cron.php file every 5 minutes. Recommended for all instances." : "Utiliser le service cron du système pour appeler le fichier 'cron.php' toutes les 5 minutes.", "Profile" : "Profil", - "Enable or disable profile by default for new users." : "Activer ou désactiver par défaut le profil pour les nouveaux utilisateurs.", + "Enable or disable profile by default for new users." : "Activer ou désactiver le profil par défaut pour les nouveaux utilisateurs.", "Enable" : "Activer", + "Unable to update profile default setting" : "Impossible de mettre à jour les paramètres par défaut du profil", "Server-side encryption" : "Chiffrement côté serveur", "Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed." : "Le chiffrement côté serveur permet de chiffrer les fichiers qui sont téléversés sur ce serveur. Cela implique des limitations comme une performance moindre, donc activez-le seulement si nécessaire.", "Enable server-side encryption" : "Activer le chiffrement côté serveur", + "Please read carefully before activating server-side encryption:" : "Veuillez lire attentivement avant d’activer le chiffrement côté serveur :", "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." : "Une fois le chiffrement activé, les fichiers téléversés sur le serveur à partir de ce moment seront stockés sous forme chiffrée. Il n'est possible de désactiver le chiffrement que si le module utilisé le permet spécifiquement, et que toutes les conditions préalables sont réunies pour ce faire (par exemple la création d'une clef de récupération).", "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Le chiffrement seul ne garantit pas la sécurité du système. Veuillez consulter la documentation pour plus d'informations à propos du fonction de l'application de chiffrement, et des cas d'utilisations supportés.", "Be aware that encryption always increases the file size." : "Veuillez noter que le chiffrement augmente toujours la taille des fichiers.", @@ -235,6 +237,8 @@ "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?", "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.", "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :", + "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 {command}" : "Vous devez migrer vos clés de cryptage de l’ancien cryptage (ownCloud <= 8.0) vers le nouveau. Veuillez activer le \"module de cryptage par défaut\" et exécuter {command}", + "Unable to update server side encryption config" : "Impossible de mettre à jour la configuration du chiffrement côté serveur", "Rename group" : "Renommer le groupe", "Remove group" : "Supprimer le groupe", "You are about to remove the group {group}. The users will NOT be deleted." : "Vous êtes sur le point de supprimer le groupe {group}. Les utilisateurs ne seront PAS supprimés.", @@ -268,7 +272,7 @@ "No language set" : "Aucune langue définie", "Your organisation" : "Votre organisation", "Unable to update organisation" : "Impossible de modifier l'organisation", - "Edit your Profile visibility" : "Modifier la visibilité de votre profil", + "Edit your Profile visibility" : "Modifier la visibilité du profil", "Enable Profile" : "Activer le profil", "Unable to update profile enabled state" : "Impossible de mettre à jour l'état du profil", "The more restrictive setting of either visibility or scope is respected on your Profile. For example, if visibility is set to \"Show to everyone\" and scope is set to \"Private\", \"Private\" is respected." : "Le paramètre le plus restrictif entre la visibilité et la confidentialité est respecté. Par exemple, si la visibilité est définie à \"Montrer à tout le monde\" et que la confidentialité est \"Privée\", \"Privée\" est respecté.", @@ -301,7 +305,7 @@ "Welcome mail sent!" : "E-mail de bienvenue envoyé !", "Edit User" : "Modifier l'utilisateur", "Toggle user actions menu" : "Basculer le menu des actions de l'utilisateur", - "{size} used" : "{size} utilisé", + "{size} used" : "{size} utilisés", "New user" : "Nouvel utilisateur", "Will be autogenerated" : "Sera généré automatiquement", "Display name" : "Nom à afficher", @@ -381,7 +385,7 @@ "An error occured during the request. Unable to proceed." : "Une erreur est survenue durant la requête. Impossible de traiter la demande.", "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.", "Error: This app cannot be enabled because it makes the server unstable" : "Erreur : cette application ne peut être activée car elle rend le serveur instable", - "User already exists." : "L'utilisateur existe déjà.", + "User already exists." : "Cet utilisateur existe déjà.", "Administrator documentation" : "Documentation administrateur", "Documentation" : "Documentation", "Forum" : "Forum", diff --git a/apps/sharebymail/l10n/fi.js b/apps/sharebymail/l10n/fi.js index 4afbd8169d9..614dc830268 100644 --- a/apps/sharebymail/l10n/fi.js +++ b/apps/sharebymail/l10n/fi.js @@ -1,31 +1,46 @@ OC.L10N.register( "sharebymail", { - "Shared with %1$s" : "Jaettu käyttäjälle %1$s", + "Shared with %1$s" : "Jaettu käyttäjälle %1$s", "Shared with {email}" : "Jaettu käyttäjälle {email}", - "Shared with %1$s by %2$s" : "Jaettu käyttäjälle %1$s käyttäjältä %2$s", - "Shared with {email} by {actor}" : "Jaettu käyttäjälle {email} käyttäjältä {actor}", + "Shared with %1$s by %2$s" : "Jaettu käyttäjälle %1$s käyttäjän %2$s toimesta", + "Shared with {email} by {actor}" : "Jaettu käyttäjälle {email} käyttäjän {actor} toimesta", + "Unshared from {email}" : "Jako käyttäjälle {email} lopetettu", + "Unshared from {email} by {actor}" : "Jako käyttäjälle {email} lopetettiin käyttäjän {actor} toimesta", + "Password for mail share sent to %1$s" : "Salasana sähköpostijakoon lähetettiin osoitteeseen %1$s", + "Password for mail share sent to {email}" : "Salasana sähköpostijakoon lähetettiin osoitteeseen {email}", + "Password for mail share sent to you" : "Salasana sähköpostijakoon lähetettiin sinulle", "You shared %1$s with %2$s by mail" : "Jaoit tiedoston %1$s sähköpostitse osoitteeseen %2$s", "You shared {file} with {email} by mail" : "Jaoit tiedoston {file} sähköpostitse osoitteeseen {email}", "%3$s shared %1$s with %2$s by mail" : "%3$s jakoi tiedoston %1$s sähköpostitse osoitteeseen %2$s", "{actor} shared {file} with {email} by mail" : "{actor} jakoi tiedoston {file} sähköpostitse osoitteeseen {email}", + "You unshared %1$s from %2$s by mail" : "Lopetit kohteen %1$s jaon käyttäjältä %2$s sähköpostitse", + "You unshared {file} from {email} by mail" : "Lopetit kohteen {file} jaon käyttäjältä {email} sähköpostitse", + "Password to access %1$s was sent to %2s" : "Salasana kohteen %1$s käyttämiseksi lähetettiin käyttäjälle %2s", + "Password to access {file} was sent to {email}" : "Salasana kohteen {file} käyttämiseksi lähetettiin osoitteeseen {email}", + "Password to access %1$s was sent to you" : "Salasana kohteen %1$s käyttämiseksi lähetettiin sinulle", "Password to access {file} was sent to you" : "Salasana tiedoston {file} käyttämiseksi lähetettiin sinulle", + "Share by mail" : "Jaa sähköpostitse", + "Sharing %1$s failed, because this item is already shared with user %2$s" : "Kohteen %1$s jakaminen epäonnistui, koska tämä kohde on jo jaettu käyttäjän %2$s kanssa", + "We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automaattisesti muodostettua salasanaa ei voi lähettää sinulle. Aseta kelvollinen sähköpostiosoite henkilökohtaisiin asetuksiisi ja yritä uudelleen.", + "Failed to send share by email. Got an invalid email address" : "Jaon lähettäminen sähköpostitse epäonnistui. Virheellinen sähköpostiosoite", "Failed to send share by email" : "Jaon lähettäminen sähköpostitse epäonnistui", - "Click the button below to open it." : "Klikkaa alla olevaa linkkiä avataksesi sen.", + "%1$s shared »%2$s« with you" : "%1$s jakoi kohteen »%2$s« kanssasi", + "%1$s shared »%2$s« with you." : "%1$s jakoi kohteen »%2$s« kanssasi.", + "Click the button below to open it." : "Napsauta alla olevaa linkkiä avataksesi sen.", "Open »%s«" : "Avaa »%s«", + "%1$s via %2$s" : "%1$s palvelun %2$s kautta", + "Password to access »%s«" : "Salasana kohteen »%s« käyttöön", "It is protected with the following password:" : "Se on suojattu seuraavalla salasanalla:", + "This password will expire at %s" : "Tämä salasana vanhenee %s", + "%1$s shared »%2$s« with you and wants to add:" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä:", + "%1$s shared »%2$s« with you and wants to add" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä", + "»%s« added a note to a file shared with you" : "»%s« lisäsi huomion jakamaasi tiedostoon", "This is the password:" : "Tämä on salasana:", "You can choose a different password at any time in the share dialog." : "Voit valita muun salasanan koska tahansa jakovalikossa.", "Could not find share" : "Jakoa ei löytynyt", - "Share by mail" : "Jaa sähköpostitse", "Allows users to share a personalized link to a file or folder by putting in an email address." : "Salli käyttäjien jakaa personoitu linkki tiedostoon tai kansioon syöttämällä sähköpostiosoitteen.", "Send password by mail" : "Lähetä salasana sähköpostitse", - "Enforce password protection" : "Pakota salasanasuojaus", - "Sharing %s failed, this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska se on jo jaettu käyttäjälle %s", - "%s shared »%s« with you" : "%s jakoi kohteen »%s« kanssasi", - "%s shared »%s« with you." : "%s jakoi kohteen »%s« kanssasi.", - "%s via %s" : "%s (palvelun %s kautta)", - "It is protected with the following password: %s" : "Se on suojattu seuraavalla salasanalla: %s", - "This is the password: %s" : "Tämä on salasana: %s" + "Reply to initiator" : "Vastaa aloitteentekijälle" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/sharebymail/l10n/fi.json b/apps/sharebymail/l10n/fi.json index c653bdf4396..39407ab0019 100644 --- a/apps/sharebymail/l10n/fi.json +++ b/apps/sharebymail/l10n/fi.json @@ -1,29 +1,44 @@ { "translations": { - "Shared with %1$s" : "Jaettu käyttäjälle %1$s", + "Shared with %1$s" : "Jaettu käyttäjälle %1$s", "Shared with {email}" : "Jaettu käyttäjälle {email}", - "Shared with %1$s by %2$s" : "Jaettu käyttäjälle %1$s käyttäjältä %2$s", - "Shared with {email} by {actor}" : "Jaettu käyttäjälle {email} käyttäjältä {actor}", + "Shared with %1$s by %2$s" : "Jaettu käyttäjälle %1$s käyttäjän %2$s toimesta", + "Shared with {email} by {actor}" : "Jaettu käyttäjälle {email} käyttäjän {actor} toimesta", + "Unshared from {email}" : "Jako käyttäjälle {email} lopetettu", + "Unshared from {email} by {actor}" : "Jako käyttäjälle {email} lopetettiin käyttäjän {actor} toimesta", + "Password for mail share sent to %1$s" : "Salasana sähköpostijakoon lähetettiin osoitteeseen %1$s", + "Password for mail share sent to {email}" : "Salasana sähköpostijakoon lähetettiin osoitteeseen {email}", + "Password for mail share sent to you" : "Salasana sähköpostijakoon lähetettiin sinulle", "You shared %1$s with %2$s by mail" : "Jaoit tiedoston %1$s sähköpostitse osoitteeseen %2$s", "You shared {file} with {email} by mail" : "Jaoit tiedoston {file} sähköpostitse osoitteeseen {email}", "%3$s shared %1$s with %2$s by mail" : "%3$s jakoi tiedoston %1$s sähköpostitse osoitteeseen %2$s", "{actor} shared {file} with {email} by mail" : "{actor} jakoi tiedoston {file} sähköpostitse osoitteeseen {email}", + "You unshared %1$s from %2$s by mail" : "Lopetit kohteen %1$s jaon käyttäjältä %2$s sähköpostitse", + "You unshared {file} from {email} by mail" : "Lopetit kohteen {file} jaon käyttäjältä {email} sähköpostitse", + "Password to access %1$s was sent to %2s" : "Salasana kohteen %1$s käyttämiseksi lähetettiin käyttäjälle %2s", + "Password to access {file} was sent to {email}" : "Salasana kohteen {file} käyttämiseksi lähetettiin osoitteeseen {email}", + "Password to access %1$s was sent to you" : "Salasana kohteen %1$s käyttämiseksi lähetettiin sinulle", "Password to access {file} was sent to you" : "Salasana tiedoston {file} käyttämiseksi lähetettiin sinulle", + "Share by mail" : "Jaa sähköpostitse", + "Sharing %1$s failed, because this item is already shared with user %2$s" : "Kohteen %1$s jakaminen epäonnistui, koska tämä kohde on jo jaettu käyttäjän %2$s kanssa", + "We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automaattisesti muodostettua salasanaa ei voi lähettää sinulle. Aseta kelvollinen sähköpostiosoite henkilökohtaisiin asetuksiisi ja yritä uudelleen.", + "Failed to send share by email. Got an invalid email address" : "Jaon lähettäminen sähköpostitse epäonnistui. Virheellinen sähköpostiosoite", "Failed to send share by email" : "Jaon lähettäminen sähköpostitse epäonnistui", - "Click the button below to open it." : "Klikkaa alla olevaa linkkiä avataksesi sen.", + "%1$s shared »%2$s« with you" : "%1$s jakoi kohteen »%2$s« kanssasi", + "%1$s shared »%2$s« with you." : "%1$s jakoi kohteen »%2$s« kanssasi.", + "Click the button below to open it." : "Napsauta alla olevaa linkkiä avataksesi sen.", "Open »%s«" : "Avaa »%s«", + "%1$s via %2$s" : "%1$s palvelun %2$s kautta", + "Password to access »%s«" : "Salasana kohteen »%s« käyttöön", "It is protected with the following password:" : "Se on suojattu seuraavalla salasanalla:", + "This password will expire at %s" : "Tämä salasana vanhenee %s", + "%1$s shared »%2$s« with you and wants to add:" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä:", + "%1$s shared »%2$s« with you and wants to add" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä", + "»%s« added a note to a file shared with you" : "»%s« lisäsi huomion jakamaasi tiedostoon", "This is the password:" : "Tämä on salasana:", "You can choose a different password at any time in the share dialog." : "Voit valita muun salasanan koska tahansa jakovalikossa.", "Could not find share" : "Jakoa ei löytynyt", - "Share by mail" : "Jaa sähköpostitse", "Allows users to share a personalized link to a file or folder by putting in an email address." : "Salli käyttäjien jakaa personoitu linkki tiedostoon tai kansioon syöttämällä sähköpostiosoitteen.", "Send password by mail" : "Lähetä salasana sähköpostitse", - "Enforce password protection" : "Pakota salasanasuojaus", - "Sharing %s failed, this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska se on jo jaettu käyttäjälle %s", - "%s shared »%s« with you" : "%s jakoi kohteen »%s« kanssasi", - "%s shared »%s« with you." : "%s jakoi kohteen »%s« kanssasi.", - "%s via %s" : "%s (palvelun %s kautta)", - "It is protected with the following password: %s" : "Se on suojattu seuraavalla salasanalla: %s", - "This is the password: %s" : "Tämä on salasana: %s" + "Reply to initiator" : "Vastaa aloitteentekijälle" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index bf7ad0f89cc..fb541b7aca9 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -59,10 +59,4 @@ --primary-invert-if-bright: no; --background-invert-if-dark: no; --background-invert-if-bright: invert(100%); - --image-logo: url('/core/img/logo/logo.png?v=0'); - --image-logoheader: url('/core/img/logo/logo.png?v=0'); - --image-favicon: url('/core/img/logo/logo.png?v=0'); - --image-background-size: cover; - --image-background: url('/core/img/background.png?v=0'); - --image-login-background: url('/core/img/background.png?v=0'); } diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index d327b7db6d4..d141a5d3241 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -91,6 +91,7 @@ class DefaultTheme implements ITheme { $colorPrimaryLight = $this->util->mix($this->primaryColor, $colorMainBackground, -80); $hasCustomLogoHeader = $this->imageManager->hasImage('logo') || $this->imageManager->hasImage('logoheader'); + $hasCustomPrimaryColour = !empty($this->config->getAppValue('theming', 'color')); $variables = [ '--color-main-background' => $colorMainBackground, @@ -192,17 +193,25 @@ class DefaultTheme implements ITheme { ]; $backgroundDeleted = $this->config->getAppValue('theming', 'backgroundMime', '') === 'backgroundColor'; + // If primary as background has been request or if we have a custom primary colour + // let's not define the background image + if ($backgroundDeleted || $hasCustomPrimaryColour) { + $variables["--image-background-plain"] = 'true'; + } + + // Register image variables only if custom-defined foreach(['logo', 'logoheader', 'favicon', 'background'] as $image) { - // If primary as background has been request, let's not define the background image - if ($image === 'background' && $backgroundDeleted) { - $variables["--image-background-plain"] = 'true'; - continue; - } else if ($image === 'background') { - $variables['--image-background-size'] = 'cover'; + if ($this->imageManager->hasImage($image)) { + if ($image === 'background') { + // If background deleted is set, ignoring variable + if ($backgroundDeleted) { + continue; + } + $variables['--image-background-size'] = 'cover'; + } + $variables["--image-$image"] = "url('".$this->imageManager->getImageUrl($image)."')"; } - $variables["--image-$image"] = "url('".$this->imageManager->getImageUrl($image)."')"; } - $variables["--image-login-background"] = $variables["--image-background"]; if ($hasCustomLogoHeader) { $variables["--image-logoheader-custom"] = 'true'; diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php index 0f22a774a39..ead9ca113e6 100644 --- a/apps/theming/tests/ImageManagerTest.php +++ b/apps/theming/tests/ImageManagerTest.php @@ -307,7 +307,7 @@ class ImageManagerTest extends TestCase { foreach ($folders as $index => $folder) { $folder->expects($this->any()) ->method('getName') - ->willReturn((string)$index); + ->willReturn("$index"); } $folders[0]->expects($this->once())->method('delete'); $folders[1]->expects($this->once())->method('delete'); diff --git a/apps/theming/tests/Themes/DefaultThemeTest.php b/apps/theming/tests/Themes/DefaultThemeTest.php index 5086c5da8ee..160efdba142 100644 --- a/apps/theming/tests/Themes/DefaultThemeTest.php +++ b/apps/theming/tests/Themes/DefaultThemeTest.php @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -namespace OCA\Theming\Tests; +namespace OCA\Theming\Tests\Service; use OC\App\AppManager; use OCA\Theming\ImageManager; @@ -68,23 +68,6 @@ class DefaultThemeTest extends TestCase { ->method('getColorPrimary') ->willReturn('#0082c9'); - $this->imageManager->expects($this->any()) - ->method('getImageUrl') - ->willReturnCallback(function (string $name): string { - switch ($name) { - case 'logo': - case 'logoheader': - case 'favicon': - return '/core/img/logo/logo.png?v=0'; - case 'background': - case 'login-background': - return '/core/img/background.png?v=0'; - default: - return ''; - } - }); - - $this->l10n ->expects($this->any()) ->method('t') diff --git a/apps/updatenotification/l10n/fr.js b/apps/updatenotification/l10n/fr.js index b425d5d7a19..17b5d8b778a 100644 --- a/apps/updatenotification/l10n/fr.js +++ b/apps/updatenotification/l10n/fr.js @@ -45,6 +45,7 @@ OC.L10N.register( "The most recent stable version. It is suited for regular use and will always update to the latest major version." : "La version stable la plus récente. Elle est adaptée pour une utilisation régulière et sera toujours mise à jour vers la dernière version majeure.", "Beta" : "Beta", "A pre-release version only for testing new features, not for production environments." : "Une version préliminaire utilisée seulement pour tester les nouvelles fonctionnalités, n'est pas adaptée dans un environnement de production.", + "_<strong>%n</strong> app has no compatible version for this Nextcloud version available._::_<strong>%n</strong> apps have no compatible version for this Nextcloud version available._" : ["<strong>%n</strong> application n'a pas de version compatible pour cette version de Nextcloud disponible.","<strong>%n</strong> applications n'ont pas de version compatible pour cette version de Nextcloud disponible.","<strong>%n</strong> applications n'ont pas de version compatible pour cette version de Nextcloud disponible."], "<strong>All</strong> apps have a compatible version for this Nextcloud version available" : "<strong></strong>Applications compatibles pour cette version de Nexctloud", "_<strong>%n</strong> app has no compatible version for this Nextcloud version available_::_<strong>%n</strong> apps have no compatible version for this Nextcloud version available_" : ["<strong>%n</strong> application n'a pas de version compatible avec cette version disponible de Nextcloud","<strong>%n</strong> applications n'ont pas de version compatible avec cette version disponible de Nextcloud","<strong>%n</strong> applications n'ont pas de version compatible avec cette version disponible de Nextcloud"] }, diff --git a/apps/updatenotification/l10n/fr.json b/apps/updatenotification/l10n/fr.json index eb1754b4584..77190da4319 100644 --- a/apps/updatenotification/l10n/fr.json +++ b/apps/updatenotification/l10n/fr.json @@ -43,6 +43,7 @@ "The most recent stable version. It is suited for regular use and will always update to the latest major version." : "La version stable la plus récente. Elle est adaptée pour une utilisation régulière et sera toujours mise à jour vers la dernière version majeure.", "Beta" : "Beta", "A pre-release version only for testing new features, not for production environments." : "Une version préliminaire utilisée seulement pour tester les nouvelles fonctionnalités, n'est pas adaptée dans un environnement de production.", + "_<strong>%n</strong> app has no compatible version for this Nextcloud version available._::_<strong>%n</strong> apps have no compatible version for this Nextcloud version available._" : ["<strong>%n</strong> application n'a pas de version compatible pour cette version de Nextcloud disponible.","<strong>%n</strong> applications n'ont pas de version compatible pour cette version de Nextcloud disponible.","<strong>%n</strong> applications n'ont pas de version compatible pour cette version de Nextcloud disponible."], "<strong>All</strong> apps have a compatible version for this Nextcloud version available" : "<strong></strong>Applications compatibles pour cette version de Nexctloud", "_<strong>%n</strong> app has no compatible version for this Nextcloud version available_::_<strong>%n</strong> apps have no compatible version for this Nextcloud version available_" : ["<strong>%n</strong> application n'a pas de version compatible avec cette version disponible de Nextcloud","<strong>%n</strong> applications n'ont pas de version compatible avec cette version disponible de Nextcloud","<strong>%n</strong> applications n'ont pas de version compatible avec cette version disponible de Nextcloud"] },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" diff --git a/apps/workflowengine/l10n/fr.js b/apps/workflowengine/l10n/fr.js index aa6eddbe531..b4ad395766e 100644 --- a/apps/workflowengine/l10n/fr.js +++ b/apps/workflowengine/l10n/fr.js @@ -54,6 +54,7 @@ OC.L10N.register( "Images" : "Images", "Office documents" : "Documents Office", "PDF documents" : "Documents PDF", + "Custom MIME type" : "Type MIME personnalisé", "Custom mimetype" : "mimetype personnalisé", "Select a tag" : "Choisir une étiquette", "No results" : "Aucun résultat", diff --git a/apps/workflowengine/l10n/fr.json b/apps/workflowengine/l10n/fr.json index 45cafd242e2..d314995394c 100644 --- a/apps/workflowengine/l10n/fr.json +++ b/apps/workflowengine/l10n/fr.json @@ -52,6 +52,7 @@ "Images" : "Images", "Office documents" : "Documents Office", "PDF documents" : "Documents PDF", + "Custom MIME type" : "Type MIME personnalisé", "Custom mimetype" : "mimetype personnalisé", "Select a tag" : "Choisir une étiquette", "No results" : "Aucun résultat", diff --git a/composer.lock b/composer.lock index 0176e90bcf5..46cdcd56358 100644 --- a/composer.lock +++ b/composer.lock @@ -9,16 +9,16 @@ "packages-dev": [ { "name": "bamarni/composer-bin-plugin", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/bamarni/composer-bin-plugin.git", - "reference": "24764700027bcd3cb072e5f8005d4a150fe714fe" + "reference": "e12e9769c8ee97d036f7f98abf66b96cf3862346" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/24764700027bcd3cb072e5f8005d4a150fe714fe", - "reference": "24764700027bcd3cb072e5f8005d4a150fe714fe", + "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/e12e9769c8ee97d036f7f98abf66b96cf3862346", + "reference": "e12e9769c8ee97d036f7f98abf66b96cf3862346", "shasum": "" }, "require": { @@ -32,9 +32,9 @@ "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.1", "phpunit/phpunit": "^8.5 || ^9.5", - "symfony/console": "^5.4.7 || ^6.0.7", - "symfony/finder": "^5.4.7 || ^6.0.7", - "symfony/process": "^5.4.7 || ^6.0.7" + "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", + "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", + "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0" }, "type": "composer-plugin", "extra": { @@ -60,9 +60,9 @@ ], "support": { "issues": "https://github.com/bamarni/composer-bin-plugin/issues", - "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.0" + "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.1" }, - "time": "2022-07-14T10:29:51+00:00" + "time": "2022-08-03T19:58:11+00:00" } ], "aliases": [], diff --git a/core/l10n/fr.js b/core/l10n/fr.js index b63ae1526a9..ab44e3cf87c 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -343,6 +343,7 @@ OC.L10N.register( "More apps menu" : "Menu des autres applications", "Contacts" : "Contacts", "Contacts menu" : "Menu des contacts", + "Open settings menu" : "Ouvrir le menu des paramètres", "Confirm your password" : "Confirmer votre mot de passe", "Connect to your account" : "Connectez vous à votre compte", "Please log in before granting %1$s access to your %2$s account." : "Veuillez vous connecter avant d'autoriser %1$s à accéder à votre compte %2$s.", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index b0c3d5a7af3..a880f408057 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -341,6 +341,7 @@ "More apps menu" : "Menu des autres applications", "Contacts" : "Contacts", "Contacts menu" : "Menu des contacts", + "Open settings menu" : "Ouvrir le menu des paramètres", "Confirm your password" : "Confirmer votre mot de passe", "Connect to your account" : "Connectez vous à votre compte", "Please log in before granting %1$s access to your %2$s account." : "Veuillez vous connecter avant d'autoriser %1$s à accéder à votre compte %2$s.", diff --git a/core/l10n/ja.js b/core/l10n/ja.js index 87a9158fd21..3b632c1c0e3 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -344,6 +344,7 @@ OC.L10N.register( "More apps menu" : "その他のアプリメニュー", "Contacts" : "連絡先", "Contacts menu" : "連絡先メニュー", + "Open settings menu" : "設定メニューを開く", "Confirm your password" : "パスワードを確認", "Connect to your account" : "あなたのアカウントに接続する", "Please log in before granting %1$s access to your %2$s account." : "あなたの %2$s アカウントに %1$s アクセスを許可する前にログインしてください。", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index 5c39694cc33..f2bacd0d6f6 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -342,6 +342,7 @@ "More apps menu" : "その他のアプリメニュー", "Contacts" : "連絡先", "Contacts menu" : "連絡先メニュー", + "Open settings menu" : "設定メニューを開く", "Confirm your password" : "パスワードを確認", "Connect to your account" : "あなたのアカウントに接続する", "Please log in before granting %1$s access to your %2$s account." : "あなたの %2$s アカウントに %1$s アクセスを許可する前にログインしてください。", diff --git a/lib/l10n/fi.js b/lib/l10n/fi.js index 62ac7751f43..13ebcfcffeb 100644 --- a/lib/l10n/fi.js +++ b/lib/l10n/fi.js @@ -116,7 +116,11 @@ OC.L10N.register( "Set an admin password." : "Aseta ylläpitäjän salasana.", "Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt", "Sharing backend for %s not found" : "Jakamisen taustaosaa kohteelle %s ei löytynyt", + "%1$s shared »%2$s« with you and wants to add:" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä:", + "%1$s shared »%2$s« with you and wants to add" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä", + "»%s« added a note to a file shared with you" : "»%s« lisäsi huomion jakamaasi tiedostoon", "Open »%s«" : "Avaa »%s«", + "%1$s via %2$s" : "%1$s palvelun %2$s kautta", "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.", "Cannot increase permissions of %s" : "Kohteen %s käyttöoikeuksien lisääminen ei onnistu", "Files cannot be shared with delete permissions" : "Tiedostoja ei voi jakaa poistamisoikeuksilla", @@ -189,6 +193,7 @@ OC.L10N.register( "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Sovellusta \"%1$s\" ei voi asentaa, koska seuraavat riippuvuudet eivät täyty: %2$s", "a safe home for all your data" : "turvallinen koti kaikille tiedostoillesi", "File is currently busy, please try again later" : "Tiedosto on parhaillaan käytössä, yritä myöhemmin uudelleen", + "Cannot download file" : "Tiedostoa ei voi ladata", "Application is not enabled" : "Sovellusta ei ole otettu käyttöön", "Authentication error" : "Tunnistautumisvirhe", "Token expired. Please reload page." : "Valtuutus vanheni. Lataa sivu uudelleen.", diff --git a/lib/l10n/fi.json b/lib/l10n/fi.json index 975213c6cdc..2aa4fdcd0d5 100644 --- a/lib/l10n/fi.json +++ b/lib/l10n/fi.json @@ -114,7 +114,11 @@ "Set an admin password." : "Aseta ylläpitäjän salasana.", "Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt", "Sharing backend for %s not found" : "Jakamisen taustaosaa kohteelle %s ei löytynyt", + "%1$s shared »%2$s« with you and wants to add:" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä:", + "%1$s shared »%2$s« with you and wants to add" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä", + "»%s« added a note to a file shared with you" : "»%s« lisäsi huomion jakamaasi tiedostoon", "Open »%s«" : "Avaa »%s«", + "%1$s via %2$s" : "%1$s palvelun %2$s kautta", "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.", "Cannot increase permissions of %s" : "Kohteen %s käyttöoikeuksien lisääminen ei onnistu", "Files cannot be shared with delete permissions" : "Tiedostoja ei voi jakaa poistamisoikeuksilla", @@ -187,6 +191,7 @@ "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Sovellusta \"%1$s\" ei voi asentaa, koska seuraavat riippuvuudet eivät täyty: %2$s", "a safe home for all your data" : "turvallinen koti kaikille tiedostoillesi", "File is currently busy, please try again later" : "Tiedosto on parhaillaan käytössä, yritä myöhemmin uudelleen", + "Cannot download file" : "Tiedostoa ei voi ladata", "Application is not enabled" : "Sovellusta ei ole otettu käyttöön", "Authentication error" : "Tunnistautumisvirhe", "Token expired. Please reload page." : "Valtuutus vanheni. Lataa sivu uudelleen.", diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js index 86f56e69a85..fce71090c61 100644 --- a/lib/l10n/fr.js +++ b/lib/l10n/fr.js @@ -207,6 +207,7 @@ OC.L10N.register( "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "L'application \"%1$s\" ne peut pas être installée à cause des dépendances suivantes non satisfaites : %2$s", "a safe home for all your data" : "un lieu sûr pour toutes vos données", "File is currently busy, please try again later" : "Le fichier est actuellement utilisé, veuillez réessayer plus tard", + "Cannot download file" : "Impossible de télécharger le fichier", "Application is not enabled" : "L'application n'est pas activée", "Authentication error" : "Erreur d'authentification", "Token expired. Please reload page." : "La session a expiré. Veuillez recharger la page.", diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json index f3b85ba4ac2..f9ff67188b0 100644 --- a/lib/l10n/fr.json +++ b/lib/l10n/fr.json @@ -205,6 +205,7 @@ "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "L'application \"%1$s\" ne peut pas être installée à cause des dépendances suivantes non satisfaites : %2$s", "a safe home for all your data" : "un lieu sûr pour toutes vos données", "File is currently busy, please try again later" : "Le fichier est actuellement utilisé, veuillez réessayer plus tard", + "Cannot download file" : "Impossible de télécharger le fichier", "Application is not enabled" : "L'application n'est pas activée", "Authentication error" : "Erreur d'authentification", "Token expired. Please reload page." : "La session a expiré. Veuillez recharger la page.", diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php index fb32b64c012..4799c3bff7d 100644 --- a/lib/private/Files/Cache/Scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -339,7 +339,7 @@ class Scanner extends BasicEmitter implements IScanner { try { $data = $this->scanFile($path, $reuse, -1, null, $lock); if ($data and $data['mimetype'] === 'httpd/unix-directory') { - $size = $this->scanChildren($path, $recursive, $reuse, $data['fileid'], $lock); + $size = $this->scanChildren($path, $recursive, $reuse, $data['fileid'], $lock, $data); $data['size'] = $size; } } finally { @@ -376,9 +376,10 @@ class Scanner extends BasicEmitter implements IScanner { * @param int $reuse * @param int $folderId id for the folder to be scanned * @param bool $lock set to false to disable getting an additional read lock during scanning + * @param array $data the data of the folder before (re)scanning the children * @return int the size of the scanned folder or -1 if the size is unknown at this stage */ - protected function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $folderId = null, $lock = true) { + protected function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $folderId = null, $lock = true, array $data = []) { if ($reuse === -1) { $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : self::REUSE_ETAG; } @@ -397,7 +398,8 @@ class Scanner extends BasicEmitter implements IScanner { $size += $childSize; } } - if ($this->cacheActive) { + $oldSize = $data['size'] ?? null; + if ($this->cacheActive && $oldSize !== $size) { $this->cache->update($folderId, ['size' => $size]); } $this->emit('\OC\Files\Cache\Scanner', 'postScanFolder', [$path, $this->storageId]); @@ -409,6 +411,11 @@ class Scanner extends BasicEmitter implements IScanner { $existingChildren = $this->getExistingChildren($folderId); $newChildren = iterator_to_array($this->storage->getDirectoryContent($path)); + if (count($existingChildren) === 0 && count($newChildren) === 0) { + // no need to do a transaction + return []; + } + if ($this->useTransactions) { \OC::$server->getDatabaseConnection()->beginTransaction(); } diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php index b5f548dd563..1a8c3637063 100644 --- a/lib/private/Files/Cache/SearchBuilder.php +++ b/lib/private/Files/Cache/SearchBuilder.php @@ -54,7 +54,7 @@ class SearchBuilder { ISearchComparison::COMPARE_GREATER_THAN => 'lte', ISearchComparison::COMPARE_GREATER_THAN_EQUAL => 'lt', ISearchComparison::COMPARE_LESS_THAN => 'gte', - ISearchComparison::COMPARE_LESS_THAN_EQUAL => 'lt', + ISearchComparison::COMPARE_LESS_THAN_EQUAL => 'gt', ]; public const TAG_FAVORITE = '_$!<Favorite>!$_'; diff --git a/lib/private/Files/ObjectStore/NoopScanner.php b/lib/private/Files/ObjectStore/NoopScanner.php index 3b8cbdb18bb..bdfc93758d4 100644 --- a/lib/private/Files/ObjectStore/NoopScanner.php +++ b/lib/private/Files/ObjectStore/NoopScanner.php @@ -68,7 +68,7 @@ class NoopScanner extends Scanner { * @param array $folderData existing cache data for the folder to be scanned * @return int the size of the scanned folder or -1 if the size is unknown at this stage */ - protected function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $folderId = null, $lock = true) { + protected function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $folderId = null, $lock = true, array $data = []) { return 0; } diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index d12869fbdaa..e5394e72ffe 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -49,9 +49,7 @@ namespace OC\Files; use Icewind\Streams\CallbackWrapper; use OC\Files\Mount\MoveableMount; use OC\Files\Storage\Storage; -use OC\User\DisplayNameCache; use OC\User\LazyUser; -use OC\User\User; use OCA\Files_Sharing\SharedMount; use OCP\Constants; use OCP\Files\Cache\ICacheEntry; @@ -103,8 +101,6 @@ class View { private LoggerInterface $logger; - private DisplayNameCache $displayNameCache; - /** * @param string $root * @throws \Exception If $root contains an invalid path @@ -121,7 +117,6 @@ class View { $this->lockingProvider = \OC::$server->getLockingProvider(); $this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider); $this->userManager = \OC::$server->getUserManager(); - $this->displayNameCache = \OC::$server->get(DisplayNameCache::class); $this->logger = \OC::$server->get(LoggerInterface::class); } @@ -1319,7 +1314,7 @@ class View { * @return IUser */ private function getUserObjectForOwner(string $ownerId) { - return new LazyUser($ownerId, $this->displayNameCache, $this->userManager); + return new LazyUser($ownerId, $this->userManager); } /** diff --git a/lib/private/Server.php b/lib/private/Server.php index b473f4e75c0..7223c3b8ae3 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -151,6 +151,7 @@ use OC\SystemTag\ManagerFactory as SystemTagManagerFactory; use OC\Tagging\TagMapper; use OC\Talk\Broker; use OC\Template\JSCombiner; +use OC\User\DisplayNameCache; use OC\User\Listeners\UserChangedListener; use OC\User\Listeners\UserDeletedListener; use OCA\Theming\ImageManager; @@ -474,6 +475,10 @@ class Server extends ServerContainer implements IServerContainer { $this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class); $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class); + $this->registerService(DisplayNameCache::class, function (ContainerInterface $c) { + return $c->get(\OC\User\Manager::class)->getDisplayNameCache(); + }); + $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) { $groupManager = new \OC\Group\Manager( $this->get(IUserManager::class), diff --git a/lib/private/User/DisplayNameCache.php b/lib/private/User/DisplayNameCache.php index 22a79863e49..5d1cc8940d7 100644 --- a/lib/private/User/DisplayNameCache.php +++ b/lib/private/User/DisplayNameCache.php @@ -47,7 +47,7 @@ class DisplayNameCache implements IEventListener { $this->userManager = $userManager; } - public function getDisplayName(string $userId) { + public function getDisplayName(string $userId): ?string { if (isset($this->cache[$userId])) { return $this->cache[$userId]; } @@ -61,7 +61,7 @@ class DisplayNameCache implements IEventListener { if ($user) { $displayName = $user->getDisplayName(); } else { - $displayName = $userId; + $displayName = null; } $this->cache[$userId] = $displayName; $this->memCache->set($userId, $displayName, 60 * 10); // 10 minutes diff --git a/lib/private/User/LazyUser.php b/lib/private/User/LazyUser.php index 8e93d6481ab..096578b8f37 100644 --- a/lib/private/User/LazyUser.php +++ b/lib/private/User/LazyUser.php @@ -29,12 +29,10 @@ use OCP\UserInterface; class LazyUser implements IUser { private ?IUser $user = null; - private DisplayNameCache $displayNameCache; private string $uid; private IUserManager $userManager; - public function __construct(string $uid, DisplayNameCache $displayNameCache, IUserManager $userManager) { - $this->displayNameCache = $displayNameCache; + public function __construct(string $uid, IUserManager $userManager) { $this->uid = $uid; $this->userManager = $userManager; } @@ -53,7 +51,7 @@ class LazyUser implements IUser { } public function getDisplayName() { - return $this->displayNameCache->getDisplayName($this->uid); + return $this->userManager->getDisplayName($this->uid) ?? $this->uid; } public function setDisplayName($displayName) { diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index a6f56585325..be5151313c4 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -95,6 +95,8 @@ class Manager extends PublicEmitter implements IUserManager { /** @var IEventDispatcher */ private $eventDispatcher; + private DisplayNameCache $displayNameCache; + public function __construct(IConfig $config, EventDispatcherInterface $oldDispatcher, ICacheFactory $cacheFactory, @@ -108,6 +110,7 @@ class Manager extends PublicEmitter implements IUserManager { unset($cachedUsers[$user->getUID()]); }); $this->eventDispatcher = $eventDispatcher; + $this->displayNameCache = new DisplayNameCache($cacheFactory, $this); } /** @@ -185,6 +188,10 @@ class Manager extends PublicEmitter implements IUserManager { return null; } + public function getDisplayName(string $uid): ?string { + return $this->displayNameCache->getDisplayName($uid); + } + /** * get or construct the user object * @@ -742,4 +749,8 @@ class Manager extends PublicEmitter implements IUserManager { return !file_exists(rtrim($dataDirectory, '/') . '/' . $uid); } + + public function getDisplayNameCache(): DisplayNameCache { + return $this->displayNameCache; + } } diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php index 77e2fc21a22..af0d5f08809 100644 --- a/lib/public/IUserManager.php +++ b/lib/public/IUserManager.php @@ -85,6 +85,15 @@ interface IUserManager { public function get($uid); /** + * Get the display name of a user + * + * @param string $uid + * @return string|null + * @since 25.0.0 + */ + public function getDisplayName(string $uid): ?string; + + /** * check if a user exists * * @param string $uid diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php index 29e619cd09b..e4c052f6025 100644 --- a/tests/lib/Files/Cache/ScannerTest.php +++ b/tests/lib/Files/Cache/ScannerTest.php @@ -8,7 +8,14 @@ namespace Test\Files\Cache; +use OC; +use OC\Files\Cache\Cache; use OC\Files\Cache\CacheEntry; +use OC\Files\Cache\Scanner; +use OC\Files\Storage\Storage; +use OC\Files\Storage\Temporary; +use OCP\Files\Cache\IScanner; +use Test\TestCase; /** * Class ScannerTest @@ -17,34 +24,21 @@ use OC\Files\Cache\CacheEntry; * * @package Test\Files\Cache */ -class ScannerTest extends \Test\TestCase { - /** - * @var \OC\Files\Storage\Storage $storage - */ - private $storage; - - /** - * @var \OC\Files\Cache\Scanner $scanner - */ - private $scanner; - - /** - * @var \OC\Files\Cache\Cache $cache - */ - private $cache; +class ScannerTest extends TestCase { + private Storage $storage; + private Scanner $scanner; + private Cache $cache; protected function setUp(): void { parent::setUp(); - $this->storage = new \OC\Files\Storage\Temporary([]); - $this->scanner = new \OC\Files\Cache\Scanner($this->storage); - $this->cache = new \OC\Files\Cache\Cache($this->storage); + $this->storage = new Temporary([]); + $this->scanner = new Scanner($this->storage); + $this->cache = new Cache($this->storage); } protected function tearDown(): void { - if ($this->cache) { - $this->cache->clear(); - } + $this->cache->clear(); parent::tearDown(); } @@ -60,7 +54,7 @@ class ScannerTest extends \Test\TestCase { $this->assertEquals($cachedData['mimetype'], 'text/plain'); $this->assertNotEquals($cachedData['parent'], -1); //parent folders should be scanned automatically - $data = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png'); + $data = file_get_contents(OC::$SERVERROOT . '/core/img/logo/logo.png'); $this->storage->file_put_contents('foo.png', $data); $this->scanner->scanFile('foo.png'); @@ -74,7 +68,7 @@ class ScannerTest extends \Test\TestCase { $data = "dummy file data\n"; $this->storage->file_put_contents('foo🙈.txt', $data); - if (\OC::$server->getDatabaseConnection()->supports4ByteText()) { + if (OC::$server->getDatabaseConnection()->supports4ByteText()) { $this->assertNotNull($this->scanner->scanFile('foo🙈.txt')); $this->assertTrue($this->cache->inCache('foo🙈.txt'), true); @@ -98,7 +92,7 @@ class ScannerTest extends \Test\TestCase { private function fillTestFolders() { $textData = "dummy file data\n"; - $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png'); + $imgData = file_get_contents(OC::$SERVERROOT . '/core/img/logo/logo.png'); $this->storage->mkdir('folder'); $this->storage->file_put_contents('foo.txt', $textData); $this->storage->file_put_contents('foo.png', $imgData); @@ -130,7 +124,7 @@ class ScannerTest extends \Test\TestCase { public function testShallow() { $this->fillTestFolders(); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW); + $this->scanner->scan('', IScanner::SCAN_SHALLOW); $this->assertEquals($this->cache->inCache(''), true); $this->assertEquals($this->cache->inCache('foo.txt'), true); $this->assertEquals($this->cache->inCache('foo.png'), true); @@ -143,7 +137,7 @@ class ScannerTest extends \Test\TestCase { $this->assertEquals(-1, $cachedDataFolder['size']); $this->assertEquals(-1, $cachedDataFolder2['size']); - $this->scanner->scan('folder', \OC\Files\Cache\Scanner::SCAN_SHALLOW); + $this->scanner->scan('folder', IScanner::SCAN_SHALLOW); $cachedDataFolder2 = $this->cache->get('folder'); @@ -160,7 +154,7 @@ class ScannerTest extends \Test\TestCase { $this->storage->mkdir('folder2'); $this->storage->file_put_contents('folder2/bar.txt', 'foobar'); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW); + $this->scanner->scan('', IScanner::SCAN_SHALLOW); $this->assertFalse($this->cache->inCache('folder/bar.txt')); $this->assertFalse($this->cache->inCache('folder/2bar.txt')); $cachedData = $this->cache->get(''); @@ -182,7 +176,7 @@ class ScannerTest extends \Test\TestCase { $this->storage->mkdir('folder2'); $this->storage->file_put_contents('folder2/bar.txt', 'foobar'); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW); + $this->scanner->scan('', IScanner::SCAN_SHALLOW); $this->assertFalse($this->cache->inCache('folder/bar.txt')); $this->assertFalse($this->cache->inCache('folder/2bar.txt')); $this->assertFalse($this->cache->inCache('folder2/bar.txt')); @@ -191,7 +185,7 @@ class ScannerTest extends \Test\TestCase { $cachedData = $this->cache->get(''); $this->assertEquals(-1, $cachedData['size']); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE_INCOMPLETE, \OC\Files\Cache\Scanner::REUSE_ETAG | \OC\Files\Cache\Scanner::REUSE_SIZE); + $this->scanner->scan('', IScanner::SCAN_RECURSIVE_INCOMPLETE, IScanner::REUSE_ETAG | IScanner::REUSE_SIZE); $this->assertTrue($this->cache->inCache('folder/bar.txt')); $this->assertTrue($this->cache->inCache('folder/bar.txt')); @@ -248,7 +242,7 @@ class ScannerTest extends \Test\TestCase { $oldData = $this->cache->get(''); $this->storage->unlink('folder/bar.txt'); $this->cache->put('folder', ['mtime' => $this->storage->filemtime('folder'), 'storage_mtime' => $this->storage->filemtime('folder')]); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_SIZE); + $this->scanner->scan('', IScanner::SCAN_SHALLOW, IScanner::REUSE_SIZE); $newData = $this->cache->get(''); $this->assertIsString($oldData['etag']); $this->assertIsString($newData['etag']); @@ -256,25 +250,25 @@ class ScannerTest extends \Test\TestCase { $this->assertEquals($oldData['size'], $newData['size']); $oldData = $newData; - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); + $this->scanner->scan('', IScanner::SCAN_SHALLOW, IScanner::REUSE_ETAG); $newData = $this->cache->get(''); $this->assertSame($oldData['etag'], $newData['etag']); $this->assertEquals(-1, $newData['size']); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE); + $this->scanner->scan('', IScanner::SCAN_RECURSIVE); $oldData = $this->cache->get(''); $this->assertNotEquals(-1, $oldData['size']); - $this->scanner->scanFile('', \OC\Files\Cache\Scanner::REUSE_ETAG + \OC\Files\Cache\Scanner::REUSE_SIZE); + $this->scanner->scanFile('', IScanner::REUSE_ETAG + IScanner::REUSE_SIZE); $newData = $this->cache->get(''); $this->assertSame($oldData['etag'], $newData['etag']); $this->assertEquals($oldData['size'], $newData['size']); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG + \OC\Files\Cache\Scanner::REUSE_SIZE); + $this->scanner->scan('', IScanner::SCAN_RECURSIVE, IScanner::REUSE_ETAG + IScanner::REUSE_SIZE); $newData = $this->cache->get(''); $this->assertSame($oldData['etag'], $newData['etag']); $this->assertEquals($oldData['size'], $newData['size']); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG + \OC\Files\Cache\Scanner::REUSE_SIZE); + $this->scanner->scan('', IScanner::SCAN_SHALLOW, IScanner::REUSE_ETAG + IScanner::REUSE_SIZE); $newData = $this->cache->get(''); $this->assertSame($oldData['etag'], $newData['etag']); $this->assertEquals($oldData['size'], $newData['size']); @@ -286,7 +280,7 @@ class ScannerTest extends \Test\TestCase { $this->scanner->scan(''); $this->assertTrue($this->cache->inCache('foo.txt')); $this->storage->unlink('foo.txt'); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW); + $this->scanner->scan('', IScanner::SCAN_SHALLOW); $this->assertFalse($this->cache->inCache('foo.txt')); } @@ -296,7 +290,7 @@ class ScannerTest extends \Test\TestCase { $this->scanner->scan(''); $this->assertTrue($this->cache->inCache('folder/bar.txt')); $this->storage->rmdir('/folder'); - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW); + $this->scanner->scan('', IScanner::SCAN_SHALLOW); $this->assertFalse($this->cache->inCache('folder')); $this->assertFalse($this->cache->inCache('folder/bar.txt')); } @@ -317,7 +311,7 @@ class ScannerTest extends \Test\TestCase { $this->scanner->scan('folder/bar.txt'); // manipulate etag to simulate an empty etag - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); + $this->scanner->scan('', IScanner::SCAN_SHALLOW, IScanner::REUSE_ETAG); /** @var CacheEntry $data0 */ $data0 = $this->cache->get('folder/bar.txt'); $this->assertIsString($data0['etag']); @@ -329,7 +323,7 @@ class ScannerTest extends \Test\TestCase { $this->cache->put('folder/bar.txt', $data0->getData()); // rescan - $this->scanner->scan('folder/bar.txt', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); + $this->scanner->scan('folder/bar.txt', IScanner::SCAN_SHALLOW, IScanner::REUSE_ETAG); // verify cache content $newData0 = $this->cache->get('folder/bar.txt'); @@ -344,7 +338,7 @@ class ScannerTest extends \Test\TestCase { $oldFolderId = $this->cache->getId('folder'); // delete the folder without removing the children - $query = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $query = OC::$server->getDatabaseConnection()->getQueryBuilder(); $query->delete('filecache') ->where($query->expr()->eq('fileid', $query->createNamedParameter($oldFolderId))); $query->execute(); @@ -370,7 +364,7 @@ class ScannerTest extends \Test\TestCase { $oldFolderId = $this->cache->getId('folder'); // delete the folder without removing the children - $query = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $query = OC::$server->getDatabaseConnection()->getQueryBuilder(); $query->delete('filecache') ->where($query->expr()->eq('fileid', $query->createNamedParameter($oldFolderId))); $query->execute(); @@ -379,7 +373,7 @@ class ScannerTest extends \Test\TestCase { $this->assertEquals($oldFolderId, $cachedData['parent']); $this->assertFalse($this->cache->inCache('folder')); - $this->scanner->scan('folder', \OC\Files\Cache\Scanner::SCAN_SHALLOW); + $this->scanner->scan('folder', IScanner::SCAN_SHALLOW); $this->assertTrue($this->cache->inCache('folder')); $newFolderId = $this->cache->getId('folder'); diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php index 2536eee8441..cef578e9555 100644 --- a/tests/lib/User/ManagerTest.php +++ b/tests/lib/User/ManagerTest.php @@ -50,7 +50,6 @@ class ManagerTest extends TestCase { $this->cache = $this->createMock(ICache::class); $this->cacheFactory->method('createDistributed') - ->with('user_backend_map') ->willReturn($this->cache); } |