Skip to content

Commit 2c817aa

Browse files
GVodyanovGVodyanov
committed
Merge with main
Signed-off-by: Grigory V <scratchx@gmx.com>
2 parents d6418c9 + 961ae74 commit 2c817aa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+2389
-434
lines changed

‎CHANGELOG.md

+24-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,29 @@
1-
21
# Changelog
32

4-
## 4.6.0 - unreleased
3+
## 3.5.8 - 2023-01-10
4+
### Fixed
5+
- Rate limit appointment booking and config creation
6+
- Tooltip when importing ics with invalid attendees
7+
- "After the event" slot not being displayed on the appointment config modal
8+
9+
## 4.6.3 - 2024-01-10
10+
### Fixed
11+
- Rate limit appointment booking and config creation
12+
- Apointment confirmation modal button style
13+
- Filtering in sharing search
14+
- Attachment folder picker opening twice
15+
16+
## 4.6.2 - 2024-01-03
17+
### Fixed
18+
- Uploading attachments in Firefox
19+
20+
## 4.6.1 - 2023-12-21
21+
### Fixed
22+
- Localisation for month view
23+
- From/To order in booking emails
24+
- Alarm not editable when menu is open
25+
26+
## 4.6.0 - 2023-11-30
527
### Added
628
- v2 for widget API
729
- PHP8.3 support

‎l10n/ar.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ OC.L10N.register(
8282
"New subscription from link (read-only)" : "إشتراك جديد عن طريق رابط (للقراءة فقط)",
8383
"Creating subscription …" : "جارٍ إنشاء اشتراك …",
8484
"Add public holiday calendar" : "أضف تقويم العطلات العامة",
85+
"Add custom public calendar" : "أضِف تقويماً عمومياً مُخصّصاً",
8586
"An error occurred, unable to create the calendar." : "حدث خطأ، يتعذّر إنشاء التقويم.",
8687
"Please enter a valid link (starting with http://, https://, webcal://, or webcals://)" : "يرجى ادخال رابطٍ صحيحٍ (يبدأ بـ https://, http://, webcals://, webcal://)",
8788
"Copy subscription link" : "نسخ رابط الاشتراك",
@@ -266,6 +267,7 @@ OC.L10N.register(
266267
"Choose a file to add as attachment" : "إختر ملفّاً لإضافته كمرفق",
267268
"Choose a file to share as a link" : "إختر ملفاً لمشاركته كرابط",
268269
"Attachment {name} already exist!" : "المُرفَق {name} موجودٌ سلفاً!",
270+
"Could not upload attachment(s)" : "يتعذّر رفع المرفقـ(ات)",
269271
"_{count} attachment_::_{count} attachments_" : ["{count} مرفقات","{count} مرفق","{count} مرفقات","{count} مرفقات","{count} مرفقات","{count} مرفقات"],
270272
"Invitation accepted" : "تمّ قبول الدعوة",
271273
"Available" : "مُتوفر",
@@ -383,12 +385,17 @@ OC.L10N.register(
383385
"Type to search time zone" : "أكتب للبحث في المنطقة الزمنية ",
384386
"Global" : "عالمي",
385387
"Public holiday calendars" : "تقاويم العطلات العامة",
388+
"Public calendars" : "التقاويم العمومية",
389+
"No valid public calendars configured" : "لا توجد أيّ تقاويم عمومية مُهيّأة بالشكل الصحيح",
390+
"Speak to the server administrator to resolve this issue." : "تحدّث مع مشرف الخادوم لحل هذا الإشكال.",
386391
"Public holiday calendars are provided by Thunderbird. Calendar data will be downloaded from {website}" : "يتم توفير تقاويم العطلات العامة من موقع ثندربرد Thunderbird. سوف يتم تنزيل بيانات التقويم من {website}",
392+
"These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "هذه التقاويم العمومية تمّ اقتراحها من قِبل مشرف الخادوم. بيانات التقويم سيتم تحميلها من موقع الوب المعنِي.",
387393
"By {authors}" : "من قِبَل {authors}",
388394
"Subscribed" : "مُشترِك subscribed",
389395
"Subscribe" : "إشترك subscribe",
390396
"Holidays in {region}" : "العطلات الرسمية في {region}",
391-
"An error occurred, unable to create the public holiday calendar." : "حدث خطأ، غير قادر على إنشاء تقويم العطللات العامة.",
397+
"An error occurred, unable to read public calendars." : "حدث خطأ؛ تعذّرت قراءة التقاويم العمومية.",
398+
"An error occurred, unable to subscribe to calendar." : "حدث خطأ؛ تعذّر الاشتراك في التقويم.",
392399
"Select date" : "إختر التاريخ",
393400
"Select slot" : "إختر الفُرضة الزمنية",
394401
"No slots available" : "لا توجد أي فُرَضةٍ slot مٌتاحةٍ",

‎l10n/ar.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"New subscription from link (read-only)" : "إشتراك جديد عن طريق رابط (للقراءة فقط)",
8181
"Creating subscription …" : "جارٍ إنشاء اشتراك …",
8282
"Add public holiday calendar" : "أضف تقويم العطلات العامة",
83+
"Add custom public calendar" : "أضِف تقويماً عمومياً مُخصّصاً",
8384
"An error occurred, unable to create the calendar." : "حدث خطأ، يتعذّر إنشاء التقويم.",
8485
"Please enter a valid link (starting with http://, https://, webcal://, or webcals://)" : "يرجى ادخال رابطٍ صحيحٍ (يبدأ بـ https://, http://, webcals://, webcal://)",
8586
"Copy subscription link" : "نسخ رابط الاشتراك",
@@ -264,6 +265,7 @@
264265
"Choose a file to add as attachment" : "إختر ملفّاً لإضافته كمرفق",
265266
"Choose a file to share as a link" : "إختر ملفاً لمشاركته كرابط",
266267
"Attachment {name} already exist!" : "المُرفَق {name} موجودٌ سلفاً!",
268+
"Could not upload attachment(s)" : "يتعذّر رفع المرفقـ(ات)",
267269
"_{count} attachment_::_{count} attachments_" : ["{count} مرفقات","{count} مرفق","{count} مرفقات","{count} مرفقات","{count} مرفقات","{count} مرفقات"],
268270
"Invitation accepted" : "تمّ قبول الدعوة",
269271
"Available" : "مُتوفر",
@@ -381,12 +383,17 @@
381383
"Type to search time zone" : "أكتب للبحث في المنطقة الزمنية ",
382384
"Global" : "عالمي",
383385
"Public holiday calendars" : "تقاويم العطلات العامة",
386+
"Public calendars" : "التقاويم العمومية",
387+
"No valid public calendars configured" : "لا توجد أيّ تقاويم عمومية مُهيّأة بالشكل الصحيح",
388+
"Speak to the server administrator to resolve this issue." : "تحدّث مع مشرف الخادوم لحل هذا الإشكال.",
384389
"Public holiday calendars are provided by Thunderbird. Calendar data will be downloaded from {website}" : "يتم توفير تقاويم العطلات العامة من موقع ثندربرد Thunderbird. سوف يتم تنزيل بيانات التقويم من {website}",
390+
"These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "هذه التقاويم العمومية تمّ اقتراحها من قِبل مشرف الخادوم. بيانات التقويم سيتم تحميلها من موقع الوب المعنِي.",
385391
"By {authors}" : "من قِبَل {authors}",
386392
"Subscribed" : "مُشترِك subscribed",
387393
"Subscribe" : "إشترك subscribe",
388394
"Holidays in {region}" : "العطلات الرسمية في {region}",
389-
"An error occurred, unable to create the public holiday calendar." : "حدث خطأ، غير قادر على إنشاء تقويم العطللات العامة.",
395+
"An error occurred, unable to read public calendars." : "حدث خطأ؛ تعذّرت قراءة التقاويم العمومية.",
396+
"An error occurred, unable to subscribe to calendar." : "حدث خطأ؛ تعذّر الاشتراك في التقويم.",
390397
"Select date" : "إختر التاريخ",
391398
"Select slot" : "إختر الفُرضة الزمنية",
392399
"No slots available" : "لا توجد أي فُرَضةٍ slot مٌتاحةٍ",

‎l10n/ast.js

+9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ OC.L10N.register(
77
"More events" : "Más eventos",
88
"Calendar" : "Calendariu",
99
"%1$s - %2$s" : "%1$s - %2$s",
10+
"Confirm" : "Confirmar",
1011
"Date:" : "Data:",
1112
"Today" : "Güei",
1213
"Year" : "Añu",
1314
"Edit" : "Editar",
1415
"Delete" : "Desaniciar",
16+
"Export" : "Esportar",
1517
"Trash bin" : "Papelera",
1618
"Name" : "Nome",
1719
"Internal link" : "Enllaz internu",
1820
"A private link that can be used with external clients" : "Un enllaz priváu que se pue usar con veceros esternos",
21+
"Copy public link" : "Copiar l'enllaz públicu",
1922
"An error occurred while unsharing the calendar." : "Prodúxose un error mentanto se dexaba de compartir el calendariu.",
2023
"Save" : "Guardar",
2124
"Cancel" : "Encaboxar",
@@ -39,14 +42,17 @@ OC.L10N.register(
3942
"Friday" : "Vienres",
4043
"Saturday" : "Sábadu",
4144
"Sunday" : "Domingu",
45+
"Update" : "Anovar",
4246
"Notification" : "Avisu",
4347
"_second_::_seconds_" : ["segundu","segundos"],
4448
"_minute_::_minutes_" : ["minutu","minutos"],
4549
"_hour_::_hours_" : ["hora","hores"],
4650
"_day_::_days_" : ["día","díes"],
4751
"_week_::_weeks_" : ["selmana","selmanes"],
52+
"Out of office" : "Fuera de la oficina",
4853
"Accept" : "Aceptar",
4954
"Decline" : "Refugar",
55+
"Send email" : "Unviar un corréu electrónicu",
5056
"_month_::_months_" : ["mes","meses"],
5157
"_year_::_years_" : ["añu","años"],
5258
"Suggestions" : "Suxerencies",
@@ -72,7 +78,9 @@ OC.L10N.register(
7278
"_Every %n year_::_Every %n years_" : ["Cada %n añu","Cada %n años"],
7379
"%n more" : "%n más",
7480
"Status" : "Estáu",
81+
"Categories" : "Categories",
7582
"Meditation" : "Meditación",
83+
"Commuting" : "En desplazamientu",
7684
"Dog" : "Perru",
7785
"Concert" : "Conciertu",
7886
"Festival" : "Festival",
@@ -85,6 +93,7 @@ OC.L10N.register(
8593
"Cinema" : "Cine",
8694
"Graduation" : "Graduación",
8795
"Inspection" : "Inspeición",
96+
"Mail" : "Corréu electrónicu",
8897
"Soccer" : "Fútbol",
8998
"Basketball" : "Baloncestu",
9099
"Museum" : "Muséu",

‎l10n/ast.json

+9
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,18 @@
55
"More events" : "Más eventos",
66
"Calendar" : "Calendariu",
77
"%1$s - %2$s" : "%1$s - %2$s",
8+
"Confirm" : "Confirmar",
89
"Date:" : "Data:",
910
"Today" : "Güei",
1011
"Year" : "Añu",
1112
"Edit" : "Editar",
1213
"Delete" : "Desaniciar",
14+
"Export" : "Esportar",
1315
"Trash bin" : "Papelera",
1416
"Name" : "Nome",
1517
"Internal link" : "Enllaz internu",
1618
"A private link that can be used with external clients" : "Un enllaz priváu que se pue usar con veceros esternos",
19+
"Copy public link" : "Copiar l'enllaz públicu",
1720
"An error occurred while unsharing the calendar." : "Prodúxose un error mentanto se dexaba de compartir el calendariu.",
1821
"Save" : "Guardar",
1922
"Cancel" : "Encaboxar",
@@ -37,14 +40,17 @@
3740
"Friday" : "Vienres",
3841
"Saturday" : "Sábadu",
3942
"Sunday" : "Domingu",
43+
"Update" : "Anovar",
4044
"Notification" : "Avisu",
4145
"_second_::_seconds_" : ["segundu","segundos"],
4246
"_minute_::_minutes_" : ["minutu","minutos"],
4347
"_hour_::_hours_" : ["hora","hores"],
4448
"_day_::_days_" : ["día","díes"],
4549
"_week_::_weeks_" : ["selmana","selmanes"],
50+
"Out of office" : "Fuera de la oficina",
4651
"Accept" : "Aceptar",
4752
"Decline" : "Refugar",
53+
"Send email" : "Unviar un corréu electrónicu",
4854
"_month_::_months_" : ["mes","meses"],
4955
"_year_::_years_" : ["añu","años"],
5056
"Suggestions" : "Suxerencies",
@@ -70,7 +76,9 @@
7076
"_Every %n year_::_Every %n years_" : ["Cada %n añu","Cada %n años"],
7177
"%n more" : "%n más",
7278
"Status" : "Estáu",
79+
"Categories" : "Categories",
7380
"Meditation" : "Meditación",
81+
"Commuting" : "En desplazamientu",
7482
"Dog" : "Perru",
7583
"Concert" : "Conciertu",
7684
"Festival" : "Festival",
@@ -83,6 +91,7 @@
8391
"Cinema" : "Cine",
8492
"Graduation" : "Graduación",
8593
"Inspection" : "Inspeición",
94+
"Mail" : "Corréu electrónicu",
8695
"Soccer" : "Fútbol",
8796
"Basketball" : "Baloncestu",
8897
"Museum" : "Muséu",

‎l10n/az.js

+7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
OC.L10N.register(
22
"calendar",
33
{
4+
"Hello," : "Salam,",
45
"Cheers!" : "Şərəfə!",
56
"Calendar" : "Təqvim",
7+
"Confirm" : "Təsdiq edin",
68
"Today" : "Bu gün",
79
"Day" : "Gün",
810
"Week" : "Həftə",
@@ -38,18 +40,23 @@ OC.L10N.register(
3840
"Email" : "Email",
3941
"Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
4042
"Accept" : "Qəbul et",
43+
"Decline" : "İmtina",
4144
"Send email" : "Email yolla",
4245
"Remove group" : "Qrupu sil",
4346
"Repeat" : "Təkrar",
4447
"never" : "heç vaxt",
4548
"More" : "Daha da",
49+
"Subscribe" : "Abunə",
4650
"Personal" : "Şəxsi",
4751
"Details" : "Detallar",
4852
"Attendees" : "İştirakçılar",
53+
"Resources" : "Resurslar",
4954
"Close" : "Bağla",
5055
"Daily" : "Günlük",
5156
"Weekly" : "Həftəlik",
5257
"Other" : "Digər",
58+
"Status" : "Status",
59+
"Categories" : "Kateqoriyalar",
5360
"Mail" : "Məktub",
5461
"Birthday" : "Ad günü"
5562
},

‎l10n/az.json

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{ "translations": {
2+
"Hello," : "Salam,",
23
"Cheers!" : "Şərəfə!",
34
"Calendar" : "Təqvim",
5+
"Confirm" : "Təsdiq edin",
46
"Today" : "Bu gün",
57
"Day" : "Gün",
68
"Week" : "Həftə",
@@ -36,18 +38,23 @@
3638
"Email" : "Email",
3739
"Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
3840
"Accept" : "Qəbul et",
41+
"Decline" : "İmtina",
3942
"Send email" : "Email yolla",
4043
"Remove group" : "Qrupu sil",
4144
"Repeat" : "Təkrar",
4245
"never" : "heç vaxt",
4346
"More" : "Daha da",
47+
"Subscribe" : "Abunə",
4448
"Personal" : "Şəxsi",
4549
"Details" : "Detallar",
4650
"Attendees" : "İştirakçılar",
51+
"Resources" : "Resurslar",
4752
"Close" : "Bağla",
4853
"Daily" : "Günlük",
4954
"Weekly" : "Həftəlik",
5055
"Other" : "Digər",
56+
"Status" : "Status",
57+
"Categories" : "Kateqoriyalar",
5158
"Mail" : "Məktub",
5259
"Birthday" : "Ad günü"
5360
},"pluralForm" :"nplurals=2; plural=(n != 1);"

‎l10n/ca.js

+15-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ OC.L10N.register(
3434
"Dear %s, your booking has been accepted." : "Benvolgut %s, s'ha acceptat la vostra reserva.",
3535
"Appointment for:" : "Cita per a:",
3636
"Date:" : "Data:",
37-
"You will receive a link with the confirmation email" : "Rebreu un enllaç amb el correu de confirmació",
37+
"You will receive a link with the confirmation email" : "Rebreu un enllaç amb el correu electrònic de confirmació",
3838
"Where:" : "Ubicació:",
3939
"Comment:" : "Comentari:",
4040
"You have a new appointment booking \"%s\" from %s" : "Tens una nova reserva de cita \"%s\" de %s",
@@ -82,6 +82,7 @@ OC.L10N.register(
8282
"New subscription from link (read-only)" : "Nova subscripció des d'enllaç (només lectura)",
8383
"Creating subscription …" : "Creant la subscripció …",
8484
"Add public holiday calendar" : "Afegeix un calendari de festes públiques",
85+
"Add custom public calendar" : "Afegeix un calendari públic personalitzat",
8586
"An error occurred, unable to create the calendar." : "Ha succeït un error i no s'ha pogut crear el calendari.",
8687
"Please enter a valid link (starting with http://, https://, webcal://, or webcals://)" : "Escriviu un enllaç vàlid (que comenci amb http://, https://, webcal://, o webcals://)",
8788
"Copy subscription link" : "Copiar l'enllaç de subscripció",
@@ -203,8 +204,8 @@ OC.L10N.register(
203204
"Private – only accessible via secret link" : "Privat – només accessible mitjançant un enllaç secret",
204205
"Appointment name" : "Nom de la cita",
205206
"Location" : "Ubicació",
206-
"Create a Talk room" : "Crea una sala de conversa",
207-
"A unique link will be generated for every booked appointment and sent via the confirmation email" : "Un enllaç únic que es generarà per cada cita reservada i enviada mitjançant el correu de confirmació",
207+
"Create a Talk room" : "Crea una sala de Converses",
208+
"A unique link will be generated for every booked appointment and sent via the confirmation email" : "Un enllaç únic que es generarà per cada cita reservada i enviada mitjançant el correu electrònic de confirmació",
208209
"Description" : "Descripció",
209210
"Visibility" : "Visibilitat",
210211
"Duration" : "Durada",
@@ -298,6 +299,7 @@ OC.L10N.register(
298299
"Create Talk room for this event" : "Crea una sala a Talk per a aquest esdeveniment",
299300
"Show busy times" : "Mostra els horaris ocupats",
300301
"No attendees yet" : "Encara no hi ha cap participant",
302+
"You do not own this calendar, so you cannot add attendees to this event" : "No sou el propietari d'aquest calendari, de manera que no podeu afegir assistents a aquest esdeveniment",
301303
"Successfully appended link to talk room to location." : "S'ha afegit correctament l'enllaç a la sala de conversa a la ubicació.",
302304
"Successfully appended link to talk room to description." : "S'ha afegit l'enllaç d'una nova sala de Talk a la descripció de l'esdeveniment.",
303305
"Error creating Talk room" : "Ha succeït un error tractant de crear la sala a Talk",
@@ -308,7 +310,10 @@ OC.L10N.register(
308310
"Non-participant" : "Sense participació",
309311
"Remove group" : "Suprimir el grup",
310312
"Remove attendee" : "Suprimeix el participant",
313+
"_%n member_::_%n members_" : ["{n} membre","{n} membres"],
314+
"Search for emails, users, contacts or groups" : "Cerca correus electrònics, usuaris, contactes o grups",
311315
"No match found" : "No s'ha trobat cap coincidència",
316+
"Note that members of circles get invited but are not synced yet." : "Tingueu en compte que els membres dels cercles són convidats però encara no es sincronitzen.",
312317
"(organizer)" : "(organitza l'esdeveniment)",
313318
"To send out invitations and handle responses, [linkopen]add your email address in personal settings[linkclose]." : "Per enviar invitacions i atendre les respostes, cal que [linkopen]afegiu la vostra adreça de correu a la vostra configuració personal[linkclose].",
314319
"Remove color" : "Suprimeix el color",
@@ -379,15 +384,21 @@ OC.L10N.register(
379384
"Type to search time zone" : "Escriviu per cercar la zona horària",
380385
"Global" : "Global",
381386
"Public holiday calendars" : "Calendaris de festius",
387+
"Public calendars" : "Calendaris públics",
388+
"No valid public calendars configured" : "No s'han configurat calendaris públics vàlids",
389+
"Speak to the server administrator to resolve this issue." : "Parleu amb l'administrador del servidor per resoldre aquest problema.",
382390
"Public holiday calendars are provided by Thunderbird. Calendar data will be downloaded from {website}" : "Thunderbird proporciona els calendaris de festius. Les dades del calendari es baixaran de {website}",
391+
"These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "Aquests calendaris públics els suggereix l'administrador del servidor. Les dades del calendari es descarregaran del lloc web corresponent.",
383392
"By {authors}" : "Per {authors}",
384393
"Subscribed" : "Subscrit",
385394
"Subscribe" : "Subscriu-m'hi",
386395
"Holidays in {region}" : "Festius a {region}",
387-
"An error occurred, unable to create the public holiday calendar." : "S'ha produït un error, no s'ha pogut crear el calendari de festius.",
396+
"An error occurred, unable to read public calendars." : "S'ha produït un error, no es poden llegir els calendaris públics.",
397+
"An error occurred, unable to subscribe to calendar." : "S'ha produït un error, no es pot subscriure al calendari.",
388398
"Select date" : "Seleccioneu una data",
389399
"Select slot" : "Seleccioneu unitat temporal",
390400
"No slots available" : "No hi han unitats temporals disponibles",
401+
"Could not fetch slots" : "No s'han pogut obtenir les unitats temporals",
391402
"The slot for your appointment has been confirmed" : "S'ha confirmat l’unitat temporal per a la vostra cita",
392403
"Appointment Details:" : "Detalls de la cita:",
393404
"Time:" : "Hora:",

0 commit comments

Comments
 (0)