Skip to content

Commit

Permalink
Merge branch 'stable29' into backport/49271/stable29
Browse files Browse the repository at this point in the history
Signed-off-by: Git'Fellow <[email protected]>
  • Loading branch information
solracsf authored Dec 25, 2024
2 parents 49ddafa + 245f1c0 commit 9022f6e
Show file tree
Hide file tree
Showing 1,397 changed files with 14,118 additions and 6,191 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/files-external-smb-kerberos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ jobs:
repository: nextcloud/user_saml
path: apps/user_saml

- name: Install user_saml
run: |
cd apps/user_saml
composer i
cd ../..
- name: Pull images
run: |
docker pull ghcr.io/icewind1991/samba-krb-test-dc
Expand Down
14 changes: 14 additions & 0 deletions __tests__/FixJSDOMEnvironment.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import JSDOMEnvironment from 'jest-environment-jsdom'

// https://github.com/facebook/jest/blob/v29.4.3/website/versioned_docs/version-29.4/Configuration.md#testenvironment-string
export default class FixJSDOMEnvironment extends JSDOMEnvironment {

constructor(...args: ConstructorParameters<typeof JSDOMEnvironment>) {
super(...args)

// https://github.com/jsdom/jsdom/issues/3363
// 31 ad above switched to vitest and don't have that issue
this.global.structuredClone = structuredClone
}

}
7 changes: 7 additions & 0 deletions apps/admin_audit/l10n/ms_MY.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OC.L10N.register(
"admin_audit",
{
"Auditing / Logging" : "Pengauditan / Pengelogan",
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Menyediakan kebolehan pengelogan untuk Nextcloud seperti akses fail log atau tindakan sensitif."
},
"nplurals=1; plural=0;");
5 changes: 5 additions & 0 deletions apps/admin_audit/l10n/ms_MY.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{ "translations": {
"Auditing / Logging" : "Pengauditan / Pengelogan",
"Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Menyediakan kebolehan pengelogan untuk Nextcloud seperti akses fail log atau tindakan sensitif."
},"pluralForm" :"nplurals=1; plural=0;"
}
1 change: 1 addition & 0 deletions apps/comments/l10n/fi.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ OC.L10N.register(
"New comment" : "Uusi kommentti",
"Write a comment …" : "Kirjoita kommentti…",
"Post comment" : "Lähetä viesti",
"Could not reload comments" : "Kommenttien lataus epäonnistui",
"No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
"No more messages" : "Ei enempää viestejä",
"Retry" : "Yritä uudelleen",
Expand Down
1 change: 1 addition & 0 deletions apps/comments/l10n/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"New comment" : "Uusi kommentti",
"Write a comment …" : "Kirjoita kommentti…",
"Post comment" : "Lähetä viesti",
"Could not reload comments" : "Kommenttien lataus epäonnistui",
"No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
"No more messages" : "Ei enempää viestejä",
"Retry" : "Yritä uudelleen",
Expand Down
16 changes: 8 additions & 8 deletions apps/comments/l10n/ug.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ OC.L10N.register(
{
"Comments" : "باھا",
"You commented" : "باھا بەردىڭىز",
"{author} commented" : "{ئاپتور} باھا بەردى",
"You commented on %1$s" : "سىز% 1 $ s غا باھا بەردىڭىز",
"You commented on {file}" : "سىز {ھۆججەت} گە باھا بەردىڭىز",
"%1$s commented on %2$s" : "% 1 $ s% 2 $ s غا باھا بەردى",
"{author} commented on {file}" : "{ئاپتور} ھۆججەتكە باھا بەردى}",
"{author} commented" : "{author} باھا بەردى",
"You commented on %1$s" : "سىز%1 $ s غا باھا بەردىڭىز",
"You commented on {file}" : "سىز {file} گە باھا بەردىڭىز",
"%1$s commented on %2$s" : "%1 $ s%2 $ s غا باھا بەردى",
"{author} commented on {file}" : "{author} {{file} گە باھا بەردى",
"<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </ strong>",
"Files" : "ھۆججەتلەر",
"You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "سىز ئۆچۈرۈلگەن ھېساباتنىڭ ئىزاھاتىدا سىز «{ھۆججەت}» دە تىلغا ئېلىندى",
"{user} mentioned you in a comment on \"{file}\"" : "{user} سىزنى \"{ھۆججەت}\" دىكى باھادا تىلغا ئالدى",
"You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "سىز ئۆچۈرۈلگەن ھېساباتنىڭ ئىزاھاتىدا سىز «{file}» دە تىلغا ئېلىندى",
"{user} mentioned you in a comment on \"{file}\"" : "{user} سىزنى \"{file}\" دىكى باھادا تىلغا ئالدى",
"Files app plugin to add comments to files" : "ھۆججەتلەرگە باھا قوشۇش ئۈچۈن ھۆججەت قىستۇرمىسى",
"Edit comment" : "باھا تەھرىرلەش",
"Delete comment" : "باھانى ئۆچۈرۈڭ",
Expand All @@ -31,6 +31,6 @@ OC.L10N.register(
"Comment deleted" : "باھا ئۆچۈرۈلدى",
"An error occurred while trying to delete the comment" : "باھانى ئۆچۈرمەكچى بولغاندا خاتالىق كۆرۈلدى",
"An error occurred while trying to create the comment" : "باھا قۇرماقچى بولغاندا خاتالىق كۆرۈلدى",
"You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "سىز ئۆچۈرۈلگەن ئىشلەتكۈچىنىڭ ئىزاھاتىدا سىز «{ھۆججەت}» دە تىلغا ئېلىندى"
"You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "سىز ئۆچۈرۈلگەن ئىشلەتكۈچىنىڭ ئىزاھاتىدا سىز «{file}» دە تىلغا ئېلىندى"
},
"nplurals=2; plural=(n != 1);");
16 changes: 8 additions & 8 deletions apps/comments/l10n/ug.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ "translations": {
"Comments" : "باھا",
"You commented" : "باھا بەردىڭىز",
"{author} commented" : "{ئاپتور} باھا بەردى",
"You commented on %1$s" : "سىز% 1 $ s غا باھا بەردىڭىز",
"You commented on {file}" : "سىز {ھۆججەت} گە باھا بەردىڭىز",
"%1$s commented on %2$s" : "% 1 $ s% 2 $ s غا باھا بەردى",
"{author} commented on {file}" : "{ئاپتور} ھۆججەتكە باھا بەردى}",
"{author} commented" : "{author} باھا بەردى",
"You commented on %1$s" : "سىز%1 $ s غا باھا بەردىڭىز",
"You commented on {file}" : "سىز {file} گە باھا بەردىڭىز",
"%1$s commented on %2$s" : "%1 $ s%2 $ s غا باھا بەردى",
"{author} commented on {file}" : "{author} {{file} گە باھا بەردى",
"<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </ strong>",
"Files" : "ھۆججەتلەر",
"You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "سىز ئۆچۈرۈلگەن ھېساباتنىڭ ئىزاھاتىدا سىز «{ھۆججەت}» دە تىلغا ئېلىندى",
"{user} mentioned you in a comment on \"{file}\"" : "{user} سىزنى \"{ھۆججەت}\" دىكى باھادا تىلغا ئالدى",
"You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "سىز ئۆچۈرۈلگەن ھېساباتنىڭ ئىزاھاتىدا سىز «{file}» دە تىلغا ئېلىندى",
"{user} mentioned you in a comment on \"{file}\"" : "{user} سىزنى \"{file}\" دىكى باھادا تىلغا ئالدى",
"Files app plugin to add comments to files" : "ھۆججەتلەرگە باھا قوشۇش ئۈچۈن ھۆججەت قىستۇرمىسى",
"Edit comment" : "باھا تەھرىرلەش",
"Delete comment" : "باھانى ئۆچۈرۈڭ",
Expand All @@ -29,6 +29,6 @@
"Comment deleted" : "باھا ئۆچۈرۈلدى",
"An error occurred while trying to delete the comment" : "باھانى ئۆچۈرمەكچى بولغاندا خاتالىق كۆرۈلدى",
"An error occurred while trying to create the comment" : "باھا قۇرماقچى بولغاندا خاتالىق كۆرۈلدى",
"You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "سىز ئۆچۈرۈلگەن ئىشلەتكۈچىنىڭ ئىزاھاتىدا سىز «{ھۆججەت}» دە تىلغا ئېلىندى"
"You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "سىز ئۆچۈرۈلگەن ئىشلەتكۈچىنىڭ ئىزاھاتىدا سىز «{file}» دە تىلغا ئېلىندى"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
3 changes: 1 addition & 2 deletions apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

use OCA\ContactsInteraction\Db\RecentContactMapper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\TimedJob;

class CleanupJob extends TimedJob {
Expand All @@ -39,7 +38,7 @@ public function __construct(
parent::__construct($time);

$this->setInterval(24 * 60 * 60);
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);

}

Expand Down
2 changes: 2 additions & 0 deletions apps/dashboard/l10n/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ OC.L10N.register(
"Good evening, {name}" : "مساء الخير، {name}",
"Hello" : "مرحباً",
"Hello, {name}" : "أهلا، {name} ",
"Happy birthday 🥳🤩🎂🎉" : "عيد ميلاد سعيد 🥳🤩🎂🎉",
"Happy birthday, {name} 🥳🤩🎂🎉" : "عيد ميلاد سعيد, يا {name} 🥳🤩🎂🎉",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "إبدأ يومك بالاطلاع على ما يهمّك\n\nلوحة قيادة نكست كلاود هي نقطة البداية ليومك؛\nتعطيك لمحة عن مواعيدك القادمة و الرسائل المستعجلة و المحادثات الواردة و تذاكر طلب المساعدة المعلقة و آخر التغريدات و الكثير غيرها!\nيمكنك أن تضيف أدوات أخرى ترغبها\nكما يمكنك تغيير مظهر و خلفية اللوحة كما تريد. "
},
"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;");
2 changes: 2 additions & 0 deletions apps/dashboard/l10n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
"Good evening, {name}" : "مساء الخير، {name}",
"Hello" : "مرحباً",
"Hello, {name}" : "أهلا، {name} ",
"Happy birthday 🥳🤩🎂🎉" : "عيد ميلاد سعيد 🥳🤩🎂🎉",
"Happy birthday, {name} 🥳🤩🎂🎉" : "عيد ميلاد سعيد, يا {name} 🥳🤩🎂🎉",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "إبدأ يومك بالاطلاع على ما يهمّك\n\nلوحة قيادة نكست كلاود هي نقطة البداية ليومك؛\nتعطيك لمحة عن مواعيدك القادمة و الرسائل المستعجلة و المحادثات الواردة و تذاكر طلب المساعدة المعلقة و آخر التغريدات و الكثير غيرها!\nيمكنك أن تضيف أدوات أخرى ترغبها\nكما يمكنك تغيير مظهر و خلفية اللوحة كما تريد. "
},"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;"
}
2 changes: 2 additions & 0 deletions apps/dashboard/l10n/cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ OC.L10N.register(
"Good evening, {name}" : "Dobrý večer, {name}",
"Hello" : "Dobrý den",
"Hello, {name}" : "Dobrý den, {name}",
"Happy birthday 🥳🤩🎂🎉" : "Všechno nejlepší k narozeninám 🥳🤩🎂🎉",
"Happy birthday, {name} 🥳🤩🎂🎉" : "Všechno nejlepší k narozeninám, {name} 🥳🤩🎂🎉",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "Začněte svůj den informovaní\n\nNextcloud Nástěnka je váš úvodní bod dne, který vám podává přehled\nnadcházejících schůzek, neodkladných e-mailů, zpráv v chatech, příchozích\npožadavků, nejnovějších tweetů a mnoha dalšího! Uživatelé si\nmohou přidávat ovládací prvky, které chtějí a měnit pozadí dle své libosti."
},
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
2 changes: 2 additions & 0 deletions apps/dashboard/l10n/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
"Good evening, {name}" : "Dobrý večer, {name}",
"Hello" : "Dobrý den",
"Hello, {name}" : "Dobrý den, {name}",
"Happy birthday 🥳🤩🎂🎉" : "Všechno nejlepší k narozeninám 🥳🤩🎂🎉",
"Happy birthday, {name} 🥳🤩🎂🎉" : "Všechno nejlepší k narozeninám, {name} 🥳🤩🎂🎉",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "Začněte svůj den informovaní\n\nNextcloud Nástěnka je váš úvodní bod dne, který vám podává přehled\nnadcházejících schůzek, neodkladných e-mailů, zpráv v chatech, příchozích\npožadavků, nejnovějších tweetů a mnoha dalšího! Uživatelé si\nmohou přidávat ovládací prvky, které chtějí a měnit pozadí dle své libosti."
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
}
4 changes: 3 additions & 1 deletion apps/dashboard/l10n/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ OC.L10N.register(
{
"Dashboard" : "Dashboard",
"Dashboard app" : "Dashboard-App",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud Dashboard ist Ihr Ausgangspunkt für den Tag und gibt dir einen Überblick über deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neueste Tweets und vieles mehr! Benutzer können die gewünschten Widgets hinzufügen und den Hintergrund nach Belieben ändern.",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud Dashboard ist dein Ausgangspunkt für den Tag und gibt dir einen Überblick über deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neueste Tweets und vieles mehr! Benutzer können die gewünschten Widgets hinzufügen und den Hintergrund nach Belieben ändern.",
"\"{title} icon\"" : "\"{title}-Symbol\"",
"Customize" : "Anpassen",
"Edit widgets" : "Widgets bearbeiten",
Expand All @@ -23,6 +23,8 @@ OC.L10N.register(
"Good evening, {name}" : "Guten Abend {name}",
"Hello" : "Hallo",
"Hello, {name}" : "Hallo, {name}",
"Happy birthday 🥳🤩🎂🎉" : "Alles Gute zum Geburtstag 🥳🤩🎂🎉",
"Happy birthday, {name} 🥳🤩🎂🎉" : "Alles Gute zum Geburtstag, {name} 🥳🤩🎂🎉",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud Dashboard ist dein Ausgangspunkt für den Tag und gibt dir einen Überblick über deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neueste Tweets und vieles mehr! Benutzer können die gewünschten Widgets hinzufügen und den Hintergrund nach Belieben ändern."
},
"nplurals=2; plural=(n != 1);");
4 changes: 3 additions & 1 deletion apps/dashboard/l10n/de.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ "translations": {
"Dashboard" : "Dashboard",
"Dashboard app" : "Dashboard-App",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud Dashboard ist Ihr Ausgangspunkt für den Tag und gibt dir einen Überblick über deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neueste Tweets und vieles mehr! Benutzer können die gewünschten Widgets hinzufügen und den Hintergrund nach Belieben ändern.",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud Dashboard ist dein Ausgangspunkt für den Tag und gibt dir einen Überblick über deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neueste Tweets und vieles mehr! Benutzer können die gewünschten Widgets hinzufügen und den Hintergrund nach Belieben ändern.",
"\"{title} icon\"" : "\"{title}-Symbol\"",
"Customize" : "Anpassen",
"Edit widgets" : "Widgets bearbeiten",
Expand All @@ -21,6 +21,8 @@
"Good evening, {name}" : "Guten Abend {name}",
"Hello" : "Hallo",
"Hello, {name}" : "Hallo, {name}",
"Happy birthday 🥳🤩🎂🎉" : "Alles Gute zum Geburtstag 🥳🤩🎂🎉",
"Happy birthday, {name} 🥳🤩🎂🎉" : "Alles Gute zum Geburtstag, {name} 🥳🤩🎂🎉",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "Starte informiert in den Tag\n\nDas Nextcloud Dashboard ist dein Ausgangspunkt für den Tag und gibt dir einen Überblick über deine anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neueste Tweets und vieles mehr! Benutzer können die gewünschten Widgets hinzufügen und den Hintergrund nach Belieben ändern."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
2 changes: 2 additions & 0 deletions apps/dashboard/l10n/de_DE.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ OC.L10N.register(
"Good evening, {name}" : "Guten Abend {name}",
"Hello" : "Hallo",
"Hello, {name}" : "Hallo, {name}",
"Happy birthday 🥳🤩🎂🎉" : "Alles Gute zum Geburtstag 🥳🤩🎂🎉",
"Happy birthday, {name} 🥳🤩🎂🎉" : "Alles Gute zum Geburtstag, {name} 🥳🤩🎂🎉",
"Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking." : "Starten Sie informiert in den Tag\n\nDas Nextcloud Dashboard ist Ihr Ausgangspunkt für den Tag und gibt Ihnen einen Überblick über Ihre anstehenden Termine, dringende E-Mails, Chatnachrichten, eingehende Tickets, neueste Tweets und vieles mehr! Benutzer können die gewünschten Widgets hinzufügen und den Hintergrund nach Belieben ändern."
},
"nplurals=2; plural=(n != 1);");
Loading

0 comments on commit 9022f6e

Please sign in to comment.