Skip to content

Commit 6da7214

Browse files
authored
Merge branch 'mealie-next' into feat/add-suggestion-for-bulk-url-import
2 parents a52b93f + a1b36d9 commit 6da7214

File tree

15 files changed

+630
-619
lines changed

15 files changed

+630
-619
lines changed

.github/workflows/partial-builder.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,5 @@ jobs:
5959
build-args: |
6060
COMMIT=${{ github.sha }}
6161
# https://docs.docker.com/build/ci/github-actions/cache/#github-cache
62-
# TEMP: Disable cache to possible fix missing LDAP issues
63-
# https://github.com/mealie-recipes/mealie/issues/2847
64-
# cache-from: type=gha
65-
# cache-to: type=gha,mode=max
62+
cache-from: type=gha
63+
cache-to: type=gha,mode=max

frontend/lang/messages/bg-BG.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@
510510
"how-did-it-turn-out": "Как се получи?",
511511
"user-made-this": "{user} направи това",
512512
"last-made-date": "Последно приготвена на {date}",
513-
"api-extras-description": "Recipes extras are a key feature of the Mealie API. They allow you to create custom JSON key/value pairs within a recipe, to reference from 3rd party applications. You can use these keys to provide information, for example to trigger automations or custom messages to relay to your desired device.",
513+
"api-extras-description": "Екстрите за рецепти са ключова характеристика на Mealie API. Те Ви позволяват да създавате персонализирани JSON двойки ключ/стойност в рамките на рецепта, за да ги препращате към други приложения. Можете да използвате тези ключове, за да предоставите информация за задействане на автоматизация или персонализирани съобщения, за препращане към желаното от Вас устройство.",
514514
"message-key": "Ключ на съобщението",
515515
"parse": "Анализирай",
516516
"attach-images-hint": "Прикачете снимки като ги влачете и пуснете в редактора",

frontend/lang/messages/it-IT.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@
114114
"json": "JSON",
115115
"keyword": "Parola chiave",
116116
"link-copied": "Link Copiato",
117-
"loading": "Loading",
117+
"loading": "Caricamento in corso",
118118
"loading-events": "Caricamento eventi",
119-
"loading-recipe": "Loading recipe...",
120-
"loading-ocr-data": "Loading OCR data...",
119+
"loading-recipe": "Caricamento della ricetta...",
120+
"loading-ocr-data": "Caricamento dati OCR...",
121121
"loading-recipes": "Caricamento Ricette",
122122
"message": "Messaggio",
123123
"monday": "Lunedì",
@@ -128,7 +128,7 @@
128128
"no-recipe-found": "Nessuna Ricetta Trovata",
129129
"ok": "OK",
130130
"options": "Opzioni:",
131-
"plural-name": "Plural Name",
131+
"plural-name": "Nome Plurale",
132132
"print": "Stampa",
133133
"print-preferences": "Preferenze Di Stampa",
134134
"random": "Casuale",
@@ -496,10 +496,10 @@
496496
"public-link": "Link Pubblico",
497497
"timer": {
498498
"kitchen-timer": "Kitchen Timer",
499-
"start-timer": "Start Timer",
499+
"start-timer": "Avvia timer",
500500
"pause-timer": "Pause Timer",
501501
"resume-timer": "Resume Timer",
502-
"stop-timer": "Stop Timer"
502+
"stop-timer": "Arresta il Timer"
503503
},
504504
"edit-timeline-event": "Modifica Evento Timeline",
505505
"timeline": "Timeline",
@@ -510,7 +510,7 @@
510510
"how-did-it-turn-out": "Come è venuto?",
511511
"user-made-this": "{user} l'ha preparato",
512512
"last-made-date": "Ultima Preparazione {date}",
513-
"api-extras-description": "Recipes extras are a key feature of the Mealie API. They allow you to create custom JSON key/value pairs within a recipe, to reference from 3rd party applications. You can use these keys to provide information, for example to trigger automations or custom messages to relay to your desired device.",
513+
"api-extras-description": "Le opzioni extra delle ricette sono una caratteristica fondamentale dell'API Mealie. Consentono di creare json personalizzati con coppie di chiavi/valore all'interno di una ricetta a cui fare riferimento tramite applicazioni terze. È possibile utilizzare queste chiavi per inserire informazioni, per esempio per attivare automazioni oppure per inoltrare messaggi personalizzati al dispositivo desiderato.",
514514
"message-key": "Chiave Messaggio",
515515
"parse": "Analizza",
516516
"attach-images-hint": "Allega immagini trascinandole nell'editor",
@@ -554,7 +554,7 @@
554554
"unit": "Unità",
555555
"upload-image": "Carica immagine",
556556
"screen-awake": "Keep Screen Awake",
557-
"remove-image": "Remove image"
557+
"remove-image": "Rimuovi immagine"
558558
},
559559
"search": {
560560
"advanced-search": "Ricerca Avanzata",
@@ -573,16 +573,16 @@
573573
"search-hint": "Premi '/'",
574574
"advanced": "Ricerca Avanzata",
575575
"auto-search": "Ricerca automatica",
576-
"no-results": "No results found"
576+
"no-results": "Nessun risultato trovato"
577577
},
578578
"settings": {
579579
"add-a-new-theme": "Aggiungi un Nuovo Tema",
580580
"admin-settings": "Impostazioni Amministratore",
581581
"backup": {
582-
"backup-created": "Backup created successfully",
582+
"backup-created": "Backup creato con successo",
583583
"backup-created-at-response-export_path": "Backup Creato in {path}",
584584
"backup-deleted": "Backup eliminato",
585-
"restore-success": "Restore successful",
585+
"restore-success": "Ripristino riuscito",
586586
"backup-tag": "Tag Backup",
587587
"create-heading": "Crea un Backup",
588588
"delete-backup": "Elimina Backup",
@@ -696,7 +696,7 @@
696696
"status-unknown-try-running-a-validation": "Stato sconosciuto. Prova ad eseguire una convalida.",
697697
"validate": "Convalida",
698698
"email-configuration-status": "Configurazione e-mail",
699-
"email-configured": "Email Configured",
699+
"email-configured": "Email configurata",
700700
"email-test-results": "Email Test Results",
701701
"ready": "Pronto",
702702
"not-ready": "Non Pronto - Verifica Variabili Di Ambiente",
@@ -853,7 +853,7 @@
853853
"username": "Nome Utente",
854854
"users-header": "UTENTI",
855855
"users": "Utenti",
856-
"user-not-found": "User not found",
856+
"user-not-found": "Utente non trovato",
857857
"webhook-time": "Ora Webhook",
858858
"webhooks-enabled": "Webhooks Abilitati",
859859
"you-are-not-allowed-to-create-a-user": "Non sei autorizzato per la creazione di utenti",
@@ -889,7 +889,7 @@
889889
"enable-advanced-features": "Abilita funzionalità avanzate",
890890
"it-looks-like-this-is-your-first-time-logging-in": "It looks like this is your first time logging in.",
891891
"dont-want-to-see-this-anymore-be-sure-to-change-your-email": "Don't want to see this anymore? Be sure to change your email in your user settings!",
892-
"forgot-password": "Forgot Password",
892+
"forgot-password": "Password Dimenticata",
893893
"forgot-password-text": "Please enter your email address and we will send you a link to reset your password.",
894894
"changes-reflected-immediately": "Changes to this user will be reflected immediately."
895895
},
@@ -965,8 +965,8 @@
965965
"delete-recipes": "Elimina Ricette",
966966
"source-unit-will-be-deleted": "L'unità di origine verrà eliminata"
967967
},
968-
"create-alias": "Create Alias",
969-
"manage-aliases": "Manage Aliases",
968+
"create-alias": "Crea Alias",
969+
"manage-aliases": "Gestisci Alias",
970970
"seed-data": "Dati Predefiniti",
971971
"seed": "Inizializza",
972972
"data-management": "Gestione Dati",
@@ -976,8 +976,8 @@
976976
"columns": "Colonne",
977977
"combine": "Unisci",
978978
"categories": {
979-
"edit-category": "Edit Category",
980-
"new-category": "New Category",
979+
"edit-category": "Modifica categoria",
980+
"new-category": "Nuova categoria",
981981
"category-data": "Category Data"
982982
},
983983
"tags": {
@@ -1157,13 +1157,13 @@
11571157
"show-advanced-description": "Mostra funzionalità avanzate (Chiavi API, Webhook e Gestione dati)",
11581158
"back-to-profile": "Torna al Profilo",
11591159
"looking-for-privacy-settings": "Stai cercando le Impostazioni Della Privacy?",
1160-
"manage-your-api-tokens": "Manage Your API Tokens",
1161-
"manage-user-profile": "Manage User Profile",
1162-
"manage-cookbooks": "Manage Cookbooks",
1163-
"manage-members": "Manage Members",
1160+
"manage-your-api-tokens": "Gestisci i tuoi Token Api",
1161+
"manage-user-profile": "Gestisci Profilo Utente",
1162+
"manage-cookbooks": "Gestisci Libri Di Cucina",
1163+
"manage-members": "Gestisci i membri",
11641164
"manage-webhooks": "Manage Webhooks",
1165-
"manage-notifiers": "Manage Notifiers",
1166-
"manage-data-migrations": "Manage Data Migrations"
1165+
"manage-notifiers": "Gestisci Notifiche",
1166+
"manage-data-migrations": "Gestione Migrazioni Dei Dati"
11671167
},
11681168
"cookbook": {
11691169
"cookbooks": "Ricettari",

0 commit comments

Comments
 (0)