Skip to content

Commit

Permalink
Merge branch 'mealie-next' into fix/add-missing-webhook-route
Browse files Browse the repository at this point in the history
  • Loading branch information
Kuchenpirat authored Jul 6, 2024
2 parents 9e3d9ac + aa6e109 commit 550fffe
Show file tree
Hide file tree
Showing 42 changed files with 65 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PostgreSQL might be considered if you need to support many concurrent users. In
```yaml
services:
mealie:
image: ghcr.io/mealie-recipes/mealie:v1.10.1 # (3)
image: ghcr.io/mealie-recipes/mealie:v1.10.2 # (3)
container_name: mealie
restart: always
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th
```yaml
services:
mealie:
image: ghcr.io/mealie-recipes/mealie:v1.10.1 # (3)
image: ghcr.io/mealie-recipes/mealie:v1.10.2 # (3)
container_name: mealie
restart: always
ports:
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/af-ZA.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permissies",
"administrator": "Administrateur",
"user-can-invite-other-to-group": "Gebruiker kan ander na groep nooi",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Gebruiker kan groep bestuur",
"user-can-organize-group-data": "Gebruiker kan groepdata organiseer",
"enable-advanced-features": "Aktiveer gevorderde funksies",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/ar-SA.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/bg-BG.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Права",
"administrator": "Администратор",
"user-can-invite-other-to-group": "Потребителя може да добавя други в групата",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Потребителя може да управлява групата",
"user-can-organize-group-data": "Потребителя може да организира данните на групата",
"enable-advanced-features": "Включване на разширени функции",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/ca-ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permisos",
"administrator": "Administrador",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/cs-CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/da-DK.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Rettigheder",
"administrator": "Administrator",
"user-can-invite-other-to-group": "Bruger kan invitere andre til gruppen",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Bruger kan administrere gruppen",
"user-can-organize-group-data": "Bruger kan organisere gruppedata",
"enable-advanced-features": "Aktiver avancerede funktioner",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/el-GR.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "Αυτό καθορίζει τον τρόπο με τον οποίο ένας χρήστης θα ταυτοποιηθεί με το Mealie. Αν δεν είστε σίγουροι, επιλέξτε 'Mealie'",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "Ο χρήστης μπορεί να προσκαλέσει άλλους στην ομάδα",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Ενεργοποίηση χαρακτηριστικών για προχωρημένους",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/en-GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie'",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie'",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/es-ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permisos",
"administrator": "Administrador",
"user-can-invite-other-to-group": "El usuario puede invitar a otros al grupo",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "El usuario puede administrar el grupo",
"user-can-organize-group-data": "El usuario puede organizar los datos del grupo",
"enable-advanced-features": "Habilitar Características Avanzadas",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/fi-FI.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "Tämä määrittelee, miten käyttäjä todentaa Mealien. Jos et ole varma, valitse 'Mealie'",
"permissions": "Käyttöoikeudet",
"administrator": "Ylläpitäjä",
"user-can-invite-other-to-group": "Käyttäjä voi kutsua muita ryhmään",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Käyttäjä voi hallita ryhmää",
"user-can-organize-group-data": "Käyttäjä voi järjestellä ryhmän tietoja",
"enable-advanced-features": "Salli edistyneemmät ominaisuudet",
Expand Down
6 changes: 3 additions & 3 deletions frontend/lang/messages/fr-CA.json
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,8 @@
"items-checked-count": "Aucun élément coché|Un élément coché|{count} éléments cochés",
"no-label": "Aucune étiquette",
"completed-on": "Terminé le {date}",
"you-are-offline": "You are offline",
"you-are-offline-description": "Not all features are available while offline. You can still add, modify, and remove items, but you will not be able to sync your changes to the server until you are back online.",
"you-are-offline": "Vous êtes hors-ligne",
"you-are-offline-description": "Certaines fonctionnalités ne sont pas disponibles lorsque vous êtes hors-ligne. Vous pouvez toujours ajouter, modifier et supprimer des éléments, mais il ne sera pas possible de synchroniser les changements avec le serveur tant que vous ne serez pas en ligne.",
"are-you-sure-you-want-to-check-all-items": "Voulez-vous vraiment sélectionner tous les éléments ?",
"are-you-sure-you-want-to-uncheck-all-items": "Voulez-vous vraiment désélectionner tous les éléments ?",
"are-you-sure-you-want-to-delete-checked-items": "Voulez-vous vraiment supprimer tous les éléments sélectionnés ?"
Expand Down Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "Ceci infique comment un utilisateur va s'authentifier sur Mealie. Si vous n'êtes pas sûr, choisissez 'Mealie'",
"permissions": "Autorisations",
"administrator": "Administrateur",
"user-can-invite-other-to-group": "L'utilisateur peut inviter quelqu'un au groupe",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "L'utilisateur peut gérer le groupe",
"user-can-organize-group-data": "L'utilisateur peut organiser des données de groupe",
"enable-advanced-features": "Activer les fonctions avancées",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "Ceci infique comment un utilisateur va s'authentifier sur Mealie. Si vous n'êtes pas sûr, choisissez 'Mealie'",
"permissions": "Autorisations",
"administrator": "Administrateur",
"user-can-invite-other-to-group": "L'utilisateur peut inviter quelqu'un au groupe",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "L'utilisateur peut gérer le groupe",
"user-can-organize-group-data": "L'utilisateur peut organiser des données de groupe",
"enable-advanced-features": "Activer les fonctions avancées",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/gl-ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/he-IL.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "זה מציין איך משתמש יתחבר ל״מילי״. אם אתה לא בטוח, בחר מילי",
"permissions": "הרשאות",
"administrator": "מנהל ראשי",
"user-can-invite-other-to-group": "משתמש יכול להזמין אחרים לקבוצה",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "משתמש יכול לנהל קבוצה",
"user-can-organize-group-data": "משתמש יכול לשנות מידע של קבוצה",
"enable-advanced-features": "אפשר אפשרויות מתקדמות",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/hr-HR.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "Ovo određuje način autentifikacije korisnika u Mealie sustavu. Ako niste sigurni, odaberite 'Mealie",
"permissions": "Dozvole",
"administrator": "Administrator",
"user-can-invite-other-to-group": "Korisnik može pozvati druge u grupu",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Korisnik može upravljati grupom",
"user-can-organize-group-data": "Korisnik može organizirati podatke grupe",
"enable-advanced-features": "Omogućite napredne značajke",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/hu-HU.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Engedélyek",
"administrator": "Adminisztrátor",
"user-can-invite-other-to-group": "A felhasználó meghívhat másokat a csoportba",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "A felhasználó csoportot kezelhet",
"user-can-organize-group-data": "Felhasználó szerkesztheti a csoport adatait",
"enable-advanced-features": "Haladó funkciók engedélyezése",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/is-IS.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie'",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/it-IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "Indica come un utente si autenticherà con Mealie. Se non sei sicuro, scegli 'Mealie",
"permissions": "Permessi",
"administrator": "Amministratore",
"user-can-invite-other-to-group": "L'utente può invitare altri al gruppo",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "L'utente può gestire il gruppo",
"user-can-organize-group-data": "L'utente può organizzare i dati del gruppo",
"enable-advanced-features": "Abilita funzionalità avanzate",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "権限",
"administrator": "管理者",
"user-can-invite-other-to-group": "ユーザーは他のグループに招待できます",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "ユーザーはグループを管理できます",
"user-can-organize-group-data": "ユーザーはグループデータを整理できます",
"enable-advanced-features": "高度な機能を有効にする",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/ko-KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/lt-LT.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Leidimai",
"administrator": "Administratorius",
"user-can-invite-other-to-group": "Naudotojas gali kviesti kitus į grupę",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Naudotojas gali valdyti grupę",
"user-can-organize-group-data": "Naudotojas gali tvarkyti grupės duomenis",
"enable-advanced-features": "Įjungti pažangias funkcijas",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/lv-LV.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/nl-NL.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "Dit bepaalt hoe een gebruiker zich aanmeldt bij Mealie. Als je het niet zeker weet, kies dan voor 'Mealie'",
"permissions": "Gebruikersrechten",
"administrator": "Beheerder",
"user-can-invite-other-to-group": "Gebruiker kan iemand uitnodigen voor de groep",
"user-can-invite-other-to-group": "Gebruiker kan anderen uitnodigen voor zijn groep",
"user-can-manage-group": "Gebruiker kan de groep beheren",
"user-can-organize-group-data": "Gebruiker kan groepsgegevens indelen",
"enable-advanced-features": "Geavanceerde functies inschakelen",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/no-NO.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Rettigheter",
"administrator": "Administrator",
"user-can-invite-other-to-group": "Brukeren kan invitere andre til gruppe",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Brukeren kan administrere gruppe",
"user-can-organize-group-data": "Brukeren kan organisere gruppedata",
"enable-advanced-features": "Aktiver avanserte funksjoner",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/pl-PL.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "Określa jak użytkownik będzie uwierzytelniać się z Mealie. Jeśli nie jesteś pewien, wybierz 'Mealie",
"permissions": "Uprawnienia",
"administrator": "Administrator",
"user-can-invite-other-to-group": "Użytkownik może zaprosić innych do grupy",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Użytkownik może zarządzać grupą",
"user-can-organize-group-data": "Użytkownik może organizować dane grupy",
"enable-advanced-features": "Włącz zaawansowane funkcje",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "Isto especifica como um usuário se autentica com o Mealie. Se não tem certeza, escolha \"Mealie\"",
"permissions": "Permissões",
"administrator": "Administrador",
"user-can-invite-other-to-group": "O usuário pode convidar outro para o grupo",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Usuário pode gerenciar o grupo",
"user-can-organize-group-data": "Usuário pode organizar dados do grupo",
"enable-advanced-features": "Ativar recursos avançados",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permissões",
"administrator": "Administrador",
"user-can-invite-other-to-group": "O utilizador pode convidar outro para o grupo",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "O utilizador pode gerir o grupo",
"user-can-organize-group-data": "O utilizador pode organizar dados do grupo",
"enable-advanced-features": "Habilitar recursos avançados",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/ro-RO.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Permissions",
"administrator": "Administrator",
"user-can-invite-other-to-group": "User can invite other to group",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "User can manage group",
"user-can-organize-group-data": "User can organize group data",
"enable-advanced-features": "Enable advanced features",
Expand Down
2 changes: 1 addition & 1 deletion frontend/lang/messages/ru-RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
"authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
"permissions": "Права доступа",
"administrator": "Администратор",
"user-can-invite-other-to-group": "Пользователь может пригласить других в группу",
"user-can-invite-other-to-group": "User can invite others to group",
"user-can-manage-group": "Пользователь может управлять группой",
"user-can-organize-group-data": "Пользователь может менять групповые данные",
"enable-advanced-features": "Включить доп. функции",
Expand Down
Loading

0 comments on commit 550fffe

Please sign in to comment.