Skip to content

Commit

Permalink
Release preparation
Browse files Browse the repository at this point in the history
  • Loading branch information
bastianallgeier committed Jul 20, 2021
1 parent 4a817a2 commit aac427b
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 37 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-alpha.1",
"version": "3.6.0-alpha.2",
"license": "proprietary",
"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

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

22 changes: 11 additions & 11 deletions i18n/translations/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"error.file.changeName.permission": "Non ti è permesso modificare il nome di \"{filename}\"",
"error.file.duplicate": "Un file con il nome \"{filename}\" esiste già",
"error.file.extension.forbidden": "L'estensione \"{extension}\" non è consentita",
"error.file.extension.invalid": "Invalid extension: {extension}",
"error.file.extension.invalid": "Estensione non valida: {extension}",
"error.file.extension.missing": "Il file \"{filename}\" non ha estensione",
"error.file.maxheight": "L'immagine non dev'essere più alta di {height} pixel",
"error.file.maxsize": "Il file è troppo pesante",
Expand All @@ -83,7 +83,7 @@
"error.file.notFound": "Il file non \u00e8 stato trovato",
"error.file.orientation": "L'imaggine dev'essere orientata in \"{orientation}\"",
"error.file.type.forbidden": "Non ti è permesso caricare file {type}",
"error.file.type.invalid": "Invalid file type: {type}",
"error.file.type.invalid": "Tipo di file non valido: {type}",
"error.file.undefined": "Il file non \u00e8 stato trovato",

"error.form.incomplete": "Correggi tutti gli errori nel form...",
Expand All @@ -93,8 +93,8 @@
"error.language.duplicate": "La lingua esiste già",
"error.language.name": "Inserisci un nome valido per la lingua",

"error.layout.validation.block": "There's an error in block {blockIndex} in layout {layoutIndex}",
"error.layout.validation.settings": "There's an error in layout {index} settings",
"error.layout.validation.block": "C'è un errore nel blocco {blockIndex} nel layout {layoutIndex}",
"error.layout.validation.settings": "C'è un errore nelle impostazioni del layout {index}",

"error.license.format": "Inserisci un codice di licenza valido",
"error.license.email": "Inserisci un indirizzo email valido",
Expand All @@ -118,7 +118,7 @@
"error.page.duplicate.permission": "Non ti è permesso duplicare \"{slug}\"",
"error.page.notFound": "La pagina \"{slug}\" non è stata trovata",
"error.page.num.invalid": "Inserisci un numero di ordinamento valido. I numeri non devono essere negativi",
"error.page.slug.invalid": "Please enter a valid URL appendix",
"error.page.slug.invalid": "Per favore inserisci un suffisso valido per l'URL",
"error.page.slug.maxlength": "Lo \"slug\" dev'essere più corto di \"{length}\" caratteri",
"error.page.sort.permission": "La pagina \"{slug}\" non può essere ordinata",
"error.page.status.invalid": "Imposta uno stato valido per la pagina",
Expand Down Expand Up @@ -163,7 +163,7 @@
"error.user.password.invalid": "Per favore inserisci una password valida. Le password devono essere lunghe almeno 8 caratteri",
"error.user.password.notSame": "Le password non corrispondono",
"error.user.password.undefined": "L'utente non ha una password",
"error.user.password.wrong": "Wrong password",
"error.user.password.wrong": "Password sbagliata",
"error.user.role.invalid": "Inserisci un ruolo valido",
"error.user.update.permission": "Non ti è permesso aggiornare l'utente \"{name}\"",

Expand Down Expand Up @@ -233,7 +233,7 @@
"field.blocks.image.name": "Immagine",
"field.blocks.image.placeholder": "Seleziona un'immagine",
"field.blocks.image.ratio": "Rapporto",
"field.blocks.image.url": "Image URL",
"field.blocks.image.url": "URL immagine",
"field.blocks.list.name": "Lista",
"field.blocks.markdown.name": "Markdown",
"field.blocks.markdown.label": "Testo",
Expand Down Expand Up @@ -376,7 +376,7 @@
"off": "off",
"on": "on",
"open": "Apri",
"open.newWindow": "Open in new window",
"open.newWindow": "Apri in una finestra nuova",
"options": "Opzioni",
"options.none": "Nessuna opzione",

Expand Down Expand Up @@ -468,9 +468,9 @@
"toolbar.button.file.select": "Seleziona un file",
"toolbar.button.file.upload": "Carica un file",
"toolbar.button.link": "Link",
"toolbar.button.strike": "Strike-through",
"toolbar.button.strike": "Barrato",
"toolbar.button.ol": "Elenco numerato",
"toolbar.button.underline": "Underline",
"toolbar.button.underline": "Sottolinea",
"toolbar.button.ul": "Elenco puntato",

"translation.author": "Kirby Team, Roman Steiner, Manu Moreale",
Expand Down Expand Up @@ -523,5 +523,5 @@

"welcome": "Benvenuto",
"year": "Anno",
"yes": "yes"
"yes": ""
}
12 changes: 6 additions & 6 deletions i18n/translations/ko.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"add": "\ucd94\uac00",
"avatar": "\ud504\ub85c\ud544 \uc774\ubbf8\uc9c0",
"avatar": "프로필 이미지",
"back": "복귀",
"cancel": "\ucde8\uc18c",
"change": "\ubcc0\uacbd",
Expand Down Expand Up @@ -372,11 +372,11 @@
"more": "더 보기",
"name": "이름",
"next": "다음",
"no": "no",
"no": "",
"off": "",
"on": "",
"open": "열기",
"open.newWindow": "Open in new window",
"open.newWindow": "새 창에서 열기",
"options": "옵션",
"options.none": "옵션이 없습니다.",

Expand Down Expand Up @@ -468,9 +468,9 @@
"toolbar.button.file.select": "파일 선택",
"toolbar.button.file.upload": "파일 업로드",
"toolbar.button.link": "링크",
"toolbar.button.strike": "Strike-through",
"toolbar.button.strike": "취소선",
"toolbar.button.ol": "숫자 목록",
"toolbar.button.underline": "Underline",
"toolbar.button.underline": "밑줄",
"toolbar.button.ul": "기호 목록",

"translation.author": "Kirby 팀",
Expand Down Expand Up @@ -523,5 +523,5 @@

"welcome": "반갑습니다.",
"year": "",
"yes": "yes"
"yes": "아니요"
}
14 changes: 7 additions & 7 deletions i18n/translations/lt.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"error.page.duplicate.permission": "Neturite leidimo dubliuoti \"{slug}\"",
"error.page.notFound": "Puslapis \"{slug}\" nerastas",
"error.page.num.invalid": "Įrašykite teisingą eiliškumo numerį. Numeris negali būti neigiamas.",
"error.page.slug.invalid": "Please enter a valid URL appendix",
"error.page.slug.invalid": "Įrašykite teisingą URL priedą",
"error.page.slug.maxlength": "url adreso maksimalus simbolių kiekis: \"{length}\"",
"error.page.sort.permission": "Puslapiui \"{slug}\" negalima pakeisti eiliškumo",
"error.page.status.invalid": "Nustatykite teisingą puslapio statusą",
Expand Down Expand Up @@ -163,7 +163,7 @@
"error.user.password.invalid": "Prašome įrašyti galiojantį slaptažodį. Slaptažodį turi sudaryti bent 8 simboliai.",
"error.user.password.notSame": "Slaptažodžiai nesutampa",
"error.user.password.undefined": "Vartotojas neturi slaptažodžio",
"error.user.password.wrong": "Wrong password",
"error.user.password.wrong": "Neteisingas slaptažodis",
"error.user.role.invalid": "Įrašykite teisingą rolę",
"error.user.update.permission": "Neturite teisės keisti vartotojo \"{name}\"",

Expand Down Expand Up @@ -372,11 +372,11 @@
"more": "Daugiau",
"name": "Pavadinimas",
"next": "Toliau",
"no": "no",
"no": "ne",
"off": "off",
"on": "on",
"open": "Atidaryti",
"open.newWindow": "Open in new window",
"open.newWindow": "Atidaryti naujame lange",
"options": "Pasirinkimai",
"options.none": "Nėra pasirinkimų",

Expand Down Expand Up @@ -468,9 +468,9 @@
"toolbar.button.file.select": "Pasirinkite failą",
"toolbar.button.file.upload": "Įkelti failą",
"toolbar.button.link": "Nuoroda",
"toolbar.button.strike": "Strike-through",
"toolbar.button.strike": "Perbraukimas",
"toolbar.button.ol": "Sąrašas su skaičiais",
"toolbar.button.underline": "Underline",
"toolbar.button.underline": "Pabraukimas",
"toolbar.button.ul": "Sąrašas su taškais",

"translation.author": "Roman U",
Expand Down Expand Up @@ -523,5 +523,5 @@

"welcome": "Sveiki",
"year": "Metai",
"yes": "yes"
"yes": "taip"
}
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.

12 changes: 7 additions & 5 deletions vendor/composer/InstalledVersions.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@





class InstalledVersions
{
private static $installed = array (
'root' =>
array (
'pretty_version' => '3.6.0-alpha.1',
'version' => '3.6.0.0-alpha1',
'pretty_version' => '3.6.0-alpha.2',
'version' => '3.6.0.0-alpha2',
'aliases' =>
array (
),
Expand Down Expand Up @@ -55,8 +57,8 @@ class InstalledVersions
),
'getkirby/cms' =>
array (
'pretty_version' => '3.6.0-alpha.1',
'version' => '3.6.0.0-alpha1',
'pretty_version' => '3.6.0-alpha.2',
'version' => '3.6.0.0-alpha2',
'aliases' =>
array (
),
Expand Down Expand Up @@ -184,7 +186,6 @@ public static function getInstalledPackages()
$packages[] = array_keys($installed['versions']);
}


if (1 === \count($packages)) {
return $packages[0];
}
Expand Down Expand Up @@ -380,6 +381,7 @@ public static function reload($data)




private static function getInstalled()
{
if (null === self::$canGetVendors) {
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php return array (
'root' =>
array (
'pretty_version' => '3.6.0-alpha.1',
'version' => '3.6.0.0-alpha1',
'pretty_version' => '3.6.0-alpha.2',
'version' => '3.6.0.0-alpha2',
'aliases' =>
array (
),
Expand Down Expand Up @@ -31,8 +31,8 @@
),
'getkirby/cms' =>
array (
'pretty_version' => '3.6.0-alpha.1',
'version' => '3.6.0.0-alpha1',
'pretty_version' => '3.6.0-alpha.2',
'version' => '3.6.0.0-alpha2',
'aliases' =>
array (
),
Expand Down

0 comments on commit aac427b

Please sign in to comment.