Skip to content

Commit

Permalink
Merge branch 'stable29' into backport/48583/stable29
Browse files Browse the repository at this point in the history
  • Loading branch information
SebastianKrupinski authored Nov 14, 2024
2 parents 63953be + defe57e commit 6888528
Show file tree
Hide file tree
Showing 104 changed files with 256 additions and 216 deletions.
10 changes: 5 additions & 5 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
/apps/contactsinteraction/lib @kesselb @SebastianKrupinski
/apps/contactsinteraction/tests @kesselb @SebastianKrupinski
/apps/dashboard/appinfo/info.xml @julien-nc @juliusknorr
/apps/dav/lib/CalDAV @miaulalala @st3iny @SebastianKrupinski
/apps/dav/lib/CardDAV @miaulalala @st3iny @SebastianKrupinski
/apps/dav/tests/unit/CalDAV @miaulalala @st3iny @SebastianKrupinski
/apps/dav/tests/unit/CardDAV @miaulalala @st3iny @SebastianKrupinski
/apps/dav/lib/CalDAV @st3iny @SebastianKrupinski @tcitworld
/apps/dav/lib/CardDAV @hamza221 @SebastianKrupinski
/apps/dav/tests/unit/CalDAV @st3iny @SebastianKrupinski @tcitworld
/apps/dav/tests/unit/CardDAV @hamza221 @SebastianKrupinski
/apps/encryption/appinfo/info.xml @come-nc @icewind1991
/apps/federatedfilesharing/appinfo/info.xml @icewind1991 @danxuliu
/apps/federation/appinfo/info.xml @nfebe
Expand Down Expand Up @@ -41,7 +41,7 @@

# Security team
/resources/codesigning @mgallien @miaulalala @nickvergessen
/resources/config/ca-bundle.crt @ChristophWurst @miaulalala @nickvergessen
/resources/config/ca-bundle.crt @miaulalala @nickvergessen
/.drone.yml @nickvergessen

# Two-Factor Authentication
Expand Down
16 changes: 16 additions & 0 deletions apps/dav/l10n/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,25 @@ OC.L10N.register(
"Description: %s" : "Descripción: %s",
"Where: %s" : "Lugar: %s",
"%1$s via %2$s" : "%1$s vía %2$s",
"In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
"In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
"In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
"In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s",
"Could not generate when statement" : "No se ha podido general la declaración de cuándo",
"Every Day for the entire day" : "Todos los días durante todo el día",
"Every Day for the entire day until %1$s" : "Cada day todo el día hasta el %1$s",
"Every Day between %1$s - %2$s" : "Todos los días entre %1$s - %2$s",
"Every Day between %1$s - %2$s until %3$s" : "Todos los días entre %1$s - %2$s hasta %3$s",
"Every %1$d Days for the entire day" : "Cada %1$d días todo el día",
"Every %1$d Days for the entire day until %2$s" : "Cada %1$d días todo el día hasta el %2$s",
"Every %1$d Days between %2$s - %3$s" : "Cada %1$d días entre las %2$s y %3$s",
"Every %1$d Days between %2$s - %3$s until %4$s" : "Cada %1$d días entre las %2$s y %3$s hasta el %4$s",
"Could not generate event recurrence statement" : "No se ha podido generar la declaración de recurrencia",
"Every Week on %1$s for the entire day" : "Cada semana el %1$s todo el día",
"Every Week on %1$s for the entire day until %2$s" : "Cada %1$s días todo el día hasta el %2$s",
"Every Week on %1$s between %2$s - %3$s" : "Cada semana el %1$s entre %2$s y %3$s",
"Every Week on %1$s between %2$s - %3$s until %4$s" : "Cada semana el %1$s entre %2$s y %3$s hasta el %4$s",
"Every %1$d Weeks on %2$s for the entire day" : "Cada %1$d semanas el %2$s todo el día",
"Cancelled: %1$s" : "Cancelado: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" ha sido cancelada",
"Re: %1$s" : "Re: %1$s",
Expand Down
16 changes: 16 additions & 0 deletions apps/dav/l10n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,25 @@
"Description: %s" : "Descripción: %s",
"Where: %s" : "Lugar: %s",
"%1$s via %2$s" : "%1$s vía %2$s",
"In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
"In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
"In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
"In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s",
"Could not generate when statement" : "No se ha podido general la declaración de cuándo",
"Every Day for the entire day" : "Todos los días durante todo el día",
"Every Day for the entire day until %1$s" : "Cada day todo el día hasta el %1$s",
"Every Day between %1$s - %2$s" : "Todos los días entre %1$s - %2$s",
"Every Day between %1$s - %2$s until %3$s" : "Todos los días entre %1$s - %2$s hasta %3$s",
"Every %1$d Days for the entire day" : "Cada %1$d días todo el día",
"Every %1$d Days for the entire day until %2$s" : "Cada %1$d días todo el día hasta el %2$s",
"Every %1$d Days between %2$s - %3$s" : "Cada %1$d días entre las %2$s y %3$s",
"Every %1$d Days between %2$s - %3$s until %4$s" : "Cada %1$d días entre las %2$s y %3$s hasta el %4$s",
"Could not generate event recurrence statement" : "No se ha podido generar la declaración de recurrencia",
"Every Week on %1$s for the entire day" : "Cada semana el %1$s todo el día",
"Every Week on %1$s for the entire day until %2$s" : "Cada %1$s días todo el día hasta el %2$s",
"Every Week on %1$s between %2$s - %3$s" : "Cada semana el %1$s entre %2$s y %3$s",
"Every Week on %1$s between %2$s - %3$s until %4$s" : "Cada semana el %1$s entre %2$s y %3$s hasta el %4$s",
"Every %1$d Weeks on %2$s for the entire day" : "Cada %1$d semanas el %2$s todo el día",
"Cancelled: %1$s" : "Cancelado: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" ha sido cancelada",
"Re: %1$s" : "Re: %1$s",
Expand Down
4 changes: 2 additions & 2 deletions apps/files/l10n/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ OC.L10N.register(
"Details" : "التفاصيل",
"Please select tag(s) to add to the selection" : "يرجى تحديد علامة (علامات) لإضافتها إلى التحديد",
"Apply tag(s) to selection" : "تطبيق وسم على التحديد",
"Select directory \"{dirName}\"" : "حدد المجلد \"{اسم المجلد}\"",
"Select file \"{fileName}\"" : "حدد الملف \"{اسم الملف}\"",
"Select directory \"{dirName}\"" : "حدِّد الدليل \"{dirName}\"",
"Select file \"{fileName}\"" : "حدِّد الملف \"{fileName}\"",
"Unable to determine date" : "تعذر تحديد التاريخ",
"Could not move \"{file}\", target exists" : "فشل نقل \"{file}\", الملف موجود بالفعل هناك",
"Could not move \"{file}\"" : "فشل نقل \"{file}\"",
Expand Down
4 changes: 2 additions & 2 deletions apps/files/l10n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@
"Details" : "التفاصيل",
"Please select tag(s) to add to the selection" : "يرجى تحديد علامة (علامات) لإضافتها إلى التحديد",
"Apply tag(s) to selection" : "تطبيق وسم على التحديد",
"Select directory \"{dirName}\"" : "حدد المجلد \"{اسم المجلد}\"",
"Select file \"{fileName}\"" : "حدد الملف \"{اسم الملف}\"",
"Select directory \"{dirName}\"" : "حدِّد الدليل \"{dirName}\"",
"Select file \"{fileName}\"" : "حدِّد الملف \"{fileName}\"",
"Unable to determine date" : "تعذر تحديد التاريخ",
"Could not move \"{file}\", target exists" : "فشل نقل \"{file}\", الملف موجود بالفعل هناك",
"Could not move \"{file}\"" : "فشل نقل \"{file}\"",
Expand Down
4 changes: 3 additions & 1 deletion apps/files/l10n/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ OC.L10N.register(
"Incoming ownership transfer from {user}" : "Eingehende Besitzübertragung von {user}",
"Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour." : "Soll {path} angenommen werden?\n\nInfo: Der Übertragungsprozess nach der Annahme kann bis zu einer Stunde dauern.",
"Ownership transfer denied" : "Besitzübertragung verweigert",
"Your ownership transfer of {path} was denied by {user}." : "Die Eigentumsübertragung von {path} wurde von {user} abgelehnt.",
"Your ownership transfer of {path} was denied by {user}." : "Die Besitzübertragung von {path} wurde von {user} abgelehnt.",
"Ownership transfer failed" : "Besitzübertragung fehlgeschlagen",
"Your ownership transfer of {path} to {user} failed." : "Die Besitzübertragung von {path} an {user} ist fehlgeschlagen.",
"The ownership transfer of {path} from {user} failed." : "Die Übertragung von {path} ist fehlgeschlagen.",
Expand Down Expand Up @@ -202,6 +202,8 @@ OC.L10N.register(
"Confirm deletion" : "Löschen bestätigen",
"Cancel" : "Abbrechen",
"Edit file locally" : "Datei lokal bearbeiten",
"The file should now open on your device. If it doesn't, please check that you have the desktop app installed." : "Die Datei sollte sich jetzt auf Ihrem Gerät öffnen. Wenn dies nicht der Fall ist, überprüfe, ob Du die Desktop-App installiert hast.",
"Retry and close" : "Erneut versuchen und schließen",
"Edit online" : "Online bearbeiten",
"Failed to redirect to client" : "Umleitung zum Client fehlgeschlagen",
"Edit locally" : "Lokal bearbeiten",
Expand Down
4 changes: 3 additions & 1 deletion apps/files/l10n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"Incoming ownership transfer from {user}" : "Eingehende Besitzübertragung von {user}",
"Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour." : "Soll {path} angenommen werden?\n\nInfo: Der Übertragungsprozess nach der Annahme kann bis zu einer Stunde dauern.",
"Ownership transfer denied" : "Besitzübertragung verweigert",
"Your ownership transfer of {path} was denied by {user}." : "Die Eigentumsübertragung von {path} wurde von {user} abgelehnt.",
"Your ownership transfer of {path} was denied by {user}." : "Die Besitzübertragung von {path} wurde von {user} abgelehnt.",
"Ownership transfer failed" : "Besitzübertragung fehlgeschlagen",
"Your ownership transfer of {path} to {user} failed." : "Die Besitzübertragung von {path} an {user} ist fehlgeschlagen.",
"The ownership transfer of {path} from {user} failed." : "Die Übertragung von {path} ist fehlgeschlagen.",
Expand Down Expand Up @@ -200,6 +200,8 @@
"Confirm deletion" : "Löschen bestätigen",
"Cancel" : "Abbrechen",
"Edit file locally" : "Datei lokal bearbeiten",
"The file should now open on your device. If it doesn't, please check that you have the desktop app installed." : "Die Datei sollte sich jetzt auf Ihrem Gerät öffnen. Wenn dies nicht der Fall ist, überprüfe, ob Du die Desktop-App installiert hast.",
"Retry and close" : "Erneut versuchen und schließen",
"Edit online" : "Online bearbeiten",
"Failed to redirect to client" : "Umleitung zum Client fehlgeschlagen",
"Edit locally" : "Lokal bearbeiten",
Expand Down
4 changes: 0 additions & 4 deletions apps/files/l10n/fa.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ OC.L10N.register(
"File not found" : "فایل یافت نشد",
"{usedQuotaByte} used" : "{usedQuotaByte} استفاده شده است",
"{used} of {quota} used" : "{used} از {quota} استفاده شده",
"{relative}% used" : "{نسبی}% استفاده شده است",
"Could not refresh storage stats" : "نمی‌توان آمار ذخیره‌سازی را بازخوانی کرد",
"Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
"Create" : "ساخت",
Expand Down Expand Up @@ -224,9 +223,6 @@ OC.L10N.register(
"Could not move \"{file}\", target exists" : "انتقال\"{پرونده}\" امکان پذیر نیست ، هدف وجود دارد",
"Could not move \"{file}\"" : "پروندهٔ \"{file}\" منتقل نمی‌شود",
"copy" : "کپی",
"Could not copy \"{file}\", target exists" : "\"{پرونده}\" کپی نشد ، هدف وجود دارد",
"Could not copy \"{file}\"" : "پرونده کپی نشد",
"Copied {origin} inside {destination}" : "کپی شده (اصل) در مقصد",
"Copied {origin} and {nbfiles} other files inside {destination}" : "رونوشت شده از {origin} و {nbfiles} پرونده‌های دیگر در {destination}",
"{newName} already exists" : "{newName} قبلاً موجود است",
"Could not rename \"{fileName}\", it does not exist any more" : "نمی‌توان نام «{fileName}» را تغییر داد، دیگر وجود ندارد",
Expand Down
4 changes: 0 additions & 4 deletions apps/files/l10n/fa.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
"File not found" : "فایل یافت نشد",
"{usedQuotaByte} used" : "{usedQuotaByte} استفاده شده است",
"{used} of {quota} used" : "{used} از {quota} استفاده شده",
"{relative}% used" : "{نسبی}% استفاده شده است",
"Could not refresh storage stats" : "نمی‌توان آمار ذخیره‌سازی را بازخوانی کرد",
"Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
"Create" : "ساخت",
Expand Down Expand Up @@ -222,9 +221,6 @@
"Could not move \"{file}\", target exists" : "انتقال\"{پرونده}\" امکان پذیر نیست ، هدف وجود دارد",
"Could not move \"{file}\"" : "پروندهٔ \"{file}\" منتقل نمی‌شود",
"copy" : "کپی",
"Could not copy \"{file}\", target exists" : "\"{پرونده}\" کپی نشد ، هدف وجود دارد",
"Could not copy \"{file}\"" : "پرونده کپی نشد",
"Copied {origin} inside {destination}" : "کپی شده (اصل) در مقصد",
"Copied {origin} and {nbfiles} other files inside {destination}" : "رونوشت شده از {origin} و {nbfiles} پرونده‌های دیگر در {destination}",
"{newName} already exists" : "{newName} قبلاً موجود است",
"Could not rename \"{fileName}\", it does not exist any more" : "نمی‌توان نام «{fileName}» را تغییر داد، دیگر وجود ندارد",
Expand Down
1 change: 1 addition & 0 deletions apps/files/l10n/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ OC.L10N.register(
"Confirm deletion" : "Confirmer la suppression",
"Cancel" : "Annuler",
"Edit file locally" : "Éditer le fichier localement",
"The file should now open on your device. If it doesn't, please check that you have the desktop app installed." : "Le fichier devrait maintenant s'ouvrir sur votre appareil. Si ce n'est pas le cas, vérifiez que vous avez installé l'application de bureau.",
"Retry and close" : "Réessayer et fermer",
"Edit online" : "Éditer en ligne",
"Failed to redirect to client" : "Échec de la redirection vers le client",
Expand Down
1 change: 1 addition & 0 deletions apps/files/l10n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
"Confirm deletion" : "Confirmer la suppression",
"Cancel" : "Annuler",
"Edit file locally" : "Éditer le fichier localement",
"The file should now open on your device. If it doesn't, please check that you have the desktop app installed." : "Le fichier devrait maintenant s'ouvrir sur votre appareil. Si ce n'est pas le cas, vérifiez que vous avez installé l'application de bureau.",
"Retry and close" : "Réessayer et fermer",
"Edit online" : "Éditer en ligne",
"Failed to redirect to client" : "Échec de la redirection vers le client",
Expand Down
2 changes: 2 additions & 0 deletions apps/files/l10n/pt_BR.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ OC.L10N.register(
"Confirm deletion" : "Confirmar exclusão",
"Cancel" : "Cancelar",
"Edit file locally" : "Editar arquivo localmente",
"The file should now open on your device. If it doesn't, please check that you have the desktop app installed." : "O arquivo agora deve abrir no seu dispositivo. Caso contrário, verifique se você tem o aplicativo para desktop instalado.",
"Retry and close" : "Tente novamente e feche",
"Edit online" : "Editar on-line",
"Failed to redirect to client" : "Falha ao redirecionar para o cliente",
"Edit locally" : "Editar localmente",
Expand Down
2 changes: 2 additions & 0 deletions apps/files/l10n/pt_BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@
"Confirm deletion" : "Confirmar exclusão",
"Cancel" : "Cancelar",
"Edit file locally" : "Editar arquivo localmente",
"The file should now open on your device. If it doesn't, please check that you have the desktop app installed." : "O arquivo agora deve abrir no seu dispositivo. Caso contrário, verifique se você tem o aplicativo para desktop instalado.",
"Retry and close" : "Tente novamente e feche",
"Edit online" : "Editar on-line",
"Failed to redirect to client" : "Falha ao redirecionar para o cliente",
"Edit locally" : "Editar localmente",
Expand Down
4 changes: 2 additions & 2 deletions apps/files/l10n/sc.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ OC.L10N.register(
"_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartellas"],
"_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archìviu","{fileCount} archìvios"],
"_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archìviu e {folderCount} cartella","1 archìviu e {folderCount} cartellas"],
"_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{folderCount} archìviu e 1 cartella","{folderCount} archìvios e 1 cartella"],
"{fileCount} files and {folderCount} folders" : "{folderCount} archìvios e {folderCount} cartellas",
"_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archìviu e 1 cartella","{fileCount} archìvios e 1 cartella"],
"{fileCount} files and {folderCount} folders" : "{fileCount} archìvios e {folderCount} cartellas",
"No favorites yet" : "Ancora perunu preferidu",
"Files and folders you mark as favorite will show up here" : "Is archìvios e is cartellas chi marcas comente preferidos ant a aparèssere inoghe",
"All files" : "Totu is archìvios",
Expand Down
4 changes: 2 additions & 2 deletions apps/files/l10n/sc.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@
"_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartellas"],
"_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archìviu","{fileCount} archìvios"],
"_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archìviu e {folderCount} cartella","1 archìviu e {folderCount} cartellas"],
"_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{folderCount} archìviu e 1 cartella","{folderCount} archìvios e 1 cartella"],
"{fileCount} files and {folderCount} folders" : "{folderCount} archìvios e {folderCount} cartellas",
"_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archìviu e 1 cartella","{fileCount} archìvios e 1 cartella"],
"{fileCount} files and {folderCount} folders" : "{fileCount} archìvios e {folderCount} cartellas",
"No favorites yet" : "Ancora perunu preferidu",
"Files and folders you mark as favorite will show up here" : "Is archìvios e is cartellas chi marcas comente preferidos ant a aparèssere inoghe",
"All files" : "Totu is archìvios",
Expand Down
2 changes: 1 addition & 1 deletion apps/files/l10n/th.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ OC.L10N.register(
"Details" : "รายละเอียด",
"Please select tag(s) to add to the selection" : "กรุณาเลือกแท็กเพื่อเพิ่มเข้าไปในรายการที่เลือก",
"Apply tag(s) to selection" : "นำแท็กไปใช้ในรายการที่เลือก",
"Select directory \"{dirName}\"" : "เลือกไดเร็กทอรี \"{dirname}\"",
"Select directory \"{dirName}\"" : "เลือกไดเร็กทอรี \"{dirName}\"",
"Select file \"{fileName}\"" : "เลือกไฟล์ \"{fileName}\"",
"Unable to determine date" : "ไม่สามารถระบุวัน",
"Could not move \"{file}\", target exists" : "ไม่สามารถย้าย \"{file}\" เป้าหมายมีอยู่แล้ว",
Expand Down
Loading

0 comments on commit 6888528

Please sign in to comment.