Skip to content

Commit

Permalink
Merge pull request getkirby#3913 from getkirby/pre-release/3.6.0-rc.4
Browse files Browse the repository at this point in the history
3.6.0 rc.4
  • Loading branch information
bastianallgeier authored Nov 5, 2021
2 parents f7e6151 + b290cf1 commit 3b4f5d2
Show file tree
Hide file tree
Showing 12 changed files with 551 additions and 607 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"core"
],
"homepage": "https://getkirby.com",
"version": "3.6.0-rc.3",
"version": "3.6.0-rc.4",
"license": "proprietary",
"authors": [
{
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 21 additions & 21 deletions i18n/translations/da.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"account.changeName": "Change your name",
"account.delete": "Delete your account",
"account.changeName": "Ændre dit navn",
"account.delete": "Slet din konto",
"account.delete.confirm": "Do you really want to delete your account? You will be logged out immediately. Your account cannot be recovered.",

"add": "Ny",
"author": "Author",
"author": "Forfatter",
"avatar": "Profilbillede",
"back": "Tilbage",
"cancel": "Annuller",
Expand All @@ -14,7 +14,7 @@
"collapse": "Fold sammen",
"collapse.all": "Fold alle sammen",
"copy": "Kopier",
"copy.all": "Copy all",
"copy.all": "Kopier alle",
"create": "Opret",

"date": "Dato",
Expand All @@ -29,7 +29,7 @@
"days.tue": "Tir",
"days.wed": "Ons",

"debugging": "Debugging",
"debugging": "Fejlfinding",

"delete": "Slet",
"delete.all": "Slet alle",
Expand All @@ -49,7 +49,7 @@
"email": "Email",
"email.placeholder": "[email protected]",

"environment": "Environment",
"environment": "Miljø",

"error.access.code": "Ugyldig kode",
"error.access.login": "Ugyldigt log ind",
Expand Down Expand Up @@ -102,7 +102,7 @@
"error.language.code": "Indtast venligst en gyldig kode for sproget",
"error.language.duplicate": "Sproget eksisterer allerede",
"error.language.name": "Indtast venligst et gyldigt navn for sproget",
"error.language.notFound": "The language could not be found",
"error.language.notFound": "Sproget fandtes ikke",

"error.layout.validation.block": "Der er fejl i blok {blockIndex} i layout {layoutIndex}",
"error.layout.validation.settings": "Der er fejl i layout {index} indstillinger",
Expand Down Expand Up @@ -174,7 +174,7 @@
"error.user.password.invalid": "Indtast venligst en gyldig adgangskode. Adgangskoder skal minimum være 8 tegn lange.",
"error.user.password.notSame": "Bekr\u00e6ft venligst adgangskoden",
"error.user.password.undefined": "Brugeren har ikke en adgangskode",
"error.user.password.wrong": "Wrong password",
"error.user.password.wrong": "Forkert adgangskode",
"error.user.role.invalid": "Indtast venligst en gyldig rolle",
"error.user.undefined": "Brugeren kunne ikke findes",
"error.user.update.permission": "Du har ikke tilladelse til at opdatere brugeren \"{name}\"",
Expand Down Expand Up @@ -250,7 +250,7 @@
"field.blocks.image.placeholder": "Vælg et billede",
"field.blocks.image.ratio": "Størrelsesforhold",
"field.blocks.image.url": "Billede URL",
"field.blocks.line.name": "Line",
"field.blocks.line.name": "Linje",
"field.blocks.list.name": "Liste",
"field.blocks.markdown.name": "Markdown",
"field.blocks.markdown.label": "Tekst",
Expand Down Expand Up @@ -289,7 +289,7 @@

"hide": "Skjul",
"hour": "Time",
"import": "Import",
"import": "Importer",
"insert": "Inds\u00e6t",
"insert.after": "Indsæt efter",
"insert.before": "Indsæt før",
Expand Down Expand Up @@ -390,11 +390,11 @@
"more": "Mere",
"name": "Navn",
"next": "Næste",
"no": "no",
"no": "nej",
"off": "Sluk",
"on": "Tænd",
"open": "Åben",
"open.newWindow": "Open in new window",
"open.newWindow": "Åben i et nyt vindue",
"options": "Indstillinger",
"options.none": "Ingen muligheder",

Expand Down Expand Up @@ -435,8 +435,8 @@
"pagination.page": "Side",

"password": "Adgangskode",
"paste": "Paste",
"paste.after": "Paste after",
"paste": "Indsæt",
"paste.after": "Indsæt efter",
"pixel": "Pixel",
"plugins": "Plugins",
"prev": "Forrige",
Expand Down Expand Up @@ -486,18 +486,18 @@
"toolbar.button.heading.1": "Overskrift 1",
"toolbar.button.heading.2": "Overskrift 2",
"toolbar.button.heading.3": "Overskrift 3",
"toolbar.button.heading.4": "Heading 4",
"toolbar.button.heading.5": "Heading 5",
"toolbar.button.heading.6": "Heading 6",
"toolbar.button.heading.4": "Overskrift 4",
"toolbar.button.heading.5": "Overskrift 5",
"toolbar.button.heading.6": "Overskrift 6",
"toolbar.button.italic": "Kursiv tekst",
"toolbar.button.file": "Fil",
"toolbar.button.file.select": "Vælg en fil",
"toolbar.button.file.upload": "Upload en fil",
"toolbar.button.link": "Link",
"toolbar.button.paragraph": "Paragraph",
"toolbar.button.strike": "Strike-through",
"toolbar.button.paragraph": "Afsnit",
"toolbar.button.strike": "Gennemstreg",
"toolbar.button.ol": "Ordnet liste",
"toolbar.button.underline": "Underline",
"toolbar.button.underline": "Understreg",
"toolbar.button.ul": "Punktliste",

"translation.author": "Kirby Team",
Expand Down Expand Up @@ -551,5 +551,5 @@

"welcome": "Velkommen",
"year": "År",
"yes": "yes"
"yes": "ja"
}
6 changes: 3 additions & 3 deletions i18n/translations/fr.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"account.changeName": "Change your name",
"account.delete": "Delete your account",
"account.delete.confirm": "Do you really want to delete your account? You will be logged out immediately. Your account cannot be recovered.",
"account.changeName": "Modifier votre nom",
"account.delete": "Supprimer votre compte",
"account.delete.confirm": "Voulez-vous vraiment supprimer votre compte ? Vous serez déconnecté immédiatement. Votre compte ne pourra pas être récupéré.",

"add": "Ajouter",
"author": "Auteur",
Expand Down
6 changes: 3 additions & 3 deletions i18n/translations/tr.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"account.changeName": "Change your name",
"account.delete": "Delete your account",
"account.delete.confirm": "Do you really want to delete your account? You will be logged out immediately. Your account cannot be recovered.",
"account.changeName": "İsminizi değiştirin",
"account.delete": "Hesabınızı silin",
"account.delete.confirm": "Hesabınızı gerçekten silmek istiyor musunuz? Oturumunuz hemen sonlandırılacaktır. Hesabınız daha sonra geri alınamaz.",

"add": "Ekle",
"author": "Yazar",
Expand Down
2 changes: 1 addition & 1 deletion panel/dist/css/style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion panel/dist/js/index.js

Large diffs are not rendered by default.

Loading

0 comments on commit 3b4f5d2

Please sign in to comment.