Merge branch 'mealie-next' into fix/translation-issues-when-scraping

.devcontainer/Dockerfile

@@ -14,6 +14,7 @@ RUN echo "export PROMPT_COMMAND='history -a'" >> /home/vscode/.bashrc \
     && echo "export HISTFILE=~/commandhistory/.bash_history" >> /home/vscode/.bashrc \
     && chown vscode:vscode -R /home/vscode/
 
+RUN npm install -g @go-task/cli
 
 ENV PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
@@ -37,4 +38,3 @@ RUN apt-get update \
     libwebp-dev \
     libsasl2-dev libldap2-dev libssl-dev \
     gnupg gnupg2 gnupg1
-#     && pip install -U --no-cache-dir pip

.devcontainer/devcontainer.json

@@ -46,7 +46,7 @@
   ],
   // Use 'onCreateCommand' to run commands at the end of container creation.
   // Use 'postCreateCommand' to run commands after the container is created.
-  "onCreateCommand": "sudo chown -R vscode:vscode /workspaces/mealie/frontend/node_modules && make setup",
+  "onCreateCommand": "sudo chown -R vscode:vscode /workspaces/mealie/frontend/node_modules && task setup",
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode",
   // "features": {

.github/DISCUSSION_TEMPLATE/feature-request.yaml

@@ -11,7 +11,7 @@ body:
       options:
         - label: I used the GitHub search to find a similar requests and didn't find it.
           required: true
-        - label: Checked the [tasks tagged](https://github.com/hay-kot/mealie/issues?q=is%3Aissue+is%3Aopen+label%3Atask+) issues and verified my feature is not covered
+        - label: Checked the [tasks tagged](https://github.com/mealie-recipes/mealie/issues?q=is%3Aissue+is%3Aopen+label%3Atask+) issues and verified my feature is not covered
           required: true
   - type: textarea
     id: problem

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -42,7 +42,7 @@ body:
     id: logs
     attributes:
       label: Please provide relevant logs
-      placeholder: For example from `docker-compose logs` or other system logs.
+      placeholder: For example from `docker compose logs` or other system logs.
     validations:
       required: true
   - type: textarea

.github/stale.yml

@@ -1,21 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - early-stages
-  - "bug: confirmed"
-  - feedback
-  - task
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/workflows/partial-backend.yml

@@ -35,6 +35,12 @@ jobs:
 
     # Steps
     steps:
+      - name: Install Task
+        uses: arduino/setup-task@v1
+        with:
+          version: 3.x
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Check out repository
         uses: actions/checkout@v4
 
@@ -69,7 +75,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install libsasl2-dev libldap2-dev libssl-dev
           poetry install
-          poetry add "psycopg2-binary==2.8.6"
+          poetry add "psycopg2-binary==2.9.9"
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' || steps.cache-validate.outputs.cache-hit-success != 'true'
 
       - name: Formatting (Black)
@@ -78,11 +84,11 @@ jobs:
 
       - name: Lint (Ruff)
         run: |
-          make backend-lint
+          task py:lint
 
       - name: Mypy Typecheck
         run: |
-          make backend-typecheck
+          task py:mypy
 
       - name: Pytest
         env:
@@ -101,4 +107,4 @@ jobs:
           LDAP_NAME_ATTRIBUTE: cn
           LDAP_MAIL_ATTRIBUTE: mail
         run: |
-          make backend-test
+          task py:test

.github/workflows/release.yml

@@ -42,4 +42,27 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
         uses: Ilshidur/action-discord@0.3.2
         with:
-          args: "🚀  Version {{ EVENT_PAYLOAD.release.tag_name }} of Mealie has been released. See the release notes https://github.com/hay-kot/mealie/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}"
+          args: "🚀  Version {{ EVENT_PAYLOAD.release.tag_name }} of Mealie has been released. See the release notes https://github.com/mealie-recipes/mealie/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}"
+
+  update-image-tags:
+    name: Update image tag in sample docker-compose files
+    needs:
+      - build-release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎
+        uses: actions/checkout@v4
+
+      - name: Modify version strings
+        run: |
+          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:${{ github.event.release.tag_name }}/' docs/docs/documentation/getting-started/installation/sqlite.md
+          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:${{ github.event.release.tag_name }}/' docs/docs/documentation/getting-started/installation/postgres.md
+
+      - name: Commit updates
+        uses: test-room-7/action-update-file@v1
+        with:
+          file-path: |
+            docs/docs/documentation/getting-started/installation/sqlite.md
+            docs/docs/documentation/getting-started/installation/postgres.md
+          commit-msg: "Change image tag, for release ${{ github.event.release.tag_name }}"
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale.yml

@@ -0,0 +1,41 @@
+# Documentation: https://github.com/marketplace/actions/close-stale-issues
+name: 'Stale: Flag and close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-label: 'stale'
+          exempt-issue-labels: 'pinned,security,early-stages,bug: confirmed,feedback,task'
+          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          days-before-issue-stale: 30
+          days-before-issue-close: 5
+          stale-pr-label: 'stale'
+          stale-pr-message: 'This PR is stale because it has been open 45 days with no activity.'
+          days-before-pr-stale: 45
+          # This stops a PR from ever getting closed automatically.
+          days-before-pr-close: -1
+          # If an issue/PR has a milestone, it's exempt from being marked as stale.
+          exempt-all-milestones: true
+          # How many API calls will we allow the action to make, essentially.
+          # Doco: https://github.com/actions/stale?tab=readme-ov-file#operations-per-run
+          operations-per-run: 150
+          ########################################################################
+          # The below are just default values, but populating here for reference #
+          ########################################################################
+          # Automatically remove the stale label when the issues or the pull requests are updated
+          remove-stale-when-updated: true
+          # The reason used when closing issues. Valid values are `completed` and `not_planned`.
+          close-issue-reason: 'not_planned'
+          # If true, PRs currently in draft will not be marked as stale automatically.
+          # We can mark them stale (after `days-before-pr-stale`), though we don't auto-close.
+          exempt-draft-pr: false

.gitignore

@@ -162,3 +162,4 @@ lcov.info
 dev/code-generation/openapi.json
 
 .run/
+.task/*

.pre-commit-config.yaml

@@ -11,6 +11,6 @@ repos:
       - id: trailing-whitespace
         exclude: ^tests/data/
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 24.1.0
     hooks:
       - id: black

.pylintrc

@@ -60,17 +60,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-disable=print-statement,
+disable=raw-checker-failed,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
-        raw-checker-failed,
         bad-inline-option,
         locally-disabled,
         file-ignored,
@@ -78,67 +68,10 @@ disable=print-statement,
         useless-suppression,
         deprecated-pragma,
         use-symbolic-message-instead,
-        apply-builtin,
+        missing-function-docstring,
-        basestring-builtin,
+        missing-class-docstring,
-        buffer-builtin,
+        missing-module-docstring,
-        cmp-builtin,
+        too-few-public-methods
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -292,7 +225,9 @@ good-names=i,
            k,
            ex,
            Run,
-           _
+           _,
+           e,
+           db
 
 # Good variable names regexes, separated by a comma. If names match any regex,
 # they will always be accepted
@@ -455,7 +390,7 @@ indent-after-paren=4
 indent-string='    '
 
 # Maximum number of characters on a single line.
-max-line-length=100
+max-line-length=120
 
 # Maximum number of lines in a module.
 max-module-lines=1000
@@ -583,5 +518,5 @@ valid-metaclass-classmethod-first-arg=cls
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
+overgeneral-exceptions=builtins.BaseException,
-                       Exception
+                       builtins.Exception

.vscode/tasks.json

@@ -1,22 +1,9 @@
 {
   "version": "2.0.0",
   "tasks": [
-    {
-      "label": "DEV: Build and Start Docker Compose",
-      "command": "make docker-dev",
-      "type": "shell",
-      "args": [],
-      "problemMatcher": [
-        "$tsc"
-      ],
-      "presentation": {
-        "reveal": "always"
-      },
-      "group": "test"
-    },
     {
       "label": "Production: Build and Start Docker Compose",
-      "command": "make docker-prod",
+      "command": "task docker:prod",
       "type": "shell",
       "args": [],
       "problemMatcher": [
@@ -29,7 +16,7 @@
     },
     {
       "label": "Dev: Start Backend",
-      "command": "make backend",
+      "command": "task py",
       "type": "shell",
       "presentation": {
         "reveal": "always",
@@ -49,7 +36,7 @@
     },
     {
       "label": "Dev: Start Frontend",
-      "command": "make frontend",
+      "command": "task ui",
       "type": "shell",
       "presentation": {
         "reveal": "always",
@@ -59,7 +46,7 @@
     },
     {
       "label": "Dev: Start Docs Server",
-      "command": "make docs",
+      "command": "task docs",
       "type": "shell",
       "presentation": {
         "reveal": "always",
@@ -69,7 +56,7 @@
     },
     {
       "label": "Run python tests",
-      "command": "make test",
+      "command": "task py:test",
       "type": "shell",
       "presentation": {
         "reveal": "always"

README.md

@@ -1,10 +1,10 @@
+[![Latest Release][latest-release-shield]][latest-release-url]
 [![Contributors][contributors-shield]][contributors-url]
 [![Forks][forks-shield]][forks-url]
 [![Stargazers][stars-shield]][stars-url]
 [![Issues][issues-shield]][issues-url]
 [![AGPL License][license-shield]][license-url]
 [![Docker Pulls][docker-pull]][docker-pull]
-[![CodeFactor](https://www.codefactor.io/repository/github/mealie-recipes/mealie/badge)](https://www.codefactor.io/repository/github/mealie-recipes/mealie)
 
 <!-- PROJECT LOGO -->
 <br />
@@ -91,6 +91,8 @@ Thanks to Linode for providing Hosting for the Demo, Beta, and Documentation sit
 [stars-url]: https://github.com/mealie-recipes/mealie/stargazers
 [issues-shield]: https://img.shields.io/github/issues/mealie-recipes/mealie.svg?style=flat-square
 [issues-url]: https://github.com/mealie-recipes/mealie/issues
+[latest-release-shield]: https://img.shields.io/github/v/release/mealie-recipes/mealie?style=flat-square&label=latest%20release
+[latest-release-url]: https://img.shields.io/github/v/release/mealie-recipes/mealie
 [license-shield]: https://img.shields.io/github/license/mealie-recipes/mealie.svg?style=flat-square
 [license-url]: https://github.com/mealie-recipes/mealie/blob/mealie-next/LICENSE
 [linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=flat-square&logo=linkedin&colorB=555

Taskfile.yml

@@ -0,0 +1,183 @@
+# https://taskfile.dev
+
+version: "3"
+vars:
+  GREETING: Hello, World!
+env:
+  DEFAULT_GROUP: Home
+  PRODUCTION: false
+  API_PORT: 9000
+  API_DOCS: True
+  TOKEN_TIME: 256 # hours
+  # mailplit SMTP config
+  # start dev:services to use mailpit
+  SMTP_HOST: localhost
+  SMTP_PORT: 1025
+  SMTP_FROM_NAME: MealieDev
+  SMTP_AUTH_STRATEGY: NONE
+  LANG: en-US
+
+# loads .env file if it exists
+dotenv:
+  - .env
+  - .dev.env
+tasks:
+  docs:gen:
+    desc: runs the API documentation generator
+    cmds:
+      - poetry run python dev/code-generation/gen_docs_api.py
+
+  docs:
+    desc: runs the documentation server
+    dir: docs
+    deps:
+      - docs:gen
+    cmds:
+      - poetry run python -m mkdocs serve
+
+  setup:ui:
+    desc: setup frontend dependencies
+    dir: frontend
+    cmds:
+      - yarn install
+
+  setup:py:
+    desc: setup python dependencies
+    cmds:
+      - poetry install --with main,dev,postgres
+      - poetry run pre-commit install
+
+  setup:model:
+    desc: setup nlp model
+    vars:
+      MODEL_URL: https://github.com/mealie-recipes/nlp-model/releases/download/v1.0.0/model.crfmodel
+      OUTPUT: ./mealie/services/parser_services/crfpp/model.crfmodel
+    sources:
+      # using pyproject.toml as the dependency since this should only ever need to run once
+      # during setup. There is perhaps a better way to do this.
+      - ./pyproject.toml
+    generates:
+      - ./mealie/services/parser_services/crfpp/model.crfmodel
+    cmds:
+      - curl -L0 {{ .MODEL_URL }} --output {{ .OUTPUT }}
+
+  setup:
+    desc: setup all dependencies
+    deps:
+      - setup:ui
+      - setup:py
+      - setup:model
+
+  dev:generate:
+    desc: run code generators
+    cmds:
+      - poetry run python dev/code-generation/main.py
+
+  dev:services:
+    desc: starts postgres and mailpit containers
+    dir: docker
+    cmds:
+      - docker compose -f docker-compose.dev.yml up
+
+  dev:clean:
+    desc: cleans up dev environment !! removes all data files !!
+    vars:
+      DEV_DATA: ""
+    cmds:
+      - rm -r ./dev/data/recipes/
+      - rm -r ./dev/data/users/
+      - rm -f ./dev/data/mealie*.db
+      - rm -f ./dev/data/mealie.log
+      - rm -f ./dev/data/.secret
+
+  py:mypy:
+    desc: runs python type checking
+    cmds:
+      - poetry run mypy mealie
+
+  py:test:
+    desc: runs python tests (support args after '--')
+    cmds:
+      - poetry run pytest {{ .CLI_ARGS }}
+
+  py:format:
+    desc: runs python code formatter
+    cmds:
+      - poetry run black mealie
+
+  py:lint:
+    desc: runs python linter
+    cmds:
+      - poetry run ruff mealie
+
+  py:check:
+    desc: runs all linters, type checkers, and formatters
+    deps:
+      - py:format
+      - py:lint
+      - py:mypy
+      - py:test
+
+  py:coverage:
+    desc: runs python coverage and generates html report
+    cmds:
+      - poetry run pytest
+      - poetry run coverage report -m
+      - poetry run coveragepy-lcov
+      - poetry run coverage html
+      - open htmlcov/index.html
+
+  py:
+    desc: runs the backend server
+    cmds:
+      - poetry run python mealie/db/init_db.py
+      - poetry run python mealie/app.py
+
+  py:postgres:
+    desc: runs the backend server configured for containerized postgres
+    env:
+      DB_ENGINE: postgres
+      POSTGRES_USER: mealie
+      POSTGRES_PASSWORD: mealie
+      POSTGRES_SERVER: localhost
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: mealie
+    cmds:
+      - poetry run python mealie/db/init_db.py
+      - poetry run python mealie/app.py
+
+  ui:build:
+    desc: builds the frontend in frontend/dist
+    dir: frontend
+    cmds:
+      - yarn build
+
+  ui:lint:
+    desc: runs the frontend linter
+    dir: frontend
+    cmds:
+      - yarn lint
+
+  ui:test:
+    desc: runs the frontend tests
+    dir: frontend
+    cmds:
+      - yarn test
+
+  ui:check:
+    desc: runs all frontend checks
+    deps:
+      - ui:lint
+      - ui:test
+
+  ui:
+    desc: runs the frontend server
+    dir: frontend
+    cmds:
+      - yarn run dev
+
+  docker:prod:
+    desc: builds and runs the production docker image locally
+    dir: docker
+    cmds:
+      - docker compose -f docker-compose.yml -p mealie up -d --build

alembic/versions/2022-02-21-19.56.24_6b0f5f32d602_initial_tables.py

@@ -1,10 +1,11 @@
 """Initial tables
 
 Revision ID: 6b0f5f32d602
-Revises: 
+Revises:
 Create Date: 2022-02-21 19:56:24.351115
 
 """
+
 import sqlalchemy as sa
 from sqlalchemy import engine_from_config
 

alembic/versions/2022-03-23-17.43.34_263dd6707191_convert_quantity_from_integer_to_float.py

@@ -5,6 +5,7 @@ Revises: 6b0f5f32d602
 Create Date: 2022-03-23 17:43:34.727829
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op

alembic/versions/2022-03-27-19.30.28_f1a2dbee5fe9_add_original_text_column_to_recipes_.py

@@ -5,6 +5,7 @@ Revises: 263dd6707191
 Create Date: 2022-03-27 19:30:28.545846
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op

alembic/versions/2022-03-31-19.19.55_59eb59135381_add_tags_to_cookbooks.py

@@ -5,6 +5,7 @@ Revises: f1a2dbee5fe9
 Create Date: 2022-03-31 19:19:55.428965
 
 """
+
 import sqlalchemy as sa
 
 import mealie.db.migration_types

alembic/versions/2022-04-03-10.48.51_09dfc897ad62_add_require_all_for_cookbook_filters.py

@@ -5,6 +5,7 @@ Revises: 59eb59135381
 Create Date: 2022-04-03 10:48:51.379968
 
 """
+
 import sqlalchemy as sa
 
 import mealie.db.migration_types  # noqa: F401

alembic/versions/2022-06-01-11.12.06_ab0bae02578f_add_use_abbreviation_column_to_.py

@@ -5,6 +5,7 @@ Revises: 09dfc897ad62
 Create Date: 2022-06-01 11:12:06.748383
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op

alembic/versions/2022-06-15-21.05.34_f30cf048c228_add_new_webhook_fields.py

@@ -6,6 +6,7 @@ Revises: ab0bae02578f
 Create Date: 2022-06-15 21:05:34.851857
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op

alembic/versions/2022-08-12-19.05.59_188374910655_add_login_attemps_and_locked_at_field_.py

@@ -5,6 +5,7 @@ Revises: f30cf048c228
 Create Date: 2022-08-12 19:05:59.776361
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op

alembic/versions/2022-08-13-17.07.07_089bfa50d0ed_add_is_ocr_recipe_column_to_recipes.py

@@ -5,6 +5,7 @@ Revises: 188374910655
 Create Date: 2022-08-05 17:07:07.389271
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op

alembic/versions/2022-08-29-13.57.40_44e8d670719d_add_extras_to_shopping_lists_list_items_.py

@@ -5,6 +5,7 @@ Revises: 089bfa50d0ed
 Create Date: 2022-08-29 13:57:40.452245
 
 """
+
 import sqlalchemy as sa
 
 import mealie.db.migration_types

alembic/versions/2022-09-27-14.53.14_2ea7a807915c_add_recipe_timeline_events_table.py

@@ -5,6 +5,7 @@ Revises: 44e8d670719d
 Create Date: 2022-09-27 14:53:14.111054
 
 """
+
 import sqlalchemy as sa
 
 import mealie.db.migration_types

alembic/versions/2022-11-03-13.10.24_1923519381ad_renamed_timeline_event_message_and_.py

@@ -5,6 +5,7 @@ Revises: 2ea7a807915c
 Create Date: 2022-11-03 13:10:24.811134
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op

alembic/versions/2022-11-22-03.42.45_167eb69066ad_add_recipe_scale_to_shopping_list_item_.py

@@ -5,6 +5,7 @@ Revises: 1923519381ad
 Create Date: 2022-11-22 03:42:45.494567
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op

alembic/versions/2023-01-21-16.54.44_165d943c64ee_add_related_user_to_mealplan.py

@@ -5,6 +5,7 @@ Revises: 167eb69066ad
 Create Date: 2023-01-21 16:54:44.368768
 
 """
+
 import sqlalchemy as sa
 
 import mealie.db.migration_types

alembic/versions/2023-02-10-21.18.32_16160bf731a0_add_more_indices_necessary_for_search.py

@@ -5,6 +5,7 @@ Revises: ff5f73b01a7a
 Create Date: 2023-02-10 21:18:32.405130
 
 """
+
 import sqlalchemy as sa
 
 import mealie.db.migration_types

alembic/versions/2023-02-14-20.45.41_5ab195a474eb_add_normalized_search_properties.py

@@ -5,6 +5,7 @@ Revises: 16160bf731a0
 Create Date: 2023-02-14 20:45:41.102571
 
 """
+
 import sqlalchemy as sa
 from sqlalchemy import orm, select
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column

alembic/versions/2023-02-21-22.03.19_b04a08da2108_added_shopping_list_label_settings.py

@@ -5,6 +5,7 @@ Revises: 5ab195a474eb
 Create Date: 2023-21-02 22:03:19.837244
 
 """
+
 from uuid import uuid4
 
 import sqlalchemy as sa

alembic/versions/2023-02-22-21.45.52_38514b39a824_add_auth_method_to_user_table.py

@@ -5,6 +5,7 @@ Revises: b04a08da2108
 Create Date: 2023-02-22 21:45:52.900964
 
 """
+
 import sqlalchemy as sa
 
 import mealie.db.migration_types

alembic/versions/2023-04-13-06.47.04_b3dbb554ba53_postgres_fuzzy_search.py

@@ -5,6 +5,7 @@ Revises: 38514b39a824
 Create Date: 2023-04-13 06:47:04.617131
 
 """
+
 import sqlalchemy as sa
 
 import mealie.db.migration_types

alembic/versions/2023-08-06-21.00.34_04ac51cbe9a4_added_group_slug.py

@@ -5,6 +5,7 @@ Revises: b3dbb554ba53
 Create Date: 2023-08-06 21:00:34.582905
 
 """
+
 import sqlalchemy as sa
 from slugify import slugify
 from sqlalchemy.orm import Session

alembic/versions/2023-08-14-19.30.49_1825b5225403_added_recipe_note_to_shopping_list_.py

@@ -5,6 +5,7 @@ Revises: 04ac51cbe9a4
 Create Date: 2023-08-14 19:30:49.103185
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op

alembic/versions/2023-08-15-16.25.07_bcfdad6b7355_remove_tool_name_and_slug_unique_.py

@@ -5,6 +5,7 @@ Revises: 1825b5225403
 Create Date: 2023-08-15 16:25:07.058929
 
 """
+
 from alembic import op
 
 # revision identifiers, used by Alembic.

alembic/versions/2023-09-01-14.55.42_0341b154f79a_added_normalized_unit_and_food_names.py

@@ -5,6 +5,7 @@ Revises: bcfdad6b7355
 Create Date: 2023-09-01 14:55:42.166766
 
 """
+
 import sqlalchemy as sa
 from sqlalchemy import orm, select
 

alembic/versions/2023-10-04-14.29.26_dded3119c1fe_added_unique_constraints.py

@@ -5,6 +5,7 @@ Revises: 0341b154f79a
 Create Date: 2023-10-04 14:29:26.688065
 
 """
+
 from collections import defaultdict
 from dataclasses import dataclass
 from typing import Any
@@ -58,7 +59,12 @@ def _resolve_duplicate_food(
     keep_food_id: UUID4,
     dupe_food_id: UUID4,
 ):
-    for shopping_list_item in session.query(ShoppingListItem).filter_by(food_id=dupe_food_id).all():
+    for shopping_list_item in (
+        session.query(ShoppingListItem)
+        .options(load_only(ShoppingListItem.id, ShoppingListItem.food_id))
+        .filter_by(food_id=dupe_food_id)
+        .all()
+    ):
         shopping_list_item.food_id = keep_food_id
 
     for recipe_ingredient in (
@@ -81,10 +87,20 @@ def _resolve_duplicate_unit(
     keep_unit_id: UUID4,
     dupe_unit_id: UUID4,
 ):
-    for shopping_list_item in session.query(ShoppingListItem).filter_by(unit_id=dupe_unit_id).all():
+    for shopping_list_item in (
+        session.query(ShoppingListItem)
+        .options(load_only(ShoppingListItem.id, ShoppingListItem.unit_id))
+        .filter_by(unit_id=dupe_unit_id)
+        .all()
+    ):
         shopping_list_item.unit_id = keep_unit_id
 
-    for recipe_ingredient in session.query(RecipeIngredientModel).filter_by(unit_id=dupe_unit_id).all():
+    for recipe_ingredient in (
+        session.query(RecipeIngredientModel)
+        .options(load_only(RecipeIngredientModel.id, RecipeIngredientModel.unit_id))
+        .filter_by(unit_id=dupe_unit_id)
+        .all()
+    ):
         recipe_ingredient.unit_id = keep_unit_id
 
     session.commit()
@@ -99,10 +115,20 @@ def _resolve_duplicate_label(
     keep_label_id: UUID4,
     dupe_label_id: UUID4,
 ):
-    for shopping_list_item in session.query(ShoppingListItem).filter_by(label_id=dupe_label_id).all():
+    for shopping_list_item in (
+        session.query(ShoppingListItem)
+        .options(load_only(ShoppingListItem.id, ShoppingListItem.label_id))
+        .filter_by(label_id=dupe_label_id)
+        .all()
+    ):
         shopping_list_item.label_id = keep_label_id
 
-    for ingredient_food in session.query(IngredientFoodModel).filter_by(label_id=dupe_label_id).all():
+    for ingredient_food in (
+        session.query(IngredientFoodModel)
+        .options(load_only(IngredientFoodModel.id, IngredientFoodModel.label_id))
+        .filter_by(label_id=dupe_label_id)
+        .all()
+    ):
         ingredient_food.label_id = keep_label_id
 
     session.commit()

alembic/versions/2023-10-19-19.22.55_ba1e4a6cfe99_added_plural_names_and_alias_tables_for_.py

@@ -5,6 +5,7 @@ Revises: dded3119c1fe
 Create Date: 2023-10-19 19:22:55.369319
 
 """
+
 import sqlalchemy as sa
 
 import mealie.db.migration_types

dev/code-generation/gen_ts_locales.py

@@ -1,4 +1,5 @@
 import pathlib
+from dataclasses import dataclass
 from pathlib import Path
 
 import dotenv
@@ -15,38 +16,44 @@ BASE = pathlib.Path(__file__).parent.parent.parent
 API_KEY = dotenv.get_key(BASE / ".env", "CROWDIN_API_KEY")
 
 
-NAMES = {
+@dataclass
-    "en-US": "American English",
+class LocaleData:
-    "en-GB": "British English",
+    name: str
-    "af-ZA": "Afrikaans (Afrikaans)",
+    dir: str = "ltr"
-    "ar-SA": "العربية (Arabic)",
+
-    "ca-ES": "Català (Catalan)",
+
-    "cs-CZ": "Čeština (Czech)",
+LOCALE_DATA: dict[str, LocaleData] = {
-    "da-DK": "Dansk (Danish)",
+    "en-US": LocaleData(name="American English"),
-    "de-DE": "Deutsch (German)",
+    "en-GB": LocaleData(name="British English"),
-    "el-GR": "Ελληνικά (Greek)",
+    "af-ZA": LocaleData(name="Afrikaans (Afrikaans)"),
-    "es-ES": "Español (Spanish)",
+    "ar-SA": LocaleData(name="العربية (Arabic)", dir="rtl"),
-    "fi-FI": "Suomi (Finnish)",
+    "ca-ES": LocaleData(name="Català (Catalan)"),
-    "fr-FR": "Français (French)",
+    "cs-CZ": LocaleData(name="Čeština (Czech)"),
-    "he-IL": "עברית (Hebrew)",
+    "da-DK": LocaleData(name="Dansk (Danish)"),
-    "hu-HU": "Magyar (Hungarian)",
+    "de-DE": LocaleData(name="Deutsch (German)"),
-    "it-IT": "Italiano (Italian)",
+    "el-GR": LocaleData(name="Ελληνικά (Greek)"),
-    "ja-JP": "日本語 (Japanese)",
+    "es-ES": LocaleData(name="Español (Spanish)"),
-    "ko-KR": "한국어 (Korean)",
+    "fi-FI": LocaleData(name="Suomi (Finnish)"),
-    "no-NO": "Norsk (Norwegian)",
+    "fr-FR": LocaleData(name="Français (French)"),
-    "nl-NL": "Nederlands (Dutch)",
+    "he-IL": LocaleData(name="עברית (Hebrew)", dir="rtl"),
-    "pl-PL": "Polski (Polish)",
+    "hu-HU": LocaleData(name="Magyar (Hungarian)"),
-    "pt-BR": "Português do Brasil (Brazilian Portuguese)",
+    "it-IT": LocaleData(name="Italiano (Italian)"),
-    "pt-PT": "Português (Portuguese)",
+    "ja-JP": LocaleData(name="日本語 (Japanese)"),
-    "ro-RO": "Română (Romanian)",
+    "ko-KR": LocaleData(name="한국어 (Korean)"),
-    "ru-RU": "Pусский (Russian)",
+    "no-NO": LocaleData(name="Norsk (Norwegian)"),
-    "sr-SP": "српски (Serbian)",
+    "nl-NL": LocaleData(name="Nederlands (Dutch)"),
-    "sv-SE": "Svenska (Swedish)",
+    "pl-PL": LocaleData(name="Polski (Polish)"),
-    "tr-TR": "Türkçe (Turkish)",
+    "pt-BR": LocaleData(name="Português do Brasil (Brazilian Portuguese)"),
-    "uk-UA": "Українська (Ukrainian)",
+    "pt-PT": LocaleData(name="Português (Portuguese)"),
-    "vi-VN": "Tiếng Việt (Vietnamese)",
+    "ro-RO": LocaleData(name="Română (Romanian)"),
-    "zh-CN": "简体中文 (Chinese simplified)",
+    "ru-RU": LocaleData(name="Pусский (Russian)"),
-    "zh-TW": "繁體中文 (Chinese traditional)",
+    "sr-SP": LocaleData(name="српски (Serbian)"),
+    "sv-SE": LocaleData(name="Svenska (Swedish)"),
+    "tr-TR": LocaleData(name="Türkçe (Turkish)"),
+    "uk-UA": LocaleData(name="Українська (Ukrainian)"),
+    "vi-VN": LocaleData(name="Tiếng Việt (Vietnamese)"),
+    "zh-CN": LocaleData(name="简体中文 (Chinese simplified)"),
+    "zh-TW": LocaleData(name="繁體中文 (Chinese traditional)"),
 }
 
 LOCALE_TEMPLATE = """// This Code is auto generated by gen_global_components.py
@@ -55,6 +62,7 @@ export const LOCALES = [{% for locale in locales %}
     name: "{{ locale.name }}",
     value: "{{ locale.locale }}",
     progress: {{ locale.progress }},
+    dir: "{{ locale.dir }}",
   },{% endfor %}
 ]
 
@@ -65,12 +73,14 @@ class TargetLanguage(MealieModel):
     id: str
     name: str
     locale: str
+    dir: str = "ltr"
     threeLettersCode: str
     twoLettersCode: str
     progress: float = 0.0
 
     class Config:
         extra = Extra.allow
+        allow_population_by_field_name = True
 
 
 class CrowdinApi:
@@ -103,15 +113,23 @@ class CrowdinApi:
         models.insert(
             0,
             TargetLanguage(
-                id="en-US", name="English", locale="en-US", threeLettersCode="en", twoLettersCode="en", progress=100
+                id="en-US",
+                name="English",
+                locale="en-US",
+                dir="ltr",
+                threeLettersCode="en",
+                twoLettersCode="en",
+                progress=100,
             ),
         )
 
         progress: list[dict] = self.get_progress()["data"]
 
         for model in models:
-            if model.locale in NAMES:
+            if model.locale in LOCALE_DATA:
-                model.name = NAMES[model.locale]
+                locale_data = LOCALE_DATA[model.locale]
+                model.name = locale_data.name
+                model.dir = locale_data.dir
 
             for p in progress:
                 if p["data"]["languageId"] == model.id:

docker/Dockerfile

@@ -138,4 +138,4 @@ EXPOSE ${APP_PORT}
 COPY ./docker/entry.sh $MEALIE_HOME/run.sh
 
 RUN chmod +x $MEALIE_HOME/run.sh
-ENTRYPOINT $MEALIE_HOME/run.sh
+ENTRYPOINT ["/app/run.sh"]

docker/docker-compose.dev.yml

@@ -0,0 +1,21 @@
+version: "3.4"
+services:
+  mailpit:
+    image: axllent/mailpit:latest
+    container_name: mealie_dev_mailpit
+    restart: no
+    environment:
+      - "MP_SMTP_AUTH_ACCEPT_ANY=true"
+      - "MP_SMTP_AUTH_ALLOW_INSECURE=true"
+    ports:
+      - "8025:8025"
+      - "1025:1025"
+  postgres:
+    container_name: mealie_dev_postgres
+    image: postgres:15
+    restart: no
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_PASSWORD: mealie
+      POSTGRES_USER: mealie

docker/entry.sh

@@ -1,13 +1,10 @@
-# Start Backend API
 #!/bin/bash
-
+# Start Backend API
-# Strict Mode
-# set -e
-# IFS=$'\n\t'
 
 # Get PUID/PGID
 PUID=${PUID:-911}
 PGID=${PGID:-911}
+BASH_SOURCE=${BASH_SOURCE:-$0}
 
 add_user() {
     groupmod -o -g "$PGID" abc
@@ -15,18 +12,18 @@ add_user() {
 }
 
 change_user() {
-    # If container is started as root then create a new user and switch to it
+    if [ "$(id -u)" = $PUID ]; then
-    if [ "$(id -u)" = "0" ]; then
+        echo "
+        User uid:    $PUID
+        User gid:    $PGID
+        "
+    elif [ "$(id -u)" = "0" ]; then
+        # If container is started as root then create a new user and switch to it
         add_user
         chown -R $PUID:$PGID /app
 
         echo "Switching to dedicated user"
         exec gosu $PUID "$BASH_SOURCE" "$@"
-        elif [ "$(id -u)" = $PUID ]; then
-        echo "
-        User uid:    $PUID
-        User gid:    $PGID
-        "
     fi
 }
 
@@ -41,7 +38,7 @@ init() {
     poetry run python /app/mealie/db/init_db.py
 }
 
-# change_user
+change_user
 init
 GUNICORN_PORT=${API_PORT:-9000}
 
@@ -49,7 +46,7 @@ GUNICORN_PORT=${API_PORT:-9000}
 hostip=`/sbin/ip route|awk '/default/ { print $3 }'`
 if [ "$WEB_GUNICORN" = 'true' ]; then
     echo "Starting Gunicorn"
-    gunicorn mealie.app:app -b 0.0.0.0:$GUNICORN_PORT --forwarded-allow-ips=$hostip -k uvicorn.workers.UvicornWorker -c /app/gunicorn_conf.py --preload
+    exec gunicorn mealie.app:app -b 0.0.0.0:$GUNICORN_PORT --forwarded-allow-ips=$hostip -k uvicorn.workers.UvicornWorker -c /app/gunicorn_conf.py --preload
 else
-    uvicorn mealie.app:app --host 0.0.0.0 --forwarded-allow-ips=$hostip --port $GUNICORN_PORT
+    exec uvicorn mealie.app:app --host 0.0.0.0 --forwarded-allow-ips=$hostip --port $GUNICORN_PORT
 fi

docs/docs/contributors/developers-guide/code-contributions.md

@@ -13,7 +13,7 @@ Pull requests are the best way to propose changes to the codebase (we use [Githu
 3. If you're interested on working on major changes please get in touch on discord and coordinate with other developers. No sense in doubling up on work if someones already on it.
 4. Once you've got an idea of what changes you want to make, create a draft PR as soon as you can to let us know what you're working on and how we can help!
 5. If you've changed APIs, update the documentation.
-6. Run tests, including `make backend-all`. Note that the tests do not clean up after themselves and leave things in the database. So be sure to also run `make clean-data` and/or `make backend-clean` inbetween major testing rounds to be sure that you aren't testing on old data.
+6. Run tests, including `task py:check`.
 6. Issue that pull request! First make a draft PR, make sure that the automated github tests all pass, then mark as ready for review.
 7. Be sure to add release notes to the pull request.
 

docs/docs/contributors/developers-guide/maintainers.md

@@ -1,6 +1,6 @@
 # Maintainers Guide
 
-This is the start of the maintainers guide for Mealie developers. Those who have been invited to the GitHub organization and/or those who whish to play a bigger part in the Mealie developers community may find this helpful.
+This is the start of the maintainers guide for Mealie developers. Those who have been invited to the GitHub organization and/or those who wish to play a bigger part in the Mealie developers community may find this helpful.
 
 ## Managing Issues
 
@@ -13,7 +13,7 @@ After you've reviered an issue it will generally move into one of two states:
 
 
 `needs more info`
-:   The orignal post does not contain enough information, and if the reporter does not provide additional information, the issue will be automatically closed.
+:   The original post does not contain enough information, and if the reporter does not provide additional information, the issue will be automatically closed.
 
 Once you've reviewed an issue and moved it into another category, you should remove the triage label.
 
@@ -40,18 +40,38 @@ Mealie is published via GitHub actions to the GitHub container registry with the
 : published when a new GitHub Release is created - [Actions File](https://github.com/mealie-recipes/mealie/blob/mealie-next/.github/workflows/release.yml)
 
 !!! note
-    Both the latest, and {version} tags will be the same container on the release of a new version
+    Both the latest, and {version} tags will be the same image on the release of a new version
 
 ### Process
 
-Because we've built all our publishing effors on GitHub Actions we rely primarily on automations to perform our releases. As such creating a new build of Mealie is as simple as creating a new GitHub release. Here are the general steps we take to create a new release
+Because we've built all our publishing efforts on GitHub Actions we rely primarily on automations to perform our releases. As such creating a new build of Mealie is as simple as creating a new GitHub release. Here are the general steps we take to create a new release
 
 1. Navigate to the [Github Release Page](https://github.com/mealie-recipes/mealie/releases) and click the 'Draft a new release' button.
 2. Choose a tag and increment the version according to the semver specification. i.e, **major** version for breaking changes, **minor** for feature updates, and **patch** for bug fixes.
-3. Name the Release, usually just the tag is fine, however if there is a special feature you'd like to higlight this would be a great place to do it.
+3. Name the Release, usually just the tag is fine, however if there is a special feature you'd like to highlight this would be a great place to do it.
 4. Click the "Generate release notes" button which will pull in all the Git Commits as a changelog. For bug fix only releases this is sufficient, however if there are major features, or good quality of life improvements it's good to provide those prior to listing the full changelog.
 
 !!! tip
     Don't worry about setting the version number in the container or code, it's set during the build process and uses the tag you specified when drafting a new release.
 
     You can see how this is done in the [Actions File](https://github.com/mealie-recipes/mealie/blob/mealie-next/.github/workflows/partial-builder.yml#L35-L37)
+
+### Tags and Releases
+
+Mealie tries to adhere to a strict [Semver](https://semver.org/) policy. This means that we try to keep our releases as stable as possible, and only introduce breaking changes when absolutely necessary. As such we try to keep our releases as follows:
+
+- **Major** releases are reserved for breaking changes, and are not expected to be frequent. Ideally, we will remain at v1.x.x for the forseeable future.
+- **Minor** releases are reserved for new features, and are expected to be frequent.
+- **Patch** releases are reserved for bug fixes, and are expected to be frequent.
+
+Any maintainer who has privileges on GitHub to create a new release can create a release at any time they feel it is necessary. However, it is recommended that you reach out in the discord to other maintainers and get at least one other maintainer to approve the release.
+
+An important caveat to this is that we _may_ make breaking changes in a minor release if it is security related. In this case, the releaser should headline the release notes with the notice and impact of the breaking change, however we may not bump the major version depending on user impact.
+
+### Release Notes
+
+When drafting a new release, GitHub will automatically pull in all the commits since the last release. This is a great start. After pulling in all of the commits, you should add sections for
+
+- New Features - Any new features that are being introduced in this release (screenshots are great here)
+- Bug Fixes - Significant bug fixes that are being introduced in this release, smaller bug fixes can be left out if they are noted in a commit message
+- Breaking Changes - Any breaking changes that are being introduced in this release (should be rare)

docs/docs/contributors/developers-guide/starting-dev-server.md

@@ -14,12 +14,12 @@ Prerequisites
 - Visual Studio Code
 
 ### Linux and MacOS
+
 First ensure that docker is running. Then when you clone the repo and open with VS Code you should see a popup asking you to reopen the project inside a development container. Click yes and it will build the development container and run the setup required to run both the backend API and the frontend webserver. This also pre-configures pre-commit hooks to ensure that the code is up to date before committing.
 
 ### Windows
-Make sure the VSCode Dev Containers extension is installed, then select "Dev Containers: Clone Repository in Container Volume..." in the command pallete (F1). Select your forked repo and choose the `mealie-next` branch, which contains the latest changes. This mounts your repository directly in WSL2, which [greatly improves the performance of the container](https://code.visualstudio.com/docs/devcontainers/containers#_quick-start-open-a-git-repository-or-github-pr-in-an-isolated-container-volume), and enables hot-reloading for the frontend. Running the container on a mounted volume may not work correctly on Windows due to WSL permission mapping issues.
 
-[Checkout the makefile reference](#make-file-reference) for all of the available commands.
+Make sure the VSCode Dev Containers extension is installed, then select "Dev Containers: Clone Repository in Container Volume..." in the command palette (F1). Select your forked repo and choose the `mealie-next` branch, which contains the latest changes. This mounts your repository directly in WSL2, which [greatly improves the performance of the container](https://code.visualstudio.com/docs/devcontainers/containers#_quick-start-open-a-git-repository-or-github-pr-in-an-isolated-container-volume), and enables hot-reloading for the frontend. Running the container on a mounted volume may not work correctly on Windows due to WSL permission mapping issues.
 
 !!! tip
     For slow terminal checkout the solution in this [GitHub Issue](https://github.com/microsoft/vscode/issues/133215)
@@ -29,16 +29,18 @@ Make sure the VSCode Dev Containers extension is installed, then select "Dev Con
     ```
 
 ## Without Dev Containers
+
 ### Prerequisites
 
 - [Python 3.10](https://www.python.org/downloads/)
 - [Poetry](https://python-poetry.org/docs/#installation)
 - [Node v16.x](https://nodejs.org/en/)
 - [yarn](https://classic.yarnpkg.com/lang/en/docs/install/#mac-stable)
+- [task](https://taskfile.dev/#/installation)
 
 ### Installing Dependencies
 
-Once the prerequisites are installed you can cd into the project base directory and run `make setup` to install the python and node dependencies.
+Once the prerequisites are installed you can cd into the project base directory and run `task setup` to install the python and node dependencies, and download the NLP model.
 
 === "Linux / macOS"
 
@@ -46,29 +48,16 @@ Once the prerequisites are installed you can cd into the project base directory
     # Naviate To The Root Directory
     cd /path/to/project
 
-    # Utilize the Makefile to Install Dependencies
+    # Utilize the Taskfile to Install Dependencies
-    make setup
+    task setup
     ```
 
-=== "Windows"
-
-    ``` powershell
-    # Install Python Dependencies
-    Set-Directory -Path "C:\path\to\project"
-    poetry install
-
-    # Install Node Dependencies
-    Set-Directory frontend
-    yarn install
-    ```
-
-### Setting ENV Variables
-
-Before you start the server you MUST copy the `template.env` and `frontend/template.env` files to their respective locations with the name `.env` and `frontend/.env` respectively. The application will-not run without these files.
-
 ## Postgres
-- Whether using a container or manual install, you need to set up your own postgres dev server. The database, username, password, etc should match the `POSTGRES_*` options located in the `.env` file.
+
-- Install psycog2 with `poetry install -E pgsql` (in the main `mealie` directory, *not* `frontend`)
+The taskfile has two commands that need to be run to run the development environment against a postgres database.
+
+- `task dev:services` - This will start the postgres database, and a smtp server for email testing.
+- `task py:postgres` - This will run that backend API configured for the local postgres database.
 
 ## Starting The Server
 
@@ -78,57 +67,24 @@ Now you're ready to start the servers. You'll need two shells open, One for the
 
     ```bash
     # Terminal #1
-    make backend
+    task py
 
     # Terminal #2
-    make frontend
+    task ui
     ```
 
-=== "Windows"
-
-    ``` powershell
-    # Terminal # 1
-	poetry run python mealie/db/init_db.py # Initialize the database
-	poetry run python mealie/app.py # start application
-
-    # Terminal # 2
-    Set-Directory frontend
-    yarn run dev
-    ```
-
-## Make File Reference
-
-Run `make help` for reference. If you're on a system that doesn't support makefiles in most cases you can use the commands directly in your terminal by copy/pasting them from the Makefile.
-
-```
-docs                 📄 Start Mkdocs Development Server
-code-gen             🤖 Run Code-Gen Scripts
-setup                🏗  Setup Development Instance
-setup-model          🤖 Get the latest NLP CRF++ Model
-clean-data           ⚠️  Removes All Developer Data for a fresh server start
-clean-pyc            🧹 Remove Python file artifacts
-clean-test           🧹 Remove test and coverage artifacts
-backend-clean        🧹 Remove all build, test, coverage and Python artifacts
-backend-test         🧪 Run tests quickly with the default Python
-backend-format       🧺 Format, Check and Flake8
-backend-all          🧪 Runs all the backend checks and tests
-backend-coverage     ☂️  Check code coverage quickly with the default Python
-backend              🎬 Start Mealie Backend Development Server
-frontend             🎬 Start Mealie Frontend Development Server
-frontend-build       🏗  Build Frontend in frontend/dist
-frontend-generate    🏗  Generate Code for Frontend
-frontend-lint        🧺 Run yarn lint
-docker-dev           🐳 Build and Start Docker Development Stack (currently not functional, see #756, #1072)
-docker-prod          🐳 Build and Start Docker Production Stack
-
-```
 ## Internationalization
+
 ### Frontend
+
 We use vue-i18n package for internationalization. Translations are stored in json format located in [frontend/lang/messages](https://github.com/mealie-recipes/mealie/tree/mealie-next/frontend/lang/messages).
+
 ### Backend
+
 Translations are stored in json format located in [mealie/lang/messages](https://github.com/mealie-recipes/mealie/tree/mealie-next/mealie/lang/messages).
 
 ### Quick frontend localization with VS Code
+
 [i18n Ally for VScode](https://marketplace.visualstudio.com/items?itemName=lokalise.i18n-ally) is helpful for generating new strings to translate using Code Actions. It also has a nice feature, which shows translations in-place when editing code.
 
 A few settings must be tweaked to make the most of its features. Some settings are stored on project level, but most of them have to be set manually in your workspace or user settings.\

docs/docs/documentation/community-guide/ios.md

@@ -3,37 +3,80 @@
 !!! info
     This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
 
-![Image from apple site](https://help.apple.com/assets/5E8CEA35094622DF10489984/5E8CEA42094622DF1048998D/en_US/ed1f9c157cdefc13e0161e0f70015455.png)
-
-User [brasilikum](https://github.com/brasilikum) opened an issue on the main repo about how they had created an [iOS shortcut](https://github.com/mealie-recipes/mealie/issues/103) for interested users.
-This original method broke after the transition to version 1.X and an issue was raised on [Github](https://github.com/mealie-recipes/mealie/issues/2092) GitHub user [Zippyy](https://github.com/zippyy) has helped to create a working shortcut for version 1.X.
-
-This is a useful utility for iOS users who browse for recipes in their web browser from their devices.
-
 Don't know what an iOS shortcut is? Neither did I! Experienced iOS users may already be familiar with this utility but for the uninitiated, here is the official Apple explanation:
 
 > A shortcut is a quick way to get one or more tasks done with your apps. The Shortcuts app lets you create your own shortcuts with multiple steps. For example, build a “Surf Time” shortcut that grabs the surf report, gives an ETA to the beach, and launches your surf music playlist.
 
-Basically it is a visual scripting language that lets a user build an automation in a guided fashion. The automation can be [shared with anyone](https://www.icloud.com/shortcuts/cc568d1615bc4f998789f85d1ef74846) but if it is a user creation, you'll have to jump through a few hoops to make an untrusted automation work on your device.
+Basically it is a visual scripting language that lets a user build an automation in a guided fashion. The automation can be [shared with anyone](https://www.icloud.com/shortcuts/94aa272af5ff4d2c8fe5e13a946f89a9) but if it is a user creation, you'll have to jump through a few hoops to make an untrusted automation work on your device.
 
-This guide assumes that you already know how to [generate API tokens](https://hay-kot.github.io/mealie/documentation/users-groups/user-settings/#api-key-generation) for your user that intends to use an iOS shortcut.
+## Setup Video
 
-First, click the [link](https://www.icloud.com/shortcuts/cc568d1615bc4f998789f85d1ef74846) and begin the setup of the shortcut.
+The following YouTube video walks through setting up the shortcut in 3 minutes for those who prefer following along visually.
 
+<iframe width="560" height="315" src="https://www.youtube.com/embed/XZk6S1MVUrE?si=HGH07RbK-Ip_1qFz" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
 
-![screenshot](../../assets/img/sc1half.png)
+## Guide
+
+### Prerequisites
+
+Before setting up the shortcut, make sure you have the following information ready and easily accessable on your Apple device.
+
+1. The URL of your Mealie instance
+2. An API Key for your user
+3. A Gemini API Key from [Google AI Studio](https://makersuite.google.com)
+
+!!! note
+    A Gemini API Key is not required for importing URLs from Safari or your Camera, however you will not be able to take a photo of a recipe and import it without a Gemini key.
+
+    Google AI Studio is currently only available in [certain countries and languages](https://ai.google.dev/available_regions). Most notably it is not currently available in Europe.
+
+### Setup
+
+On the Apple device you wish to add the shortcut to, click on [this link](https://www.icloud.com/shortcuts/94aa272af5ff4d2c8fe5e13a946f89a9) to begin the setup of the shortcut.
+
+![screenshot](../../assets/img/ios/setup.png)
 
 Next, you need to replace `url` and `port` with the information for your Mealie instance.
 
 If you have a domain that you use (e.g. `https://mealie.example.com`), put that here. If you just run local, then you need to put in your Mealie instance IP and the port you use (e.g. the default is `9925`).
 
+![screenshot](../../assets/img/ios/url.png)
 
-![screenshot](../../assets/img/sc2half.png)
+Next, you need to replace `MEALIE_API_KEY` with your API token.
 
+![screenshot](../../assets/img/ios/api.png)
 
-Finally, you need to replace the word `keyhere` with your API token. Keep the word `Bearer`!!!
+Finally, replace `GEMINI_API_KEY` with the one you got from [Google AI Studio](https://makersuite.google.com)
 
+![screenshot](../../assets/img/ios/gemini.png)
 
-![screenshot](../../assets/img/sc3half.png)
+You may wish to [add the shortcut to your home screen](https://support.apple.com/guide/shortcuts/add-a-shortcut-to-the-home-screen-apd735880972/ios) for easier access.
 
-You should now be able to share a website to the shortcut and have Mealie grab all the necessary information!
+## Features
+
+- Share a website from Safari with Mealie to import via URL.
+- Share a recipe photo from photos to perform OCR and import a physical recipe.
+- Trigger the shortcut and take a photo of a physical recipe to import.
+- Trigger the shortcut to select a photo from your Photos app to import.
+- Trigger the shortcut to take a picture of a URL (like on the bottom of a printed recipe) to import.
+
+## Troubleshooting
+
+Sometimes Gemini will not be able to parse a recipe, and you will get an error. Users have found success with a combination of the following:
+
+1. #### Try Again
+   Sometimes Gemini returns the wrong information which causes the import to fail. Often, trying again will be successful.
+
+2. #### Photo Quality
+   Make sure there is no large glare or shadow over the picture, and you have all the text in frame.
+
+3. #### Edit the Photo
+   Users have found success by cropping the picture to just the recipe card, adding a "mono" filter, and cranking up the exposure before importing.
+
+## History
+
+User [brasilikum](https://github.com/brasilikum) opened an issue on the main repo about how they had created an [iOS shortcut](https://github.com/mealie-recipes/mealie/issues/103) for interested users.
+
+This original method broke after the transition to version 1.X and an issue was raised on [Github](https://github.com/mealie-recipes/mealie/issues/2092) GitHub user [Zippyy](https://github.com/zippyy) has helped to create a working shortcut for version 1.X.
+
+When OCR was removed from Mealie, GitHub user [hunterjm](https://github.com/zippyy) created a new shortcut that uses Apple's built-in OCR and Google Gemini to enhance and replace that functionality.

docs/docs/documentation/community-guide/swag.md

@@ -5,7 +5,7 @@
 
 
 
-To make the setup of a Reverse Proxy much easier, Linuxserver.io developed [SWAG](https://github.com/linuxserver/docker-swag)  
+To make the setup of a Reverse Proxy much easier, Linuxserver.io developed [SWAG](https://github.com/linuxserver/docker-swag)
 SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx web server and reverse proxy with PHP support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.
 
 ## Step 1: Get a domain
@@ -14,39 +14,38 @@ The first step is to grab a dynamic DNS if you don't have your own subdomain alr
 
 ## Step 2: Set-up SWAG
 
-Then you will need to set up SWAG, the variables of the docker-compose are explained on the Github page of [SWAG](https://github.com/linuxserver/docker-swag).
+Then you will need to set up SWAG, the variables of the docker-compose.yaml file are explained on the Github page of [SWAG](https://github.com/linuxserver/docker-swag).
-This is an example of how to set it up using duckdns and docker-compose.
+This is an example of how to set it up using duckdns and docker compose.
 
-!!! example "docker-compose.yml"
+!!! example "docker-compose.yaml"
 ```yaml
 version: "3.1"
 services:
-swag:
+  swag:
-image: ghcr.io/linuxserver/swag
+    image: ghcr.io/linuxserver/swag
-container_name: swag
+    container_name: swag
-cap_add:
+    cap_add:
-- NET_ADMIN
+      - NET_ADMIN
-environment:
+    environment:
-- PUID=1000
+      - PUID=1000
-- PGID=1000
+      - PGID=1000
-- TZ=Europe/Brussels
+      - TZ=Europe/Brussels
-- URL=<mydomain.duckdns>
+      - URL=<mydomain.duckdns>
-- SUBDOMAINS=wildcard
+      - SUBDOMAINS=wildcard
-- VALIDATION=duckdns
+      - VALIDATION=duckdns
-- CERTPROVIDER= #optional
+      - CERTPROVIDER= #optional
-- DNSPLUGIN= #optional
+      - DNSPLUGIN= #optional
-- DUCKDNSTOKEN=<duckdnstoken>
+      - DUCKDNSTOKEN=<duckdnstoken>
-- EMAIL=<e-mail> #optional
+      - EMAIL=<e-mail> #optional
-- ONLY_SUBDOMAINS=false #optional
+      - ONLY_SUBDOMAINS=false #optional
-- EXTRA_DOMAINS=<extradomains> #optional
+      - EXTRA_DOMAINS=<extradomains> #optional
-- STAGING=false #optional
+      - STAGING=false #optional
-volumes:
+    volumes:
-- /etc/config/swag:/config
+      - /etc/config/swag:/config
-ports:
+    ports:
-- 443:443
+      - 443:443
-- 80:80 #optional
+      - 80:80 #optional
-restart: unless-stopped
+    restart: unless-stopped
-
 ```
 
 Don't forget to change the <code>mydomain.duckns</code> into your personal domain and the <code>duckdnstoken</code> into your token and remove the brackets.
@@ -61,26 +60,25 @@ Alternatively, you can create a new file <code>mealie.subdomain.conf</code> in p
 
 !!! example "mealie.subdomain.conf"
 ```yaml
-    server {
+server {
-    listen 443 ssl http2;
+  listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+  listen [::]:443 ssl http2;
 
-    	server_name mealie.*;
+  server_name mealie.*;
 
-    	include /config/nginx/ssl.conf;
+  include /config/nginx/ssl.conf;
 
-    	client_max_body_size 0;
+  client_max_body_size 0;
 
-    	location / {
+  location / {
-        	include /config/nginx/proxy.conf;
+    include /config/nginx/proxy.conf;
-        	include /config/nginx/resolver.conf;
+    include /config/nginx/resolver.conf;
-        	set $upstream_app mealie-frontend;
+    set $upstream_app mealie-frontend;
-        	set $upstream_port 3000;
+    set $upstream_port 3000;
-        	set $upstream_proto http;
+    set $upstream_proto http;
-        	proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-    		}
+  }
-
+}
-	}	
 ```
 
 ## Step 4: Port-forward port 443

docs/docs/documentation/getting-started/installation/installation-checklist.md

@@ -72,7 +72,7 @@ After you've decided setup the files it's important to set a few ENV variables t
 After you've configured your database and updated the `docker-compose.yaml` files, you can start Mealie by running the following command in the directory where you've added your `docker-compose.yaml`.
 
 ```bash
-$ docker-compose up -d
+$ docker compose up -d
 ```
 
 You should see the containers start up without error. You should now be able to access the Mealie frontend at [http://localhost:9925](http://localhost:9925).
@@ -107,13 +107,11 @@ See all available tags on [GitHub](https://github.com/mealie-recipes/mealie/pkgs
 
 The nightly build are the latest and greatest builds that are built directly off of every commit to the `mealie-next` branch and as such may contain bugs. These are great to help the community catch bugs before they hit the stable release or if you like living on the edge.
 
-`ghrc.io/mealie-recipes/mealie:<version>`
+`ghcr.io/mealie-recipes/mealie:<version>`
 
 We also provide versioned containers that allow to pin to a specific release. Each time a new release is built a new tag will be pushed with the version. These are great to pin to a specific version and allows you to have absolute control on when you upgrade your container.
 
-`ghrc.io/mealie-recipes/mealie:latest`
+`ghcr.io/mealie-recipes/mealie:latest`
-
-_Note: This tag is not yet available; it will be available with the v1 stable release_
 
 The latest tag provides the latest released image of Mealie.
 

docs/docs/documentation/getting-started/installation/postgres.md

@@ -2,23 +2,21 @@
 
 PostgreSQL might be considered if you need to support many concurrent users. In addition, some features are only enabled on PostgreSQL, such as fuzzy search.
 
-**For Environmental Variable Configuration See:**
+**For Environment Variable Configuration, see** [Backend Configuration](./backend-config.md)
-
-- [Configuration](./backend-config.md)
 
 ```yaml
 ---
 version: "3.7"
 services:
   mealie:
-    image: ghcr.io/mealie-recipes/mealie:v1.0.0-RC1.1
+    image: ghcr.io/mealie-recipes/mealie:v1.1.0 # (3)
     container_name: mealie
     ports:
-        - "9925:9000"
+        - "9925:9000" # (1)
     deploy:
       resources:
         limits:
-          memory: 1000M # (1)
+          memory: 1000M # (2)
     depends_on:
       - postgres
     volumes:
@@ -62,3 +60,4 @@ volumes:
 
 1.  To access the mealie interface you only need to expose port 9000 on the mealie container. Here we expose port 9925 on the host, but feel free to change this to any port you like.
 2.  Setting an explicit memory limit is recommended. Python can pre-allocate larger amounts of memory than is necessary if you have a machine with a lot of RAM. This can cause the container to idle at a high memory usage. Setting a memory limit will improve idle performance.
+3.  You should double check this value isn't out of date when setting up for the first time; check the README and use the value from the "latest release" badge at the top - the format should be `vX.Y.Z`. Whilst a 'latest' tag is available, the Mealie team advises specifying a specific version tag and consciously updating to newer versions when you have time to read the release notes and ensure you follow any manual actions required (which should be rare).

docs/docs/documentation/getting-started/installation/sqlite.md

@@ -1,17 +1,19 @@
 # Installing with SQLite
 
+!!! Warning
+    If you're planning on deploying and using Network Attached Storage with Mealie, you should use [Postgres](./postgres.md) instead of SQLite. SQLite is not designed to be used with Network Attached Storage and can cause data corruption, or locked database errors
+
+
 SQLite is a popular, open source, self-contained, zero-configuration database that is the ideal choice for Mealie when you have 1-20 Users. Below is a ready to use docker-compose.yaml file for deploying Mealie on your server.
 
-**For Environmental Variable Configuration See:**
+**For Environment Variable Configuration, see** [Backend Configuration](./backend-config.md)
-
-- [Configuration](./backend-config.md)
 
 ```yaml
 ---
 version: "3.7"
 services:
   mealie:
-    image: ghcr.io/mealie-recipes/mealie:v1.0.0-RC1.1
+    image: ghcr.io/mealie-recipes/mealie:v1.1.0 # (3)
     container_name: mealie
     ports:
         - "9925:9000" # (1)
@@ -41,3 +43,4 @@ volumes:
 
 1.  To access the mealie interface you only need to expose port 9000 on the container. Here we expose port 9925 on the host, but feel free to change this to any port you like.
 2.  Setting an explicit memory limit is recommended. Python can pre-allocate larger amounts of memory than is necessary if you have a machine with a lot of RAM. This can cause the container to idle at a high memory usage. Setting a memory limit will improve idle performance.
+3.  You should double check this value isn't out of date when setting up for the first time; check the README and use the value from the "latest release" badge at the top - the format should be `vX.Y.Z`. Whilst a 'latest' tag is available, the Mealie team advises specifying a specific version tag and consciously updating to newer versions when you have time to read the release notes and ensure you follow any manual actions required (which should be rare).

docs/docs/documentation/getting-started/introduction.md

@@ -1,11 +1,5 @@
 # About The Project
 
-!!! warning "Mealie v1 Beta Release"
-
-    This documentation is for the Mealie v1 Beta release and is not final. As such, it may contain incomplete or incorrect information. You should understand that installing Mealie v1 Beta is a work in progress and while we've committed to maintaining the database schema and provided migrations, we are still in the process of adding new features, and robust testing to ensure the application works as expected.
-
-    You should likely find bugs, errors, and unfinished pages within the application. To find the current status of the release you can checkout the [project on github](https://github.com/mealie-recipes/mealie/projects/7) or reach out on discord.
-
 Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the url and Mealie will automatically import the relevant data or add a family recipe with the UI editor. Mealie also provides an API for interactions from 3rd party applications.
 
 [Remember to join the Discord](https://discord.gg/QuStdQGSGK)

docs/docs/documentation/getting-started/updating.md

@@ -19,6 +19,7 @@ If you are upgrading from pre-v1.0.0 to v1.0.0, make sure you read [Migrating to
 ## Docker
 For all setups using Docker the updating process looks something like this
 
-- Stop the container using `docker-compose down`
+- Stop the container using `docker compose down`
-- Pull the latest image using `docker-compose pull`
+- If you are not using the latest tag, change the version (image tag) in your docker-compose file
-- Start the container again using `docker-compose up -d`
+- Pull the latest image using `docker compose pull`
+- Start the container again using `docker compose up -d`

docs/mkdocs.yml

@@ -51,8 +51,8 @@ extra_css:
   - assets/stylesheets/custom.css
 extra_javascript:
   - assets/js/extra.js
-repo_url: https://github.com/hay-kot/mealie/
+repo_url: https://github.com/mealie-recipes/mealie/
-repo_name: hay-kot/mealie
+repo_name: mealie-recipes/mealie
 edit_uri: edit/mealie-next/docs/docs/
 
 nav:

frontend/components/Domain/Cookbook/CookbookEditor.vue

@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <v-card-text v-if="cookbook">
+      <v-text-field v-model="cookbook.name" :label="$t('cookbook.cookbook-name')"></v-text-field>
+      <v-textarea v-model="cookbook.description" auto-grow :rows="2" :label="$t('recipe.description')"></v-textarea>
+      <RecipeOrganizerSelector v-model="cookbook.categories" selector-type="categories" />
+      <RecipeOrganizerSelector v-model="cookbook.tags" selector-type="tags" />
+      <RecipeOrganizerSelector v-model="cookbook.tools" selector-type="tools" />
+      <v-switch v-model="cookbook.public" hide-details single-line>
+        <template #label>
+          {{ $t('cookbook.public-cookbook') }}
+          <HelpIcon small right class="ml-2">
+            {{ $t('cookbook.public-cookbook-description') }}
+          </HelpIcon>
+        </template>
+      </v-switch>
+      <div class="mt-4">
+        <h3 class="text-subtitle-1 d-flex align-center mb-0 pb-0">
+          {{ $t('cookbook.filter-options') }}
+          <HelpIcon right small class="ml-2">
+            {{ $t('cookbook.filter-options-description') }}
+          </HelpIcon>
+        </h3>
+        <v-switch v-model="cookbook.requireAllCategories" class="mt-0" hide-details single-line>
+          <template #label> {{ $t('cookbook.require-all-categories') }} </template>
+        </v-switch>
+        <v-switch v-model="cookbook.requireAllTags" hide-details single-line>
+          <template #label> {{ $t('cookbook.require-all-tags') }} </template>
+        </v-switch>
+        <v-switch v-model="cookbook.requireAllTools" hide-details single-line>
+          <template #label> {{ $t('cookbook.require-all-tools') }} </template>
+        </v-switch>
+      </div>
+    </v-card-text>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "@nuxtjs/composition-api";
+import { ReadCookBook } from "~/lib/api/types/cookbook";
+import RecipeOrganizerSelector from "~/components/Domain/Recipe/RecipeOrganizerSelector.vue";
+export default defineComponent({
+  components: { RecipeOrganizerSelector },
+  props: {
+    cookbook: {
+      type: Object as () => ReadCookBook,
+      required: true,
+    },
+    actions: {
+      type: Object as () => any,
+      required: true,
+    },
+  },
+});
+</script>

frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue

@@ -26,54 +26,69 @@
     >
       <div style="max-height: 70vh;  overflow-y: auto">
         <v-card
-          v-for="(section, sectionIndex) in recipeIngredientSections" :key="section.recipeId + sectionIndex"
+          v-for="(recipeSection, recipeSectionIndex) in recipeIngredientSections" :key="recipeSection.recipeId + recipeSectionIndex"
           elevation="0"
           height="fit-content"
           width="100%"
         >
-          <v-divider v-if="sectionIndex > 0" class="mt-3" />
+          <v-divider v-if="recipeSectionIndex > 0" class="mt-3" />
           <v-card-title
             v-if="recipeIngredientSections.length > 1"
-            class="justify-center"
+            class="justify-center text-h5"
             width="100%"
           >
             <v-container style="width: 100%;">
               <v-row no-gutters class="ma-0 pa-0">
                 <v-col cols="12" align-self="center" class="text-center">
-                  {{ section.recipeName }}
+                  {{ recipeSection.recipeName }}
                 </v-col>
               </v-row>
-              <v-row v-if="section.recipeScale > 1" no-gutters class="ma-0 pa-0">
+              <v-row v-if="recipeSection.recipeScale > 1" no-gutters class="ma-0 pa-0">
                 <!-- TODO: make this editable in the dialog and visible on single-recipe lists -->
                 <v-col cols="12" align-self="center" class="text-center">
-                  ({{ $tc("recipe.quantity") }}: {{ section.recipeScale }})
+                  ({{ $tc("recipe.quantity") }}: {{ recipeSection.recipeScale }})
                 </v-col>
               </v-row>
             </v-container>
           </v-card-title>
-          <div
+          <div>
-            :class="$vuetify.breakpoint.smAndDown ? '' : 'ingredient-grid'"
+            <div
-            :style="$vuetify.breakpoint.smAndDown ? '' : { gridTemplateRows: `repeat(${Math.ceil(section.ingredients.length / 2)}, min-content)` }"
+              v-for="(ingredientSection, ingredientSectionIndex) in recipeSection.ingredientSections"
-          >
+              :key="recipeSection.recipeId + recipeSectionIndex + ingredientSectionIndex"
-            <v-list-item
-              v-for="(ingredientData, i) in section.ingredients"
-              :key="'ingredient' + i"
-              dense
-              @click="recipeIngredientSections[sectionIndex].ingredients[i].checked = !recipeIngredientSections[sectionIndex].ingredients[i].checked"
             >
-              <v-checkbox
+              <v-card-title v-if="ingredientSection.sectionName" class="ingredient-title mt-2 pb-0 text-h6">
-                hide-details
+                {{ ingredientSection.sectionName }}
-                :input-value="ingredientData.checked"
+              </v-card-title>
-                class="pt-0 my-auto py-auto"
+              <div
-                color="secondary"
+                :class="$vuetify.breakpoint.smAndDown ? '' : 'ingredient-grid'"
-              />
+                :style="$vuetify.breakpoint.smAndDown ? '' : { gridTemplateRows: `repeat(${Math.ceil(ingredientSection.ingredients.length / 2)}, min-content)` }"
-              <v-list-item-content :key="ingredientData.ingredient.quantity">
+              >
-                <RecipeIngredientListItem
+                <v-list-item
-                  :ingredient="ingredientData.ingredient"
+                  v-for="(ingredientData, i) in ingredientSection.ingredients"
-                  :disable-amount="ingredientData.disableAmount"
+                  :key="recipeSection.recipeId + recipeSectionIndex + ingredientSectionIndex + i"
-                  :scale="section.recipeScale" />
+                  dense
-              </v-list-item-content>
+                  @click="recipeIngredientSections[recipeSectionIndex]
-            </v-list-item>
+                    .ingredientSections[ingredientSectionIndex]
+                    .ingredients[i].checked = !recipeIngredientSections[recipeSectionIndex]
+                    .ingredientSections[ingredientSectionIndex]
+                    .ingredients[i]
+                    .checked"
+                >
+                  <v-checkbox
+                    hide-details
+                    :input-value="ingredientData.checked"
+                    class="pt-0 my-auto py-auto"
+                    color="secondary"
+                  />
+                  <v-list-item-content :key="ingredientData.ingredient.quantity">
+                    <RecipeIngredientListItem
+                      :ingredient="ingredientData.ingredient"
+                      :disable-amount="ingredientData.disableAmount"
+                      :scale="recipeSection.recipeScale" />
+                  </v-list-item-content>
+                </v-list-item>
+              </div>
+            </div>
           </div>
         </v-card>
       </div>
@@ -112,17 +127,22 @@ export interface RecipeWithScale extends Recipe {
   scale: number;
 }
 
-export interface ShoppingListRecipeIngredient {
+export interface ShoppingListIngredient {
   checked: boolean;
   ingredient: RecipeIngredient;
   disableAmount: boolean;
 }
 
+export interface ShoppingListIngredientSection {
+  sectionName: string;
+  ingredients: ShoppingListIngredient[];
+}
+
 export interface ShoppingListRecipeIngredientSection {
   recipeId: string;
   recipeName: string;
   recipeScale: number;
-  ingredients: ShoppingListRecipeIngredient[];
+  ingredientSections: ShoppingListIngredientSection[];
 }
 
 export default defineComponent({
@@ -191,7 +211,7 @@ export default defineComponent({
           continue;
         }
 
-        const shoppingListIngredients: ShoppingListRecipeIngredient[] = recipe.recipeIngredient.map((ing) => {
+        const shoppingListIngredients: ShoppingListIngredient[] = recipe.recipeIngredient.map((ing) => {
           return {
             checked: true,
             ingredient: ing,
@@ -199,11 +219,35 @@ export default defineComponent({
           }
         });
 
+        const shoppingListIngredientSections = shoppingListIngredients.reduce((sections, ing) => {
+          // if title append new section to the end of the array
+          if (ing.ingredient.title) {
+            sections.push({
+              sectionName: ing.ingredient.title,
+              ingredients: [ing],
+            });
+            return sections;
+          }
+
+          // append new section if first
+          if (sections.length === 0) {
+            sections.push({
+              sectionName: "",
+              ingredients: [ing],
+            });
+            return sections;
+          }
+
+          // otherwise add ingredient to last section in the array
+          sections[sections.length - 1].ingredients.push(ing);
+          return sections;
+        }, [] as ShoppingListIngredientSection[]);
+
         recipeSectionMap.set(recipe.slug, {
           recipeId: recipe.id,
           recipeName: recipe.name,
           recipeScale: recipe.scale,
-          ingredients: shoppingListIngredients,
+          ingredientSections: shoppingListIngredientSections,
         })
       }
 
@@ -231,9 +275,11 @@ export default defineComponent({
     }
 
     function bulkCheckIngredients(value = true) {
-      recipeIngredientSections.value.forEach((section) => {
+      recipeIngredientSections.value.forEach((recipeSection) => {
-        section.ingredients.forEach((ing) => {
+        recipeSection.ingredientSections.forEach((ingSection) => {
-          ing.checked = value;
+          ingSection.ingredients.forEach((ing) => {
+            ing.checked = value;
+          });
         });
       });
     }
@@ -246,10 +292,12 @@ export default defineComponent({
         }
 
         const ingredients: RecipeIngredient[] = [];
-        section.ingredients.forEach((ing) => {
+        section.ingredientSections.forEach((ingSection) => {
-          if (ing.checked) {
+          ingSection.ingredients.forEach((ing) => {
-            ingredients.push(ing.ingredient);
+            if (ing.checked) {
-          }
+              ingredients.push(ing.ingredient);
+            }
+          });
         });
 
         if (!ingredients.length) {
@@ -272,7 +320,11 @@ export default defineComponent({
         }
       })
 
-      success ? alert.success(i18n.t("recipe.recipes-added-to-list") as string)
+      const successMessage = promises.length === 1
+        ? i18n.t("recipe.successfully-added-to-list") as string
+        : i18n.t("recipe.failed-to-add-to-list") as string;
+
+      success ? alert.success(successMessage)
       : alert.error(i18n.t("failed-to-add-recipes-to-list") as string)
 
       state.shoppingListDialog = false;

frontend/components/Domain/Recipe/RecipeIngredients.vue

@@ -52,11 +52,20 @@ export default defineComponent({
     });
 
     const ingredientCopyText = computed(() => {
-      return props.value
+      const components: string[] = [];
-        .map((ingredient) => {
+      props.value.forEach((ingredient) => {
-          return `${parseIngredientText(ingredient, props.disableAmount, props.scale, false)}`;
+        if (ingredient.title) {
-        })
+          if (components.length) {
-        .join("\n");
+            components.push("");
+          }
+
+          components.push(`[${ingredient.title}]`);
+        }
+
+        components.push(parseIngredientText(ingredient, props.disableAmount, props.scale, false));
+      });
+
+      return components.join("\n");
     });
 
     function toggleChecked(index: number) {

frontend/components/Domain/Recipe/RecipeOrganizerPage.vue

@@ -18,7 +18,7 @@
 
     <BaseDialog v-if="updateTarget" v-model="dialogs.update" :title="$t('general.update')" @confirm="updateOne()">
       <v-card-text>
-        <v-text-field v-model="updateTarget.name" label="$t('general.name')"> </v-text-field>
+        <v-text-field v-model="updateTarget.name" :label="$t('general.name')"> </v-text-field>
         <v-checkbox v-if="itemType === Organizer.Tool" v-model="updateTarget.onHand" :label="$t('tool.on-hand')"></v-checkbox>
       </v-card-text>
     </BaseDialog>

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue

@@ -1,7 +1,7 @@
 <template>
   <section @keyup.ctrl.90="undoMerge">
     <!-- Ingredient Link Editor -->
-    <v-dialog v-model="dialog" width="600">
+    <v-dialog v-if="dialog" v-model="dialog" width="600">
       <v-card :ripple="false">
         <v-app-bar dark color="primary" class="mt-n1 mb-3">
           <v-icon large left>
@@ -50,11 +50,15 @@
           <BaseButton cancel @click="dialog = false"> </BaseButton>
           <v-spacer></v-spacer>
           <div class="d-flex flex-wrap justify-end">
-            <BaseButton color="info" @click="autoSetReferences">
+            <BaseButton class="my-1" color="info" @click="autoSetReferences">
               <template #icon> {{ $globals.icons.robot }}</template>
               {{ $t("recipe.auto") }}
             </BaseButton>
-            <BaseButton class="ml-2" save @click="setIngredientIds"> </BaseButton>
+            <BaseButton class="ml-2 my-1" save @click="setIngredientIds"> </BaseButton>
+            <BaseButton v-if="availableNextStep" class="ml-2 my-1" @click="saveAndOpenNextLinkIngredients">
+              <template #icon> {{ $globals.icons.forward }}</template>
+              {{ $t("recipe.nextStep") }}
+            </BaseButton>
           </div>
         </v-card-actions>
       </v-card>
@@ -236,6 +240,7 @@ import {
   onMounted,
   useContext,
   computed,
+  nextTick,
 } from "@nuxtjs/composition-api";
 import RecipeIngredientHtml from "../../RecipeIngredientHtml.vue";
 import { RecipeStep, IngredientReferences, RecipeIngredient, RecipeAsset, Recipe } from "~/lib/api/types/recipe";
@@ -399,6 +404,8 @@ export default defineComponent({
       activeRefs.value = refs.map((ref) => ref.referenceId ?? "");
     }
 
+    const availableNextStep = computed(() => activeIndex.value < props.value.length - 1);
+
     function setIngredientIds() {
       const instruction = props.value[activeIndex.value];
       instruction.ingredientReferences = activeRefs.value.map((ref) => {
@@ -417,6 +424,20 @@ export default defineComponent({
       state.dialog = false;
     }
 
+    function saveAndOpenNextLinkIngredients() {
+      const currentStepIndex = activeIndex.value;
+
+      if(!availableNextStep.value) {
+        return; // no next step, the button calling this function should not be shown
+      }
+
+      setIngredientIds();
+      const nextStep = props.value[currentStepIndex + 1];
+      // close dialog before opening to reset the scroll position
+      nextTick(() => openDialog(currentStepIndex + 1, nextStep.text, nextStep.ingredientReferences));
+
+    }
+
     function setUsedIngredients() {
       const usedRefs: { [key: string]: boolean } = {};
 
@@ -627,6 +648,8 @@ export default defineComponent({
       mergeAbove,
       openDialog,
       setIngredientIds,
+      availableNextStep,
+      saveAndOpenNextLinkIngredients,
       undoMerge,
       toggleDisabled,
       isChecked,

frontend/components/global/BaseDialog.vue

@@ -12,6 +12,8 @@
         $emit('submit');
         dialog = false;
       "
+      @click:outside="$emit('cancel')"
+      @keydown.esc="$emit('cancel')"
     >
       <v-card height="100%">
         <v-app-bar dark dense :color="color" class="">

frontend/components/global/CrudTable.vue

@@ -57,12 +57,12 @@
           :buttons="[
             {
               icon: $globals.icons.edit,
-              text: $t('general.edit'),
+              text: $tc('general.edit'),
               event: 'edit',
             },
             {
               icon: $globals.icons.delete,
-              text: $t('general.delete'),
+              text: $tc('general.delete'),
               event: 'delete',
             },
           ]"
@@ -160,6 +160,8 @@ export default defineComponent({
       props.bulkActions.forEach((action) => {
         handlers[action.event] = () => {
           context.emit(action.event, selected.value);
+          // clear selection
+          selected.value = [];
         };
       });
 

frontend/composables/store/use-food-store.ts

@@ -4,7 +4,7 @@ import { usePublicExploreApi } from "../api/api-client";
 import { useUserApi } from "~/composables/api";
 import { IngredientFood } from "~/lib/api/types/recipe";
 
-let foodStore: Ref<IngredientFood[] | null> | null = null;
+let foodStore: Ref<IngredientFood[] | null> = ref([]);
 
 /**
  * useFoodData returns a template reactive object
@@ -39,11 +39,11 @@ export const usePublicFoodStore = function (groupSlug: string) {
   const actions = {
     ...usePublicStoreActions(api.foods, foodStore, loading),
     flushStore() {
-      foodStore = null;
+      foodStore = ref([]);
     },
   };
 
-  if (!foodStore) {
+  if (!foodStore.value) {
     foodStore = actions.getAll();
   }
 
@@ -57,7 +57,7 @@ export const useFoodStore = function () {
   const actions = {
     ...useStoreActions(api.foods, foodStore, loading),
     flushStore() {
-      foodStore = null;
+      foodStore.value = [];
     },
   };
 

frontend/composables/store/use-label-store.ts

@@ -3,7 +3,7 @@ import { useStoreActions } from "../partials/use-actions-factory";
 import { MultiPurposeLabelOut } from "~/lib/api/types/labels";
 import { useUserApi } from "~/composables/api";
 
-let labelStore: Ref<MultiPurposeLabelOut[] | null> | null = null;
+let labelStore: Ref<MultiPurposeLabelOut[] | null> = ref([]);
 
 export function useLabelData() {
   const data = reactive({
@@ -33,11 +33,11 @@ export function useLabelStore() {
   const actions = {
     ...useStoreActions<MultiPurposeLabelOut>(api.multiPurposeLabels, labelStore, loading),
     flushStore() {
-      labelStore = null;
+      labelStore.value =[];
     },
   };
 
-  if (!labelStore) {
+  if (!labelStore.value) {
     labelStore = actions.getAll();
   }
 

frontend/composables/store/use-unit-store.ts

@@ -3,7 +3,7 @@ import { useStoreActions } from "../partials/use-actions-factory";
 import { useUserApi } from "~/composables/api";
 import { IngredientUnit } from "~/lib/api/types/recipe";
 
-let unitStore: Ref<IngredientUnit[] | null> | null = null;
+let unitStore: Ref<IngredientUnit[] | null> = ref([]);
 
 /**
  * useUnitData returns a template reactive object
@@ -40,11 +40,11 @@ export const useUnitStore = function () {
   const actions = {
     ...useStoreActions<IngredientUnit>(api.units, unitStore, loading),
     flushStore() {
-      unitStore = null;
+      unitStore.value = [];
     },
   };
 
-  if (!unitStore) {
+  if (!unitStore.value) {
     unitStore = actions.getAll();
   }
 

frontend/composables/use-group-cookbooks.ts

@@ -109,6 +109,7 @@ export const useCookbooks = function () {
       }
 
       loading.value = false;
+      return data;
     },
     async updateOne(updateData: UpdateCookBook) {
       if (!updateData.id) {

frontend/composables/use-locales/available-locales.ts

@@ -3,196 +3,241 @@ export const LOCALES = [
   {
     name: "繁體中文 (Chinese traditional)",
     value: "zh-TW",
-    progress: 28,
+    progress: 30,
+    dir: "ltr",
   },
   {
     name: "简体中文 (Chinese simplified)",
     value: "zh-CN",
-    progress: 65,
+    progress: 98,
+    dir: "ltr",
   },
   {
     name: "Tiếng Việt (Vietnamese)",
     value: "vi-VN",
-    progress: 2,
+    progress: 1,
+    dir: "ltr",
   },
   {
     name: "Українська (Ukrainian)",
     value: "uk-UA",
-    progress: 99,
+    progress: 100,
+    dir: "ltr",
   },
   {
     name: "Türkçe (Turkish)",
     value: "tr-TR",
-    progress: 50,
+    progress: 53,
+    dir: "ltr",
   },
   {
     name: "Svenska (Swedish)",
     value: "sv-SE",
-    progress: 71,
+    progress: 94,
+    dir: "ltr",
   },
   {
     name: "српски (Serbian)",
     value: "sr-SP",
-    progress: 4,
+    progress: 32,
+    dir: "ltr",
   },
   {
     name: "Slovenian",
     value: "sl-SI",
-    progress: 49,
+    progress: 47,
+    dir: "ltr",
   },
   {
     name: "Slovak",
     value: "sk-SK",
-    progress: 97,
+    progress: 93,
+    dir: "ltr",
   },
   {
     name: "Pусский (Russian)",
     value: "ru-RU",
-    progress: 99,
+    progress: 98,
+    dir: "ltr",
   },
   {
     name: "Română (Romanian)",
     value: "ro-RO",
-    progress: 32,
+    progress: 42,
+    dir: "ltr",
   },
   {
     name: "Português (Portuguese)",
     value: "pt-PT",
-    progress: 99,
+    progress: 100,
+    dir: "ltr",
   },
   {
     name: "Português do Brasil (Brazilian Portuguese)",
     value: "pt-BR",
-    progress: 98,
+    progress: 97,
+    dir: "ltr",
   },
   {
     name: "Polski (Polish)",
     value: "pl-PL",
-    progress: 97,
+    progress: 98,
+    dir: "ltr",
   },
   {
     name: "Norsk (Norwegian)",
     value: "no-NO",
-    progress: 85,
+    progress: 99,
+    dir: "ltr",
   },
   {
     name: "Nederlands (Dutch)",
     value: "nl-NL",
-    progress: 98,
+    progress: 100,
+    dir: "ltr",
   },
   {
     name: "Latvian",
     value: "lv-LV",
     progress: 1,
+    dir: "ltr",
   },
   {
     name: "Lithuanian",
     value: "lt-LT",
-    progress: 97,
+    progress: 93,
+    dir: "ltr",
   },
   {
     name: "한국어 (Korean)",
     value: "ko-KR",
     progress: 5,
+    dir: "ltr",
   },
   {
     name: "日本語 (Japanese)",
     value: "ja-JP",
-    progress: 11,
+    progress: 12,
+    dir: "ltr",
   },
   {
     name: "Italiano (Italian)",
     value: "it-IT",
-    progress: 96,
+    progress: 100,
+    dir: "ltr",
+  },
+  {
+    name: "Icelandic",
+    value: "is-IS",
+    progress: 0,
+    dir: "ltr",
   },
   {
     name: "Magyar (Hungarian)",
     value: "hu-HU",
-    progress: 99,
+    progress: 100,
+    dir: "ltr",
   },
   {
     name: "Croatian",
     value: "hr-HR",
-    progress: 97,
+    progress: 93,
+    dir: "ltr",
   },
   {
     name: "עברית (Hebrew)",
     value: "he-IL",
-    progress: 99,
+    progress: 97,
+    dir: "rtl",
   },
   {
     name: "Galician",
     value: "gl-ES",
     progress: 1,
+    dir: "ltr",
   },
   {
     name: "Français (French)",
     value: "fr-FR",
-    progress: 99,
+    progress: 100,
+    dir: "ltr",
   },
   {
     name: "French, Canada",
     value: "fr-CA",
     progress: 97,
+    dir: "ltr",
   },
   {
     name: "Suomi (Finnish)",
     value: "fi-FI",
-    progress: 95,
+    progress: 91,
+    dir: "ltr",
   },
   {
     name: "Español (Spanish)",
     value: "es-ES",
-    progress: 76,
+    progress: 79,
+    dir: "ltr",
   },
   {
     name: "American English",
     value: "en-US",
     progress: 100.0,
+    dir: "ltr",
   },
   {
     name: "British English",
     value: "en-GB",
-    progress: 4,
+    progress: 3,
+    dir: "ltr",
   },
   {
     name: "Ελληνικά (Greek)",
     value: "el-GR",
-    progress: 35,
+    progress: 34,
+    dir: "ltr",
   },
   {
     name: "Deutsch (German)",
     value: "de-DE",
-    progress: 99,
+    progress: 100,
+    dir: "ltr",
   },
   {
     name: "Dansk (Danish)",
     value: "da-DK",
-    progress: 100,
+    progress: 98,
+    dir: "ltr",
   },
   {
     name: "Čeština (Czech)",
     value: "cs-CZ",
-    progress: 66,
+    progress: 64,
+    dir: "ltr",
   },
   {
     name: "Català (Catalan)",
     value: "ca-ES",
-    progress: 61,
+    progress: 75,
+    dir: "ltr",
   },
   {
     name: "Bulgarian",
     value: "bg-BG",
     progress: 99,
+    dir: "ltr",
   },
   {
     name: "العربية (Arabic)",
     value: "ar-SA",
-    progress: 16,
+    progress: 20,
+    dir: "rtl",
   },
   {
     name: "Afrikaans (Afrikaans)",
     value: "af-ZA",
-    progress: 96,
+    progress: 92,
+    dir: "ltr",
   },
 ]

frontend/composables/use-locales/use-locales.ts

@@ -4,14 +4,31 @@ import { LOCALES } from "./available-locales";
 export const useLocales = () => {
   const { i18n, $vuetify } = useContext();
 
+  function getLocale(value: string) {
+    const currentLocale = LOCALES.filter((locale) => locale.value === value);
+    return currentLocale.length ? currentLocale[0] : null;
+  }
+
   const locale = computed<string>({
     get() {
-      $vuetify.lang.current = i18n.locale; // dirty hack
+      // dirty hack
+      $vuetify.lang.current = i18n.locale;
+      const currentLocale = getLocale(i18n.locale);
+      if (currentLocale) {
+        $vuetify.rtl = currentLocale.dir === "rtl";
+      }
+
       return i18n.locale;
     },
     set(value) {
       i18n.setLocale(value);
-      $vuetify.lang.current = value; // this does not persist after window reload :-(
+
+      // this does not persist after window reload :-(
+      $vuetify.lang.current = value;
+      const currentLocale = getLocale(value);
+      if (currentLocale) {
+        $vuetify.rtl = currentLocale.dir === "rtl";
+      }
 
       // Reload the page to update the language - not all strings are reactive
       window.location.reload();

frontend/lang/messages/af-ZA.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Skep 'n nuwe maaltydplan",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Aandete hierdie week",
     "dinner-today": "Vandag se Aandete",
     "dinner-tonight": "VANAAND SE AANDETE",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Voeg by tydlyn",
     "recipe-added-to-list": "Resep by lys gevoeg",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Resep is by die maaltydplan gevoeg",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Kon nie resep by maaltydplan voeg nie",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Resultaat",
     "quantity": "Hoeveelheid",
     "choose-unit": "Kies 'n eenheid",
@@ -557,7 +560,8 @@
     "unit": "Eenheid",
     "upload-image": "Laai prent",
     "screen-awake": "Hou die skerm aan",
-    "remove-image": "Verwyder prent"
+    "remove-image": "Verwyder prent",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Gevorderde soek",

frontend/lang/messages/ar-SA.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "إنشاء خطة وجبة جديدة",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "العشاء لهذا الأسبوع",
     "dinner-today": "العشاء اليوم",
     "dinner-tonight": "العشاء الليلة",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Add to Timeline",
     "recipe-added-to-list": "Recipe added to list",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Recipe added to mealplan",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
@@ -557,7 +560,8 @@
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
-    "remove-image": "Remove image"
+    "remove-image": "Remove image",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Advanced Search",

frontend/lang/messages/bg-BG.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Създаване на нов хранителен план",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Вечеря тази седмица",
     "dinner-today": "Вечеря Днес",
     "dinner-tonight": "Вечеря ТАЗИ ВЕЧЕР",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Добави към времевата линия",
     "recipe-added-to-list": "Рецептата е добавена към списъка",
     "recipes-added-to-list": "Рецептите са добавени към списъка",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Рецептата е добавена към хранителния план",
     "failed-to-add-recipes-to-list": "Неуспешно добавяне на рецепта към списъка",
     "failed-to-add-recipe-to-mealplan": "Рецептата не беше добавена към хранителния план",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Добив",
     "quantity": "Количество",
     "choose-unit": "Избери единица",
@@ -557,7 +560,8 @@
     "unit": "Единица",
     "upload-image": "Качване на изображение",
     "screen-awake": "Запази екрана активен",
-    "remove-image": "Премахване на изображение"
+    "remove-image": "Премахване на изображение",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Разширено търсене",

frontend/lang/messages/ca-ES.json

@@ -56,7 +56,7 @@
     "event-delete-confirmation": "Està segur que vol suprimir aquest esdeveniment?",
     "event-deleted": "Esdeveniment eliminat",
     "event-updated": "Esdeveniment actualitzat",
-    "new-notification-form-description": "Mealie utilitza la llibreria Apprise per a generar notificacions. Ofereix moltes opcions de serveis de notificació. A la seua wiki, disposeu de guies d'ús i informació per a crear l'URL al vostre servei. Si està disponible, al seleccionar el tipus de notificació, pot incloure funcions adicionals.",
+    "new-notification-form-description": "Mealie utilitza la llibreria Apprise per a generar notificacions. Ofereix moltes opcions de serveis de notificació. A la seva wiki, disposeu de guies d'ús i informació per a crear l'URL al vostre servei. Si està disponible, en seleccionar el tipus de notificació, pot incloure funcions addicionals.",
     "new-version": "Hi ha una nova versió disponible!",
     "notification": "Notificacions",
     "refresh": "Recarrega",
@@ -114,7 +114,7 @@
     "json": "JSON",
     "keyword": "Paraula clau",
     "link-copied": "S'ha copiat l'enllaç",
-    "loading": "Loading",
+    "loading": "Carregant",
     "loading-events": "Carregant esdeveniments",
     "loading-recipe": "Carregant la recepta...",
     "loading-ocr-data": "Carregant les dades OCR...",
@@ -199,7 +199,7 @@
     "upload-file": "Puja un fitxer",
     "created-on-date": "Creat el: {0}",
     "unsaved-changes": "Tens canvis que no estan guardats. Vols guardar-los abans de sortir? Clica d'acord per guardar-los o cancel·lar per descartar els canvis.",
-    "clipboard-copy-failure": "Failed to copy to the clipboard."
+    "clipboard-copy-failure": "No s'ha pogut copiar al porta-retalls."
   },
   "group": {
     "are-you-sure-you-want-to-delete-the-group": "Esteu segur de voler suprimir el grup <b>{groupName}<b/>?",
@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Crea un nou menú",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Sopar d'esta setmana",
     "dinner-today": "Sopar per avui",
     "dinner-tonight": "Sopar d'aquesta nit",
@@ -294,7 +295,7 @@
     "meal-recipe": "Recepta del menú",
     "meal-title": "Títol del menú",
     "meal-note": "Notes del menú",
-    "note-only": "Note Only",
+    "note-only": "Només notes",
     "random-meal": "Menú aleatori",
     "random-dinner": "Principal aleatori",
     "random-side": "Guarnició aleatòria",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Afegir a la cronologia",
     "recipe-added-to-list": "Recepta afegida a la llista",
     "recipes-added-to-list": "Receptes afegides a la llista",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Recepta afegida al menú",
     "failed-to-add-recipes-to-list": "S'ha produït un error al intentar afegir la recepta a la llista",
     "failed-to-add-recipe-to-mealplan": "S'ha produït un error afegint la recepta al menú",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Racions",
     "quantity": "Quantitat",
     "choose-unit": "Tria el tipus d'unitat",
@@ -512,7 +515,7 @@
     "user-made-this": "{user} ha fet això",
     "last-made-date": "Última vegada feta {date}",
     "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.",
-    "message-key": "Message Key",
+    "message-key": "Clau del missatge",
     "parse": "Analitzar",
     "attach-images-hint": "Afegeix imatges arrossegant i deixant anar la imatge a l'editor",
     "drop-image": "Deixa anar la imatge",
@@ -557,7 +560,8 @@
     "unit": "Unitat",
     "upload-image": "Puja una imatge",
     "screen-awake": "Mantenir la pantalla encesa",
-    "remove-image": "Esborrar la imatge"
+    "remove-image": "Esborrar la imatge",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Cerca avançada",
@@ -698,8 +702,8 @@
     "volumes-are-configured-correctly": "Volumes are configured correctly.",
     "status-unknown-try-running-a-validation": "Status Unknown. Try running a validation.",
     "validate": "Validate",
-    "email-configuration-status": "Email Configuration Status",
+    "email-configuration-status": "Estat de la configuració del correu electrònic",
-    "email-configured": "Email Configured",
+    "email-configured": "Correu electrònic configurat",
     "email-test-results": "Email Test Results",
     "ready": "Ready",
     "not-ready": "Not Ready - Check Environmental Variables",
@@ -894,7 +898,7 @@
     "enable-advanced-features": "Enable advanced features",
     "it-looks-like-this-is-your-first-time-logging-in": "It looks like this is your first time logging in.",
     "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!",
-    "forgot-password": "Forgot Password",
+    "forgot-password": "Contrasenya oblidada",
     "forgot-password-text": "Please enter your email address and we will send you a link to reset your password.",
     "changes-reflected-immediately": "Changes to this user will be reflected immediately."
   },

frontend/lang/messages/cs-CZ.json

@@ -66,7 +66,7 @@
     "test-message-sent": "Testovací zpráva odeslána",
     "new-notification": "Nové oznámení",
     "event-notifiers": "Notifikace událostí",
-    "apprise-url-skipped-if-blank": "Apprise URL (skipped if blank)",
+    "apprise-url-skipped-if-blank": "Apprise URL (přeskočeno pokud je prázdné)",
     "enable-notifier": "Povolit notifikaci",
     "what-events": "What events should this notifier subscribe to?",
     "user-events": "Uživatelské události",
@@ -114,10 +114,10 @@
     "json": "JSON",
     "keyword": "Klíčové slovo",
     "link-copied": "Odkaz zkopírován",
-    "loading": "Loading",
+    "loading": "Načítá se",
     "loading-events": "Načítání událostí",
-    "loading-recipe": "Loading recipe...",
+    "loading-recipe": "Načítám recept...",
-    "loading-ocr-data": "Loading OCR data...",
+    "loading-ocr-data": "Načítám OCR data...",
     "loading-recipes": "Načítám recepty",
     "message": "Zpráva",
     "monday": "Pondělí",
@@ -243,8 +243,8 @@
     "show-recipe-assets-description": "When enabled the recipe assets will be shown on the recipe if available",
     "default-to-landscape-view": "Default to landscape view",
     "default-to-landscape-view-description": "When enabled the recipe header section will be shown in landscape view",
-    "disable-users-from-commenting-on-recipes": "Disable users from commenting on recipes",
+    "disable-users-from-commenting-on-recipes": "Zakázat uživatelům komentovat u receptů",
-    "disable-users-from-commenting-on-recipes-description": "Hides the comment section on the recipe page and disables commenting",
+    "disable-users-from-commenting-on-recipes-description": "Na stránce receptu skryje sekci s komentáři a zakáže komentování",
     "disable-organizing-recipe-ingredients-by-units-and-food": "Disable organizing recipe ingredients by units and food",
     "disable-organizing-recipe-ingredients-by-units-and-food-description": "Hides the Food, Unit, and Amount fields for ingredients and treats ingredients as plain text fields.",
     "general-preferences": "General Preferences",
@@ -254,10 +254,11 @@
     "group-management": "Správa skupin",
     "admin-group-management": "Admin Group Management",
     "admin-group-management-text": "Změny v této skupině budou okamžitě zohledněny.",
-    "group-id-value": "Group Id: {0}"
+    "group-id-value": "ID skupiny: {0}"
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Vytvořit nový jídelníček",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Večeře na tento týden",
     "dinner-today": "Dnešní večeře",
     "dinner-tonight": "DNEŠNÍ VEČEŘE",
@@ -307,10 +308,10 @@
     "new-rule": "Nové pravidlo",
     "meal-plan-rules-description": "You can create rules for auto selecting recipes for your meal plans. These rules are used by the server to determine the random pool of recipes to select from when creating meal plans. Note that if rules have the same day/type constraints then the categories of the rules will be merged. In practice, it's unnecessary to create duplicate rules, but it's possible to do so.",
     "new-rule-description": "When creating a new rule for a meal plan you can restrict the rule to be applicable for a specific day of the week and/or a specific type of meal. To apply a rule to all days or all meal types you can set the rule to \"Any\" which will apply it to all the possible values for the day and/or meal type.",
-    "recipe-rules": "Recipe Rules",
+    "recipe-rules": "Pravidla receptu",
     "applies-to-all-days": "Použije se na všechny dny",
     "applies-on-days": "Applies on {0}s",
-    "meal-plan-settings": "Meal Plan Settings"
+    "meal-plan-settings": "Nastavení jídelníčku"
   },
   "migration": {
     "migration-data-removed": "Data z migrace byla smazána",
@@ -335,7 +336,7 @@
     },
     "paprika": {
       "description-long": "Mealie can import recipes from the Paprika application. Export your recipes from paprika, rename the export extension to .zip and upload it below.",
-      "title": "Paprika Recipe Manager"
+      "title": "Správce receptů Paprika"
     },
     "mealie-pre-v1": {
       "description-long": "Mealie can import recipes from the Mealie application from a pre v1.0 release. Export your recipes from your old instance, and upload the zip file below. Note that only recipes can be imported from the export.",
@@ -469,12 +470,14 @@
     "date-format-hint-yyyy-mm-dd": "Formát RRRR-MM-DD",
     "add-to-list": "Přidat na seznam",
     "add-to-plan": "Přidat do jídelníčku",
-    "add-to-timeline": "Add to Timeline",
+    "add-to-timeline": "Přidat na časovou osu",
     "recipe-added-to-list": "Recept byl přidán na seznam",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Recept byl přidán do jídelníčku",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Přidání receptu do jídelníčku selhalo",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Úroda",
     "quantity": "Množství",
     "choose-unit": "Vybrat jednotku",
@@ -496,9 +499,9 @@
     "locked": "Uzamčeno",
     "public-link": "Veřejný odkaz",
     "timer": {
-      "kitchen-timer": "Kitchen Timer",
+      "kitchen-timer": "Kuchyňský časovač",
-      "start-timer": "Start Timer",
+      "start-timer": "Spustit časovač",
-      "pause-timer": "Pause Timer",
+      "pause-timer": "Pozastavit časovač",
       "resume-timer": "Resume Timer",
       "stop-timer": "Stop Timer"
     },
@@ -557,7 +560,8 @@
     "unit": "Jednotka",
     "upload-image": "Nahrát obrázek",
     "screen-awake": "Keep Screen Awake",
-    "remove-image": "Remove image"
+    "remove-image": "Remove image",
+    "nextStep": "Další krok"
   },
   "search": {
     "advanced-search": "Pokročilé vyhledávání",
@@ -1153,7 +1157,7 @@
     "notifiers-description": "Setup email and push notifications that trigger on specific events.",
     "manage-data": "Spravovat data",
     "manage-data-description": "Manage your Food and Units (more options coming soon)",
-    "data-migrations": "Data Migrations",
+    "data-migrations": "Migrace dat",
     "data-migrations-description": "Migrate your existing data from other applications like Nextcloud Recipes and Chowdown",
     "email-sent": "E-mail odeslán",
     "error-sending-email": "Nastala chyba při odesílání e-mailu",
@@ -1165,10 +1169,10 @@
     "manage-your-api-tokens": "Správa API tokenů",
     "manage-user-profile": "Správa uživatelského profilu",
     "manage-cookbooks": "Správa kuchařek",
-    "manage-members": "Manage Members",
+    "manage-members": "Spravovat členy",
-    "manage-webhooks": "Manage Webhooks",
+    "manage-webhooks": "Spravovat webhooky",
-    "manage-notifiers": "Manage Notifiers",
+    "manage-notifiers": "Spravovat oznámení",
-    "manage-data-migrations": "Manage Data Migrations"
+    "manage-data-migrations": "Spravovat migrace dat"
   },
   "cookbook": {
     "cookbooks": "Kuchařky",
@@ -1176,10 +1180,10 @@
     "public-cookbook": "Veřejná kuchařka",
     "public-cookbook-description": "Veřejné kuchařky mohou být sdíleny s neregistrovanými uživateli a budou zobrazeny na stránce vaší skupiny.",
     "filter-options": "Možnosti filtru",
-    "filter-options-description": "When require all is selected the cookbook will only include recipes that have all of the items selected. This applies to each subset of selectors and not a cross section of the selected items.",
+    "filter-options-description": "Pokud je vybrána možnost vyžadovat vše, kuchařka bude obsahovat pouze ty recepty, které mají všechny vybrané položky. To platí pro každou podmnožinu výběru, nikoliv pro jejich průnik.",
-    "require-all-categories": "Require All Categories",
+    "require-all-categories": "Vyžadovat všechny kategorie",
-    "require-all-tags": "Require All Tags",
+    "require-all-tags": "Vyžadovat všechny štítky",
-    "require-all-tools": "Require All Tools",
+    "require-all-tools": "Vyžadovat všechny nástroje",
     "cookbook-name": "Název kuchařky",
     "cookbook-with-name": "Kuchařka {0}"
   }

frontend/lang/messages/da-DK.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Opret en ny madplan",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Madplan denne uge",
     "dinner-today": "Madplan i dag",
     "dinner-tonight": "AFTENSMAD I AFTEN",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Tilføj til tidslinje",
     "recipe-added-to-list": "Opskrift tilføjet til listen",
     "recipes-added-to-list": "Opskrifter tilføjet til listen",
+    "successfully-added-to-list": "Tilføjet til listen",
     "recipe-added-to-mealplan": "Opskrift tilføjet til madplanen",
     "failed-to-add-recipes-to-list": "Kunne ikke tilføje opskrift til listen",
     "failed-to-add-recipe-to-mealplan": "Kunne ikke tilføje opskrift til madplanen",
+    "failed-to-add-to-list": "Kunne ikke tilføje opskrift til listen",
     "yield": "Portioner",
     "quantity": "Antal",
     "choose-unit": "Vælg enhed",
@@ -557,7 +560,8 @@
     "unit": "Enhed",
     "upload-image": "Upload billede",
     "screen-awake": "Hold skærmen tændt",
-    "remove-image": "Fjern billede"
+    "remove-image": "Fjern billede",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Avanceret søgning",

frontend/lang/messages/de-DE.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Neue Mahlzeit planen",
+    "update-this-meal-plan": "Mahlzeit aktualisieren",
     "dinner-this-week": "Essen diese Woche",
     "dinner-today": "Heutiges Essen",
     "dinner-tonight": "HEUTE GIBT ES",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Zum Zeitstrahl hinzufügen",
     "recipe-added-to-list": "Rezept wurde zur Einkaufsliste hinzugefügt",
     "recipes-added-to-list": "Rezepte wurden zur Einkaufsliste hinzugefügt",
+    "successfully-added-to-list": "Erfolgreich zur Liste hinzugefügt",
     "recipe-added-to-mealplan": "Rezept zum Essensplan hinzugefügt",
     "failed-to-add-recipes-to-list": "Fehler beim Hinzufügen des Rezepts zur Einkaufsliste",
     "failed-to-add-recipe-to-mealplan": "Fehler beim Hinzufügen des Rezepts zum Essensplan",
+    "failed-to-add-to-list": "Fehler beim Hinzufügen zur Liste",
     "yield": "Portionsangabe",
     "quantity": "Menge",
     "choose-unit": "Einheit wählen",
@@ -557,7 +560,8 @@
     "unit": "Maßeinheit",
     "upload-image": "Bild hochladen",
     "screen-awake": "Bildschirm nicht abschalten",
-    "remove-image": "Bild entfernen"
+    "remove-image": "Bild entfernen",
+    "nextStep": "Nächster Schritt"
   },
   "search": {
     "advanced-search": "Erweiterte Suche",

frontend/lang/messages/el-GR.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Δημιουργία νέου σχεδίου γεύματος",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Δείπνο Αυτή Τη Εβδομάδα",
     "dinner-today": "Δείπνο Σήμερα",
     "dinner-tonight": "ΔΕΙΠΝΟ ΣΗΜΕΡΑ",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Add to Timeline",
     "recipe-added-to-list": "Recipe added to list",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Recipe added to mealplan",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
@@ -557,7 +560,8 @@
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
-    "remove-image": "Remove image"
+    "remove-image": "Remove image",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Σύνθετη Αναζήτηση",

frontend/lang/messages/en-GB.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Create a New Meal Plan",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Dinner This Week",
     "dinner-today": "Dinner Today",
     "dinner-tonight": "DINNER TONIGHT",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Add to Timeline",
     "recipe-added-to-list": "Recipe added to list",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Recipe added to mealplan",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
@@ -557,7 +560,8 @@
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
-    "remove-image": "Remove image"
+    "remove-image": "Remove image",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Advanced Search",
@@ -885,7 +889,7 @@
     "user-details": "User Details",
     "user-name": "User Name",
     "authentication-method": "Authentication Method",
-    "authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie",
+    "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",

frontend/lang/messages/en-US.json

@@ -199,7 +199,8 @@
     "upload-file": "Upload File",
     "created-on-date": "Created on: {0}",
     "unsaved-changes": "You have unsaved changes. Do you want to save before leaving? Okay to save, Cancel to discard changes.",
-    "clipboard-copy-failure": "Failed to copy to the clipboard."
+    "clipboard-copy-failure": "Failed to copy to the clipboard.",
+    "confirm-delete-generic-items": "Are you sure you want to delete the following items?"
   },
   "group": {
     "are-you-sure-you-want-to-delete-the-group": "Are you sure you want to delete <b>{groupName}<b/>?",
@@ -258,6 +259,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Create a New Meal Plan",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Dinner This Week",
     "dinner-today": "Dinner Today",
     "dinner-tonight": "DINNER TONIGHT",
@@ -472,9 +474,11 @@
     "add-to-timeline": "Add to Timeline",
     "recipe-added-to-list": "Recipe added to list",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Recipe added to mealplan",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
@@ -557,7 +561,8 @@
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
-    "remove-image": "Remove image"
+    "remove-image": "Remove image",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Advanced Search",
@@ -1181,6 +1186,8 @@
     "require-all-tags": "Require All Tags",
     "require-all-tools": "Require All Tools",
     "cookbook-name": "Cookbook Name",
-    "cookbook-with-name": "Cookbook {0}"
+    "cookbook-with-name": "Cookbook {0}",
+    "create-a-cookbook": "Create a Cookbook",
+    "cookbook": "Cookbook"
   }
 }

frontend/lang/messages/es-ES.json

@@ -77,7 +77,7 @@
     "tag-events": "Eventos de etiqueta",
     "category-events": "Eventos de Categoría",
     "when-a-new-user-joins-your-group": "Cuando un nuevo usuario se une a tu grupo",
-    "recipe-events": "Recipe Events"
+    "recipe-events": "Eventos de receta"
   },
   "general": {
     "cancel": "Cancelar",
@@ -114,10 +114,10 @@
     "json": "JSON",
     "keyword": "Etiqueta",
     "link-copied": "Enlace copiado",
-    "loading": "Loading",
+    "loading": "Cargando",
     "loading-events": "Cargando Eventos",
-    "loading-recipe": "Loading recipe...",
+    "loading-recipe": "Cargando receta...",
-    "loading-ocr-data": "Loading OCR data...",
+    "loading-ocr-data": "Cargando datos OCR...",
     "loading-recipes": "Cargando recetas",
     "message": "Mensaje",
     "monday": "Lunes",
@@ -198,8 +198,8 @@
     "refresh": "Actualizar",
     "upload-file": "Subir Archivo",
     "created-on-date": "Creado el {0}",
-    "unsaved-changes": "You have unsaved changes. Do you want to save before leaving? Okay to save, Cancel to discard changes.",
+    "unsaved-changes": "Tienes cambios sin guardar. ¿Quieres guardar antes de salir? Aceptar para guardar, Cancelar para descartar cambios.",
-    "clipboard-copy-failure": "Failed to copy to the clipboard."
+    "clipboard-copy-failure": "No se pudo copiar al portapapeles."
   },
   "group": {
     "are-you-sure-you-want-to-delete-the-group": "Por favor, confirma que deseas eliminar <b>{groupName}<b/>",
@@ -214,7 +214,7 @@
     "group-id-with-value": "ID del Grupo: {groupID}",
     "group-name": "Nombre del Grupo",
     "group-not-found": "Grupo no encontrado",
-    "group-token": "Group Token",
+    "group-token": "Token del grupo",
     "group-with-value": "Grupo: {groupID}",
     "groups": "Grupos",
     "manage-groups": "Administrar grupos",
@@ -250,7 +250,7 @@
     "general-preferences": "Opciones generales",
     "group-recipe-preferences": "Preferencias de grupo de las recetas",
     "report": "Informe",
-    "report-with-id": "Report ID: {id}",
+    "report-with-id": "ID de informe: {id}",
     "group-management": "Administración de grupos",
     "admin-group-management": "Gestión del grupo administrador",
     "admin-group-management-text": "Los cambios en este grupo se reflejarán inmediatamente.",
@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Crear un nuevo menú",
+    "update-this-meal-plan": "Actualizar este plan de comidas",
     "dinner-this-week": "Cena para esta semana",
     "dinner-today": "Cena para hoy",
     "dinner-tonight": "Cena para esta noche",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Añadir al cronograma",
     "recipe-added-to-list": "Receta añadida a la lista",
     "recipes-added-to-list": "Recetas añadidas a la lista",
+    "successfully-added-to-list": "Añadido correctamente a la lista",
     "recipe-added-to-mealplan": "Receta añadida al menú",
     "failed-to-add-recipes-to-list": "Error al añadir las recetas a la lista",
     "failed-to-add-recipe-to-mealplan": "Error al añadir receta al menú",
+    "failed-to-add-to-list": "No se pudo agregar a la lista",
     "yield": "Raciones",
     "quantity": "Cantidad",
     "choose-unit": "Elija unidad",
@@ -511,11 +514,11 @@
     "how-did-it-turn-out": "¿Cómo resultó esto?",
     "user-made-this": "{user} hizo esto",
     "last-made-date": "Cocinado por última vez el {date}",
-    "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.",
+    "api-extras-description": "Los extras de las recetas son una característica clave de la API de Mealie. Permiten crear pares json clave/valor personalizados dentro de una receta para acceder desde aplicaciones de terceros. Puede utilizar estas claves para almacenar información, para activar la automatización o mensajes personalizados para transmitir al dispositivo deseado.",
     "message-key": "Clave de mensaje",
     "parse": "Analizar",
     "attach-images-hint": "Adjuntar imágenes arrastrando y soltando en el editor",
-    "drop-image": "Drop image",
+    "drop-image": "Soltar imagen",
     "enable-ingredient-amounts-to-use-this-feature": "Habilitar la cantidad de ingredientes para usar esta característica",
     "recipes-with-units-or-foods-defined-cannot-be-parsed": "Las recetas con unidades o alimentos definidos no pueden ser analizadas.",
     "parse-ingredients": "Analizar ingredientes",
@@ -533,8 +536,8 @@
     "new-recipe-names-must-be-unique": "El nombre de la receta debe ser único",
     "scrape-recipe": "Analiza receta",
     "scrape-recipe-description": "Importa una receta por URL. Proporcione la URL para el sitio que desea importar, y Mealie intentará importar la receta de ese sitio y añadirla a su colección.",
-    "scrape-recipe-have-a-lot-of-recipes": "Have a lot of recipes you want to scrape at once?",
+    "scrape-recipe-have-a-lot-of-recipes": "¿Tienes muchas recetas que quieres raspar a la vez?",
-    "scrape-recipe-suggest-bulk-importer": "Try out the bulk importer",
+    "scrape-recipe-suggest-bulk-importer": "Prueba el importador masivo",
     "import-original-keywords-as-tags": "Importar palabras clave originales como etiquetas",
     "stay-in-edit-mode": "Permanecer en modo edición",
     "import-from-zip": "Importar desde zip",
@@ -543,7 +546,7 @@
     "create-a-recipe-by-uploading-a-scan": "Crea una receta subiendo una escaneada.",
     "upload-a-png-image-from-a-recipe-book": "Suba una imagen png de un libro de recetas",
     "recipe-bulk-importer": "Importador masivo de recetas",
-    "recipe-bulk-importer-description": "The Bulk recipe importer allows you to import multiple recipes at once by queueing the sites on the backend and running the task in the background. This can be useful when initially migrating to Mealie, or when you want to import a large number of recipes.",
+    "recipe-bulk-importer-description": "El importador masivo de recetas te permite importar múltiples recetas a la vez poniendo en cola los sitios en el backend y ejecutando la tarea en segundo plano. Esto puede ser útil al migrar inicialmente a Mealie, o cuando desea importar un gran número de recetas.",
     "set-categories-and-tags": "Establecer categorías y etiquetas",
     "bulk-imports": "Importación masiva",
     "bulk-import-process-has-started": "El proceso de importación masiva se ha iniciado",
@@ -557,7 +560,8 @@
     "unit": "Unidades",
     "upload-image": "Subir imagen",
     "screen-awake": "Mantener la pantalla encendida",
-    "remove-image": "Eliminar imagen"
+    "remove-image": "Eliminar imagen",
+    "nextStep": "Siguiente paso"
   },
   "search": {
     "advanced-search": "Búsqueda avanzada",
@@ -576,16 +580,16 @@
     "search-hint": "Presione '/'",
     "advanced": "Avanzado",
     "auto-search": "Búsqueda automática",
-    "no-results": "No results found"
+    "no-results": "No se encontraron resultados"
   },
   "settings": {
     "add-a-new-theme": "Añadir un nuevo tema",
     "admin-settings": "Opciones del adminstrador",
     "backup": {
-      "backup-created": "Backup created successfully",
+      "backup-created": "Copia de seguridad creada con éxito",
       "backup-created-at-response-export_path": "Copia de seguridad creada en {path}",
       "backup-deleted": "Copia de seguridad eliminada",
-      "restore-success": "Restore successful",
+      "restore-success": "Restauración exitosa",
       "backup-tag": "Etiqueta de la copia de seguridad",
       "create-heading": "Crear una copia de seguridad",
       "delete-backup": "Eliminar copia de seguridad",
@@ -686,21 +690,21 @@
       "webhooks-caps": "WEBHOOKS",
       "webhooks": "Webhooks",
       "webhook-name": "Nombre del Webhook",
-      "description": "The webhooks defined below will be executed when a meal is defined for the day. At the scheduled time the webhooks will be sent with the data from the recipe that is scheduled for the day. Note that webhook execution is not exact. The webhooks are executed on a 5 minutes interval so the webhooks will be executed within 5 +/- minutes of the scheduled."
+      "description": "Los webhooks definidos a continuación se ejecutarán cuando una comida esté definida para el día. A la hora prevista se enviarán los webhooks con los datos de la receta programada para el día. Tenga en cuenta que la ejecución de webhook no es exacta. Los webhooks se ejecutan en un intervalo de 5 minutos, por lo que los webhooks se ejecutarán en 5 minutos +/- de los programados."
     },
     "bug-report": "Informe de error",
     "bug-report-information": "Utilice esta información para informar de un error. Proporcionar detalles de su instancia a los desarrolladores es la mejor manera de resolver sus problemas rápidamente.",
-    "tracker": "Tracker",
+    "tracker": "Rastreador",
     "configuration": "Configuración",
     "docker-volume": "Volumen de Docker",
     "docker-volume-help": "Mealie requiere que los contenedores de frontend y backend compartan el mismo volumen o almacenamiento en docker. Esto asegura que el contenedor del frontend pueda acceder adecuadamente a las imágenes y los activos almacenados en el disco.",
-    "volumes-are-misconfigured": "Volumes are misconfigured.",
+    "volumes-are-misconfigured": "Los volúmenes están mal configurados.",
     "volumes-are-configured-correctly": "Los volúmenes se configuran correctamente.",
     "status-unknown-try-running-a-validation": "Estado desconocido. Intente ejecutar una validación.",
     "validate": "Validar",
     "email-configuration-status": "Estado de la Configuración del Correo Electrónico",
-    "email-configured": "Email Configured",
+    "email-configured": "Email configurado",
-    "email-test-results": "Email Test Results",
+    "email-test-results": "Resultados de la prueba de email",
     "ready": "Listo",
     "not-ready": "No Listo - Comprobar variables de ambiente",
     "succeeded": "Logrado",
@@ -711,10 +715,10 @@
     "mealie-is-up-to-date": "Mealie está actualizada",
     "secure-site": "Sitio Seguro",
     "secure-site-error-text": "Servir a través de local host o seguro con HTTPS. El portapapeles y API adicionales del navegador pueden no funcionar.",
-    "secure-site-success-text": "Site is accessed by localhost or https",
+    "secure-site-success-text": "Se accede al sitio por localhost o https",
-    "server-side-base-url": "Server Side Base URL",
+    "server-side-base-url": "URL base del servidor",
-    "server-side-base-url-error-text": "`BASE_URL` is still the default value on API Server. This will cause issues with notifications links generated on the server for emails, etc.",
+    "server-side-base-url-error-text": "`BASE_URL` sigue siendo el valor por defecto en el servidor API. Esto causará problemas con las notificaciones generadas en el servidor de correos electrónicos, etc.",
-    "server-side-base-url-success-text": "Server Side URL does not match the default",
+    "server-side-base-url-success-text": "La URL del servidor no coincide con la predeterminada",
     "ldap-ready": "LDAP Listo",
     "ldap-ready-error-text": "No todos los valores LDAP están configurados. Esto puede ignorarse si no está usando autenticación LDAP.",
     "ldap-ready-success-text": "Las variables LDAP requeridas están todas definidas.",
@@ -744,7 +748,7 @@
     "reorder-labels": "Reordenar etiquetas",
     "uncheck-all-items": "Desmarcar todos los elementos",
     "check-all-items": "Marcar todos los elementos",
-    "linked-recipes-count": "No Linked Recipes|One Linked Recipe|{count} Linked Recipes",
+    "linked-recipes-count": "No hay recetas vinculadas|Una receta vinculada|{count} recetas vinculadas",
     "items-checked-count": "Ningún elemento comprobado|Un elemento comprobado|{count} elementos comprobados",
     "no-label": "Sin Etiqueta",
     "completed-on": "Completado el {date}"
@@ -837,7 +841,7 @@
     "password-updated": "Contraseña actualizada",
     "password": "Contraseña",
     "password-strength": "Fortaleza de la contraseña: {strength}",
-    "please-enter-password": "Please enter your new password.",
+    "please-enter-password": "Por favor ingrese su nueva contraseña.",
     "register": "Registrarse",
     "reset-password": "Restablecer contraseña",
     "sign-in": "Iniciar sesión",
@@ -858,7 +862,7 @@
     "username": "Usuario",
     "users-header": "USUARIOS",
     "users": "Usuarios",
-    "user-not-found": "User not found",
+    "user-not-found": "Usuario no encontrado",
     "webhook-time": "Tiempo de Webhook",
     "webhooks-enabled": "Webhooks habilitados",
     "you-are-not-allowed-to-create-a-user": "No tiene permisos para crear usuarios",
@@ -881,7 +885,7 @@
     "user-management": "Gestión de Usuarios",
     "reset-locked-users": "Restablecer usuarios bloqueados",
     "admin-user-creation": "Creación de Usuario Administrador",
-    "admin-user-management": "Admin User Management",
+    "admin-user-management": "Administración de usuario de admin",
     "user-details": "Detalles de usuario",
     "user-name": "Nombre de usuario",
     "authentication-method": "Método de autenticación",
@@ -892,11 +896,11 @@
     "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",
-    "it-looks-like-this-is-your-first-time-logging-in": "It looks like this is your first time logging in.",
+    "it-looks-like-this-is-your-first-time-logging-in": "Parece que esta es la primera vez que inicias sesión.",
-    "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!",
+    "dont-want-to-see-this-anymore-be-sure-to-change-your-email": "¿No quieres ver esto más? ¡Asegúrate de cambiar tu correo electrónico en tu configuración de usuario!",
-    "forgot-password": "Forgot Password",
+    "forgot-password": "Olvidé mi contraseña",
-    "forgot-password-text": "Please enter your email address and we will send you a link to reset your password.",
+    "forgot-password-text": "Por favor, introduce tu correo electrónico y te enviaremos un enlace para restablecer tu contraseña.",
-    "changes-reflected-immediately": "Changes to this user will be reflected immediately."
+    "changes-reflected-immediately": "Los cambios en este grupo se reflejarán inmediatamente."
   },
   "language-dialog": {
     "translated": "traducido",
@@ -923,19 +927,19 @@
     },
     "units": {
       "seed-dialog-text": "Añade a la base de datos unidades comunes basadas en su idioma local.",
-      "combine-unit-description": "Combining the selected units will merge the Source Unit and Target Unit into a single unit. The {source-unit-will-be-deleted} and all of the references to the Source Unit will be updated to point to the Target Unit.",
+      "combine-unit-description": "Combinar los alimentos seleccionados fusionará el alimento origen y destinatario en un solo alimento. El alimento {source-unit-will-be-deleted} será eliminado y todas las referencias a él serán actualizadas para apuntar al nuevo alimento.",
       "combine-unit": "Unidad de Combinación",
-      "source-unit": "Source Unit",
+      "source-unit": "Unidad de origen",
-      "target-unit": "Target Unit",
+      "target-unit": "Unidad de objetivo",
-      "merging-unit-into-unit": "Merging {0} into {1}",
+      "merging-unit-into-unit": "Combinando {0} con {1}",
-      "create-unit": "Create Unit",
+      "create-unit": "Crear unidad",
       "abbreviation": "Abreviatura",
       "plural-abbreviation": "Abreviatura en plural",
       "description": "Descripción",
-      "display-as-fraction": "Display as Fraction",
+      "display-as-fraction": "Mostrar como fracción",
       "use-abbreviation": "Usar Abreviaturas",
       "edit-unit": "Editar unidad",
-      "unit-data": "Unit Data",
+      "unit-data": "Datos de la unidad",
       "use-abbv": "Usar Abr.",
       "fraction": "Fracción",
       "example-unit-singular": "ej: Cucharada",
@@ -952,10 +956,10 @@
     "recipes": {
       "purge-exports": "Limpiar exportaciones",
       "are-you-sure-you-want-to-delete-all-export-data": "¿Está seguro de que desea eliminar todos sus datos de exportación?",
-      "confirm-delete-recipes": "Are you sure you want to delete the following recipes? This action cannot be undone.",
+      "confirm-delete-recipes": "¿Estás seguro de que quieres eliminar las siguientes recetas? Esta acción no podrá deshacerse.",
-      "the-following-recipes-selected-length-will-be-exported": "The following recipes ({0}) will be exported.",
+      "the-following-recipes-selected-length-will-be-exported": "Las siguientes recetas ({0}) serán exportadas.",
-      "settings-chosen-explanation": "Settings chosen here, excluding the locked option, will be applied to all selected recipes.",
+      "settings-chosen-explanation": "Los ajustes seleccionados aquí, excluyendo la opción bloqueada, se aplicarán a todas las recetas seleccionadas.",
-      "selected-length-recipe-s-settings-will-be-updated": "{count} recipe(s) settings will be updated.",
+      "selected-length-recipe-s-settings-will-be-updated": "Se actualizarán los ajustes de {count} receta(s).",
       "recipe-data": "Datos de la receta",
       "recipe-data-description": "Use this section to manage the data associated with your recipes. You can perform several bulk actions on your recipes including exporting, deleting, tagging, and assigning categories.",
       "recipe-columns": "Recipe Columns",
@@ -1116,14 +1120,14 @@
     "ingredients-natural-language-processor-explanation-2": "It's not perfect, but it yields great results in general and is a good starting point for manually parsing ingredients into individual fields. Alternatively, you can also use the \"Brute\" processor that uses a pattern matching technique to identify ingredients.",
     "nlp": "NLP",
     "brute": "Brute",
-    "show-individual-confidence": "Show individual confidence",
+    "show-individual-confidence": "Mostrar confianza individual",
-    "ingredient-text": "Ingredient Text",
+    "ingredient-text": "Texto del ingrediente",
-    "average-confident": "{0} Confident",
+    "average-confident": "{0} Confianza",
-    "try-an-example": "Try an example",
+    "try-an-example": "Prueba un ejemplo",
     "parser": "Procesador",
     "background-tasks": "Tareas en Segundo Plano",
-    "background-tasks-description": "Here you can view all the running background tasks and their status",
+    "background-tasks-description": "Aquí puedes ver todas las tareas de fondo en ejecución y su estado",
-    "no-logs-found": "No Logs Found",
+    "no-logs-found": "No se encontraron registros",
     "tasks": "Tareas"
   },
   "profile": {
@@ -1133,7 +1137,7 @@
     "get-public-link": "Obtener enlace público",
     "account-summary": "Información de la cuenta",
     "account-summary-description": "Este es un resumen de la información de tu grupo",
-    "group-statistics": "Group Statistics",
+    "group-statistics": "Estadísticas del grupo",
     "group-statistics-description": "Your Group Statistics provide some insight how you're using Mealie.",
     "storage-capacity": "Capacidad de almacenamiento",
     "storage-capacity-description": "Your storage capacity is a calculation of the images and assets you have uploaded.",

frontend/lang/messages/fi-FI.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Luo uusi ateriasuunnitelma",
+    "update-this-meal-plan": "Päivitä tämä ateriasuunnitelma",
     "dinner-this-week": "Viikon päivällinen",
     "dinner-today": "Päivällinen tänään",
     "dinner-tonight": "PÄIVÄLLINEN TÄNÄÄN",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Lisää aikajanalle",
     "recipe-added-to-list": "Resepti lisätty listalle",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Resepti lisätty ateriasuunnitelmaan",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Reseptiä ei voitu lisätä ateriasuunnitelmaan",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Sato",
     "quantity": "Määrä",
     "choose-unit": "Valitse Yksikkö",
@@ -557,7 +560,8 @@
     "unit": "Yksikkö",
     "upload-image": "Lataa kuva",
     "screen-awake": "Pidä näyttö aina päällä",
-    "remove-image": "Poista kuva"
+    "remove-image": "Poista kuva",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Tarkennettu haku",

frontend/lang/messages/fr-CA.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Créer un nouveau menu",
+    "update-this-meal-plan": "Mettre à jour ce menu",
     "dinner-this-week": "Menu de la semaine",
     "dinner-today": "Menu du jour",
     "dinner-tonight": "AU MENU CE SOIR",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Ajouter à l’historique",
     "recipe-added-to-list": "Recette ajoutée à la liste",
     "recipes-added-to-list": "Recettes ajoutées à la liste",
+    "successfully-added-to-list": "Ajouté à la liste",
     "recipe-added-to-mealplan": "Recette ajoutée à la planification des repas",
     "failed-to-add-recipes-to-list": "Impossible d’ajouter la recette à la liste",
     "failed-to-add-recipe-to-mealplan": "Échec de l'ajout de la recette à la planification des repas",
+    "failed-to-add-to-list": "Ajout dans la liste en échec",
     "yield": "Rendement",
     "quantity": "Quantité",
     "choose-unit": "Choisir une unité",
@@ -557,7 +560,8 @@
     "unit": "Unité",
     "upload-image": "Ajouter une image",
     "screen-awake": "Garder l’écran allumé",
-    "remove-image": "Supprimer l’image"
+    "remove-image": "Supprimer l’image",
+    "nextStep": "Étape suivante"
   },
   "search": {
     "advanced-search": "Recherche avancée",

frontend/lang/messages/fr-FR.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Créer un nouveau menu",
+    "update-this-meal-plan": "Mettre à jour ce menu",
     "dinner-this-week": "Au menu cette semaine",
     "dinner-today": "Menu du jour",
     "dinner-tonight": "AU MENU CE SOIR",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Ajouter à l’historique",
     "recipe-added-to-list": "Recette ajoutée à la liste",
     "recipes-added-to-list": "Recettes ajoutées à la liste",
+    "successfully-added-to-list": "Ajouté à la liste",
     "recipe-added-to-mealplan": "Recette ajoutée au menu",
     "failed-to-add-recipes-to-list": "Impossible d’ajouter la recette à la liste",
     "failed-to-add-recipe-to-mealplan": "Échec de l’ajout de la recette au menu",
+    "failed-to-add-to-list": "Ajout dans la liste en échec",
     "yield": "Nombre de portions",
     "quantity": "Quantité",
     "choose-unit": "Choisissez une unité",
@@ -557,7 +560,8 @@
     "unit": "Unité",
     "upload-image": "Envoyer une image",
     "screen-awake": "Garder l’écran allumé",
-    "remove-image": "Supprimer l’image"
+    "remove-image": "Supprimer l’image",
+    "nextStep": "Étape suivante"
   },
   "search": {
     "advanced-search": "Recherche avancée",

frontend/lang/messages/gl-ES.json

@@ -1,61 +1,61 @@
 {
   "about": {
-    "about": "About",
+    "about": "Acerca de",
-    "about-mealie": "About Mealie",
+    "about-mealie": "Acerca de Mealie",
-    "api-docs": "API Docs",
+    "api-docs": "Documentación da API",
-    "api-port": "API Port",
+    "api-port": "Porto da API",
-    "application-mode": "Application Mode",
+    "application-mode": "Modo da Aplicación",
-    "database-type": "Database Type",
+    "database-type": "Tipo de base de datos",
-    "database-url": "Database URL",
+    "database-url": "URL da base de datos",
-    "default-group": "Default Group",
+    "default-group": "Grupo por defecto",
-    "demo": "Demo",
+    "demo": "Demostración",
-    "demo-status": "Demo Status",
+    "demo-status": "Estado da demostración",
-    "development": "Development",
+    "development": "Desenvolvemento",
-    "docs": "Docs",
+    "docs": "Documentación",
-    "download-log": "Download Log",
+    "download-log": "Descargar rexistro",
-    "download-recipe-json": "Last Scraped JSON",
+    "download-recipe-json": "Último JSON raspado",
-    "github": "Github",
+    "github": "GitHub",
-    "log-lines": "Log Lines",
+    "log-lines": "Liñas de rexistro",
-    "not-demo": "Not Demo",
+    "not-demo": "Non demostración",
-    "portfolio": "Portfolio",
+    "portfolio": "Portafolio",
-    "production": "Production",
+    "production": "Produción",
-    "support": "Support",
+    "support": "Soporte",
-    "version": "Version",
+    "version": "Versión",
-    "unknown-version": "unknown",
+    "unknown-version": "descoñecido",
-    "sponsor": "Sponsor"
+    "sponsor": "Patrocinador"
   },
   "asset": {
-    "assets": "Assets",
+    "assets": "Activos",
-    "code": "Code",
+    "code": "Código",
-    "file": "File",
+    "file": "Ficheiro",
-    "image": "Image",
+    "image": "Imaxe",
-    "new-asset": "New Asset",
+    "new-asset": "Novo documento",
     "pdf": "PDF",
-    "recipe": "Recipe",
+    "recipe": "Receita",
-    "show-assets": "Show Assets",
+    "show-assets": "Amosar documentos",
-    "error-submitting-form": "Error Submitting Form"
+    "error-submitting-form": "Erro ao enviar formulario"
   },
   "category": {
-    "categories": "Categories",
+    "categories": "Categorías",
-    "category-created": "Category created",
+    "category-created": "Categoría creada",
-    "category-creation-failed": "Category creation failed",
+    "category-creation-failed": "Fallou a creación da categoría",
-    "category-deleted": "Category Deleted",
+    "category-deleted": "Categoría eliminada",
-    "category-deletion-failed": "Category deletion failed",
+    "category-deletion-failed": "Fallou a eliminación da categoría",
-    "category-filter": "Category Filter",
+    "category-filter": "Filtro de categoría",
-    "category-update-failed": "Category update failed",
+    "category-update-failed": "Fallou a actualización da categoría",
-    "category-updated": "Category updated",
+    "category-updated": "Categoría actualizada",
-    "uncategorized-count": "Uncategorized {count}",
+    "uncategorized-count": "Sen categorizar {count}",
-    "create-a-category": "Create a Category",
+    "create-a-category": "Crear unha categoría",
-    "category-name": "Category Name",
+    "category-name": "Nome da categoría",
-    "category": "Category"
+    "category": "Categoría"
   },
   "events": {
-    "apprise-url": "Apprise URL",
+    "apprise-url": "URL de avisos",
-    "database": "Database",
+    "database": "Base de datos",
-    "delete-event": "Delete Event",
+    "delete-event": "Eliminar evento",
-    "event-delete-confirmation": "Are you sure you want to delete this event?",
+    "event-delete-confirmation": "Estás seguro de que queres eliminar este evento?",
-    "event-deleted": "Event Deleted",
+    "event-deleted": "Evento eliminado",
-    "event-updated": "Event Updated",
+    "event-updated": "Evento actualizado",
     "new-notification-form-description": "Mealie uses the Apprise library to generate notifications. They offer many options for services to use for notifications. Refer to their wiki for a comprehensive guide on how to create the URL for your service. If available, selecting the type of your notification may include extra features.",
     "new-version": "New version available!",
     "notification": "Notification",
@@ -108,56 +108,56 @@
     "general": "General",
     "get": "Get",
     "home": "Home",
-    "image": "Image",
+    "image": "Imaxe",
-    "image-upload-failed": "Image upload failed",
+    "image-upload-failed": "Fallou a subida da imaxe",
-    "import": "Import",
+    "import": "Importar",
     "json": "JSON",
-    "keyword": "Keyword",
+    "keyword": "Palabra chave",
-    "link-copied": "Link Copied",
+    "link-copied": "Enlace copiado",
-    "loading": "Loading",
+    "loading": "Cargando",
-    "loading-events": "Loading Events",
+    "loading-events": "Cargando eventos",
-    "loading-recipe": "Loading recipe...",
+    "loading-recipe": "Cargando receita...",
-    "loading-ocr-data": "Loading OCR data...",
+    "loading-ocr-data": "Cargando información de OCR...",
-    "loading-recipes": "Loading Recipes",
+    "loading-recipes": "Cargando receitas",
-    "message": "Message",
+    "message": "Mensaxe",
-    "monday": "Monday",
+    "monday": "Luns",
-    "name": "Name",
+    "name": "Nome",
-    "new": "New",
+    "new": "Nova",
-    "never": "Never",
+    "never": "Nunca",
-    "no": "No",
+    "no": "Non",
-    "no-recipe-found": "No Recipe Found",
+    "no-recipe-found": "Non se atopou ningunha receita",
     "ok": "OK",
-    "options": "Options:",
+    "options": "Opcións:",
-    "plural-name": "Plural Name",
+    "plural-name": "Nome plural",
-    "print": "Print",
+    "print": "Imprimir",
-    "print-preferences": "Print Preferences",
+    "print-preferences": "Preferencias de impresión",
-    "random": "Random",
+    "random": "Ao chou",
-    "rating": "Rating",
+    "rating": "Puntuación",
-    "recent": "Recent",
+    "recent": "Recentes",
-    "recipe": "Recipe",
+    "recipe": "Receita",
-    "recipes": "Recipes",
+    "recipes": "Receitas",
-    "rename-object": "Rename {0}",
+    "rename-object": "Renomear {0}",
-    "reset": "Reset",
+    "reset": "Restablecer",
-    "saturday": "Saturday",
+    "saturday": "Sábado",
-    "save": "Save",
+    "save": "Gardar",
-    "settings": "Settings",
+    "settings": "Axustes",
-    "share": "Share",
+    "share": "Compartir",
-    "shuffle": "Shuffle",
+    "shuffle": "Barallar",
-    "sort": "Sort",
+    "sort": "Ordenar",
-    "sort-alphabetically": "Alphabetical",
+    "sort-alphabetically": "Alfabético",
-    "status": "Status",
+    "status": "Estado",
-    "subject": "Subject",
+    "subject": "Asunto",
-    "submit": "Submit",
+    "submit": "Enviar",
-    "success-count": "Success: {count}",
+    "success-count": "Éxito: {count}",
-    "sunday": "Sunday",
+    "sunday": "Domingo",
-    "templates": "Templates:",
+    "templates": "Modelos:",
-    "test": "Test",
+    "test": "Probar",
-    "themes": "Themes",
+    "themes": "Temas",
-    "thursday": "Thursday",
+    "thursday": "Xoves",
-    "token": "Token",
+    "token": "Identificador",
-    "tuesday": "Tuesday",
+    "tuesday": "Martes",
-    "type": "Type",
+    "type": "Tipo",
-    "update": "Update",
+    "update": "Actualizar",
     "updated": "Updated",
     "upload": "Upload",
     "url": "URL",
@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Create a New Meal Plan",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Dinner This Week",
     "dinner-today": "Dinner Today",
     "dinner-tonight": "DINNER TONIGHT",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Add to Timeline",
     "recipe-added-to-list": "Recipe added to list",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Recipe added to mealplan",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
@@ -557,7 +560,8 @@
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
-    "remove-image": "Remove image"
+    "remove-image": "Remove image",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Advanced Search",

frontend/lang/messages/he-IL.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "יצירת תכנית ארוחות חדשה",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "ארוחות ערב השבוע",
     "dinner-today": "ארוחת ערב היום",
     "dinner-tonight": "ארוחת ערב היום",
@@ -472,9 +473,11 @@
     "add-to-timeline": "הוסף לציר הזמן",
     "recipe-added-to-list": "מתכון נוסף לרשימה",
     "recipes-added-to-list": "מתכונים הוספו לרשימה",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "מתכון נוסף לתכנון ארוחות",
     "failed-to-add-recipes-to-list": "כשלון בהוספת מתכון לרשימה",
     "failed-to-add-recipe-to-mealplan": "הוספת מתכון לתכנון ארוחות נכשלה",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "תשואה",
     "quantity": "כמות",
     "choose-unit": "בחירת יחידת מידה",
@@ -557,7 +560,8 @@
     "unit": "יחידה",
     "upload-image": "העלה תמונה",
     "screen-awake": "השאר את המסך פעיל",
-    "remove-image": "האם למחוק את התמונה?"
+    "remove-image": "האם למחוק את התמונה?",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "חיפוש מתקדם",

frontend/lang/messages/hr-HR.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Kreirajte Novi Plan Obroka",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Večera Ove Sedmice",
     "dinner-today": "Večera Danas",
     "dinner-tonight": "VEČERA NOĆAS",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Add to Timeline",
     "recipe-added-to-list": "Recept je dodan na popis",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Recept je dodan u Plan",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Nije uspjelo dodavanje recepta u plan obroka",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Konačna Količina",
     "quantity": "Količina",
     "choose-unit": "Odaberi Jedinicu",
@@ -557,7 +560,8 @@
     "unit": "Jedinica",
     "upload-image": "Učitavanje Slike",
     "screen-awake": "Keep Screen Awake",
-    "remove-image": "Remove image"
+    "remove-image": "Remove image",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Napredno Pretraživanje",

frontend/lang/messages/hu-HU.json

@@ -56,7 +56,7 @@
     "event-delete-confirmation": "Biztosan törölni szeretné ezt az eseményt?",
     "event-deleted": "Esemény törölve",
     "event-updated": "Esemény Frissítve",
-    "new-notification-form-description": "A Mealie az Apprise könyvtárat használja az értesítésekhez. Számos lehetőséget kínál különbőző értesítési szolgáltatásokhoz. Nézd meg a wiki oldalukon, hogy kell URL-t létrehozni az általad használt szolgáltatáshoz. Az értesítés tipusának kiválasztásával egyéb beállítási lehetőségek jelenhetnek meg.",
+    "new-notification-form-description": "A Mealie az Apprise könyvtárat használja az értesítésekhez. Számos lehetőséget kínál különböző értesítési szolgáltatásokhoz. Nézd meg a wiki oldalukon, hogy kell URL-t létrehozni az általad használt szolgáltatáshoz. Az értesítés típusának kiválasztásával egyéb beállítási lehetőségek jelenhetnek meg.",
     "new-version": "Új verzió elérhető!",
     "notification": "Értesítések",
     "refresh": "Frissítés",
@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Menüterv létrehozása",
+    "update-this-meal-plan": "Frissítsd ezt a Menütervet",
     "dinner-this-week": "Vacsora ezen a héten",
     "dinner-today": "Vacsora ma",
     "dinner-tonight": "Vacsora ma",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Hozzáadás idővonalhoz",
     "recipe-added-to-list": "Recept hozzáadva listához",
     "recipes-added-to-list": "Recept hozzáadva listához",
+    "successfully-added-to-list": "Sikeresen hozzáadva a listához",
     "recipe-added-to-mealplan": "Recept hozzáadva menütervhez",
     "failed-to-add-recipes-to-list": "Nem sikerült hozzáadni a receptet a listához",
     "failed-to-add-recipe-to-mealplan": "Nem sikerült hozzáadni a receptet a menütervhez",
+    "failed-to-add-to-list": "Nem sikerült hozzáadni a listához",
     "yield": "Adag",
     "quantity": "Mennyiség",
     "choose-unit": "Válasszon mennyiségi egységet",
@@ -533,8 +536,8 @@
     "new-recipe-names-must-be-unique": "Az új recept nevének egyedinek kell lennie",
     "scrape-recipe": "Recept kinyerése",
     "scrape-recipe-description": "Recept (adatok) kinyerése Url alapján. Adja meg a beolvasni kívánt oldal Url-címét, és Mealie megpróbálja beolvasni a receptet az adott oldalról, majd hozzáadja azt gyűjteményéhez.",
-    "scrape-recipe-have-a-lot-of-recipes": "Have a lot of recipes you want to scrape at once?",
+    "scrape-recipe-have-a-lot-of-recipes": "Sok receptje van, amit egyszerre szeretne átvenni?",
-    "scrape-recipe-suggest-bulk-importer": "Try out the bulk importer",
+    "scrape-recipe-suggest-bulk-importer": "Próbálja ki a tömeges importálót",
     "import-original-keywords-as-tags": "Eredeti kulcsszavak importálása címkeként",
     "stay-in-edit-mode": "Maradjon Szerkesztés módban",
     "import-from-zip": "Importálás ZIP-ből",
@@ -557,7 +560,8 @@
     "unit": "Mennyiségi egység",
     "upload-image": "Kép feltöltése",
     "screen-awake": "Képernyő ébren tartása",
-    "remove-image": "Kép etávolítása"
+    "remove-image": "Kép etávolítása",
+    "nextStep": "Következő lépés"
   },
   "search": {
     "advanced-search": "Részletes keresés",
@@ -1150,7 +1154,7 @@
     "members-description": "Láthatja, hogy kik vannak a csoportjában, és kezelheti az ő jogosultságaikat.",
     "webhooks-description": "Állítson be webhookokat, amelyek azokon a napokon lépnek működésbe, amikorra a menüterveket ütemezte.",
     "notifiers": "Értesítések",
-    "notifiers-description": "Setup email and push notifications that trigger on specific events.",
+    "notifiers-description": "Állítson be olyan e-mail és push-értesítéseket, amelyek meghatározott események esetén lépnek működésbe.",
     "manage-data": "Adatok kezelése",
     "manage-data-description": "Alapanyagainak és mennyiségi egységeinek kezelése (további opciók hamarosan)",
     "data-migrations": "Adat migráció",

frontend/lang/messages/it-IT.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Crea un Nuovo Piano Alimentare",
+    "update-this-meal-plan": "Aggiorna questo piano pasto",
     "dinner-this-week": "Cena Questa Settimana",
     "dinner-today": "Cena Oggi",
     "dinner-tonight": "CENA STASERA",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Aggiungi alla linea temporale",
     "recipe-added-to-list": "Ricetta aggiunta alla lista",
     "recipes-added-to-list": "Ricette aggiunte alla lista",
+    "successfully-added-to-list": "Aggiunto correttamente alla lista",
     "recipe-added-to-mealplan": "Ricetta aggiunta al piano alimentare",
     "failed-to-add-recipes-to-list": "Impossibile aggiungere la ricetta alla lista",
     "failed-to-add-recipe-to-mealplan": "Impossibile aggiungere la ricetta al piano alimentare",
+    "failed-to-add-to-list": "Errore durante l'aggiunta alla lista",
     "yield": "Porzioni",
     "quantity": "Quantità",
     "choose-unit": "Scegli Unità",
@@ -533,8 +536,8 @@
     "new-recipe-names-must-be-unique": "I nuovi nomi delle ricette devono essere univoci",
     "scrape-recipe": "Recupera Ricetta",
     "scrape-recipe-description": "Recupera una ricetta da url. Fornire l'url per il sito che si desidera analizzare, e Mealie cercherà di recuperare la ricetta da quel sito e aggiungerlo alla vostra raccolta.",
-    "scrape-recipe-have-a-lot-of-recipes": "Have a lot of recipes you want to scrape at once?",
+    "scrape-recipe-have-a-lot-of-recipes": "Hai un sacco di ricette che vuoi importare contemporaneamente?",
-    "scrape-recipe-suggest-bulk-importer": "Try out the bulk importer",
+    "scrape-recipe-suggest-bulk-importer": "Prova l'importatore massivo",
     "import-original-keywords-as-tags": "Importa parole chiave originali come tag",
     "stay-in-edit-mode": "Rimani in modalità Modifica",
     "import-from-zip": "Importa da Zip",
@@ -557,7 +560,8 @@
     "unit": "Unità",
     "upload-image": "Carica immagine",
     "screen-awake": "Mantieni lo schermo acceso",
-    "remove-image": "Rimuovi immagine"
+    "remove-image": "Rimuovi immagine",
+    "nextStep": "Passo successivo"
   },
   "search": {
     "advanced-search": "Ricerca Avanzata",
@@ -802,7 +806,7 @@
     "create-new-tool": "Crea un Nuovo Utensile",
     "on-hand-checkbox-label": "Mostra come Disponibile (Spuntato)",
     "required-tools": "Strumenti necessari",
-    "tool": "Tool"
+    "tool": "Strumento"
   },
   "user": {
     "admin": "Amministratore",

frontend/lang/messages/ja-JP.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Create a New Meal Plan",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "今週の夕食",
     "dinner-today": "今日の夕食",
     "dinner-tonight": "今夜の夕食",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Add to Timeline",
     "recipe-added-to-list": "Recipe added to list",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "レシピを献立に追加しました。",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "レシピを献立に追加する事に失敗しました。",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
@@ -557,7 +560,8 @@
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
-    "remove-image": "Remove image"
+    "remove-image": "Remove image",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Advanced Search",

frontend/lang/messages/ko-KR.json

@@ -258,6 +258,7 @@
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Create a New Meal Plan",
+    "update-this-meal-plan": "Update this Meal Plan",
     "dinner-this-week": "Dinner This Week",
     "dinner-today": "Dinner Today",
     "dinner-tonight": "DINNER TONIGHT",
@@ -472,9 +473,11 @@
     "add-to-timeline": "Add to Timeline",
     "recipe-added-to-list": "Recipe added to list",
     "recipes-added-to-list": "Recipes added to list",
+    "successfully-added-to-list": "Successfully added to list",
     "recipe-added-to-mealplan": "Recipe added to mealplan",
     "failed-to-add-recipes-to-list": "Failed to add recipe to list",
     "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
+    "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
@@ -557,7 +560,8 @@
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
-    "remove-image": "Remove image"
+    "remove-image": "Remove image",
+    "nextStep": "Next step"
   },
   "search": {
     "advanced-search": "Advanced Search",