Skip to content

Commit

Permalink
Merge with main
Browse files Browse the repository at this point in the history
Signed-off-by: Grigory V <[email protected]>
  • Loading branch information
GVodyanov committed Feb 19, 2024
2 parents d6418c9 + 961ae74 commit 2c817aa
Show file tree
Hide file tree
Showing 103 changed files with 2,389 additions and 434 deletions.
26 changes: 24 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,29 @@

# Changelog

## 4.6.0 - unreleased
## 3.5.8 - 2023-01-10
### Fixed
- Rate limit appointment booking and config creation
- Tooltip when importing ics with invalid attendees
- "After the event" slot not being displayed on the appointment config modal

## 4.6.3 - 2024-01-10
### Fixed
- Rate limit appointment booking and config creation
- Apointment confirmation modal button style
- Filtering in sharing search
- Attachment folder picker opening twice

## 4.6.2 - 2024-01-03
### Fixed
- Uploading attachments in Firefox

## 4.6.1 - 2023-12-21
### Fixed
- Localisation for month view
- From/To order in booking emails
- Alarm not editable when menu is open

## 4.6.0 - 2023-11-30
### Added
- v2 for widget API
- PHP8.3 support
Expand Down
9 changes: 8 additions & 1 deletion l10n/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ OC.L10N.register(
"New subscription from link (read-only)" : "إشتراك جديد عن طريق رابط (للقراءة فقط)",
"Creating subscription …" : "جارٍ إنشاء اشتراك …",
"Add public holiday calendar" : "أضف تقويم العطلات العامة",
"Add custom public calendar" : "أضِف تقويماً عمومياً مُخصّصاً",
"An error occurred, unable to create the calendar." : "حدث خطأ، يتعذّر إنشاء التقويم.",
"Please enter a valid link (starting with http://, https://, webcal://, or webcals://)" : "يرجى ادخال رابطٍ صحيحٍ (يبدأ بـ https://, http://, webcals://, webcal://)",
"Copy subscription link" : "نسخ رابط الاشتراك",
Expand Down Expand Up @@ -266,6 +267,7 @@ OC.L10N.register(
"Choose a file to add as attachment" : "إختر ملفّاً لإضافته كمرفق",
"Choose a file to share as a link" : "إختر ملفاً لمشاركته كرابط",
"Attachment {name} already exist!" : "المُرفَق {name} موجودٌ سلفاً!",
"Could not upload attachment(s)" : "يتعذّر رفع المرفقـ(ات)",
"_{count} attachment_::_{count} attachments_" : ["{count} مرفقات","{count} مرفق","{count} مرفقات","{count} مرفقات","{count} مرفقات","{count} مرفقات"],
"Invitation accepted" : "تمّ قبول الدعوة",
"Available" : "مُتوفر",
Expand Down Expand Up @@ -383,12 +385,17 @@ OC.L10N.register(
"Type to search time zone" : "أكتب للبحث في المنطقة الزمنية ",
"Global" : "عالمي",
"Public holiday calendars" : "تقاويم العطلات العامة",
"Public calendars" : "التقاويم العمومية",
"No valid public calendars configured" : "لا توجد أيّ تقاويم عمومية مُهيّأة بالشكل الصحيح",
"Speak to the server administrator to resolve this issue." : "تحدّث مع مشرف الخادوم لحل هذا الإشكال.",
"Public holiday calendars are provided by Thunderbird. Calendar data will be downloaded from {website}" : "يتم توفير تقاويم العطلات العامة من موقع ثندربرد Thunderbird. سوف يتم تنزيل بيانات التقويم من {website}",
"These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "هذه التقاويم العمومية تمّ اقتراحها من قِبل مشرف الخادوم. بيانات التقويم سيتم تحميلها من موقع الوب المعنِي.",
"By {authors}" : "من قِبَل {authors}",
"Subscribed" : "مُشترِك subscribed",
"Subscribe" : "إشترك subscribe",
"Holidays in {region}" : "العطلات الرسمية في {region}",
"An error occurred, unable to create the public holiday calendar." : "حدث خطأ، غير قادر على إنشاء تقويم العطللات العامة.",
"An error occurred, unable to read public calendars." : "حدث خطأ؛ تعذّرت قراءة التقاويم العمومية.",
"An error occurred, unable to subscribe to calendar." : "حدث خطأ؛ تعذّر الاشتراك في التقويم.",
"Select date" : "إختر التاريخ",
"Select slot" : "إختر الفُرضة الزمنية",
"No slots available" : "لا توجد أي فُرَضةٍ slot مٌتاحةٍ",
Expand Down
9 changes: 8 additions & 1 deletion l10n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"New subscription from link (read-only)" : "إشتراك جديد عن طريق رابط (للقراءة فقط)",
"Creating subscription …" : "جارٍ إنشاء اشتراك …",
"Add public holiday calendar" : "أضف تقويم العطلات العامة",
"Add custom public calendar" : "أضِف تقويماً عمومياً مُخصّصاً",
"An error occurred, unable to create the calendar." : "حدث خطأ، يتعذّر إنشاء التقويم.",
"Please enter a valid link (starting with http://, https://, webcal://, or webcals://)" : "يرجى ادخال رابطٍ صحيحٍ (يبدأ بـ https://, http://, webcals://, webcal://)",
"Copy subscription link" : "نسخ رابط الاشتراك",
Expand Down Expand Up @@ -264,6 +265,7 @@
"Choose a file to add as attachment" : "إختر ملفّاً لإضافته كمرفق",
"Choose a file to share as a link" : "إختر ملفاً لمشاركته كرابط",
"Attachment {name} already exist!" : "المُرفَق {name} موجودٌ سلفاً!",
"Could not upload attachment(s)" : "يتعذّر رفع المرفقـ(ات)",
"_{count} attachment_::_{count} attachments_" : ["{count} مرفقات","{count} مرفق","{count} مرفقات","{count} مرفقات","{count} مرفقات","{count} مرفقات"],
"Invitation accepted" : "تمّ قبول الدعوة",
"Available" : "مُتوفر",
Expand Down Expand Up @@ -381,12 +383,17 @@
"Type to search time zone" : "أكتب للبحث في المنطقة الزمنية ",
"Global" : "عالمي",
"Public holiday calendars" : "تقاويم العطلات العامة",
"Public calendars" : "التقاويم العمومية",
"No valid public calendars configured" : "لا توجد أيّ تقاويم عمومية مُهيّأة بالشكل الصحيح",
"Speak to the server administrator to resolve this issue." : "تحدّث مع مشرف الخادوم لحل هذا الإشكال.",
"Public holiday calendars are provided by Thunderbird. Calendar data will be downloaded from {website}" : "يتم توفير تقاويم العطلات العامة من موقع ثندربرد Thunderbird. سوف يتم تنزيل بيانات التقويم من {website}",
"These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "هذه التقاويم العمومية تمّ اقتراحها من قِبل مشرف الخادوم. بيانات التقويم سيتم تحميلها من موقع الوب المعنِي.",
"By {authors}" : "من قِبَل {authors}",
"Subscribed" : "مُشترِك subscribed",
"Subscribe" : "إشترك subscribe",
"Holidays in {region}" : "العطلات الرسمية في {region}",
"An error occurred, unable to create the public holiday calendar." : "حدث خطأ، غير قادر على إنشاء تقويم العطللات العامة.",
"An error occurred, unable to read public calendars." : "حدث خطأ؛ تعذّرت قراءة التقاويم العمومية.",
"An error occurred, unable to subscribe to calendar." : "حدث خطأ؛ تعذّر الاشتراك في التقويم.",
"Select date" : "إختر التاريخ",
"Select slot" : "إختر الفُرضة الزمنية",
"No slots available" : "لا توجد أي فُرَضةٍ slot مٌتاحةٍ",
Expand Down
9 changes: 9 additions & 0 deletions l10n/ast.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@ OC.L10N.register(
"More events" : "Más eventos",
"Calendar" : "Calendariu",
"%1$s - %2$s" : "%1$s - %2$s",
"Confirm" : "Confirmar",
"Date:" : "Data:",
"Today" : "Güei",
"Year" : "Añu",
"Edit" : "Editar",
"Delete" : "Desaniciar",
"Export" : "Esportar",
"Trash bin" : "Papelera",
"Name" : "Nome",
"Internal link" : "Enllaz internu",
"A private link that can be used with external clients" : "Un enllaz priváu que se pue usar con veceros esternos",
"Copy public link" : "Copiar l'enllaz públicu",
"An error occurred while unsharing the calendar." : "Prodúxose un error mentanto se dexaba de compartir el calendariu.",
"Save" : "Guardar",
"Cancel" : "Encaboxar",
Expand All @@ -39,14 +42,17 @@ OC.L10N.register(
"Friday" : "Vienres",
"Saturday" : "Sábadu",
"Sunday" : "Domingu",
"Update" : "Anovar",
"Notification" : "Avisu",
"_second_::_seconds_" : ["segundu","segundos"],
"_minute_::_minutes_" : ["minutu","minutos"],
"_hour_::_hours_" : ["hora","hores"],
"_day_::_days_" : ["día","díes"],
"_week_::_weeks_" : ["selmana","selmanes"],
"Out of office" : "Fuera de la oficina",
"Accept" : "Aceptar",
"Decline" : "Refugar",
"Send email" : "Unviar un corréu electrónicu",
"_month_::_months_" : ["mes","meses"],
"_year_::_years_" : ["añu","años"],
"Suggestions" : "Suxerencies",
Expand All @@ -72,7 +78,9 @@ OC.L10N.register(
"_Every %n year_::_Every %n years_" : ["Cada %n añu","Cada %n años"],
"%n more" : "%n más",
"Status" : "Estáu",
"Categories" : "Categories",
"Meditation" : "Meditación",
"Commuting" : "En desplazamientu",
"Dog" : "Perru",
"Concert" : "Conciertu",
"Festival" : "Festival",
Expand All @@ -85,6 +93,7 @@ OC.L10N.register(
"Cinema" : "Cine",
"Graduation" : "Graduación",
"Inspection" : "Inspeición",
"Mail" : "Corréu electrónicu",
"Soccer" : "Fútbol",
"Basketball" : "Baloncestu",
"Museum" : "Muséu",
Expand Down
9 changes: 9 additions & 0 deletions l10n/ast.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@
"More events" : "Más eventos",
"Calendar" : "Calendariu",
"%1$s - %2$s" : "%1$s - %2$s",
"Confirm" : "Confirmar",
"Date:" : "Data:",
"Today" : "Güei",
"Year" : "Añu",
"Edit" : "Editar",
"Delete" : "Desaniciar",
"Export" : "Esportar",
"Trash bin" : "Papelera",
"Name" : "Nome",
"Internal link" : "Enllaz internu",
"A private link that can be used with external clients" : "Un enllaz priváu que se pue usar con veceros esternos",
"Copy public link" : "Copiar l'enllaz públicu",
"An error occurred while unsharing the calendar." : "Prodúxose un error mentanto se dexaba de compartir el calendariu.",
"Save" : "Guardar",
"Cancel" : "Encaboxar",
Expand All @@ -37,14 +40,17 @@
"Friday" : "Vienres",
"Saturday" : "Sábadu",
"Sunday" : "Domingu",
"Update" : "Anovar",
"Notification" : "Avisu",
"_second_::_seconds_" : ["segundu","segundos"],
"_minute_::_minutes_" : ["minutu","minutos"],
"_hour_::_hours_" : ["hora","hores"],
"_day_::_days_" : ["día","díes"],
"_week_::_weeks_" : ["selmana","selmanes"],
"Out of office" : "Fuera de la oficina",
"Accept" : "Aceptar",
"Decline" : "Refugar",
"Send email" : "Unviar un corréu electrónicu",
"_month_::_months_" : ["mes","meses"],
"_year_::_years_" : ["añu","años"],
"Suggestions" : "Suxerencies",
Expand All @@ -70,7 +76,9 @@
"_Every %n year_::_Every %n years_" : ["Cada %n añu","Cada %n años"],
"%n more" : "%n más",
"Status" : "Estáu",
"Categories" : "Categories",
"Meditation" : "Meditación",
"Commuting" : "En desplazamientu",
"Dog" : "Perru",
"Concert" : "Conciertu",
"Festival" : "Festival",
Expand All @@ -83,6 +91,7 @@
"Cinema" : "Cine",
"Graduation" : "Graduación",
"Inspection" : "Inspeición",
"Mail" : "Corréu electrónicu",
"Soccer" : "Fútbol",
"Basketball" : "Baloncestu",
"Museum" : "Muséu",
Expand Down
7 changes: 7 additions & 0 deletions l10n/az.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
OC.L10N.register(
"calendar",
{
"Hello," : "Salam,",
"Cheers!" : "Şərəfə!",
"Calendar" : "Təqvim",
"Confirm" : "Təsdiq edin",
"Today" : "Bu gün",
"Day" : "Gün",
"Week" : "Həftə",
Expand Down Expand Up @@ -38,18 +40,23 @@ OC.L10N.register(
"Email" : "Email",
"Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
"Accept" : "Qəbul et",
"Decline" : "İmtina",
"Send email" : "Email yolla",
"Remove group" : "Qrupu sil",
"Repeat" : "Təkrar",
"never" : "heç vaxt",
"More" : "Daha da",
"Subscribe" : "Abunə",
"Personal" : "Şəxsi",
"Details" : "Detallar",
"Attendees" : "İştirakçılar",
"Resources" : "Resurslar",
"Close" : "Bağla",
"Daily" : "Günlük",
"Weekly" : "Həftəlik",
"Other" : "Digər",
"Status" : "Status",
"Categories" : "Kateqoriyalar",
"Mail" : "Məktub",
"Birthday" : "Ad günü"
},
Expand Down
7 changes: 7 additions & 0 deletions l10n/az.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{ "translations": {
"Hello," : "Salam,",
"Cheers!" : "Şərəfə!",
"Calendar" : "Təqvim",
"Confirm" : "Təsdiq edin",
"Today" : "Bu gün",
"Day" : "Gün",
"Week" : "Həftə",
Expand Down Expand Up @@ -36,18 +38,23 @@
"Email" : "Email",
"Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
"Accept" : "Qəbul et",
"Decline" : "İmtina",
"Send email" : "Email yolla",
"Remove group" : "Qrupu sil",
"Repeat" : "Təkrar",
"never" : "heç vaxt",
"More" : "Daha da",
"Subscribe" : "Abunə",
"Personal" : "Şəxsi",
"Details" : "Detallar",
"Attendees" : "İştirakçılar",
"Resources" : "Resurslar",
"Close" : "Bağla",
"Daily" : "Günlük",
"Weekly" : "Həftəlik",
"Other" : "Digər",
"Status" : "Status",
"Categories" : "Kateqoriyalar",
"Mail" : "Məktub",
"Birthday" : "Ad günü"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
Expand Down
19 changes: 15 additions & 4 deletions l10n/ca.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ OC.L10N.register(
"Dear %s, your booking has been accepted." : "Benvolgut %s, s'ha acceptat la vostra reserva.",
"Appointment for:" : "Cita per a:",
"Date:" : "Data:",
"You will receive a link with the confirmation email" : "Rebreu un enllaç amb el correu de confirmació",
"You will receive a link with the confirmation email" : "Rebreu un enllaç amb el correu electrònic de confirmació",
"Where:" : "Ubicació:",
"Comment:" : "Comentari:",
"You have a new appointment booking \"%s\" from %s" : "Tens una nova reserva de cita \"%s\" de %s",
Expand Down Expand Up @@ -82,6 +82,7 @@ OC.L10N.register(
"New subscription from link (read-only)" : "Nova subscripció des d'enllaç (només lectura)",
"Creating subscription …" : "Creant la subscripció …",
"Add public holiday calendar" : "Afegeix un calendari de festes públiques",
"Add custom public calendar" : "Afegeix un calendari públic personalitzat",
"An error occurred, unable to create the calendar." : "Ha succeït un error i no s'ha pogut crear el calendari.",
"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://)",
"Copy subscription link" : "Copiar l'enllaç de subscripció",
Expand Down Expand Up @@ -203,8 +204,8 @@ OC.L10N.register(
"Private – only accessible via secret link" : "Privat – només accessible mitjançant un enllaç secret",
"Appointment name" : "Nom de la cita",
"Location" : "Ubicació",
"Create a Talk room" : "Crea una sala de conversa",
"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ó",
"Create a Talk room" : "Crea una sala de Converses",
"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ó",
"Description" : "Descripció",
"Visibility" : "Visibilitat",
"Duration" : "Durada",
Expand Down Expand Up @@ -298,6 +299,7 @@ OC.L10N.register(
"Create Talk room for this event" : "Crea una sala a Talk per a aquest esdeveniment",
"Show busy times" : "Mostra els horaris ocupats",
"No attendees yet" : "Encara no hi ha cap participant",
"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",
"Successfully appended link to talk room to location." : "S'ha afegit correctament l'enllaç a la sala de conversa a la ubicació.",
"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.",
"Error creating Talk room" : "Ha succeït un error tractant de crear la sala a Talk",
Expand All @@ -308,7 +310,10 @@ OC.L10N.register(
"Non-participant" : "Sense participació",
"Remove group" : "Suprimir el grup",
"Remove attendee" : "Suprimeix el participant",
"_%n member_::_%n members_" : ["{n} membre","{n} membres"],
"Search for emails, users, contacts or groups" : "Cerca correus electrònics, usuaris, contactes o grups",
"No match found" : "No s'ha trobat cap coincidència",
"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.",
"(organizer)" : "(organitza l'esdeveniment)",
"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].",
"Remove color" : "Suprimeix el color",
Expand Down Expand Up @@ -379,15 +384,21 @@ OC.L10N.register(
"Type to search time zone" : "Escriviu per cercar la zona horària",
"Global" : "Global",
"Public holiday calendars" : "Calendaris de festius",
"Public calendars" : "Calendaris públics",
"No valid public calendars configured" : "No s'han configurat calendaris públics vàlids",
"Speak to the server administrator to resolve this issue." : "Parleu amb l'administrador del servidor per resoldre aquest problema.",
"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}",
"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.",
"By {authors}" : "Per {authors}",
"Subscribed" : "Subscrit",
"Subscribe" : "Subscriu-m'hi",
"Holidays in {region}" : "Festius a {region}",
"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.",
"An error occurred, unable to read public calendars." : "S'ha produït un error, no es poden llegir els calendaris públics.",
"An error occurred, unable to subscribe to calendar." : "S'ha produït un error, no es pot subscriure al calendari.",
"Select date" : "Seleccioneu una data",
"Select slot" : "Seleccioneu unitat temporal",
"No slots available" : "No hi han unitats temporals disponibles",
"Could not fetch slots" : "No s'han pogut obtenir les unitats temporals",
"The slot for your appointment has been confirmed" : "S'ha confirmat l’unitat temporal per a la vostra cita",
"Appointment Details:" : "Detalls de la cita:",
"Time:" : "Hora:",
Expand Down
Loading

0 comments on commit 2c817aa

Please sign in to comment.