Skip to content

Commit 1023b1f

Browse files
authored
Merge branch 'master' into carl/rector
Signed-off-by: Carl Schwan <[email protected]>
2 parents 0075e7b + b0519b8 commit 1023b1f

30 files changed

+578
-373
lines changed

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"autoload": {
3+
"exclude-from-classmap": [
4+
"**/bamarni/composer-bin-plugin/**"
5+
],
36
"psr-4": {
47
"OCA\\TermsOfService\\": "lib/"
58
}
@@ -11,7 +14,7 @@
1114
"autoloader-suffix": "TermsOfService",
1215
"optimize-autoloader": true,
1316
"platform": {
14-
"php": "8.2"
17+
"php": "8.1"
1518
},
1619
"sort-packages": true
1720
},

l10n/be.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ OC.L10N.register(
439439
"You have to accept the newest version of the terms of service in order to be able to use this service." : "Каб карыстацца гэтым сервісам, вам трэба прыняць найноўшую версію ўмоў абслугоўвання.",
440440
"Requires users to accept the terms of service before accessing data." : "Патрабуе ад карыстальнікаў прыняцця ўмоў абслугоўвання перад доступам да даных.",
441441
"Requires users to accept the terms of service before accessing data.\nThis product includes GeoLite2 data created by MaxMind, available from [maxmind.com](http://www.maxmind.com)" : "Патрабуе ад карыстальнікаў прыняцця ўмоў абслугоўвання перад доступам да даных. Гэты прадукт утрымлівае даныя GeoLite2, створаныя MaxMind, даступныя на [maxmind.com](http://www.maxmind.com)",
442+
"Loading …" : "Загрузка …",
442443
"Reset signatories & notify users" : "Скінуць падпісантаў і апавясціць карыстальнікаў",
443444
"Save terms" : "Захаваць умовы",
444445
"Ensure that all fields are filled" : "Пераканайцеся, што ўсе палі запоўненыя",
@@ -456,6 +457,7 @@ OC.L10N.register(
456457
"We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again." : "Мы рэкамендуем скінуць спіс падпісантаў, калі былі ўнесены юрыдычныя змены. Для нязначных змяненняў, такіх як выпраўленне памылак друку або спасылак, гэты пункт можна не ўключаць, бо ў адваротным выпадку ўсім карыстальнікам прыйдзецца паўторна прыняць Умовы абслугоўвання.",
457458
"I acknowledge that I have read and agree to the above terms of service" : "Я пацвярджаю, што прачытаў(-ла) і згодзен(-на) з вышэйзгаданымі ўмовамі абслугоўвання",
458459
"Edit language {language} for region {country}" : "Рэдагаваць мову {language} для рэгіёна {country}",
460+
"Deleting …" : "Выдаленне …",
459461
"Delete language {language} for region {country}" : "Выдаліць мову {language} для рэгіёна {country}"
460462
},
461463
"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");

l10n/be.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@
437437
"You have to accept the newest version of the terms of service in order to be able to use this service." : "Каб карыстацца гэтым сервісам, вам трэба прыняць найноўшую версію ўмоў абслугоўвання.",
438438
"Requires users to accept the terms of service before accessing data." : "Патрабуе ад карыстальнікаў прыняцця ўмоў абслугоўвання перад доступам да даных.",
439439
"Requires users to accept the terms of service before accessing data.\nThis product includes GeoLite2 data created by MaxMind, available from [maxmind.com](http://www.maxmind.com)" : "Патрабуе ад карыстальнікаў прыняцця ўмоў абслугоўвання перад доступам да даных. Гэты прадукт утрымлівае даныя GeoLite2, створаныя MaxMind, даступныя на [maxmind.com](http://www.maxmind.com)",
440+
"Loading …" : "Загрузка …",
440441
"Reset signatories & notify users" : "Скінуць падпісантаў і апавясціць карыстальнікаў",
441442
"Save terms" : "Захаваць умовы",
442443
"Ensure that all fields are filled" : "Пераканайцеся, што ўсе палі запоўненыя",
@@ -454,6 +455,7 @@
454455
"We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again." : "Мы рэкамендуем скінуць спіс падпісантаў, калі былі ўнесены юрыдычныя змены. Для нязначных змяненняў, такіх як выпраўленне памылак друку або спасылак, гэты пункт можна не ўключаць, бо ў адваротным выпадку ўсім карыстальнікам прыйдзецца паўторна прыняць Умовы абслугоўвання.",
455456
"I acknowledge that I have read and agree to the above terms of service" : "Я пацвярджаю, што прачытаў(-ла) і згодзен(-на) з вышэйзгаданымі ўмовамі абслугоўвання",
456457
"Edit language {language} for region {country}" : "Рэдагаваць мову {language} для рэгіёна {country}",
458+
"Deleting …" : "Выдаленне …",
457459
"Delete language {language} for region {country}" : "Выдаліць мову {language} для рэгіёна {country}"
458460
},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
459461
}

l10n/de.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,12 +451,14 @@ OC.L10N.register(
451451
"Enter or update terms of service below." : "Die Nutzungsbedingungen unten eingeben oder aktualisieren.",
452452
"Select a region" : "Eine Region auswählen",
453453
"Select a language" : "Eine Sprache auswählen",
454+
"By using this service …" : "Durch die Nutzung dieses Dienstes …",
454455
"For formatting purposes Markdown is supported." : "Zur Formatierung kann Markdown verwendet werden.",
455456
"Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories." : "Durch das Speichern der Bedingungen wird der Text aktualisiert, es wird jedoch keine Benachrichtigung an die Benutzer gesendet. Benachrichtigungen werden nur gesendet, wenn du die Unterzeichner zurücksetzt.",
456457
"Existing terms of service" : "Existierende Nutzungsbedingungen",
457458
"We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again." : "Es empfielt sich, die Liste derjenigen die zugestimmt haben zurückzusetzen, wenn rechtliche Änderungen vorgenommen wurden. Bei kleineren Änderungen wie der Korrektur von Tippfehlern oder Links kann dies weggelassen werden, da sonst alle Benutzer die Nutzungsbedingungen erneut akzeptieren müssen.",
458459
"I acknowledge that I have read and agree to the above terms of service" : "Ich bestätige, dass ich die oben genannten Nutzungsbedingungen gelesen und akzeptiert habe",
459460
"Edit language {language} for region {country}" : "Sprache {language} für das Land {country} bearbeiten",
461+
"Deleting …" : "Lösche …",
460462
"Delete language {language} for region {country}" : "Sprache {language} für das Land {country} löschen"
461463
},
462464
"nplurals=2; plural=(n != 1);");

l10n/de.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,14 @@
449449
"Enter or update terms of service below." : "Die Nutzungsbedingungen unten eingeben oder aktualisieren.",
450450
"Select a region" : "Eine Region auswählen",
451451
"Select a language" : "Eine Sprache auswählen",
452+
"By using this service …" : "Durch die Nutzung dieses Dienstes …",
452453
"For formatting purposes Markdown is supported." : "Zur Formatierung kann Markdown verwendet werden.",
453454
"Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories." : "Durch das Speichern der Bedingungen wird der Text aktualisiert, es wird jedoch keine Benachrichtigung an die Benutzer gesendet. Benachrichtigungen werden nur gesendet, wenn du die Unterzeichner zurücksetzt.",
454455
"Existing terms of service" : "Existierende Nutzungsbedingungen",
455456
"We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again." : "Es empfielt sich, die Liste derjenigen die zugestimmt haben zurückzusetzen, wenn rechtliche Änderungen vorgenommen wurden. Bei kleineren Änderungen wie der Korrektur von Tippfehlern oder Links kann dies weggelassen werden, da sonst alle Benutzer die Nutzungsbedingungen erneut akzeptieren müssen.",
456457
"I acknowledge that I have read and agree to the above terms of service" : "Ich bestätige, dass ich die oben genannten Nutzungsbedingungen gelesen und akzeptiert habe",
457458
"Edit language {language} for region {country}" : "Sprache {language} für das Land {country} bearbeiten",
459+
"Deleting …" : "Lösche …",
458460
"Delete language {language} for region {country}" : "Sprache {language} für das Land {country} löschen"
459461
},"pluralForm" :"nplurals=2; plural=(n != 1);"
460462
}

l10n/de_DE.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,12 +451,14 @@ OC.L10N.register(
451451
"Enter or update terms of service below." : "Die Nutzungsbedingungen unten eingeben oder aktualisieren.",
452452
"Select a region" : "Eine Region auswählen",
453453
"Select a language" : "Eine Sprache auswählen",
454+
"By using this service …" : "Durch die Nutzung dieses Dienstes …",
454455
"For formatting purposes Markdown is supported." : "Zur Formatierung kann Markdown verwendet werden.",
455456
"Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories." : "Durch das Speichern der Bedingungen wird der Text aktualisiert, es wird jedoch keine Benachrichtigung an die Benutzer gesendet. Benachrichtigungen werden nur gesendet, wenn Sie die Unterzeichner zurücksetzen.",
456457
"Existing terms of service" : "Bestehende Nutzungsbedingungen",
457458
"We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again." : "Es empfielt sich, die Liste derjenigen die zugestimmt haben zurückzusetzen, wenn rechtliche Änderungen vorgenommen wurden. Bei kleineren Änderungen wie der Korrektur von Tippfehlern oder Links kann dies weggelassen werden, da sonst alle Benutzer die Nutzungsbedingungen erneut akzeptieren müssen.",
458459
"I acknowledge that I have read and agree to the above terms of service" : "Ich bestätige, dass ich die obenstehenden Nutzungsbedingungen gelesen habe und ihnen zustimme.",
459460
"Edit language {language} for region {country}" : "Sprache {language} für das Land {country} bearbeiten",
461+
"Deleting …" : "Lösche …",
460462
"Delete language {language} for region {country}" : "Sprache {language} für das Land {country} löschen"
461463
},
462464
"nplurals=2; plural=(n != 1);");

l10n/de_DE.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,14 @@
449449
"Enter or update terms of service below." : "Die Nutzungsbedingungen unten eingeben oder aktualisieren.",
450450
"Select a region" : "Eine Region auswählen",
451451
"Select a language" : "Eine Sprache auswählen",
452+
"By using this service …" : "Durch die Nutzung dieses Dienstes …",
452453
"For formatting purposes Markdown is supported." : "Zur Formatierung kann Markdown verwendet werden.",
453454
"Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories." : "Durch das Speichern der Bedingungen wird der Text aktualisiert, es wird jedoch keine Benachrichtigung an die Benutzer gesendet. Benachrichtigungen werden nur gesendet, wenn Sie die Unterzeichner zurücksetzen.",
454455
"Existing terms of service" : "Bestehende Nutzungsbedingungen",
455456
"We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again." : "Es empfielt sich, die Liste derjenigen die zugestimmt haben zurückzusetzen, wenn rechtliche Änderungen vorgenommen wurden. Bei kleineren Änderungen wie der Korrektur von Tippfehlern oder Links kann dies weggelassen werden, da sonst alle Benutzer die Nutzungsbedingungen erneut akzeptieren müssen.",
456457
"I acknowledge that I have read and agree to the above terms of service" : "Ich bestätige, dass ich die obenstehenden Nutzungsbedingungen gelesen habe und ihnen zustimme.",
457458
"Edit language {language} for region {country}" : "Sprache {language} für das Land {country} bearbeiten",
459+
"Deleting …" : "Lösche …",
458460
"Delete language {language} for region {country}" : "Sprache {language} für das Land {country} löschen"
459461
},"pluralForm" :"nplurals=2; plural=(n != 1);"
460462
}

l10n/en_GB.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,12 +451,14 @@ OC.L10N.register(
451451
"Enter or update terms of service below." : "Enter or update terms of service below.",
452452
"Select a region" : "Select a region",
453453
"Select a language" : "Select a language",
454+
"By using this service …" : "By using this service …",
454455
"For formatting purposes Markdown is supported." : "For formatting purposes Markdown is supported.",
455456
"Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories." : "Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories.",
456457
"Existing terms of service" : "Existing terms of service",
457458
"We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again." : "We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again.",
458459
"I acknowledge that I have read and agree to the above terms of service" : "I acknowledge that I have read and agree to the above terms of service",
459460
"Edit language {language} for region {country}" : "Edit language {language} for region {country}",
461+
"Deleting …" : "Deleting …",
460462
"Delete language {language} for region {country}" : "Delete language {language} for region {country}"
461463
},
462464
"nplurals=2; plural=(n != 1);");

l10n/en_GB.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,14 @@
449449
"Enter or update terms of service below." : "Enter or update terms of service below.",
450450
"Select a region" : "Select a region",
451451
"Select a language" : "Select a language",
452+
"By using this service …" : "By using this service …",
452453
"For formatting purposes Markdown is supported." : "For formatting purposes Markdown is supported.",
453454
"Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories." : "Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories.",
454455
"Existing terms of service" : "Existing terms of service",
455456
"We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again." : "We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again.",
456457
"I acknowledge that I have read and agree to the above terms of service" : "I acknowledge that I have read and agree to the above terms of service",
457458
"Edit language {language} for region {country}" : "Edit language {language} for region {country}",
459+
"Deleting …" : "Deleting …",
458460
"Delete language {language} for region {country}" : "Delete language {language} for region {country}"
459461
},"pluralForm" :"nplurals=2; plural=(n != 1);"
460462
}

l10n/et_EE.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,12 +451,14 @@ OC.L10N.register(
451451
"Enter or update terms of service below." : "Sisesta või uuenda järgnevaid kasutustingimusi",
452452
"Select a region" : "Vali maa või piirkond",
453453
"Select a language" : "Vali keel",
454+
"By using this service …" : "Selle teenuse kasutamisel…",
454455
"For formatting purposes Markdown is supported." : "Vorminduse huvides on ka markdown-vorming toetatud",
455456
"Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories." : "Kasutustingimuste salvestamisel nad saavad uuendatud, aga kasutajad ei saa vastavat teavitust, mis saadetakse vaid siis, kui sa kõik allkirjad nullid.",
456457
"Existing terms of service" : "Olemasolevad kasutustingimused",
457458
"We recommend resetting the signatories if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again." : "Peale juriidiliste tingimuste muutmist soovitame me kõikide seniantud allkirjade nullimist. Pisimuudatuste puhul, nagu trükivigade parandamine ja linkide uuendamine, võid selle sammu tegemata jätta. Vastasel juhul peavad kasutajad ka nende pisimuudatustega eraldi nõustuma.",
458459
"I acknowledge that I have read and agree to the above terms of service" : "Kinnitan, et olen kasutustingimusi lugenud ja neist aru saanud",
459460
"Edit language {language} for region {country}" : "Muuda „{language}“ keelt „{country}“ maa jaoks",
461+
"Deleting …" : "Kustutan…",
460462
"Delete language {language} for region {country}" : "Kustuta „{language}“ keel {country} maa jaoks"
461463
},
462464
"nplurals=2; plural=(n != 1);");

0 commit comments

Comments
 (0)