diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/l10n/eu.js | 2 | ||||
-rw-r--r-- | lib/l10n/eu.json | 2 | ||||
-rw-r--r-- | lib/l10n/lo.js | 13 | ||||
-rw-r--r-- | lib/l10n/lo.json | 11 | ||||
-rw-r--r-- | lib/l10n/oc.js | 22 | ||||
-rw-r--r-- | lib/l10n/oc.json | 22 | ||||
-rw-r--r-- | lib/l10n/sc.js | 10 | ||||
-rw-r--r-- | lib/l10n/sc.json | 8 | ||||
-rw-r--r-- | lib/l10n/si.js | 62 | ||||
-rw-r--r-- | lib/l10n/si.json | 60 | ||||
-rw-r--r-- | lib/l10n/si_LK.js | 60 | ||||
-rw-r--r-- | lib/l10n/si_LK.json | 58 | ||||
-rw-r--r-- | lib/l10n/sl.js | 4 | ||||
-rw-r--r-- | lib/l10n/sl.json | 4 | ||||
-rw-r--r-- | lib/l10n/ta.js (renamed from lib/l10n/ta_LK.js) | 0 | ||||
-rw-r--r-- | lib/l10n/ta.json (renamed from lib/l10n/ta_LK.json) | 0 | ||||
-rw-r--r-- | lib/l10n/zh_HK.js | 45 | ||||
-rw-r--r-- | lib/l10n/zh_HK.json | 45 | ||||
-rw-r--r-- | lib/private/AppFramework/Bootstrap/RegistrationContext.php | 5 | ||||
-rw-r--r-- | lib/private/DB/Migrator.php | 8 | ||||
-rw-r--r-- | lib/private/Preview/WebP.php | 2 | ||||
-rw-r--r-- | lib/private/Repair/RepairDavShares.php | 2 | ||||
-rw-r--r-- | lib/private/User/Manager.php | 25 | ||||
-rw-r--r-- | lib/public/AppFramework/Http/ZipResponse.php | 2 | ||||
-rw-r--r-- | lib/public/Contacts/IManager.php | 2 | ||||
-rw-r--r-- | lib/public/RichObjectStrings/Definitions.php | 25 |
26 files changed, 312 insertions, 187 deletions
diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js index dbc4fbc1b67..a03841dd1f2 100644 --- a/lib/l10n/eu.js +++ b/lib/l10n/eu.js @@ -48,6 +48,8 @@ OC.L10N.register( "in a few seconds" : "segundo gutxitan", "seconds ago" : "duela segundu batzuk", "Empty file" : "Fitxategi hutsa", + "File already exists" : "Badago izen bereko fitxategi bat", + "Templates" : "Txantiloiak", "File name is a reserved word" : "Fitxategi izena hitz erreserbatua da", "File name contains at least one invalid character" : "Fitxategi izenak karaktere baliogabe bat du gutxienez ", "File name is too long" : "Fitxategi-izena luzeegia da", diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json index 677f493a683..ca31c12b599 100644 --- a/lib/l10n/eu.json +++ b/lib/l10n/eu.json @@ -46,6 +46,8 @@ "in a few seconds" : "segundo gutxitan", "seconds ago" : "duela segundu batzuk", "Empty file" : "Fitxategi hutsa", + "File already exists" : "Badago izen bereko fitxategi bat", + "Templates" : "Txantiloiak", "File name is a reserved word" : "Fitxategi izena hitz erreserbatua da", "File name contains at least one invalid character" : "Fitxategi izenak karaktere baliogabe bat du gutxienez ", "File name is too long" : "Fitxategi-izena luzeegia da", diff --git a/lib/l10n/lo.js b/lib/l10n/lo.js new file mode 100644 index 00000000000..7daf612563b --- /dev/null +++ b/lib/l10n/lo.js @@ -0,0 +1,13 @@ +OC.L10N.register( + "lib", + { + "Unknown filetype" : "ບໍ່ຮູ້ປະເພດຂອງຟາຍ", + "Invalid image" : "ບໍ່ມີຮູບພາບ", + "seconds ago" : "ວິນາທີຜ່ານມາ", + "Help" : "ການຊ່ວຍເຫຼືອ", + "Apps" : "ແອັບພລິເຄຊັນ", + "Settings" : "ການຕັ້ງຄ່າ", + "Users" : "ຜູ້ໃຊ້", + "User disabled" : "ປິດຊື່ຜູ້ໃຊ້" +}, +"nplurals=1; plural=0;"); diff --git a/lib/l10n/lo.json b/lib/l10n/lo.json new file mode 100644 index 00000000000..e0fa8386162 --- /dev/null +++ b/lib/l10n/lo.json @@ -0,0 +1,11 @@ +{ "translations": { + "Unknown filetype" : "ບໍ່ຮູ້ປະເພດຂອງຟາຍ", + "Invalid image" : "ບໍ່ມີຮູບພາບ", + "seconds ago" : "ວິນາທີຜ່ານມາ", + "Help" : "ການຊ່ວຍເຫຼືອ", + "Apps" : "ແອັບພລິເຄຊັນ", + "Settings" : "ການຕັ້ງຄ່າ", + "Users" : "ຜູ້ໃຊ້", + "User disabled" : "ປິດຊື່ຜູ້ໃຊ້" +},"pluralForm" :"nplurals=1; plural=0;" +}
\ No newline at end of file diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js index 2fd7c374f90..ea6ff86b309 100644 --- a/lib/l10n/oc.js +++ b/lib/l10n/oc.js @@ -1,20 +1,28 @@ OC.L10N.register( "lib", { + "today" : "uèi", + "yesterday" : "ièr", + "_%n day ago_::_%n days ago_" : ["fa %n jorn","fa %n jorns"], + "last month" : "lo mes passat", "_%n month ago_::_%n months ago_" : ["fa %n mes","fa %n meses"], + "last year" : "l’an passat", "_%n year ago_::_%n years ago_" : ["fa %n annada","fa %n annadas"], "_%n hour ago_::_%n hours ago_" : ["fa %n ora ","fa %n oras"], "_%n minute ago_::_%n minutes ago_" : ["fa %n minuta","fa %n minutas"], "seconds ago" : "fa qualques segondas", "Help" : "Ajuda", "Settings" : "Paramètres", - "Sunday" : "Dimenge", - "Monday" : "Diluns", - "Tuesday" : "Dimars", - "Wednesday" : "Dimècres", - "Thursday" : "Dijòus", - "Friday" : "Divendres", - "Saturday" : "Dissabte", + "Log out" : "Desconnexion", + "Users" : "Utilizaires", + "Set an admin password." : "Definir un senhal admin.", + "Sunday" : "dimenge", + "Monday" : "diluns", + "Tuesday" : "dimars", + "Wednesday" : "dimècres", + "Thursday" : "dijòus", + "Friday" : "divendres", + "Saturday" : "dissabte", "January" : "Genièr", "February" : "Febrièr", "March" : "Març", diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json index 8651b2e5715..da8350c6468 100644 --- a/lib/l10n/oc.json +++ b/lib/l10n/oc.json @@ -1,18 +1,26 @@ { "translations": { + "today" : "uèi", + "yesterday" : "ièr", + "_%n day ago_::_%n days ago_" : ["fa %n jorn","fa %n jorns"], + "last month" : "lo mes passat", "_%n month ago_::_%n months ago_" : ["fa %n mes","fa %n meses"], + "last year" : "l’an passat", "_%n year ago_::_%n years ago_" : ["fa %n annada","fa %n annadas"], "_%n hour ago_::_%n hours ago_" : ["fa %n ora ","fa %n oras"], "_%n minute ago_::_%n minutes ago_" : ["fa %n minuta","fa %n minutas"], "seconds ago" : "fa qualques segondas", "Help" : "Ajuda", "Settings" : "Paramètres", - "Sunday" : "Dimenge", - "Monday" : "Diluns", - "Tuesday" : "Dimars", - "Wednesday" : "Dimècres", - "Thursday" : "Dijòus", - "Friday" : "Divendres", - "Saturday" : "Dissabte", + "Log out" : "Desconnexion", + "Users" : "Utilizaires", + "Set an admin password." : "Definir un senhal admin.", + "Sunday" : "dimenge", + "Monday" : "diluns", + "Tuesday" : "dimars", + "Wednesday" : "dimècres", + "Thursday" : "dijòus", + "Friday" : "divendres", + "Saturday" : "dissabte", "January" : "Genièr", "February" : "Febrièr", "March" : "Març", diff --git a/lib/l10n/sc.js b/lib/l10n/sc.js new file mode 100644 index 00000000000..32a9e7d3995 --- /dev/null +++ b/lib/l10n/sc.js @@ -0,0 +1,10 @@ +OC.L10N.register( + "lib", + { + "Unknown filetype" : "Genia de archìviu disconnota", + "This is an automatically sent email, please do not reply." : "Custu est unu messàgiu de posta imbiadu in automàticu, non rispondas.", + "Settings" : "Impostatziones", + "Open »%s«" : "Aberi »%s«", + "%1$s via %2$s" : "%1$s cun %2$s" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/sc.json b/lib/l10n/sc.json new file mode 100644 index 00000000000..4646b3887db --- /dev/null +++ b/lib/l10n/sc.json @@ -0,0 +1,8 @@ +{ "translations": { + "Unknown filetype" : "Genia de archìviu disconnota", + "This is an automatically sent email, please do not reply." : "Custu est unu messàgiu de posta imbiadu in automàticu, non rispondas.", + "Settings" : "Impostatziones", + "Open »%s«" : "Aberi »%s«", + "%1$s via %2$s" : "%1$s cun %2$s" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/lib/l10n/si.js b/lib/l10n/si.js new file mode 100644 index 00000000000..b872b9de10a --- /dev/null +++ b/lib/l10n/si.js @@ -0,0 +1,62 @@ +OC.L10N.register( + "lib", + { + "See %s" : "%s බලන්න", + "Other activities" : "වෙනත් ක්රියාකාරකම්", + "%1$s and %2$s" : "%1$s සහ %2$s", + "%1$s, %2$s and %3$s" : "%1$s, %2$s සහ %3$s ", + "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s සහ %4$s", + "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s සහ %5$s", + "Authentication" : "සත්යාපනය", + "Invalid image" : "වලංගු නොවන පින්තූරයකි", + "today" : "අද", + "tomorrow" : "හෙට", + "yesterday" : "ඊයේ", + "seconds ago" : "තත්පර කිහිපයකට පෙර", + "Empty file" : "හිස් ගොනුවකි", + "File already exists" : "ගොනුව දැනටමත් පවතී", + "File name is too long" : "ගොනුවේ නම දිග වැඩිය", + "__language_name__" : "__language_name__", + "This is an automatically sent email, please do not reply." : "මෙය ස්වයංක්රීයව යවන ලද විද්යුත් තැපෑලකි, කරුණාකර පිළිතුරු නොදෙන්න.", + "Help" : "උපකාර", + "Apps" : "යෙදුම්", + "Settings" : "සැකසුම්", + "Log out" : "නික්මෙන්න", + "Users" : "පරිශීලකයින්", + "Unknown user" : "නොදන්නා පරිශීලකයෙකි", + "Additional settings" : "අමතර සැකසුම්", + "Sunday" : "ඉරිදා", + "Monday" : "සඳුදා", + "Tuesday" : "අඟහරුවාදා", + "Wednesday" : "බදාදා", + "Thursday" : "බ්රහස්පතින්දා", + "Friday" : "සිකුරාදා", + "Saturday" : "සෙනසුරාදා", + "Sun." : "ඉරි.", + "Mon." : "සඳු.", + "Tue." : "අඟ.", + "Wed." : "බදා.", + "Thu." : "බ්රහ.", + "Fri." : "සිකු.", + "Sat." : "සෙන.", + "Su" : "ඉරි", + "Mo" : "සඳු", + "Tu" : "අඟ", + "We" : "බදා", + "Th" : "බ්රහ", + "Fr" : "සිකු", + "Sa" : "සෙන", + "January" : "ජනවාරි", + "February" : "පෙබරවාරි", + "March" : "මාර්තු", + "April" : "අප්රේල්", + "May" : "මැයි", + "June" : "ජූනි", + "July" : "ජුලි", + "August" : "අගෝස්තු", + "September" : "සැප්තැම්බර්", + "October" : "ඔක්තෝම්බර්", + "November" : "නොවැම්බර්", + "December" : "දෙසැම්බර්" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/si.json b/lib/l10n/si.json new file mode 100644 index 00000000000..ccb8a2046b4 --- /dev/null +++ b/lib/l10n/si.json @@ -0,0 +1,60 @@ +{ "translations": { + "See %s" : "%s බලන්න", + "Other activities" : "වෙනත් ක්රියාකාරකම්", + "%1$s and %2$s" : "%1$s සහ %2$s", + "%1$s, %2$s and %3$s" : "%1$s, %2$s සහ %3$s ", + "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s සහ %4$s", + "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s සහ %5$s", + "Authentication" : "සත්යාපනය", + "Invalid image" : "වලංගු නොවන පින්තූරයකි", + "today" : "අද", + "tomorrow" : "හෙට", + "yesterday" : "ඊයේ", + "seconds ago" : "තත්පර කිහිපයකට පෙර", + "Empty file" : "හිස් ගොනුවකි", + "File already exists" : "ගොනුව දැනටමත් පවතී", + "File name is too long" : "ගොනුවේ නම දිග වැඩිය", + "__language_name__" : "__language_name__", + "This is an automatically sent email, please do not reply." : "මෙය ස්වයංක්රීයව යවන ලද විද්යුත් තැපෑලකි, කරුණාකර පිළිතුරු නොදෙන්න.", + "Help" : "උපකාර", + "Apps" : "යෙදුම්", + "Settings" : "සැකසුම්", + "Log out" : "නික්මෙන්න", + "Users" : "පරිශීලකයින්", + "Unknown user" : "නොදන්නා පරිශීලකයෙකි", + "Additional settings" : "අමතර සැකසුම්", + "Sunday" : "ඉරිදා", + "Monday" : "සඳුදා", + "Tuesday" : "අඟහරුවාදා", + "Wednesday" : "බදාදා", + "Thursday" : "බ්රහස්පතින්දා", + "Friday" : "සිකුරාදා", + "Saturday" : "සෙනසුරාදා", + "Sun." : "ඉරි.", + "Mon." : "සඳු.", + "Tue." : "අඟ.", + "Wed." : "බදා.", + "Thu." : "බ්රහ.", + "Fri." : "සිකු.", + "Sat." : "සෙන.", + "Su" : "ඉරි", + "Mo" : "සඳු", + "Tu" : "අඟ", + "We" : "බදා", + "Th" : "බ්රහ", + "Fr" : "සිකු", + "Sa" : "සෙන", + "January" : "ජනවාරි", + "February" : "පෙබරවාරි", + "March" : "මාර්තු", + "April" : "අප්රේල්", + "May" : "මැයි", + "June" : "ජූනි", + "July" : "ජුලි", + "August" : "අගෝස්තු", + "September" : "සැප්තැම්බර්", + "October" : "ඔක්තෝම්බර්", + "November" : "නොවැම්බර්", + "December" : "දෙසැම්බර්" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/lib/l10n/si_LK.js b/lib/l10n/si_LK.js deleted file mode 100644 index 8f9fe4440b6..00000000000 --- a/lib/l10n/si_LK.js +++ /dev/null @@ -1,60 +0,0 @@ -OC.L10N.register( - "lib", - { - "Unknown filetype" : "ගොනු මාදිලිය දෝෂ සහිතයි", - "Invalid image" : "පින්තුරය දෝෂ සහිතයි", - "today" : "අද", - "yesterday" : "ඊයේ", - "last month" : "පෙර මාසයේ", - "last year" : "පෙර අවුරුද්දේ", - "seconds ago" : "තත්පරයන්ට පෙර", - "__language_name__" : "සිංහල", - "Help" : "උදව්", - "Apps" : "යෙදුම්", - "Settings" : "සැකසුම්", - "Log out" : "නික්මීම", - "Users" : "පරිශීලකයන්", - "Unknown user" : "හදුනානොගත් සේවාදායකයා", - "Sunday" : "ඉරිදා", - "Monday" : "සඳුදා", - "Tuesday" : "අඟහරුවාදා", - "Wednesday" : "බදාදා", - "Thursday" : "බ්රහස්පතින්දා", - "Friday" : "සිකුරාදා", - "Saturday" : "සෙනසුරාදා", - "Sun." : "ඉරිදා", - "Mon." : "සඳුදා", - "Tue." : "අඟ.", - "Wed." : "බදාදා", - "Thu." : "බ්රහස්.", - "Fri." : "සිකු.", - "Sat." : "සෙන.", - "January" : "ජනවාරි", - "February" : "පෙබරවාරි", - "March" : "මාර්තු", - "April" : "අප්රේල්", - "May" : "මැයි", - "June" : "ජූනි", - "July" : "ජූලි", - "August" : "අගෝස්තු", - "September" : "සැප්තැම්බර්", - "October" : "ඔක්තෝබර", - "November" : "නොවැම්බර්", - "December" : "දෙසැම්බර්", - "Jan." : "ජන.", - "Feb." : "පෙබ.", - "Mar." : "මාර්තු", - "Apr." : "අප්රේල්", - "May." : "මැයි", - "Jun." : "ජුනි", - "Jul." : "ජුලි", - "Aug." : "අගෝ.", - "Sep." : "සැප්.", - "Oct." : "ඔක්.", - "Nov." : "නොවැ.", - "Dec." : "දෙසැ.", - "Application is not enabled" : "යෙදුම සක්රිය කර නොමැත", - "Authentication error" : "සත්යාපන දෝෂයක්", - "Token expired. Please reload page." : "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/si_LK.json b/lib/l10n/si_LK.json deleted file mode 100644 index 40cf9915143..00000000000 --- a/lib/l10n/si_LK.json +++ /dev/null @@ -1,58 +0,0 @@ -{ "translations": { - "Unknown filetype" : "ගොනු මාදිලිය දෝෂ සහිතයි", - "Invalid image" : "පින්තුරය දෝෂ සහිතයි", - "today" : "අද", - "yesterday" : "ඊයේ", - "last month" : "පෙර මාසයේ", - "last year" : "පෙර අවුරුද්දේ", - "seconds ago" : "තත්පරයන්ට පෙර", - "__language_name__" : "සිංහල", - "Help" : "උදව්", - "Apps" : "යෙදුම්", - "Settings" : "සැකසුම්", - "Log out" : "නික්මීම", - "Users" : "පරිශීලකයන්", - "Unknown user" : "හදුනානොගත් සේවාදායකයා", - "Sunday" : "ඉරිදා", - "Monday" : "සඳුදා", - "Tuesday" : "අඟහරුවාදා", - "Wednesday" : "බදාදා", - "Thursday" : "බ්රහස්පතින්දා", - "Friday" : "සිකුරාදා", - "Saturday" : "සෙනසුරාදා", - "Sun." : "ඉරිදා", - "Mon." : "සඳුදා", - "Tue." : "අඟ.", - "Wed." : "බදාදා", - "Thu." : "බ්රහස්.", - "Fri." : "සිකු.", - "Sat." : "සෙන.", - "January" : "ජනවාරි", - "February" : "පෙබරවාරි", - "March" : "මාර්තු", - "April" : "අප්රේල්", - "May" : "මැයි", - "June" : "ජූනි", - "July" : "ජූලි", - "August" : "අගෝස්තු", - "September" : "සැප්තැම්බර්", - "October" : "ඔක්තෝබර", - "November" : "නොවැම්බර්", - "December" : "දෙසැම්බර්", - "Jan." : "ජන.", - "Feb." : "පෙබ.", - "Mar." : "මාර්තු", - "Apr." : "අප්රේල්", - "May." : "මැයි", - "Jun." : "ජුනි", - "Jul." : "ජුලි", - "Aug." : "අගෝ.", - "Sep." : "සැප්.", - "Oct." : "ඔක්.", - "Nov." : "නොවැ.", - "Dec." : "දෙසැ.", - "Application is not enabled" : "යෙදුම සක්රිය කර නොමැත", - "Authentication error" : "සත්යාපන දෝෂයක්", - "Token expired. Please reload page." : "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js index ed52eb65f7e..f831c840af6 100644 --- a/lib/l10n/sl.js +++ b/lib/l10n/sl.js @@ -71,6 +71,9 @@ OC.L10N.register( "seconds ago" : "pred nekaj sekundami", "Empty file" : "Prazna datoteka", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul z ID: %s ne obstaja. Omogočite ga med nastavitvami, ali pa stopite v stik s skrbnikom sistema.", + "File already exists" : "Datoteka že obstaja", + "Failed to create file from template" : "Ustvarjanje datoteke iz predloge je spodletelo", + "Templates" : "Predloge", "File name is a reserved word" : "Ime datoteke je zadržana beseda", "File name contains at least one invalid character" : "Ime datoteke vsebuje vsaj en nedovoljen znak.", "File name is too long" : "Ime datoteke je predolgo", @@ -117,6 +120,7 @@ OC.L10N.register( "Files can’t be shared with create permissions" : "Souporaba datotek z nastavljenim dovoljenjem za ustvarjanje, ni mogoča", "Expiration date is in the past" : "Datum preteka je že mimo!", "Can’t set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnost.", + "Sharing is only allowed with group members" : "Souporaba je dovoljena le med člani skupine", "%1$s shared »%2$s« with you" : "%1$s vam omogoča souporabo »%2$s«", "%1$s shared »%2$s« with you." : "%1$s vam omogoča souporabo »%2$s«.", "Click the button below to open it." : "Kliknite na gumb za odpiranje.", diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json index 3c3c794ea55..75645c84eb8 100644 --- a/lib/l10n/sl.json +++ b/lib/l10n/sl.json @@ -69,6 +69,9 @@ "seconds ago" : "pred nekaj sekundami", "Empty file" : "Prazna datoteka", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul z ID: %s ne obstaja. Omogočite ga med nastavitvami, ali pa stopite v stik s skrbnikom sistema.", + "File already exists" : "Datoteka že obstaja", + "Failed to create file from template" : "Ustvarjanje datoteke iz predloge je spodletelo", + "Templates" : "Predloge", "File name is a reserved word" : "Ime datoteke je zadržana beseda", "File name contains at least one invalid character" : "Ime datoteke vsebuje vsaj en nedovoljen znak.", "File name is too long" : "Ime datoteke je predolgo", @@ -115,6 +118,7 @@ "Files can’t be shared with create permissions" : "Souporaba datotek z nastavljenim dovoljenjem za ustvarjanje, ni mogoča", "Expiration date is in the past" : "Datum preteka je že mimo!", "Can’t set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnost.", + "Sharing is only allowed with group members" : "Souporaba je dovoljena le med člani skupine", "%1$s shared »%2$s« with you" : "%1$s vam omogoča souporabo »%2$s«", "%1$s shared »%2$s« with you." : "%1$s vam omogoča souporabo »%2$s«.", "Click the button below to open it." : "Kliknite na gumb za odpiranje.", diff --git a/lib/l10n/ta_LK.js b/lib/l10n/ta.js index d5006d7ee2d..d5006d7ee2d 100644 --- a/lib/l10n/ta_LK.js +++ b/lib/l10n/ta.js diff --git a/lib/l10n/ta_LK.json b/lib/l10n/ta.json index eaf2b0c32fe..eaf2b0c32fe 100644 --- a/lib/l10n/ta_LK.json +++ b/lib/l10n/ta.json diff --git a/lib/l10n/zh_HK.js b/lib/l10n/zh_HK.js index da2e98c5bf3..ba7ddf34f74 100644 --- a/lib/l10n/zh_HK.js +++ b/lib/l10n/zh_HK.js @@ -32,8 +32,8 @@ OC.L10N.register( "The following platforms are supported: %s" : "支援下列平台:%s", "Server version %s or higher is required." : "需要伺服器版本 %s 或更高", "Server version %s or lower is required." : "需要伺服器版本 %s 或更低", - "Logged in user must be an admin or sub admin" : "登入的使用者必須要是管理員或是子管理員", - "Logged in user must be an admin" : "登入的使用者必須有管理員權限", + "Logged in user must be an admin or sub admin" : "登入的用戶必須要是管理員或是子管理員", + "Logged in user must be an admin" : "登入的用戶必須有管理員權限", "Wiping of device %s has started" : "已開始抹除裝置 %s ", "Wiping of device »%s« has started" : "已開始抹除裝置「%s」", "»%s« started remote wipe" : "「%s」開始遠端抹除", @@ -50,7 +50,7 @@ OC.L10N.register( "Unknown filetype" : "不詳的檔案類型", "Invalid image" : "無效的圖片", "Avatar image is not square" : "頭像不是正方形", - "today" : "今天", + "today" : "今日", "tomorrow" : "明天", "yesterday" : "昨天", "_in %n day_::_in %n days_" : ["在 %n 天內"], @@ -90,11 +90,11 @@ OC.L10N.register( "Users" : "用戶", "Unknown user" : "用戶不詳", "Additional settings" : "其他設定", - "%s enter the database username and name." : "%s 輸入資料庫名稱及使用者名稱", - "%s enter the database username." : "%s 輸入資料庫使用者名稱", + "%s enter the database username and name." : "%s 輸入資料庫名稱及用戶名稱", + "%s enter the database username." : "%s 輸入資料庫用戶名稱", "%s enter the database name." : "%s 輸入資料庫名稱", "%s you may not use dots in the database name" : "%s 資料庫名稱不能包含小數點", - "MySQL username and/or password not valid" : "MySQL 使用者名稱或密碼不正確", + "MySQL username and/or password not valid" : "MySQL 用戶名稱或密碼不正確", "You need to enter details of an existing account." : "您必須輸入現有帳號的資訊", "Oracle connection could not be established" : "無法建立 Oracle 資料庫連線", "Oracle username and/or password not valid" : "Oracle 用戶名和/或密碼無效", @@ -120,18 +120,19 @@ OC.L10N.register( "Files can’t be shared with create permissions" : "無法分享具有新建權限的檔案", "Expiration date is in the past" : "到期日為過去的日期", "Can’t set expiration date more than %s days in the future" : "到期日不能設定為 %s 天以後的日期", + "Sharing is only allowed with group members" : "僅允許在群組成員中共享", "%1$s shared »%2$s« with you" : "%1$s 與您分享了 %2$s", "%1$s shared »%2$s« with you." : "%1$s 與您分享了 %2$s", "Click the button below to open it." : "點下方連結開啟", "The requested share does not exist anymore" : "該分享已經不存在", "Could not find category \"%s\"" : "找不到分類:\"%s\"", - "Sunday" : "週日", - "Monday" : "週一", - "Tuesday" : "週二", - "Wednesday" : "週三", - "Thursday" : "週四", - "Friday" : "週五", - "Saturday" : "週六", + "Sunday" : "星期日", + "Monday" : "星期一", + "Tuesday" : "星期二", + "Wednesday" : "星期三", + "Thursday" : "星期四", + "Friday" : "星期五", + "Saturday" : "星期六", "Sun." : "日", "Mon." : "一", "Tue." : "二", @@ -171,16 +172,16 @@ OC.L10N.register( "Nov." : "十一月", "Dec." : "十二月", "The user limit has been reached and the user was not created." : "用戶數量已達上限,無法創建新用戶。", - "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "使用者名稱當中只能包含下列字元:\"a-z\", \"A-Z\", \"0-9\", 和 \"_.@-'\"", + "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "用戶名稱當中只能包含下列字元:\"a-z\", \"A-Z\", \"0-9\", 和 \"_.@-'\"", "A valid username must be provided" : "必須提供一個有效的用戶名", "Username contains whitespace at the beginning or at the end" : "用戶名的開頭或結尾有空白", - "Username must not consist of dots only" : "使用者名稱不能只包含小數點", - "Username is invalid because files already exist for this user" : "使用者名稱無效,因為使用者的檔案已經存在", + "Username must not consist of dots only" : "用戶名稱不能只包含小數點", + "Username is invalid because files already exist for this user" : "用戶名稱無效,因為用戶的檔案已經存在", "A valid password must be provided" : "須提供有效的密碼", - "The username is already being used" : "這個使用者名稱已經有人使用了", - "Could not create user" : "無法建立使用者", - "User disabled" : "使用者已停用", - "Login canceled by app" : "應用程式取消了登入", + "The username is already being used" : "這個用戶名稱已經有人使用了", + "Could not create user" : "無法建立用戶", + "User disabled" : "用戶已停用", + "Login canceled by app" : "登入已被應用程式取消", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "應用程式 \"%1$s\" 無法被安裝,缺少下列所需元件: %2$s", "a safe home for all your data" : "您資料的安全屋", "File is currently busy, please try again later" : "檔案目前忙碌中,請稍候再試", @@ -212,8 +213,8 @@ OC.L10N.register( "Please ask your server administrator to restart the web server." : "請聯絡您的系統管理員重新啟動網頁伺服器", "PostgreSQL >= 9 required" : "需要 PostgreSQL 版本 >= 9", "Please upgrade your database version" : "請升級您的資料庫版本", - "Your data directory is readable by other users" : "您的資料目錄可以被其他使用者讀取", - "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ,以免其他使用者讀取目錄列表", + "Your data directory is readable by other users" : "您的資料目錄可以被其他用戶讀取", + "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ,以免其他用戶讀取目錄列表", "Your data directory must be an absolute path" : "您的資料目錄必須為絕對路徑", "Check the value of \"datadirectory\" in your configuration" : "請檢查您的設定檔中 \"datadirectory\" 的值", "Your data directory is invalid" : "您的資料目錄無效", diff --git a/lib/l10n/zh_HK.json b/lib/l10n/zh_HK.json index 2c156f0f83b..3d4931d6ff3 100644 --- a/lib/l10n/zh_HK.json +++ b/lib/l10n/zh_HK.json @@ -30,8 +30,8 @@ "The following platforms are supported: %s" : "支援下列平台:%s", "Server version %s or higher is required." : "需要伺服器版本 %s 或更高", "Server version %s or lower is required." : "需要伺服器版本 %s 或更低", - "Logged in user must be an admin or sub admin" : "登入的使用者必須要是管理員或是子管理員", - "Logged in user must be an admin" : "登入的使用者必須有管理員權限", + "Logged in user must be an admin or sub admin" : "登入的用戶必須要是管理員或是子管理員", + "Logged in user must be an admin" : "登入的用戶必須有管理員權限", "Wiping of device %s has started" : "已開始抹除裝置 %s ", "Wiping of device »%s« has started" : "已開始抹除裝置「%s」", "»%s« started remote wipe" : "「%s」開始遠端抹除", @@ -48,7 +48,7 @@ "Unknown filetype" : "不詳的檔案類型", "Invalid image" : "無效的圖片", "Avatar image is not square" : "頭像不是正方形", - "today" : "今天", + "today" : "今日", "tomorrow" : "明天", "yesterday" : "昨天", "_in %n day_::_in %n days_" : ["在 %n 天內"], @@ -88,11 +88,11 @@ "Users" : "用戶", "Unknown user" : "用戶不詳", "Additional settings" : "其他設定", - "%s enter the database username and name." : "%s 輸入資料庫名稱及使用者名稱", - "%s enter the database username." : "%s 輸入資料庫使用者名稱", + "%s enter the database username and name." : "%s 輸入資料庫名稱及用戶名稱", + "%s enter the database username." : "%s 輸入資料庫用戶名稱", "%s enter the database name." : "%s 輸入資料庫名稱", "%s you may not use dots in the database name" : "%s 資料庫名稱不能包含小數點", - "MySQL username and/or password not valid" : "MySQL 使用者名稱或密碼不正確", + "MySQL username and/or password not valid" : "MySQL 用戶名稱或密碼不正確", "You need to enter details of an existing account." : "您必須輸入現有帳號的資訊", "Oracle connection could not be established" : "無法建立 Oracle 資料庫連線", "Oracle username and/or password not valid" : "Oracle 用戶名和/或密碼無效", @@ -118,18 +118,19 @@ "Files can’t be shared with create permissions" : "無法分享具有新建權限的檔案", "Expiration date is in the past" : "到期日為過去的日期", "Can’t set expiration date more than %s days in the future" : "到期日不能設定為 %s 天以後的日期", + "Sharing is only allowed with group members" : "僅允許在群組成員中共享", "%1$s shared »%2$s« with you" : "%1$s 與您分享了 %2$s", "%1$s shared »%2$s« with you." : "%1$s 與您分享了 %2$s", "Click the button below to open it." : "點下方連結開啟", "The requested share does not exist anymore" : "該分享已經不存在", "Could not find category \"%s\"" : "找不到分類:\"%s\"", - "Sunday" : "週日", - "Monday" : "週一", - "Tuesday" : "週二", - "Wednesday" : "週三", - "Thursday" : "週四", - "Friday" : "週五", - "Saturday" : "週六", + "Sunday" : "星期日", + "Monday" : "星期一", + "Tuesday" : "星期二", + "Wednesday" : "星期三", + "Thursday" : "星期四", + "Friday" : "星期五", + "Saturday" : "星期六", "Sun." : "日", "Mon." : "一", "Tue." : "二", @@ -169,16 +170,16 @@ "Nov." : "十一月", "Dec." : "十二月", "The user limit has been reached and the user was not created." : "用戶數量已達上限,無法創建新用戶。", - "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "使用者名稱當中只能包含下列字元:\"a-z\", \"A-Z\", \"0-9\", 和 \"_.@-'\"", + "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "用戶名稱當中只能包含下列字元:\"a-z\", \"A-Z\", \"0-9\", 和 \"_.@-'\"", "A valid username must be provided" : "必須提供一個有效的用戶名", "Username contains whitespace at the beginning or at the end" : "用戶名的開頭或結尾有空白", - "Username must not consist of dots only" : "使用者名稱不能只包含小數點", - "Username is invalid because files already exist for this user" : "使用者名稱無效,因為使用者的檔案已經存在", + "Username must not consist of dots only" : "用戶名稱不能只包含小數點", + "Username is invalid because files already exist for this user" : "用戶名稱無效,因為用戶的檔案已經存在", "A valid password must be provided" : "須提供有效的密碼", - "The username is already being used" : "這個使用者名稱已經有人使用了", - "Could not create user" : "無法建立使用者", - "User disabled" : "使用者已停用", - "Login canceled by app" : "應用程式取消了登入", + "The username is already being used" : "這個用戶名稱已經有人使用了", + "Could not create user" : "無法建立用戶", + "User disabled" : "用戶已停用", + "Login canceled by app" : "登入已被應用程式取消", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "應用程式 \"%1$s\" 無法被安裝,缺少下列所需元件: %2$s", "a safe home for all your data" : "您資料的安全屋", "File is currently busy, please try again later" : "檔案目前忙碌中,請稍候再試", @@ -210,8 +211,8 @@ "Please ask your server administrator to restart the web server." : "請聯絡您的系統管理員重新啟動網頁伺服器", "PostgreSQL >= 9 required" : "需要 PostgreSQL 版本 >= 9", "Please upgrade your database version" : "請升級您的資料庫版本", - "Your data directory is readable by other users" : "您的資料目錄可以被其他使用者讀取", - "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ,以免其他使用者讀取目錄列表", + "Your data directory is readable by other users" : "您的資料目錄可以被其他用戶讀取", + "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ,以免其他用戶讀取目錄列表", "Your data directory must be an absolute path" : "您的資料目錄必須為絕對路徑", "Check the value of \"datadirectory\" in your configuration" : "請檢查您的設定檔中 \"datadirectory\" 的值", "Your data directory is invalid" : "您的資料目錄無效", diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php index d2dc365d835..988313f20e8 100644 --- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php +++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php @@ -38,6 +38,7 @@ use OCP\Dashboard\IManager; use OCP\EventDispatcher\IEventDispatcher; use OCP\ILogger; use Throwable; +use function array_shift; class RegistrationContext { @@ -399,7 +400,7 @@ class RegistrationContext { } } - foreach ($this->aliases as $registration) { + while (($registration = array_shift($this->aliases)) !== null) { try { $apps[$registration['appId']] ->getContainer() @@ -416,7 +417,7 @@ class RegistrationContext { } } - foreach ($this->parameters as $registration) { + while (($registration = array_shift($this->parameters)) !== null) { try { $apps[$registration['appId']] ->getContainer() diff --git a/lib/private/DB/Migrator.php b/lib/private/DB/Migrator.php index dcf0db89f72..609ed5d6f70 100644 --- a/lib/private/DB/Migrator.php +++ b/lib/private/DB/Migrator.php @@ -181,9 +181,9 @@ class Migrator { /** @var string|AbstractAsset $asset */ $filterExpression = $this->getFilterExpression(); if ($asset instanceof AbstractAsset) { - return preg_match($filterExpression, $asset->getName()) !== false; + return preg_match($filterExpression, $asset->getName()) === 1; } - return preg_match($filterExpression, $asset) !== false; + return preg_match($filterExpression, $asset) === 1; }); return $this->connection->getSchemaManager()->createSchema(); } @@ -210,9 +210,9 @@ class Migrator { /** @var string|AbstractAsset $asset */ $filterExpression = $this->getFilterExpression(); if ($asset instanceof AbstractAsset) { - return preg_match($filterExpression, $asset->getName()) !== false; + return preg_match($filterExpression, $asset->getName()) === 1; } - return preg_match($filterExpression, $asset) !== false; + return preg_match($filterExpression, $asset) === 1; }); $sourceSchema = $connection->getSchemaManager()->createSchema(); diff --git a/lib/private/Preview/WebP.php b/lib/private/Preview/WebP.php index 8f10a08206b..d2172b1242c 100644 --- a/lib/private/Preview/WebP.php +++ b/lib/private/Preview/WebP.php @@ -37,6 +37,6 @@ class WebP extends Image { } public function isAvailable(FileInfo $file): bool { - return (bool)(imagetypes() && IMG_WEBP); + return (bool)(imagetypes() & IMG_WEBP); } } diff --git a/lib/private/Repair/RepairDavShares.php b/lib/private/Repair/RepairDavShares.php index 64104c1e28a..8c53eaad43b 100644 --- a/lib/private/Repair/RepairDavShares.php +++ b/lib/private/Repair/RepairDavShares.php @@ -126,7 +126,7 @@ class RepairDavShares implements IRepairStep { */ public function run(IOutput $output) { $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0'); - if (version_compare($versionFromBeforeUpdate, '20.0.7', '<') + if (version_compare($versionFromBeforeUpdate, '20.0.8', '<') && $this->repairUnencodedGroupShares() ) { $output->info('Repaired DAV group shares'); diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index e447b0bfcf2..036d2703d35 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -38,6 +38,8 @@ use OC\HintException; use OC\Hooks\PublicEmitter; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\EventDispatcher\IEventDispatcher; +use OCP\ICache; +use OCP\ICacheFactory; use OCP\IConfig; use OCP\IGroup; use OCP\IUser; @@ -84,14 +86,19 @@ class Manager extends PublicEmitter implements IUserManager { /** @var EventDispatcherInterface */ private $dispatcher; + /** @var ICache */ + private $cache; + /** @var IEventDispatcher */ private $eventDispatcher; public function __construct(IConfig $config, EventDispatcherInterface $oldDispatcher, + ICacheFactory $cacheFactory, IEventDispatcher $eventDispatcher) { $this->config = $config; $this->dispatcher = $oldDispatcher; + $this->cache = $cacheFactory->createDistributed('user_backend_map'); $cachedUsers = &$this->cachedUsers; $this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) { /** @var \OC\User\User $user */ @@ -150,8 +157,24 @@ class Manager extends PublicEmitter implements IUserManager { if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends return $this->cachedUsers[$uid]; } - foreach ($this->backends as $backend) { + + $cachedBackend = $this->cache->get($uid); + if ($cachedBackend !== null && isset($this->backends[$cachedBackend])) { + // Cache has the info of the user backend already, so ask that one directly + $backend = $this->backends[$cachedBackend]; + if ($backend->userExists($uid)) { + return $this->getUserObject($uid, $backend); + } + } + + foreach ($this->backends as $i => $backend) { + if ($i === $cachedBackend) { + // Tried that one already + continue; + } + if ($backend->userExists($uid)) { + $this->cache->set($uid, $i, 300); return $this->getUserObject($uid, $backend); } } diff --git a/lib/public/AppFramework/Http/ZipResponse.php b/lib/public/AppFramework/Http/ZipResponse.php index 1e4b584fd20..a5cc82ebad8 100644 --- a/lib/public/AppFramework/Http/ZipResponse.php +++ b/lib/public/AppFramework/Http/ZipResponse.php @@ -38,7 +38,7 @@ use OCP\IRequest; */ class ZipResponse extends Response implements ICallbackResponse { /** @var resource[] Files to be added to the zip response */ - private $resources; + private $resources = []; /** @var string Filename that the zip file should have */ private $name; private $request; diff --git a/lib/public/Contacts/IManager.php b/lib/public/Contacts/IManager.php index 1fc9c060127..eba3d604ca3 100644 --- a/lib/public/Contacts/IManager.php +++ b/lib/public/Contacts/IManager.php @@ -173,7 +173,7 @@ interface IManager { /** * Return a list of the user's addressbooks * - * @return IAddressBook[] + * @return \OCP\IAddressBook[] * @since 16.0.0 */ public function getUserAddressBooks(); diff --git a/lib/public/RichObjectStrings/Definitions.php b/lib/public/RichObjectStrings/Definitions.php index 263913f27e1..c59855e957b 100644 --- a/lib/public/RichObjectStrings/Definitions.php +++ b/lib/public/RichObjectStrings/Definitions.php @@ -349,6 +349,31 @@ class Definitions { ], ], ], + 'forms-form' => [ + 'author' => 'Nextcloud', + 'app' => 'forms', + 'since' => '21.0.1', + 'parameters' => [ + 'id' => [ + 'since' => '21.0.1', + 'required' => true, + 'description' => 'The form-hash of the form', + 'example' => 'q72GGqbfbLBC6xNB', + ], + 'name' => [ + 'since' => '21.0.1', + 'required' => true, + 'description' => 'The title of the form', + 'example' => 'Nice Form', + ], + 'link' => [ + 'since' => '21.0.1', + 'required' => true, + 'description' => 'The full URL to the board', + 'example' => 'http://localhost/index.php/apps/forms/q72GGqbfbLBC6xNB', + ], + ], + ], 'guest' => [ 'author' => 'Nextcloud', 'app' => 'spreed', |