Skip to content

Commit 55563aa

Browse files
Merge pull request #7862 from getkirby/release/5.2.2
5.2.2
2 parents 42cd286 + cc6f36b commit 55563aa

48 files changed

Lines changed: 335 additions & 47 deletions

Some content is hidden

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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "The Kirby core",
44
"license": "proprietary",
55
"type": "kirby-cms",
6-
"version": "5.2.1",
6+
"version": "5.2.2",
77
"keywords": [
88
"kirby",
99
"cms",

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

i18n/translations/bg.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@
298298
"error.validation.uuid": "Please enter a valid UUID",
299299
"error.validation.url": "Моля въведете валиден URL",
300300

301+
"error.version.discard.permission": "You are not allowed to discard this version",
302+
"error.version.publish.permission": "You are not allowed to publish this version",
303+
"error.version.save.permission": "You are not allowed to change this version",
304+
301305
"expand": "Expand",
302306
"expand.all": "Expand all",
303307

i18n/translations/bs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@
298298
"error.validation.uuid": "Unesite važeći UUID",
299299
"error.validation.url": "Unesi važeći URL",
300300

301+
"error.version.discard.permission": "You are not allowed to discard this version",
302+
"error.version.publish.permission": "You are not allowed to publish this version",
303+
"error.version.save.permission": "You are not allowed to change this version",
304+
301305
"expand": "Proširi",
302306
"expand.all": "Expand all",
303307

i18n/translations/ca.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@
298298
"error.validation.uuid": "Please enter a valid UUID",
299299
"error.validation.url": "Si us plau, introduïu una URL vàlida",
300300

301+
"error.version.discard.permission": "You are not allowed to discard this version",
302+
"error.version.publish.permission": "You are not allowed to publish this version",
303+
"error.version.save.permission": "You are not allowed to change this version",
304+
301305
"expand": "Expandir",
302306
"expand.all": "Expand all",
303307

i18n/translations/cs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@
298298
"error.validation.uuid": "Zadejte platné UUID",
299299
"error.validation.url": "Zadejte prosím platnou adresu URL",
300300

301+
"error.version.discard.permission": "You are not allowed to discard this version",
302+
"error.version.publish.permission": "You are not allowed to publish this version",
303+
"error.version.save.permission": "You are not allowed to change this version",
304+
301305
"expand": "Rozbalit",
302306
"expand.all": "Rozbalit vše",
303307

i18n/translations/da.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@
298298
"error.validation.uuid": "Please enter a valid UUID",
299299
"error.validation.url": "Indtast venligst en gyldig URL",
300300

301+
"error.version.discard.permission": "You are not allowed to discard this version",
302+
"error.version.publish.permission": "You are not allowed to publish this version",
303+
"error.version.save.permission": "You are not allowed to change this version",
304+
301305
"expand": "Fold ud",
302306
"expand.all": "Expand all",
303307

i18n/translations/de.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"changes": "Änderungen",
1717
"confirm": "OK",
1818
"collapse": "Zusammenklappen",
19-
"collapse.all": "Collapse all",
19+
"collapse.all": "Alle zusammenklappen",
2020
"color": "Farbe",
2121
"coordinates": "Koordinaten",
2222
"copy": "Kopieren",
@@ -44,8 +44,8 @@
4444
"delete": "L\u00f6schen",
4545
"delete.all": "Alle löschen",
4646

47-
"deselect": "Deselect",
48-
"deselect.all": "Deselect all",
47+
"deselect": "Abwählen",
48+
"deselect.all": "Alles abwählen",
4949

5050
"dialog.fields.empty": "Der Dialog hat keine Felder",
5151
"dialog.files.empty": "Keine verfügbaren Dateien",
@@ -298,8 +298,12 @@
298298
"error.validation.uuid": "Bitte gib eine gültige UUID an",
299299
"error.validation.url": "Bitte gib eine gültige URL ein",
300300

301+
"error.version.discard.permission": "Du darfst diese Version nicht verwerfen",
302+
"error.version.publish.permission": "Du darfst diese Version nicht veröffentlichen",
303+
"error.version.save.permission": "Du darfst diese Version nicht ändern",
304+
301305
"expand": "Aufklappen",
302-
"expand.all": "Expand all",
306+
"expand.all": "Alle aufklappen",
303307

304308
"field.invalid": "Das Feld ist ungültig",
305309
"field.required": "Das Feld ist Pflicht",
@@ -380,7 +384,7 @@
380384

381385
"field.structure.delete.confirm": "Willst du diesen Eintrag wirklich l\u00f6schen?",
382386
"field.structure.delete.confirm.all": "Möchtest du wirklich alle Einträge löschen?",
383-
"field.structure.delete.confirm.selected": "Do you really want to delete the selected entries?",
387+
"field.structure.delete.confirm.selected": "Willst du die ausgewählten Einträge wirklich löschen?",
384388
"field.structure.empty": "Es bestehen keine Eintr\u00e4ge.",
385389

386390
"field.users.empty": "Keine Accounts ausgewählt",
@@ -479,7 +483,7 @@
479483
"license.code": "Code",
480484
"license.code.help": "Du hast deinen Lizenz Code nach dem Kauf per Email bekommen. Bitte kopiere sie aus der Email und füge sie hier ein. ",
481485
"license.code.label": "Bitte gib deinen Lizenzcode ein",
482-
"license.remove.text": "<p>Removing the license will irreversibly delete the license file from this site. You can then activate this site with a different license key or re-register the same license key if the domain remains the same.</p><p>To change the domain associated with the license, please contact the Kirby team. <a href='https://getkirby.com/license'>Read more &rarr;</a></p>",
486+
"license.remove.text": "<p>Durch das Entfernen der Lizenz wird die Lizenzdatei unwiderruflich von dieser Website gelöscht. Du kannst diese Website dann mit einem anderen Lizenzschlüssel aktivieren oder denselben Lizenzschlüssel erneut registrieren, wenn die Domain unverändert bleibt.</p> <p>Um die mit der Lizenz verknüpfte Domain zu ändern, wende dich bitte an das Kirby-Team. <a href='https://getkirby.com/license'>Weiterlesen &rarr;</a></p>",
483487
"license.status.active.info": "Beinhaltet neue Major Versionen bis {date}",
484488
"license.status.active.label": "Gültige Lizenz",
485489
"license.status.demo.info": "Dies ist eine Demo Installation",
@@ -667,7 +671,7 @@
667671

668672
"security": "Sicherheit",
669673
"select": "Auswählen",
670-
"select.all": "Select all",
674+
"select.all": "Alles auswählen",
671675
"server": "Server",
672676
"settings": "Einstellungen",
673677
"show": "Anzeigen",
@@ -776,7 +780,7 @@
776780
"user.changePassword.current": "Dein aktuelles Passwort",
777781
"user.changePassword.new": "Neues Passwort",
778782
"user.changePassword.new.confirm": "Wiederhole das Passwort …",
779-
"user.changePassword.own": "Your own password",
783+
"user.changePassword.own": "Dein eigenes Passwort",
780784
"user.changeRole": "Rolle ändern",
781785
"user.changeRole.select": "Neue Rolle auswählen",
782786
"user.create": "Neuen Account anlegen",

i18n/translations/el.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@
298298
"error.validation.uuid": "Please enter a valid UUID",
299299
"error.validation.url": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση URL",
300300

301+
"error.version.discard.permission": "You are not allowed to discard this version",
302+
"error.version.publish.permission": "You are not allowed to publish this version",
303+
"error.version.save.permission": "You are not allowed to change this version",
304+
301305
"expand": "Expand",
302306
"expand.all": "Expand all",
303307

i18n/translations/en.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@
298298
"error.validation.uuid": "Please enter a valid UUID",
299299
"error.validation.url": "Please enter a valid URL",
300300

301+
"error.version.discard.permission": "You are not allowed to discard this version",
302+
"error.version.publish.permission": "You are not allowed to publish this version",
303+
"error.version.save.permission": "You are not allowed to change this version",
304+
301305
"expand": "Expand",
302306
"expand.all": "Expand all",
303307

0 commit comments

Comments
 (0)