Skip to content

Commit 0dc1c02

Browse files
GermanBluefoxGermanBluefox
authored
Merge branch 'master' into feature-blockly-count
2 parents 36eb587 + 9da69f3 commit 0dc1c02

File tree

124 files changed

+3942
-9848
lines changed

Some content is hidden

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

124 files changed

+3942
-9848
lines changed

‎.github/workflows/create-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
7575
- name: Create Pull Request
7676
id: cpr
77-
uses: peter-evans/create-pull-request@v6
77+
uses: peter-evans/create-pull-request@v7
7878
with:
7979
token: ${{ secrets.PR_TOKEN }}
8080
commit-message: "[OFFICIAL RELEASE] ${{ steps.version.outputs.result }}"

‎.github/workflows/test-and-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
steps:
9595
- id: automerge
9696
name: automerge
97-
uses: "pascalgn/automerge-action@v0.16.3"
97+
uses: "pascalgn/automerge-action@v0.16.4"
9898
env:
9999
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
100100
MERGE_LABELS: "automated pr 🔧"

‎admin/custom/customComponents.js‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin/custom/customComponents.js.map‎

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

‎admin/custom/i18n/de.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"And not later": "Und nicht später",
3+
"But not earlier": "Aber nicht früher",
4+
"Day time settings": "Tageszeiteinstellungen",
5+
"Help": "Verwenden Sie das Format mit 49,1245 und nicht 49°34'0\". Andernfalls wird es automatisch konvertiert.",
6+
"Latitude °": "Breitengrad °",
7+
"Longitude °": "Längengrad °",
8+
"Offset": "Versatz",
9+
"Time event": "Zeitereignis",
10+
"Use system settings": "Systemeinstellungen verwenden",
11+
"Used as end of the daytime": "Wird als Tagesende verwendet",
12+
"Used as start of the daytime": "Wird als Tagesbeginn verwendet",
13+
"in minutes": "in Minuten",
14+
"none": "keiner",
15+
"sch_astro_dawn": "Dämmerung",
16+
"sch_astro_dusk": "Dämmerung",
17+
"sch_astro_goldenHour": "goldene Stunde",
18+
"sch_astro_goldenHourEnd": "Ende der goldenen Stunde",
19+
"sch_astro_nauticalDawn": "Nautische Morgendämmerung",
20+
"sch_astro_nauticalDusk": "Nautische Dämmerung",
21+
"sch_astro_night": "Nacht",
22+
"sch_astro_nightEnd": "Nachtende",
23+
"sch_astro_sunrise": "Sonnenaufgang",
24+
"sch_astro_sunriseEnd": "Sonnenaufgang Ende",
25+
"sch_astro_sunset": "Sonnenuntergang",
26+
"sch_astro_sunsetStart": "Sonnenuntergang beginnen",
27+
"Next sunrise": "Nächster Sonnenaufgang",
28+
"Next sunset": "Nächster Sonnenuntergang",
29+
"Local time": "Ortszeit"
30+
}

‎admin/custom/i18n/en.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"Use system settings": "Use system settings",
3+
"Latitude °": "Latitude °",
4+
"Longitude °": "Longitude °",
5+
"Help": "Use form with 49.1245 and not 49°34'0\". Elsewise it will be converted automatically.",
6+
"Day time settings": "Day time settings",
7+
"Time event": "Time event",
8+
"none": "none",
9+
"sch_astro_nightEnd": "Night end",
10+
"sch_astro_nauticalDawn": "Nautical dawn",
11+
"sch_astro_dawn": "Dawn",
12+
"sch_astro_sunrise": "Sunrise",
13+
"sch_astro_sunriseEnd": "Sunrise end",
14+
"sch_astro_goldenHourEnd": "Golden hour end",
15+
"Used as start of the daytime": "Used as start of the daytime",
16+
"Used as end of the daytime": "Used as end of the daytime",
17+
"Offset": "Offset",
18+
"in minutes": "in minutes",
19+
"But not earlier": "But not earlier",
20+
"And not later": "And not later",
21+
"sch_astro_goldenHour": "Golden hour",
22+
"sch_astro_sunsetStart": "Sunset start",
23+
"sch_astro_sunset": "Sunset",
24+
"sch_astro_dusk": "Dusk",
25+
"sch_astro_nauticalDusk": "Nautical dusk",
26+
"sch_astro_night": "Night",
27+
"Next sunrise": "Next sunrise",
28+
"Next sunset": "Next sunset",
29+
"Local time": "Local time"
30+
}

‎admin/custom/i18n/es.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"And not later": "Y no más tarde",
3+
"But not earlier": "Pero no antes",
4+
"Day time settings": "Configuración de horario diurno",
5+
"Help": "Utilice el formulario con 49.1245 y no con 49°34'0\". De lo contrario, se convertirá automáticamente.",
6+
"Latitude °": "Latitud °",
7+
"Longitude °": "longitud °",
8+
"Offset": "Compensar",
9+
"Time event": "evento de tiempo",
10+
"Use system settings": "Usar la configuración del sistema",
11+
"Used as end of the daytime": "Utilizado como final del día.",
12+
"Used as start of the daytime": "Utilizado como inicio del día.",
13+
"in minutes": "en minutos",
14+
"none": "ninguno",
15+
"sch_astro_dawn": "Amanecer",
16+
"sch_astro_dusk": "Oscuridad",
17+
"sch_astro_goldenHour": "hora dorada",
18+
"sch_astro_goldenHourEnd": "Fin de la hora dorada",
19+
"sch_astro_nauticalDawn": "Amanecer náutico",
20+
"sch_astro_nauticalDusk": "Anochecer náutico",
21+
"sch_astro_night": "Noche",
22+
"sch_astro_nightEnd": "Fin de la noche",
23+
"sch_astro_sunrise": "Amanecer",
24+
"sch_astro_sunriseEnd": "Fin del amanecer",
25+
"sch_astro_sunset": "Atardecer",
26+
"sch_astro_sunsetStart": "Inicio del atardecer",
27+
"Next sunrise": "próximo amanecer",
28+
"Next sunset": "próxima puesta de sol",
29+
"Local time": "Hora local"
30+
}

‎admin/custom/i18n/fr.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"And not later": "Et pas plus tard",
3+
"But not earlier": "Mais pas plus tôt",
4+
"Day time settings": "Paramètres d'heure de jour",
5+
"Help": "Utiliser le formulaire avec 49.1245 et non 49°34'0\". Sinon il sera converti automatiquement.",
6+
"Latitude °": "Latitude °",
7+
"Longitude °": "Longitude °",
8+
"Offset": "Compenser",
9+
"Time event": "Événement temporel",
10+
"Use system settings": "Utiliser les paramètres système",
11+
"Used as end of the daytime": "Utilisé en fin de journée",
12+
"Used as start of the daytime": "Utilisé comme début de journée",
13+
"in minutes": "en minutes",
14+
"none": "aucun",
15+
"sch_astro_dawn": "Aube",
16+
"sch_astro_dusk": "Crépuscule",
17+
"sch_astro_goldenHour": "Heure d'or",
18+
"sch_astro_goldenHourEnd": "Fin de l'heure d'or",
19+
"sch_astro_nauticalDawn": "Aube nautique",
20+
"sch_astro_nauticalDusk": "Crépuscule nautique",
21+
"sch_astro_night": "Nuit",
22+
"sch_astro_nightEnd": "Fin de la nuit",
23+
"sch_astro_sunrise": "Lever du soleil",
24+
"sch_astro_sunriseEnd": "Fin du lever du soleil",
25+
"sch_astro_sunset": "Coucher de soleil",
26+
"sch_astro_sunsetStart": "Début du coucher du soleil",
27+
"Next sunrise": "prochain lever de soleil",
28+
"Next sunset": "Prochain coucher de soleil",
29+
"Local time": "Heure locale"
30+
}

‎admin/custom/i18n/it.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"And not later": "E non più tardi",
3+
"But not earlier": "Ma non prima",
4+
"Day time settings": "Impostazioni dell'ora diurna",
5+
"Help": "Utilizzare il modulo con 49.1245 e non 49°34'0\". Altrimenti verrà convertito automaticamente.",
6+
"Latitude °": "Latitudine°",
7+
"Longitude °": "Longitudine°",
8+
"Offset": "Compensare",
9+
"Time event": "Evento temporale",
10+
"Use system settings": "Utilizza le impostazioni di sistema",
11+
"Used as end of the daytime": "Utilizzato come fine giornata",
12+
"Used as start of the daytime": "Utilizzato come inizio della giornata",
13+
"in minutes": "in pochi minuti",
14+
"none": "nessuno",
15+
"sch_astro_dawn": "Alba",
16+
"sch_astro_dusk": "Crepuscolo",
17+
"sch_astro_goldenHour": "Ora d'oro",
18+
"sch_astro_goldenHourEnd": "Fine dell'ora d'oro",
19+
"sch_astro_nauticalDawn": "Alba nautica",
20+
"sch_astro_nauticalDusk": "Crepuscolo nautico",
21+
"sch_astro_night": "Notte",
22+
"sch_astro_nightEnd": "Fine della notte",
23+
"sch_astro_sunrise": "Alba",
24+
"sch_astro_sunriseEnd": "Fine dell'alba",
25+
"sch_astro_sunset": "Tramonto",
26+
"sch_astro_sunsetStart": "Inizio del tramonto",
27+
"Next sunrise": "La prossima alba",
28+
"Next sunset": "Il prossimo tramonto",
29+
"Local time": "Ora locale"
30+
}

‎admin/custom/i18n/nl.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"And not later": "En niet later",
3+
"But not earlier": "Maar niet eerder",
4+
"Day time settings": "Instellingen voor dagtijd",
5+
"Help": "Gebruik het formulier met 49.1245 en niet met 49°34'0\". Anders wordt het automatisch omgezet.",
6+
"Latitude °": "Breedtegraad °",
7+
"Longitude °": "Lengtegraad °",
8+
"Offset": "Offset",
9+
"Time event": "Tijd evenement",
10+
"Use system settings": "Gebruik systeeminstellingen",
11+
"Used as end of the daytime": "Gebruikt als einde van de dag",
12+
"Used as start of the daytime": "Gebruikt als begin van de dag",
13+
"in minutes": "in minuten",
14+
"none": "geen",
15+
"sch_astro_dawn": "Ochtendgloren",
16+
"sch_astro_dusk": "Schemering",
17+
"sch_astro_goldenHour": "gouden uur",
18+
"sch_astro_goldenHourEnd": "Einde van het gouden uur",
19+
"sch_astro_nauticalDawn": "Nautische dageraad",
20+
"sch_astro_nauticalDusk": "Nautische schemering",
21+
"sch_astro_night": "Nacht",
22+
"sch_astro_nightEnd": "Einde van de nacht",
23+
"sch_astro_sunrise": "zonsopkomst",
24+
"sch_astro_sunriseEnd": "Einde van de zonsopgang",
25+
"sch_astro_sunset": "Zonsondergang",
26+
"sch_astro_sunsetStart": "Begin zonsondergang",
27+
"Next sunrise": "Volgende zonsopgang",
28+
"Next sunset": "Volgende zonsondergang",
29+
"Local time": "Lokale tijd"
30+
}

0 commit comments

Comments
 (0)