fix: Bulk Add Recipes to Shopping List (#5054)

Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com>

.dockerignore

@@ -6,7 +6,7 @@
 .idea
 .vscode
 
-__pycache__/
+**/__pycache__/
 *.py[cod]
 *$py.class
 *.so
@@ -25,9 +25,11 @@ venv
 
 */node_modules
 */dist
+/dist/
 */data/db
 */mealie/test
 */mealie/.temp
+/mealie/frontend/
 
 model.crfmodel
 

.github/pull_request_template.md

@@ -20,20 +20,6 @@
 
  -->
 
-## What type of PR is this?
-
-_(REQUIRED)_
-
-<!--
-  Delete any of the following that do not apply:
- -->
-
-- feature
-- bug
-- documentation
-- cleanup
-- dev (Internal development)
-
 ## What this PR does / why we need it:
 
 _(REQUIRED)_

.github/workflows/e2e.yml

@@ -3,8 +3,15 @@ on:
   workflow_call:
 
 jobs:
+  build-package:
+    name: "Build Python package"
+    uses: ./.github/workflows/partial-package.yml
+    with:
+      tag: e2e
+
   test:
     timeout-minutes: 60
+    needs: build-package
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -18,11 +25,18 @@ jobs:
         cache-dependency-path: ./tests/e2e/yarn.lock
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
+    - name: Retrieve Python package
+      uses: actions/download-artifact@v4
+      with:
+        name: backend-dist
+        path: dist
     - name: Build Image
       uses: docker/build-push-action@v5
       with:
         file: ./docker/Dockerfile
         context: .
+        build-contexts: |
+          packages=dist
         push: false
         load: true
         tags: mealie:e2e

.github/workflows/nightly.yml

@@ -21,7 +21,7 @@ jobs:
     uses: ./.github/workflows/partial-backend.yml
 
   frontend-tests:
-    name: "Frontend and End-to-End Tests"
+    name: "Frontend Tests"
     uses: ./.github/workflows/partial-frontend.yml
 
   build-release:

.github/workflows/partial-backend.yml

@@ -1,4 +1,4 @@
-name: Backend Test/Lint
+name: Backend Lint and Test
 
 on:
   workflow_call:

.github/workflows/partial-builder.yml

@@ -16,7 +16,14 @@ on:
         required: true
 
 jobs:
+  build-package:
+    name: "Build Python package"
+    uses: ./.github/workflows/partial-package.yml
+    with:
+      tag: ${{ inputs.tag }}
+
   publish:
+    needs: build-package
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -35,18 +42,22 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Override __init__.py
-        run: |
-          echo "__version__ = \"${{ inputs.tag }}\"" > ./mealie/__init__.py
-
       - uses: depot/setup-action@v1
 
+      - name: Retrieve Python package
+        uses: actions/download-artifact@v4
+        with:
+          name: backend-dist
+          path: dist
+
       - name: Build and push Docker image, via Depot.dev
         uses: depot/build-push-action@v1
         with:
           project: srzjb6mhzm
           file: ./docker/Dockerfile
           context: .
+          build-contexts: |
+            packages=dist
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |

.github/workflows/partial-frontend.yml

@@ -1,4 +1,4 @@
-name: Frontend Build/Lin
+name: Frontend Lint and Test
 
 on:
   workflow_call:
@@ -41,37 +41,3 @@ jobs:
       - name: Run tests 🧪
         run: yarn test:ci
         working-directory: "frontend"
-
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout 🛎
-        uses: actions/checkout@v4
-
-      - name: Setup node env 🏗
-        uses: actions/setup-node@v4.0.0
-        with:
-          node-version: 16
-          check-latest: true
-
-      - name: Get yarn cache directory path 🛠
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache node_modules 📦
-        uses: actions/cache@v4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install dependencies 👨🏻‍💻
-        run: yarn
-        working-directory: "frontend"
-
-      - name: Run Build 🚚
-        run: yarn build
-        working-directory: "frontend"

.github/workflows/partial-package.yml

@@ -0,0 +1,102 @@
+name: Package build
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        required: true
+        type: string
+
+jobs:
+  build-frontend:
+    name: Build frontend
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout 🛎
+        uses: actions/checkout@v4
+
+      - name: Setup node env 🏗
+        uses: actions/setup-node@v4.0.0
+        with:
+          node-version: 16
+          check-latest: true
+
+      - name: Get yarn cache directory path 🛠
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache node_modules 📦
+        uses: actions/cache@v4
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install dependencies 👨🏻‍💻
+        run: yarn
+        working-directory: "frontend"
+
+      - name: Run Build 🚚
+        run: yarn generate
+        working-directory: "frontend"
+
+      - name: Archive built frontend
+        uses: actions/upload-artifact@v4
+        with:
+          name: frontend-dist
+          path: frontend/dist
+          retention-days: 5
+
+  build-package:
+    name: Build Python package
+    needs: build-frontend
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install Task
+        uses: arduino/setup-task@v2
+        with:
+          version: 3.x
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          plugins: |
+            poetry-plugin-export
+
+      - name: Retrieve built frontend
+        uses: actions/download-artifact@v4
+        with:
+          name: frontend-dist
+          path: mealie/frontend
+
+      - name: Override __init__.py
+        run: |
+          echo "__version__ = \"${{ inputs.tag }}\"" > ./mealie/__init__.py
+
+      - name: Build package and requirements.txt
+        env:
+          SKIP_PACKAGE_DEPS: true
+        run: |
+          task py:package
+
+      - name: Archive built package
+        uses: actions/upload-artifact@v4
+        with:
+          name: backend-dist
+          path: dist
+          retention-days: 5

.github/workflows/pull-requests.yml

@@ -19,7 +19,7 @@ jobs:
     uses: ./.github/workflows/partial-backend.yml
 
   frontend-tests:
-    name: "Frontend and End-to-End Tests"
+    name: "Frontend Tests"
     uses: ./.github/workflows/partial-frontend.yml
 
   container-scanning:

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     uses: ./.github/workflows/partial-backend.yml
 
   frontend-tests:
-    name: "Frontend and End-to-End Tests"
+    name: "Frontend Tests"
     uses: ./.github/workflows/partial-frontend.yml
 
   build-release:

.gitignore

@@ -52,7 +52,7 @@ pnpm-debug.log*
 env/
 build/
 develop-eggs/
-
+/dist/
 downloads/
 eggs/
 .eggs/
@@ -66,6 +66,9 @@ wheels/
 .installed.cfg
 *.egg
 
+# frontend copied into Python module for packaging purposes
+/mealie/frontend/
+
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
         exclude: ^tests/data/
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.8.6
+    rev: v0.9.7
     hooks:
       - id: ruff
       - id: ruff-format

.vscode/settings.json

@@ -60,5 +60,9 @@
   },
   "[vue]": {
     "editor.formatOnSave": false
+  },
+  "[python]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "charliermarsh.ruff"
   }
 }

Taskfile.yml

@@ -41,14 +41,25 @@ tasks:
   setup:ui:
     desc: setup frontend dependencies
     dir: frontend
+    run: once
     cmds:
       - yarn install
+    sources:
+      - package.json
+      - yarn.lock
+    generates:
+      - node_modules/**
 
   setup:py:
     desc: setup python dependencies
+    run: once
     cmds:
       - poetry install --with main,dev,postgres
       - poetry run pre-commit install
+    sources:
+      - poetry.lock
+      - pyproject.toml
+      - .pre-commit-config.yaml
 
   setup:model:
     desc: setup nlp model
@@ -131,6 +142,63 @@ tasks:
       - poetry run coverage html
       - open htmlcov/index.html
 
+  py:package:copy-frontend:
+    desc: copy the frontend files into the Python package
+    internal: true
+    deps:
+      - ui:generate
+    cmds:
+      - rm -rf mealie/frontend
+      - cp -a frontend/dist mealie/frontend
+    sources:
+      - frontend/dist/**
+    generates:
+      - mealie/frontend/**
+
+  py:package:generate-requirements:
+    desc: Generate requirements file to pin all packages, effectively a "pip freeze" before installation begins
+    internal: true
+    cmds:
+      - poetry export -n --only=main --extras=pgsql --output=dist/requirements.txt
+      # Include mealie in the requirements, hashing the package that was just built to ensure it's the one installed
+      - echo "mealie[pgsql]=={{.MEALIE_VERSION}} \\" >> dist/requirements.txt
+      - poetry run pip hash dist/mealie-{{.MEALIE_VERSION}}-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt
+      - echo " \\" >> dist/requirements.txt
+      - poetry run pip hash dist/mealie-{{.MEALIE_VERSION}}.tar.gz | tail -n1 >> dist/requirements.txt
+    vars:
+      MEALIE_VERSION:
+         sh: poetry version --short
+    sources:
+      - poetry.lock
+      - pyproject.toml
+      - dist/mealie-*.whl
+      - dist/mealie-*.tar.gz
+    generates:
+      - dist/requirements.txt
+
+  py:package:deps-parallel:
+    desc: Run py:package dependencies in parallel
+    internal: true
+    deps:
+      - setup:py
+      - py:package:copy-frontend
+
+  py:package:deps:
+    desc: Dependencies of py:package, skippable by setting SKIP_PACKAGE_DEPS=true
+    internal: true
+    cmds:
+      - task: py:package:deps-parallel
+    status:
+      - '{{ .SKIP_PACKAGE_DEPS | default "false"}}'
+
+  py:package:
+    desc: builds Python packages (sdist and wheel) in top-level dist directory
+    deps:
+      - py:package:deps
+    cmds:
+      - poetry build -n --output=dist
+      - task: py:package:generate-requirements
+
   py:
     desc: runs the backend server
     cmds:
@@ -160,6 +228,14 @@ tasks:
     cmds:
       - yarn build
 
+  ui:generate:
+    desc: generates a static version of the frontend in frontend/dist
+    dir: frontend
+    deps:
+      - setup:ui
+    cmds:
+      - yarn generate
+
   ui:lint:
     desc: runs the frontend linter
     dir: frontend
@@ -184,6 +260,16 @@ tasks:
     cmds:
       - yarn run dev
 
+  docker:build-from-package:
+    desc: Builds the Docker image from the existing Python package in dist/
+    deps:
+       - py:package
+    cmds:
+       - docker build --tag mealie:dev --file docker/Dockerfile --build-arg COMMIT={{.GIT_COMMIT}} --build-context packages=dist .
+    vars:
+      GIT_COMMIT:
+        sh: git rev-parse HEAD
+
   docker:prod:
     desc: builds and runs the production docker image locally
     dir: docker

docker/Dockerfile

@@ -1,8 +1,11 @@
-FROM node:16 as builder
+###############################################
+# Frontend Build
+###############################################
+FROM node:16 AS frontend-builder
 
-WORKDIR /app
+WORKDIR /frontend
 
-COPY ./frontend .
+COPY frontend .
 
 RUN yarn install \
     --prefer-offline \
@@ -26,14 +29,10 @@ ENV PYTHONUNBUFFERED=1 \
     PIP_NO_CACHE_DIR=off \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
     PIP_DEFAULT_TIMEOUT=100 \
-    POETRY_HOME="/opt/poetry" \
-    POETRY_VIRTUALENVS_IN_PROJECT=true \
-    POETRY_NO_INTERACTION=1 \
-    PYSETUP_PATH="/opt/pysetup" \
-    VENV_PATH="/opt/pysetup/.venv"
+    VENV_PATH="/opt/mealie"
 
-# prepend poetry and venv to path
-ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
+# prepend venv to path
+ENV PATH="$VENV_PATH/bin:$PATH"
 
 # create user account
 RUN useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc \
@@ -41,31 +40,81 @@ RUN useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc \
     && mkdir $MEALIE_HOME
 
 ###############################################
-# Builder Image
+# Backend Package Build
 ###############################################
-FROM python-base as builder-base
+FROM python-base AS backend-builder
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
     curl \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POETRY_HOME="/opt/poetry" \
+    POETRY_NO_INTERACTION=1
+
+# prepend poetry to path
+ENV PATH="$POETRY_HOME/bin:$PATH"
+
+# install poetry - respects $POETRY_VERSION & $POETRY_HOME
+ENV POETRY_VERSION=2.0.1
+RUN curl -sSL https://install.python-poetry.org | python3 -
+
+# install poetry plugins needed to build the package
+RUN poetry self add "poetry-plugin-export>=1.9"
+
+WORKDIR /mealie
+
+# copy project files here to ensure they will be cached.
+COPY poetry.lock pyproject.toml ./
+COPY mealie ./mealie
+
+# Copy frontend to package it into the wheel
+COPY --from=frontend-builder /frontend/dist ./mealie/frontend
+
+# Build the source and binary package
+RUN poetry build --output=dist
+
+# Create the requirements file, which is used to install the built package and
+# its pinned dependencies later. mealie is included to ensure the built one is
+# what's installed.
+RUN export MEALIE_VERSION=$(poetry version --short) \
+    && poetry export --only=main --extras=pgsql --output=dist/requirements.txt \
+    && echo "mealie[pgsql]==$MEALIE_VERSION \\" >> dist/requirements.txt \
+    && poetry run pip hash dist/mealie-$MEALIE_VERSION-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt \
+    && echo " \\" >> dist/requirements.txt \
+    && poetry run pip hash dist/mealie-$MEALIE_VERSION.tar.gz | tail -n1 >> dist/requirements.txt
+
+###############################################
+# Package Container
+# Only role is to hold the packages, or be overriden by a --build-context flag.
+###############################################
+FROM scratch AS packages
+COPY --from=backend-builder /mealie/dist /
+
+###############################################
+# Python Virtual Environment Build
+###############################################
+# Install packages required to build the venv, in parallel to building the wheel
+FROM python-base AS venv-builder-base
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
     build-essential \
     libpq-dev \
     libwebp-dev \
     # LDAP Dependencies
     libsasl2-dev libldap2-dev libssl-dev \
     gnupg gnupg2 gnupg1 \
-    && rm -rf /var/lib/apt/lists/* \
-    && pip install -U --no-cache-dir pip
+    && rm -rf /var/lib/apt/lists/*
+RUN python3 -m venv --upgrade-deps $VENV_PATH
 
-# install poetry - respects $POETRY_VERSION & $POETRY_HOME
-ENV POETRY_VERSION=1.3.1
-RUN curl -sSL https://install.python-poetry.org | python3 -
+# Install the wheel and all dependencies into the venv
+FROM venv-builder-base AS venv-builder
 
-# copy project requirement files here to ensure they will be cached.
-WORKDIR $PYSETUP_PATH
-COPY ./poetry.lock ./pyproject.toml ./
+# Copy built package (wheel) and its dependency requirements
+COPY --from=packages * /dist/
 
-# install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
-RUN poetry install -E pgsql --only main
+# Install the wheel with exact versions of dependencies into the venv
+RUN . $VENV_PATH/bin/activate \
+    && pip install --require-hashes -r /dist/requirements.txt --find-links /dist
 
 ###############################################
 # CRFPP Image
@@ -96,39 +145,25 @@ RUN apt-get update \
 # create directory used for Docker Secrets
 RUN mkdir -p /run/secrets
 
-# copying poetry and venv into image
-COPY --from=builder-base $POETRY_HOME $POETRY_HOME
-COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
-
+# copy CRF++ and add it to the library path
 ENV LD_LIBRARY_PATH=/usr/local/lib
 COPY --from=crfpp /usr/local/lib/ /usr/local/lib
 COPY --from=crfpp /usr/local/bin/crf_learn /usr/local/bin/crf_learn
 COPY --from=crfpp /usr/local/bin/crf_test /usr/local/bin/crf_test
 
-# copy backend
-COPY ./mealie $MEALIE_HOME/mealie
-COPY ./poetry.lock ./pyproject.toml $MEALIE_HOME/
+# Copy venv into image. It contains a fully-installed mealie backend and frontend.
+COPY --from=venv-builder $VENV_PATH $VENV_PATH
 
-# venv already has runtime deps installed we get a quicker install
-WORKDIR $MEALIE_HOME
-RUN . $VENV_PATH/bin/activate && poetry install -E pgsql --only main
-WORKDIR /
 
 # Grab CRF++ Model Release
-RUN python $MEALIE_HOME/mealie/scripts/install_model.py
+RUN python -m mealie.scripts.install_model
 
 VOLUME [ "$MEALIE_HOME/data/" ]
 ENV APP_PORT=9000
 
 EXPOSE ${APP_PORT}
 
-HEALTHCHECK CMD python $MEALIE_HOME/mealie/scripts/healthcheck.py || exit 1
-
-# ----------------------------------
-# Copy Frontend
-
-ENV STATIC_FILES=/spa/static
-COPY --from=builder /app/dist  ${STATIC_FILES}
+HEALTHCHECK CMD python -m mealie.scripts.healthcheck || exit 1
 
 ENV HOST 0.0.0.0
 

docker/entry.sh

@@ -32,13 +32,51 @@ init() {
     cd /app
 
     # Activate our virtual environment here
-    . /opt/pysetup/.venv/bin/activate
+    . /opt/mealie/bin/activate
+}
+
+load_secrets() {
+    # Each of these environment variables will support a `_FILE` suffix that allows
+    # for setting the environment variable through the Docker Compose secret
+    # pattern.
+    local -a secret_supported_vars=(
+        "POSTGRES_USER"
+        "POSTGRES_PASSWORD"
+        "POSTGRES_SERVER"
+        "POSTGRES_PORT"
+        "POSTGRES_DB"
+        "POSTGRES_URL_OVERRIDE"
+
+        "SMTP_HOST"
+        "SMTP_PORT"
+        "SMTP_USER"
+        "SMTP_PASSWORD"
+
+        "LDAP_SERVER_URL"
+        "LDAP_QUERY_PASSWORD"
+
+        "OIDC_CONFIGURATION_URL"
+        "OIDC_CLIENT_ID"
+        "OIDC_CLIENT_SECRET"
+
+        "OPENAI_BASE_URL"
+        "OPENAI_API_KEY"
+    )
+
+    # If any secrets are set, prefer them over base environment variables.
+    for var in "${secret_supported_vars[@]}"; do
+        file_var="${var}_FILE"
+        if [ -n "${!file_var}" ]; then
+            export "$var=$(<"${!file_var}")"
+        fi
+    done
 }
 
 change_user
 init
+load_secrets
 
 # Start API
 HOST_IP=`/sbin/ip route|awk '/default/ { print $3 }'`
 
-exec python /app/mealie/main.py
+exec mealie

docs/docs/contributors/developers-guide/building-packages.md

@@ -0,0 +1,40 @@
+# Building Packages
+
+Released packages are [built and published via GitHub actions](maintainers.md#drafting-releases).
+
+## Python packages
+
+To build Python packages locally for testing, use [`task`](starting-dev-server.md#without-dev-containers). After installing `task`, run `task py:package` to perform all the steps needed to build the package and a requirements file. To do it manually, run:
+```sh
+pushd frontend
+yarnpkg install
+yarnpkg generate
+popd
+rm -r mealie/frontend
+cp -a frontend/dist mealie/frontend
+poetry build
+poetry export -n --only=main --extras=pgsql --output=dist/requirements.txt
+MEALIE_VERSION=$(poetry version --short)
+echo "mealie[pgsql]==${MEALIE_VERSION} \\" >> dist/requirements.txt
+poetry run pip hash dist/mealie-${MEALIE_VERSION}-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt
+echo " \\" >> dist/requirements.txt
+poetry run pip hash dist/mealie-${MEALIE_VERSION}.tar.gz | tail -n1 >> dist/requirements.txt
+```
+
+The Python package can be installed with all of its dependencies pinned to the versions tested by the developers with:
+```sh
+pip3 install -r dist/requirements.txt --find-links dist
+```
+
+To install with the latest but still compatible dependency versions, instead run `pip3 install dist/mealie-$VERSION-py3-none-any.whl` (where `$VERSION` is the version of mealie to install).
+
+## Docker image
+One way to build the Docker image is to run the following command in the project root directory:
+```sh
+docker build --tag mealie:dev --file docker/Dockerfile --build-arg COMMIT=$(git rev-parse HEAD) .
+```
+
+The Docker image can be built from the pre-built Python packages with the task command `task docker:build-from-package`. This is equivalent to:
+```sh
+docker build --tag mealie:dev --file docker/Dockerfile --build-arg COMMIT=$(git rev-parse HEAD) --build-context packages=dist .
+```

docs/docs/documentation/community-guide/bring-api.md

@@ -0,0 +1,8 @@
+!!! info
+This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+
+Mealie supports adding the ingredients of a recipe to your [Bring](https://www.getbring.com/) shopping list, as you can
+see [here](https://docs.mealie.io/documentation/getting-started/features/#recipe-actions).
+However, for this to work, your Mealie instance needs to be exposed to the open Internet so that the Bring servers can access its information. If you don't want your server to be publicly accessible for security reasons, you can use the [Mealie-Bring-API](https://github.com/felixschndr/mealie-bring-api) written by a community member. This integration is entirely local and does not require any service to be exposed to the Internet.
+
+This is a small web server that runs locally next to your Mealie instance, and instead of Bring pulling the data from you, it pushes the data to Bring. [Check out the project](https://github.com/felixschndr/mealie-bring-api) for more information and installation instructions.

docs/docs/documentation/getting-started/authentication/oidc-v2.md

@@ -10,7 +10,7 @@
 Mealie supports 3rd party authentication via [OpenID Connect (OIDC)](https://openid.net/connect/), an identity layer built on top of OAuth2. OIDC is supported by many Identity Providers (IdP), including:
 
 - [Authentik](https://goauthentik.io/integrations/sources/oauth/#openid-connect)
-- [Authelia](https://www.authelia.com/configuration/identity-providers/open-id-connect/)
+- [Authelia](https://www.authelia.com/integration/openid-connect/mealie/)
 - [Keycloak](https://www.keycloak.org/docs/latest/securing_apps/#_oidc)
 - [Okta](https://www.okta.com/openid-connect/)
 

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

@@ -1,164 +1,308 @@
+
 # Frequently Asked Questions
 
-## How do I enable "smart" ingredient handling?
+## Features and Functionality
 
-You might have noticed that scaling up a recipe or making a shopping list doesn't by default handle the ingredients in a way you might expect. Depending on your settings, scaling up might yield things like `2 1 cup broth` instead of `2 cup broth`. And, making shopping lists from recipes that have shared ingredients can yield multiple lines of the same ingredient. **But**, Mealie has a mechanism to intelligently handle ingredients and make your day better. How?
-### Set up your Foods and Units
-Do the following just **once**. Doing this applies to your whole group, so be careful.
+??? question "How do I enable 'smart' ingredient handling?"
 
-1. Click on your name in the upper left corner to get to your settings
-2. In the bottom right, select `Manage Data`
-3. In the Management page, make sure that a little orange button says `Foods`
-4. If your Foods database is empty, click `Seed` and choose your language. You should end up with a list of foods. (Wait a bit for seeding to happen, and try not to seed more than once or you will have duplicates)
-5. Click the little orange `Foods` button and now choose `Units`.
-6. Click `Seed` and choose your language. You should end up with a list of units (e.g. `tablespoon`)
+    ### How do I enable "smart" ingredient handling?
 
-Initial seeding of Units is pretty complete, but there are many Foods in the world. You'll probably find that you need to add Foods to the database during parsing for the first several recipes. Once you have a well-populated Food database, there are API routes to parse ingredients automatically in bulk. But this is not a good idea without a very complete set of Foods.
+    You might have noticed that scaling up a recipe or making a shopping list doesn't by default handle the ingredients in a way you might expect. Depending on your settings, scaling up might yield things like `2 1 cup broth` instead of `2 cup broth`. And, making shopping lists from recipes that have shared ingredients can yield multiple lines of the same ingredient. **But**, Mealie has a mechanism to intelligently handle ingredients and make your day better. How?
 
-### Set up Recipes to use Foods and Units
-Do the following for each recipe you want to intelligently handle ingredients.
+    <p style="font-size: 0.75rem; font-weight: 500;">Set up your Foods and Units</p>
+    Do the following just **once**. Doing this applies to your whole group, so be careful.
 
-1. Go to a recipe
-2. Click the Edit button/icon
-3. Click the Recipe Settings gear and deselect `Disable Ingredient Amounts`
-4. Save
-5. The ingredients should now look a little weird (`1 1 cup broth` and so on)
-6. Click the Edit button/icon again
-7. Scroll to the ingredients and you should see new fields for Amount, Unit, Food, and Note. The Note in particular will contain the original text of the Recipe.
-8. Click `Parse` and you will be taken to the ingredient parsing page.
-9. Choose your parser. The `Natural Language Parser` works very well, but you can also use the `Brute Parser`, or the `OpenAI Parser` if you've [enabled OpenAI support](./installation/backend-config.md#openai).
-10. Click `Parse All`, and your ingredients should be separated out into Units and Foods based on your seeding in Step 1 above.
-11. For ingredients where the Unit or Food was not found, you can click a button to accept an automatically suggested Food to add to the database. Or, manually enter the Unit/Food and hit `Enter` (or click `Create`) to add it to the database
-12. When done, click `Save All` and you will be taken back to the recipe. Now the Unit and Food fields of the recipe should be filled out.
+    1. Click on your name in the upper left corner to get to your settings
+    2. In the bottom right, select `Manage Data`
+    3. In the Management page, make sure that a little orange button says `Foods`
+    4. If your Foods database is empty, click `Seed` and choose your language. You should end up with a list of foods. (Wait a bit for seeding to happen, and try not to seed more than once or you will have duplicates)
+    5. Click the little orange `Foods` button and now choose `Units`.
+    6. Click `Seed` and choose your language. You should end up with a list of units (e.g. `tablespoon`)
 
-Scaling up this recipe or adding it to a Shopping List will now smartly take care of ingredient amounts and duplicate combinations.
+    Initial seeding of Units is pretty complete, but there are many Foods in the world. You'll probably find that you need to add Foods to the database during parsing for the first several recipes. Once you have a well-populated Food database, there are API routes to parse ingredients automatically in bulk. But this is not a good idea without a very complete set of Foods.
 
-## Is it safe to upgrade Mealie?
+    <p style="font-size: 0.75rem; font-weight: 500;">Set up Recipes to use Foods and Units</p>
 
-Yes. If you are using the v1 branches (including beta), you can upgrade to the latest version of Mealie without performing a site Export/Restore. This process was required in previous versions of Mealie, however we've automated the database migration process to make it easier to upgrade. Note that if you were using the v0.5.x version, you CANNOT upgrade to the latest version automatically. You must follow the migration instructions in the documentation.
+    Do the following for each recipe you want to intelligently handle ingredients.
 
-- [Migration From v0.5.x](./migrating-to-mealie-v1.md)
+    1. Go to a recipe
+    2. Click the Edit button/icon
+    3. Click the Recipe Settings gear and deselect `Disable Ingredient Amounts`
+    4. Save
+    5. The ingredients should now look a little weird (`1 1 cup broth` and so on)
+    6. Click the Edit button/icon again
+    7. Scroll to the ingredients and you should see new fields for Amount, Unit, Food, and Note. The Note in particular will contain the original text of the Recipe.
+    8. Click `Parse` and you will be taken to the ingredient parsing page.
+    9. Choose your parser. The `Natural Language Parser` works very well, but you can also use the `Brute Parser`, or the `OpenAI Parser` if you've [enabled OpenAI support](./installation/backend-config.md#openai).
+    10. Click `Parse All`, and your ingredients should be separated out into Units and Foods based on your seeding in Step 1 above.
+    11. For ingredients where the Unit or Food was not found, you can click a button to accept an automatically suggested Food to add to the database. Or, manually enter the Unit/Food and hit `Enter` (or click `Create`) to add it to the database
+    12. When done, click `Save All` and you will be taken back to the recipe. Now the Unit and Food fields of the recipe should be filled out.
 
-## How can I change the theme?
-
-You can change the theme by settings the environment variables.
-
-- [Backend Config - Themeing](./installation/backend-config.md#themeing)
-
-## How can I change the login session timeout?
-
-Login session can be configured by setting the `TOKEN_TIME` variable on the backend container.
-
-- [Backend Config](./installation/backend-config.md)
-
-## Can I serve Mealie on a subpath?
-
-No. Due to limitations from the JavaScript Framework, Mealie doesn't support serving Mealie on a subpath.
-
-## Can I install Mealie without docker?
-
-Yes, you can install Mealie on your local machine. HOWEVER, it is recommended that you don't. Managing non-system versions of python, node, and npm is a pain. Moreover, updating and upgrading your system with this configuration is unsupported and will likely require manual interventions.
-
-## What is fuzzy search and how do I use it?
-Mealie can use fuzzy search, which is robust to minor typos. For example, searching for "brocolli" will still find your recipe for "broccoli soup". But fuzzy search is only functional on a Postgres database backend. To enable fuzzy search you will need to migrate to Postgres:
-
-1. Backup your database and download the .zip file (same as when [migrating](./migrating-to-mealie-v1.md))
-2. Set up a [Postgres](./installation/postgres.md) instance of Mealie
-3. Upload the backup .zip and click to apply it (as as migration)
-
-## How can I attach an image or video to a Recipe?
-
-Mealie's Recipe Steps and other fields support markdown syntax and therefore support images and videos. To attach an image to the recipe, you can upload it as an asset and use the provided copy button to generate the html image tag required to render the image. For videos, Mealie provides no way to host videos. You'll need to host your videos with another provider and embed them in your recipe. Generally, the video provider will provide a link to the video and the html tag required to render the video. For example, YouTube provides the following link that works inside a step. You can adjust the width and height attributes as necessary to ensure a fit.
-
-```html
-<iframe width="560" height="315" src="https://www.youtube.com/embed/nAUwKeO93bY" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-```
-
-## How can I unlock my account?
-
-If your account has been locked by bad password attempts, you can use an administrator account to unlock another account. Alternatively, you can unlock all accounts via a script within the container.
-
-```shell
-docker exec -it mealie bash
-
-python /app/mealie/scripts/reset_locked_users.py
-```
-
-## How can I change my password?
-
-You can change your password by going to the user profile page and clicking the "Change Password" button. Alternatively you can use the following script to change your password via the CLI if you are locked out of your account.
-
-```shell
-docker exec -it mealie bash
-
-python /app/mealie/scripts/change_password.py
-```
-
-## I can't log in with external auth. How can I change my authentication method?
-
-Follow the [steps above](#how-can-i-change-my-password) for changing your password. You will be prompted if you would like to switch your authentication method back to local auth so you can log in again.
-
-## How do private groups, households, and recipes work?
-
-Managing private groups and recipes can be confusing. The following diagram and notes should help explain how they work to determine if a recipe can be shared publicly.
-
-- Private links that are generated from the recipe page using the `Share` button bypass all group and recipe permissions
-- Private groups block all access to recipes, including those that are public, except as noted above.
-- Private households, similar to private groups, block all access to recipes, except as noted above.
-- Households with "Allow users outside of your group to see your recipes" disabled block all access to recipes, except as noted above.
-- Private recipes block all access to the recipe from public links. This does not affect Private Links.
-
-```mermaid
-stateDiagram-v2
-  r1: Request Access
-  p1: Using Private Link?
-  p2: Is Group Private?
-  p3: Is Household Private?
-  p4: Is Recipe Private?
-  s1: Deny Access
-  n1: Allow Access
+    Scaling up this recipe or adding it to a Shopping List will now smartly take care of ingredient amounts and duplicate combinations.
 
 
-  r1 --> p1
-  p1 --> p2: No
-  p1 --> n1: Yes
+??? question "How do I enable Nutritional Values?"
 
-  p2 --> s1: Yes
-  p2 --> p3: No
+    ### How do I enable Nutritional Values?
 
-  p3 --> s1: Yes
-  p3 --> p4: No
+    Mealie can store Nutritional Information for Recipes. Please note that the values you enter are static for the recipe and no scaling is being done when changing Servings / Yield.
 
-  p4 --> s1: Yes
-  p4 --> n1: No
-```
+    Do the following to enable Nutritional Values on individual Recipes, or to modify your Household Recipe Preferences
 
-For more information on public access, check out the [Permissions and Public Access guide](./usage/permissions-and-public-access.md). For more information on groups vs. households, check out the [Groups and Households](./features.md#groups-and-households) section in the Features guide.
+    **Show Nutritional Values on a Single Recipe**
 
-## Can I use fail2ban with Mealie?
-Yes, Mealie is configured to properly forward external IP addresses into the `mealie.log` logfile. Note that due to restrictions in docker, IP address forwarding only works on Linux.
+    1. Go to a recipe
+    2. Click the Edit button/icon
+    3. Click the Recipe Settings gear and select `Show Nutritional Values`
+    4. Scroll down to manually fill out the Nutritional Values
+    5. Save
 
-Your fail2ban usage should look like the following:
-```
-Use      datepattern : %d-%b-%y %H:%M:%S : Day-MON-Year2 24hour:Minute:Second
-Use   failregex line : ^ERROR:\s+Incorrect username or password from <HOST>
-```
+    **Show Nutritional Values by default**
 
-## Why an API?
-An API allows integration into applications like [Home Assistant](https://www.home-assistant.io/) that can act as notification engines to provide custom notifications based on Meal Plan data to remind you to defrost the chicken, marinate the steak, or start the CrockPot. Additionally, you can access nearly any backend service via the API giving you total control to extend the application. To explore the API spin up your server and navigate to http://yourserver.com/docs for interactive API documentation.
+    1. Click your username in the top left
+    2. Click the 'Household Settings' button
+    3. Under 'Household Recipe Preferences', click to select 'Show nutrition information'
+    4. Click 'Update'
 
-## Why a database?
-Some users of static-site generator applications like ChowDown have expressed concerns about their data being stuck in a database. Considering this is a new project, it is a valid concern to be worried about your data. Mealie specifically addresses this concern by providing automatic daily backups that export your data in json, plain-text markdown files, and/or custom Jinja2 templates. **This puts you in control of how your data is represented** when exported from Mealie, which means you can easily migrate to any other service provided Mealie doesn't work for you.
 
-As to why we need a database?
+??? question "Why Link Ingredients to a Recipe Step?"
 
-- **Developer Experience:** Without a database, a lot of the work to maintain your data is taken on by the developer instead of a battle-tested platform for storing data.
-- **Multi User Support:** With a solid database as backend storage for your data, Mealie can better support multi-user sites and avoid read/write access errors when multiple actions are taken at the same time.
+    ### Why Link Ingredients to a Recipe Step?
 
-## Why is there no "Keep Screen Alive" button when I access a recipe?
-You've perhaps visited the Mealie Demo and noticed that it had a "Keep Screen Alive" button, but it doesn't show up in your own Mealie instance.
-There are typically two possible reasons for this:
-1. You're accessing your Mealie instance without using HTTPS. The Wake Lock API is only available if HTTPS is used. Read more here: https://developer.mozilla.org/en-US/docs/Web/API/Screen_Wake_Lock_API
-2. You're accessing your Mealie instance on a browser which doesn't support the API. You can test this here: https://vueuse.org/core/useWakeLock/#demo
+    Mealie allows you to link ingredients to specific steps in a recipe, ensuring you know exactly when to add each ingredient during the cooking process.
 
-Solving the above points will most likely resolve your issues. However, if you're still having problems, you are welcome to create an issue. Just remember to add that you've tried the above two options first in your description.
+    **Link Ingredients to Steps in a Recipe**
+    
+    1. Go to a recipe
+    2. Click the Edit button/icon
+    3. Scroll down to the step you want to link ingredients to
+    4. Click the ellipsis button next to the step and click 'Link Ingredients'
+    5. Check off the Ingredient(s) that you want to link to that step
+    6. Optionally, click 'Next step' to continue linking remaining ingredients to steps, or click 'Save' to Finish
+    7. Click 'Save' on the Recipe
+
+    You can optionally link the same ingredient to multiple steps, which is useful for prepping an ingredient in one step and using it in another.
+    
+??? question "What is fuzzy search and how do I use it?"
+
+    ### What is fuzzy search and how do I use it?
+
+    Mealie can use fuzzy search, which is robust to minor typos. For example, searching for "brocolli" will still find your recipe for "broccoli soup". But fuzzy search is only functional on a Postgres database backend. To enable fuzzy search you will need to migrate to Postgres:
+
+    1. Backup your database and download the .zip file (same as when [migrating](./migrating-to-mealie-v1.md))
+    2. Set up a [Postgres](./installation/postgres.md) instance of Mealie
+    3. Upload the backup .zip and click to apply it (as as migration)
+
+??? question "How can I attach an image or video to a Recipe?"
+
+    ### How can I attach an image or video to a Recipe?
+
+    Mealie's Recipe Steps and other fields support markdown syntax and therefore support images and videos. To attach an image to the recipe, you can upload it as an asset and use the provided copy button to generate the html image tag required to render the image. For videos, Mealie provides no way to host videos. You'll need to host your videos with another provider and embed them in your recipe. Generally, the video provider will provide a link to the video and the html tag required to render the video. For example, YouTube provides the following link that works inside a step. You can adjust the width and height attributes as necessary to ensure a fit.
+
+    ```html
+    <iframe width="560" height="315" src="https://www.youtube.com/embed/nAUwKeO93bY" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+    ```
+
+## Customization and Configuration
+
+??? question "How can I change the theme?"
+
+    ### How can I change the theme?
+
+    You can change the theme by settings the environment variables.
+
+    - [Backend Config - Themeing](./installation/backend-config.md#themeing)
+
+
+??? question "How can I change the login session timeout?"
+
+    ### How can I change the login session timeout?
+
+    Login session can be configured by setting the `TOKEN_TIME` variable on the backend container.
+
+    - [Backend Config](./installation/backend-config.md)
+
+
+??? question "Can I serve Mealie on a subpath?"
+
+    ### Can I serve Mealie on a subpath?
+
+    No. Due to limitations from the JavaScript Framework, Mealie doesn't support serving Mealie on a subpath.
+
+
+??? question "Can I install Mealie without docker?"
+
+    ### Can I install Mealie without docker?
+
+    Yes, you can install Mealie on your local machine. HOWEVER, it is recommended that you don't. Managing non-system versions of python, node, and npm is a pain. Moreover, updating and upgrading your system with this configuration is unsupported and will likely require manual interventions.
+
+
+## Account Management
+
+??? question "How can I unlock my account?"
+
+    ### How can I unlock my account?
+
+    If your account has been locked by bad password attempts, you can use an administrator account to unlock another account. Alternatively, you can unlock all accounts via a script within the container.
+
+    ```shell
+    docker exec -it mealie bash
+
+    python /app/mealie/scripts/reset_locked_users.py
+    ```
+
+
+??? question "How can I reset admin privileges for my account?"
+
+    ### How can I reset admin privileges for my account?
+
+    If you've lost admin privileges and no other admin can restore them, you can use the Command Line Interface (CLI) to grant admin access.
+
+    ```shell
+    docker exec -it mealie bash
+
+    python /app/mealie/scripts/make_admin.py
+    ```
+
+
+??? question "How can I change my password?"
+
+    ### How can I change my password?
+
+    You can change your password by going to the user profile page and clicking the "Change Password" button. Alternatively you can use the following script to change your password via the CLI if you are locked out of your account.
+
+    ```shell
+    docker exec -it mealie bash
+
+    python /app/mealie/scripts/change_password.py
+    ```
+
+
+??? question "I can't log in with external auth. How can I change my authentication method?"
+
+    ### I can't log in with external auth. How can I change my authentication method?
+
+    Follow the [steps above](#how-can-i-change-my-password) for changing your password. You will be prompted if you would like to switch your authentication method back to local auth so you can log in again.
+
+
+## Collaboration and Privacy
+
+??? question "How do private groups, households, and recipes work?"
+
+    ### How do private groups, households, and recipes work?
+
+    Managing private groups and recipes can be confusing. The following diagram and notes should help explain how they work to determine if a recipe can be shared publicly.
+
+    - Private links that are generated from the recipe page using the `Share` button bypass all group and recipe permissions
+    - Private groups block all access to recipes, including those that are public, except as noted above.
+    - Private households, similar to private groups, block all access to recipes, except as noted above.
+    - Households with "Allow users outside of your group to see your recipes" disabled block all access to recipes, except as noted above.
+    - Private recipes block all access to the recipe from public links. This does not affect Private Links.
+
+    ```mermaid
+    stateDiagram-v2
+      r1: Request Access
+      p1: Using Private Link?
+      p2: Is Group Private?
+      p3: Is Household Private?
+      p4: Is Recipe Private?
+      s1: Deny Access
+      n1: Allow Access
+
+
+      r1 --> p1
+      p1 --> p2: No
+      p1 --> n1: Yes
+
+      p2 --> s1: Yes
+      p2 --> p3: No
+
+      p3 --> s1: Yes
+      p3 --> p4: No
+
+      p4 --> s1: Yes
+      p4 --> n1: No
+    ```
+
+    For more information on public access, check out the [Permissions and Public Access guide](./usage/permissions-and-public-access.md). For more information on groups vs. households, check out the [Groups and Households](./features.md#groups-and-households) section in the Features guide.
+
+
+## Security and Maintenance
+
+??? question "How can I use Mealie externally?"
+
+    ### How can I use Mealie externally
+
+    Exposing Mealie or any service to the internet can pose significant security risks. Before proceeding, carefully evaluate the potential impacts on your system. Due to the unique nature of each network, we cannot provide specific steps for your setup. 
+
+    There is a community guide available for one way to potentially set this up, and you could reach out on Discord for further discussion on what may be best for your network.
+
+
+??? question "Can I use fail2ban with Mealie?"
+
+    ### Can I use fail2ban with Mealie?
+
+    Yes, Mealie is configured to properly forward external IP addresses into the `mealie.log` logfile. Note that due to restrictions in docker, IP address forwarding only works on Linux.
+
+    Your fail2ban usage should look like the following:
+    ```
+    Use      datepattern : %d-%b-%y %H:%M:%S : Day-MON-Year2 24hour:Minute:Second
+    Use   failregex line : ^ERROR:\s+Incorrect username or password from <HOST>
+    ```
+
+
+??? question "Is it safe to upgrade Mealie?"
+
+    ### Is it safe to upgrade Mealie?
+
+    Yes. If you are using the v1 branches (including beta), you can upgrade to the latest version of Mealie without performing a site Export/Restore. This process was required in previous versions of Mealie, however we've automated the database migration process to make it easier to upgrade. Note that if you were using the v0.5.x version, you CANNOT upgrade to the latest version automatically. You must follow the migration instructions in the documentation.
+
+    - [Migration From v0.5.x](./migrating-to-mealie-v1.md)
+
+
+## Technical Considerations
+
+
+??? question "Why setup Email?"
+
+    ### Why setup Email?
+
+    Mealie uses email to send account invites and password resets. If you don't use these features, you don't need to set up email. There are also other methods to perform these actions that do not require the setup of Email. 
+
+    Email settings can be adjusted via environment variables on the backend container:
+
+    - [Backend Config](./installation/backend-config.md)
+
+    Note that many email providers (e.g., Gmail, Outlook) are disabling SMTP Auth and requiring Modern Auth, which Mealie currently does not support. You may need to use an SMTP relay or third-party SMTP provider, such as SMTP2GO.
+
+??? question "Why an API?"
+
+    ### Why an API?
+
+    An API allows integration into applications like [Home Assistant](https://www.home-assistant.io/) that can act as notification engines to provide custom notifications based on Meal Plan data to remind you to defrost the chicken, marinate the steak, or start the CrockPot. Additionally, you can access nearly any backend service via the API giving you total control to extend the application. To explore the API spin up your server and navigate to http://yourserver.com/docs for interactive API documentation.
+
+
+??? question "Why a database?"
+
+    ### Why a database?
+
+    Some users of static-site generator applications like ChowDown have expressed concerns about their data being stuck in a database. Considering this is a new project, it is a valid concern to be worried about your data. Mealie specifically addresses this concern by providing automatic daily backups that export your data in json, plain-text markdown files, and/or custom Jinja2 templates. **This puts you in control of how your data is represented** when exported from Mealie, which means you can easily migrate to any other service provided Mealie doesn't work for you.
+
+    As to why we need a database?
+
+    - **Developer Experience:** Without a database, a lot of the work to maintain your data is taken on by the developer instead of a battle-tested platform for storing data.
+    - **Multi User Support:** With a solid database as backend storage for your data, Mealie can better support multi-user sites and avoid read/write access errors when multiple actions are taken at the same time.
+
+
+## Usability
+
+??? question "Why is there no 'Keep Screen Alive' button when I access a recipe?"
+
+    ### Why is there no "Keep Screen Alive" button when I access a recipe?
+
+    You've perhaps visited the Mealie Demo and noticed that it had a "Keep Screen Alive" button, but it doesn't show up in your own Mealie instance.
+    There are typically two possible reasons for this:
+    1. You're accessing your Mealie instance without using HTTPS. The Wake Lock API is only available if HTTPS is used. Read more here: https://developer.mozilla.org/en-US/docs/Web/API/Screen_Wake_Lock_API
+    2. You're accessing your Mealie instance on a browser which doesn't support the API. You can test this here: https://vueuse.org/core/useWakeLock/#demo
+
+    Solving the above points will most likely resolve your issues. However, if you're still having problems, you are welcome to create an issue. Just remember to add that you've tried the above two options first in your description.

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

@@ -35,7 +35,7 @@ Mealie has a robust and flexible recipe organization system with a few different
 
 #### Categories
 
-Categories are the overarching organizer for recipes. You can assign as many categories as you'd like to a recipe, but we recommend that you try to limit the categories you assign to a recipe to one or two. This helps keep categories as focused as possible while still allowing you to find recipes that are related to each other. For example, you might assign a recipe to the category **Breakfast**, **Lunch**, **Dinner**, or **Side**.
+Categories are the overarching organizer for recipes. You can assign as many categories as you'd like to a recipe, but we recommend that you try to limit the categories you assign to a recipe to one or two. This helps keep categories as focused as possible while still allowing you to find recipes that are related to each other. For example, you might assign a recipe to the category **Breakfast**, **Lunch**, **Dinner**, **Side**, or **Drinks**.
 
 [Categories Demo](https://demo.mealie.io/g/home/recipes/categories){ .md-button .md-button--primary }
 
@@ -84,7 +84,30 @@ The meal planner has the concept of plan rules. These offer a flexible way to us
 
 The shopping lists feature is a great way to keep track of what you need to buy for your next meal. You can add items directly to the shopping list or link a recipe and all of it's ingredients to track meals during the week.
 
+Managing shopping lists can be done from the Sidebar > Shopping Lists. 
 
+Here you will be able to:
+- See items already on the Shopping List
+- See linked recipes with ingredients
+    - Toggling via the 'Pot' icon will show you the linked recipe, allowing you to click to access it. 
+- Check off an item
+- Add / Change / Remove / Sort Items via the grid icon
+    - Be sure if you are modifying an ingredient to click the 'Save' icon.
+- Add / Change / Remove / Sort Labels
+    - 'No Label' will always be on the top, others can be Reordered via the 'Reorder Labels' button
+
+!!! tip
+    If you accidentally checked off an item, you can uncheck it by expanding 'items checked' and unchecking it. This will add it back to the Shopping List.
+
+!!! tip
+    You can use Labels to categorize your ingredients. You may want to Label by Food Type (Frozen, Fresh, etc), by Store, Tool, Recipe, or more. Play around with this to see what works best for you.
+    
+!!! tip
+    You can toggle 'Food' on items so that if you add multiple of the same food / ingredient, Mealie will automatically combine them together. Do this by editing an item in the Shopping List and clicking the 'Apple' icon. If you then have recipes that contain "1 | cup | cheese" and "2 | cup | cheese" this would be combined to show "3 cups of cheese."
+
+[See FAQ for more information](../getting-started/faq.md)
+
+    
 [Shopping List Demo](https://demo.mealie.io/shopping-lists){ .md-button .md-button--primary }
 
 ## Integrations
@@ -94,9 +117,9 @@ Mealie is designed to integrate with many different external services. There are
 ### Notifiers
 
 Notifiers are event-driven notifications sent when specific actions are performed within Mealie. Some actions include:
-- creating a recipe
-- adding items to a shopping list
-- creating a new mealplan
+- Creating / Updating a recipe
+- Adding items to a shopping list
+- Creating a new mealplan
 
 Notifiers use the [Apprise library](https://github.com/caronc/apprise/wiki), which integrates with a large number of notification services. In addition, certain custom notifiers send basic event data to the consumer (e.g. the `id` of the resource). These include:
 
@@ -139,6 +162,9 @@ Below is a list of all valid merge fields:
 - ${id}
 - ${slug}
 - ${url}
+- ${servings}
+- ${yieldQuantity}
+- ${yieldText}
 
 To add, modify, or delete Recipe Actions, visit the Data Management page (more on that below).
 

docs/docs/documentation/getting-started/installation/backend-config.md

@@ -31,27 +31,27 @@
 
 ### Database
 
-| Variables             | Default  | Description                                                             |
-| --------------------- | :------: | ----------------------------------------------------------------------- |
-| DB_ENGINE             |  sqlite  | Optional: 'sqlite', 'postgres'                                          |
-| POSTGRES_USER         |  mealie  | Postgres database user                                                  |
-| POSTGRES_PASSWORD     |  mealie  | Postgres database password                                              |
-| POSTGRES_SERVER       | postgres | Postgres database server address                                        |
-| POSTGRES_PORT         |   5432   | Postgres database port                                                  |
-| POSTGRES_DB           |  mealie  | Postgres database name                                                  |
-| POSTGRES_URL_OVERRIDE |   None   | Optional Postgres URL override to use instead of POSTGRES\_\* variables |
+ | Variables                                               | Default  | Description                                                             |
+ | ------------------------------------------------------- | :------: | ----------------------------------------------------------------------- |
+ | DB_ENGINE                                               |  sqlite  | Optional: 'sqlite', 'postgres'                                          |
+ | POSTGRES_USER<super>[&dagger;][secrets]</super>         |  mealie  | Postgres database user                                                  |
+ | POSTGRES_PASSWORD<super>[&dagger;][secrets]</super>     |  mealie  | Postgres database password                                              |
+ | POSTGRES_SERVER<super>[&dagger;][secrets]</super>       | postgres | Postgres database server address                                        |
+ | POSTGRES_PORT<super>[&dagger;][secrets]</super>         |   5432   | Postgres database port                                                  |
+ | POSTGRES_DB<super>[&dagger;][secrets]</super>           |  mealie  | Postgres database name                                                  |
+ | POSTGRES_URL_OVERRIDE<super>[&dagger;][secrets]</super> |   None   | Optional Postgres URL override to use instead of POSTGRES\_\* variables |
 
 ### Email
 
-| Variables          | Default | Description                                       |
-| ------------------ | :-----: | ------------------------------------------------- |
-| SMTP_HOST          |  None   | Required For email                                |
-| SMTP_PORT          |   587   | Required For email                                |
-| SMTP_FROM_NAME     | Mealie  | Required For email                                |
-| SMTP_AUTH_STRATEGY |   TLS   | Required For email, Options: 'TLS', 'SSL', 'NONE' |
-| SMTP_FROM_EMAIL    |  None   | Required For email                                |
-| SMTP_USER          |  None   | Required if SMTP_AUTH_STRATEGY is 'TLS' or 'SSL'  |
-| SMTP_PASSWORD      |  None   | Required if SMTP_AUTH_STRATEGY is 'TLS' or 'SSL'  |
+| Variables                                       | Default | Description                                       |
+| ----------------------------------------------- | :-----: | ------------------------------------------------- |
+| SMTP_HOST<super>[&dagger;][secrets]</super>     |  None   | Required For email                                |
+| SMTP_PORT<super>[&dagger;][secrets]</super>     |   587   | Required For email                                |
+| SMTP_FROM_NAME                                  | Mealie  | Required For email                                |
+| SMTP_AUTH_STRATEGY                              |   TLS   | Required For email, Options: 'TLS', 'SSL', 'NONE' |
+| SMTP_FROM_EMAIL                                 |  None   | Required For email                                |
+| SMTP_USER<super>[&dagger;][secrets]</super>     |  None   | Required if SMTP_AUTH_STRATEGY is 'TLS' or 'SSL'  |
+| SMTP_PASSWORD<super>[&dagger;][secrets]</super> |  None   | Required if SMTP_AUTH_STRATEGY is 'TLS' or 'SSL'  |
 
 ### Webworker
 
@@ -72,21 +72,21 @@ Use this only when mealie is run without a webserver or reverse proxy.
 
 ### LDAP
 
-| Variables            | Default | Description                                                                                                                         |
-| -------------------- | :-----: | ----------------------------------------------------------------------------------------------------------------------------------- |
-| LDAP_AUTH_ENABLED    |  False  | Authenticate via an external LDAP server in addidion to built-in Mealie auth                                                        |
-| LDAP_SERVER_URL      |  None   | LDAP server URL (e.g. ldap://ldap.example.com)                                                                                      |
-| LDAP_TLS_INSECURE    |  False  | Do not verify server certificate when using secure LDAP                                                                             |
-| LDAP_TLS_CACERTFILE  |  None   | File path to Certificate Authority used to verify server certificate (e.g. `/path/to/ca.crt`)                                       |
-| LDAP_ENABLE_STARTTLS |  False  | Optional. Use STARTTLS to connect to the server                                                                                     |
-| LDAP_BASE_DN         |  None   | Starting point when searching for users authentication (e.g. `CN=Users,DC=xx,DC=yy,DC=de`)                                          |
-| LDAP_QUERY_BIND      |  None   | Optional bind user for LDAP search queries (e.g. `cn=admin,cn=users,dc=example,dc=com`). If `None` then anonymous bind will be used |
-| LDAP_QUERY_PASSWORD  |  None   | Optional password for the bind user used in LDAP_QUERY_BIND                                                                         |
-| LDAP_USER_FILTER     |  None   | Optional LDAP filter to narrow down eligible users (e.g. `(memberOf=cn=mealie_user,dc=example,dc=com)`)                             |
-| LDAP_ADMIN_FILTER    |  None   | Optional LDAP filter, which tells Mealie the LDAP user is an admin (e.g. `(memberOf=cn=admins,dc=example,dc=com)`)                  |
-| LDAP_ID_ATTRIBUTE    |   uid   | The LDAP attribute that maps to the user's id                                                                                       |
-| LDAP_NAME_ATTRIBUTE  |  name   | The LDAP attribute that maps to the user's name                                                                                     |
-| LDAP_MAIL_ATTRIBUTE  |  mail   | The LDAP attribute that maps to the user's email                                                                                    |
+| Variables                                             | Default | Description                                                                                                                         |
+| ----------------------------------------------------- | :-----: | ----------------------------------------------------------------------------------------------------------------------------------- |
+| LDAP_AUTH_ENABLED                                     |  False  | Authenticate via an external LDAP server in addidion to built-in Mealie auth                                                        |
+| LDAP_SERVER_URL<super>[&dagger;][secrets]</super>     |  None   | LDAP server URL (e.g. ldap://ldap.example.com)                                                                                      |
+| LDAP_TLS_INSECURE                                     |  False  | Do not verify server certificate when using secure LDAP                                                                             |
+| LDAP_TLS_CACERTFILE                                   |  None   | File path to Certificate Authority used to verify server certificate (e.g. `/path/to/ca.crt`)                                       |
+| LDAP_ENABLE_STARTTLS                                  |  False  | Optional. Use STARTTLS to connect to the server                                                                                     |
+| LDAP_BASE_DN                                          |  None   | Starting point when searching for users authentication (e.g. `CN=Users,DC=xx,DC=yy,DC=de`)                                          |
+| LDAP_QUERY_BIND                                       |  None   | Optional bind user for LDAP search queries (e.g. `cn=admin,cn=users,dc=example,dc=com`). If `None` then anonymous bind will be used |
+| LDAP_QUERY_PASSWORD<super>[&dagger;][secrets]</super> |  None   | Optional password for the bind user used in LDAP_QUERY_BIND                                                                         |
+| LDAP_USER_FILTER                                      |  None   | Optional LDAP filter to narrow down eligible users (e.g. `(memberOf=cn=mealie_user,dc=example,dc=com)`)                             |
+| LDAP_ADMIN_FILTER                                     |  None   | Optional LDAP filter, which tells Mealie the LDAP user is an admin (e.g. `(memberOf=cn=admins,dc=example,dc=com)`)                  |
+| LDAP_ID_ATTRIBUTE                                     |   uid   | The LDAP attribute that maps to the user's id                                                                                       |
+| LDAP_NAME_ATTRIBUTE                                   |  name   | The LDAP attribute that maps to the user's name                                                                                     |
+| LDAP_MAIL_ATTRIBUTE                                   |  mail   | The LDAP attribute that maps to the user's email                                                                                    |
 
 ### OpenID Connect (OIDC)
 
@@ -94,23 +94,22 @@ Use this only when mealie is run without a webserver or reverse proxy.
 
 For usage, see [Usage - OpenID Connect](../authentication/oidc-v2.md)
 
-| Variables                                         | Default | Description                                                                                                                                                                                                                                                                                            |
-|---------------------------------------------------|:-------:|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| OIDC_AUTH_ENABLED                                 |  False  | Enables authentication via OpenID Connect                                                                                                                                                                                                                                                              |
-| OIDC_SIGNUP_ENABLED                               |  True   | Enables new users to be created when signing in for the first time with OIDC                                                                                                                                                                                                                           |
-| OIDC_CONFIGURATION_URL                            |  None   | The URL to the OIDC configuration of your provider. This is usually something like https://auth.example.com/.well-known/openid-configuration                                                                                                                                                           |
-| OIDC_CLIENT_ID                                    |  None   | The client id of your configured client in your provider                                                                                                                                                                                                                                               |
-| OIDC_CLIENT_SECRET <br/> :octicons-tag-24: v2.0.0 |  None   | The client secret of your configured client in your provider                                                                                                                                                                                                                                           |
-| OIDC_USER_GROUP                                   |  None   | If specified, only users belonging to this group will be able to successfully authenticate. For more information see [this page](../authentication/oidc-v2.md#groups)                                                                                                                                  |
-| OIDC_ADMIN_GROUP                                  |  None   | If specified, users belonging to this group will be able to successfully authenticate *and* be made an admin. For more information see [this page](../authentication/oidc-v2.md#groups)                                                                                                                |
-| OIDC_AUTO_REDIRECT                                |  False  | If `True`, then the login page will be bypassed and you will be sent directly to your Identity Provider. You can still get to the login page by adding `?direct=1` to the login URL                                                                                                                    |
-| OIDC_PROVIDER_NAME                                |  OAuth  | The provider name is shown in SSO login button. "Login with <OIDC_PROVIDER_NAME\>"                                                                                                                                                                                                                     |
-| OIDC_REMEMBER_ME                                  |  False  | Because redirects bypass the login screen, you cant extend your session by clicking the "Remember Me" checkbox. By setting this value to true, a session will be extended as if "Remember Me" was checked                                                                                              |
-| OIDC_USER_CLAIM                                   |  email  | This is the claim which Mealie will use to look up an existing user by (e.g. "email", "preferred_username")                                                                                                                                                                                            |
-| OIDC_NAME_CLAIM                                   |  name   | This is the claim which Mealie will use for the users Full Name                                                                                                                                                                                                                                        |
-| OIDC_GROUPS_CLAIM                                 | groups  | Optional if not using `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP`. This is the claim Mealie will request from your IdP and will use to compare to `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP` to allow the user to log in to Mealie or is set as an admin. **Your IdP must be configured to grant this claim** |
-| OIDC_SCOPES_OVERRIDE                              |  None   | Advanced configuration used to override the scopes requested from the IdP. **Most users won't need to change this**. At a minimum, 'openid profile email' are required.                                                                                                                                |
-| OIDC_TLS_CACERTFILE                               |  None   | File path to Certificate Authority used to verify server certificate (e.g. `/path/to/ca.crt`)                                                                                                                                                                                                          |
+| Variables                                                                           | Default | Description                                                                                                                                                                                                                                                                                            |
+| ----------------------------------------------------------------------------------- | :-----: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| OIDC_AUTH_ENABLED                                                                   |  False  | Enables authentication via OpenID Connect                                                                                                                                                                                                                                                              |
+| OIDC_SIGNUP_ENABLED                                                                 |  True   | Enables new users to be created when signing in for the first time with OIDC                                                                                                                                                                                                                           |
+| OIDC_CONFIGURATION_URL<super>[&dagger;][secrets]</super>                            |  None   | The URL to the OIDC configuration of your provider. This is usually something like https://auth.example.com/.well-known/openid-configuration                                                                                                                                                           |
+| OIDC_CLIENT_ID<super>[&dagger;][secrets]</super>                                    |  None   | The client id of your configured client in your provider                                                                                                                                                                                                                                               |
+| OIDC_CLIENT_SECRET<super>[&dagger;][secrets]</super> <br/> :octicons-tag-24: v2.0.0 |  None   | The client secret of your configured client in your provider                                                                                                                                                                                                                                           |
+| OIDC_USER_GROUP                                                                     |  None   | If specified, only users belonging to this group will be able to successfully authenticate, regardless of the `OIDC_ADMIN_GROUP`. For more information see [this page](../authentication/oidc.md#groups)                                                                                               |
+| OIDC_ADMIN_GROUP                                                                    |  None   | If specified, users belonging to this group will be made an admin. For more information see [this page](../authentication/oidc.md#groups)                                                                                                                                                              |
+| OIDC_AUTO_REDIRECT                                                                  |  False  | If `True`, then the login page will be bypassed an you will be sent directly to your Identity Provider. You can still get to the login page by adding `?direct=1` to the login URL                                                                                                                     |
+| OIDC_PROVIDER_NAME                                                                  |  OAuth  | The provider name is shown in SSO login button. "Login with <OIDC_PROVIDER_NAME\>"                                                                                                                                                                                                                     |
+| OIDC_REMEMBER_ME                                                                    |  False  | Because redirects bypass the login screen, you cant extend your session by clicking the "Remember Me" checkbox. By setting this value to true, a session will be extended as if "Remember Me" was checked                                                                                              |
+| OIDC_SIGNING_ALGORITHM                                                              |  RS256  | The algorithm used to sign the id token (examples: RS256, HS256)                                                                                                                                                                                                                                       |
+| OIDC_USER_CLAIM                                                                     |  email  | This is the claim which Mealie will use to look up an existing user by (e.g. "email", "preferred_username")                                                                                                                                                                                            |
+| OIDC_GROUPS_CLAIM                                                                   | groups  | Optional if not using `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP`. This is the claim Mealie will request from your IdP and will use to compare to `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP` to allow the user to log in to Mealie or is set as an admin. **Your IdP must be configured to grant this claim** |
+| OIDC_TLS_CACERTFILE                                                                 |  None   | File path to Certificate Authority used to verify server certificate (e.g. `/path/to/ca.crt`)                                                                                                                                                                                                          |
 
 ### OpenAI
 
@@ -119,17 +118,13 @@ For usage, see [Usage - OpenID Connect](../authentication/oidc-v2.md)
 Mealie supports various integrations using OpenAI. For more information, check out our [OpenAI documentation](./open-ai.md).
 For custom mapping variables (e.g. OPENAI_CUSTOM_HEADERS) you should pass values as JSON encoded strings (e.g. `OPENAI_CUSTOM_PARAMS='{"k1": "v1", "k2": "v2"}'`)
 
-| Variables                    | Default | Description                                                                                                                                                                  |
-| ---------------------------- | :-----: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| OPENAI_BASE_URL              |  None   | The base URL for the OpenAI API. If you're not sure, leave this empty to use the standard OpenAI platform                                                                    |
-| OPENAI_API_KEY               |  None   | Your OpenAI API Key. Enables OpenAI-related features                                                                                                                         |
-| OPENAI_MODEL                 | gpt-4o  | Which OpenAI model to use. If you're not sure, leave this empty                                                                                                              |
-| OPENAI_CUSTOM_HEADERS        |  None   | Custom HTTP headers to add to all OpenAI requests. This should generally be left empty unless your custom service requires them                                              |
-| OPENAI_CUSTOM_PARAMS         |  None   | Custom HTTP query params to add to all OpenAI requests. This should generally be left empty unless your custom service requires them                                         |
-| OPENAI_ENABLE_IMAGE_SERVICES |  True   | Whether to enable OpenAI image services, such as creating recipes via image. Leave this enabled unless your custom model doesn't support it, or you want to reduce costs     |
-| OPENAI_WORKERS               |    2    | Number of OpenAI workers per request. Higher values may increase processing speed, but will incur additional API costs                                                       |
-| OPENAI_SEND_DATABASE_DATA    |  True   | Whether to send Mealie data to OpenAI to improve request accuracy. This will incur additional API costs                                                                      |
-| OPENAI_REQUEST_TIMEOUT       |   60    | The number of seconds to wait for an OpenAI request to complete before cancelling the request. Leave this empty unless you're running into timeout issues on slower hardware |
+| Variables                                         | Default | Description                                                                                                            |
+| ------------------------------------------------- | :-----: | ---------------------------------------------------------------------------------------------------------------------- |
+| OPENAI_BASE_URL<super>[&dagger;][secrets]</super> |  None   | The base URL for the OpenAI API. If you're not sure, leave this empty to use the standard OpenAI platform              |
+| OPENAI_API_KEY<super>[&dagger;][secrets]</super>  |  None   | Your OpenAI API Key. Enables OpenAI-related features                                                                   |
+| OPENAI_MODEL                                      | gpt-4o  | Which OpenAI model to use. If you're not sure, leave this empty                                                        |
+| OPENAI_WORKERS                                    |    2    | Number of OpenAI workers per request. Higher values may increase processing speed, but will incur additional API costs |
+| OPENAI_SEND_DATABASE_DATA                         |  True   | Whether to send Mealie data to OpenAI to improve request accuracy. This will incur additional API costs                |
 
 ### Theming
 
@@ -154,24 +149,80 @@ Setting the following environmental variables will change the theme of the front
 
 ### Docker Secrets
 
-Setting a credential can be done using secrets when running in a Docker container.
-This can be used to avoid leaking passwords through compose files, environment variables, or command-line history.
-For example, to configure the Postgres database password in Docker compose, create a file on the host that contains only the password, and expose that file to the Mealie service as a secret with the correct name.
-Note that environment variables take priority over secrets, so any previously defined environment variables should be removed when migrating to secrets.
+### Docker Secrets
+
+> <super>&dagger;</super> Starting in version `2.4.2`, any environment variable in the preceding lists with a dagger
+> symbol next to them support the Docker Compose secrets pattern, below.
+[Docker Compose secrets][docker-secrets] can be used to secure sensitive information regarding the Mealie implementation
+by managing control of each secret independently from the single `.env` file. This is helpful for users that may need
+different levels of access for various, sensitive environment variables, such as differentiating between hardening
+operations (e.g., server endpoints and ports) and user access control (e.g., usernames, passwords, and API keys).
+
+To convert any of these environment variables to a Docker Compose secret, append `_FILE` to the environment variable and
+connect it with a Docker Compose secret, per the [Docker documentation][docker-secrets].
+
+If both the base environment variable and the secret pattern of the environment variable are set, the secret will always
+take precedence.
+
+For example, a user that wishes to harden their operations by only giving some access to their database URL, but who
+wish to place additional security around their user access control, may have a Docker Compose configuration similar to:
+
 
 ```yaml
 services:
   mealie:
-    ...
-    environment:
-      ...
-      POSTGRES_USER: postgres
     secrets:
-      - POSTGRES_PASSWORD
+      # These secrets will be loaded by Docker into the `/run/secrets` folder within the container.
+      - postgres-host
+      - postgres-port
+      - postgres-db-name
+      - postgres-user
+      - postgres-password
 
+    environment:
+      DB_ENGINE: postgres
+      POSTGRES_SERVER: duplicate.entry.tld # This will be ignored, due to the secret defined, below.
+      POSTGRES_SERVER_FILE: /run/secrets/postgres-host
+      POSTGRES_PORT_FILE: /run/secrets/postgres-port
+      POSTGRES_DB_FILE: /run/secrets/postgres-db-name
+      POSTGRES_USER_FILE: /run/secrets/postgres-user
+      POSTGRES_PASSWORD_FILE: /run/secrets/postgres-password
+
+# Each of these secrets are loaded via these local files. Different patterns are available. See the Docker Compose
+# documentation for more information.
 secrets:
-  POSTGRES_PASSWORD:
-    file: postgrespassword.txt
+  postgres-host:
+    file: ./secrets/postgres-host.txt
+  postgres-port:
+    file: ./secrets/postgres-port.txt
+  postgres-db-name:
+    file: ./secrets/sensitive/postgres-db-name.txt
+  postgres-user:
+    file: ./secrets/sensitive/postgres-user.txt
+  postgres-password:
+    file: ./secrets/sensitive/postgres-password.txt
+```
+In the example above, a directory organization and access pattern may look like the following:
+```text
+.
+├── docker-compose.yml
+└── secrets                     # Access restricted to anyone that can manage secrets
+    ├── postgres-host.txt
+    ├── postgres-port.txt
+    └── sensitive               # Access further-restricted to anyone managing service accounts
+        ├── postgres-db-name.txt
+        ├── postgres-password.txt
+        └── postgres-user.txt
 ```
 
+How you organize your secrets is ultimately up to you. At minimum, it's highly recommended to use secret patterns for
+at least these sensitive environment variables when working within shared environments:
+
+- `POSTGRES_PASSWORD`
+- `SMTP_PASSWORD`
+- `LDAP_QUERY_PASSWORD`
+- `OPENAI_API_KEY`
+
+[docker-secrets]: https://docs.docker.com/compose/use-secrets/
+[secrets]: #docker-secrets
 [unicorn_workers]: https://www.uvicorn.org/deployment/#built-in

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

@@ -31,7 +31,7 @@ To deploy mealie on your local network, it is highly recommended to use Docker t
 We've gone through a few versions of Mealie v1 deployment targets. We have settled on a single container deployment, and we've begun publishing the nightly container on github containers. If you're looking to move from the old nightly (split containers _or_ the omni image) to the new nightly, there are a few things you need to do:
 
 1. Take a backup just in case!
-2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v2.4.1`
+2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v2.6.0`
 3. Take the external port from the frontend container and set that as the port mapped to port `9000` on the new container. The frontend is now served on port 9000 from the new container, so it will need to be mapped for you to have access.
 4. Restart the container
 

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

@@ -7,7 +7,7 @@ PostgreSQL might be considered if you need to support many concurrent users. In
 ```yaml
 services:
   mealie:
-    image: ghcr.io/mealie-recipes/mealie:v2.4.1 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v2.6.0 # (3)
     container_name: mealie
     restart: always
     ports:

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

@@ -11,7 +11,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th
 ```yaml
 services:
   mealie:
-    image: ghcr.io/mealie-recipes/mealie:v2.4.1 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v2.6.0 # (3)
     container_name: mealie
     restart: always
     ports:

docs/docs/documentation/getting-started/usage/backups-and-restoring.md

@@ -1,17 +1,24 @@
-# Backups and Restoring
+# Backups and Restores
 
-Mealie provides an integrated mechanics for doing full installation backups of the database. Navigate to `/admin/backups` to
+Mealie provides an integrated mechanic for doing full installation backups of the database. 
+
+Navigate to Settings > Backups or manually by adding `/admin/backups` to your instance URL.
+
+From this page, you will be able to: 
 
 - See a list of available backups
-- Perform a backups
-- Restore a backup
+- Create a backup
+- Upload a backup
+- Delete a backup (Confirmation Required)
+- Download a backup
+- Perform a restore
 
 !!! tip
     If you're using Mealie with SQLite all your data is stored in the /app/data/ folder in the container. You can easily perform entire site backups by stopping the container, and backing up this folder with your chosen tool. This is the **best** way to backup your data.
 
 ## Restoring from a Backup
 
-To restore from a backup it needs to be uploaded to your instance, this can be done through the web portal. On the lower left hand corner of the backups data table you'll see an upload button. Click this button and select the backup file you want to upload and it will be available to import shortly.
+To restore from a backup it needs to be uploaded to your instance which can be done through the web portal. On the top left of the page you'll see an upload button. Click this button and select the backup file you want to upload and it will be available to import shortly. You can alternatively use one of the backups you see on the screen, if one exists.
 
 Before importing it's critical that you understand the following:
 
@@ -19,6 +26,9 @@ Before importing it's critical that you understand the following:
 - This action cannot be undone
 - If this action is successful you will be logged out and you will need to log back in to complete the restore
 
+!!! tip
+    If for some reason the restore does not succeed, you can review the logs of what the issue may be, download the backup .ZIP and edit the contents of database.json to potentially resolve the issue. For example, if you receive an error restoring 'shopping-list' you can edit out the contents of that list while allowing other sections to restore. If you would like any assistance on this, reach out over Discord.
+
 !!! warning
     Prior to beta-v5 using a mis-matched version of the database backup will result in an error that will prevent you from using the instance of Mealie requiring you to remove all data and reinstall. Post beta-v5 performing a mismatched restore will throw an error and alert the user of the issue.
 

docs/mkdocs.yml

@@ -48,6 +48,7 @@ markdown_extensions:
         - name: mermaid
           class: mermaid
           format: !!python/name:pymdownx.superfences.fence_code_format
+  - pymdownx.details
 extra_css:
   - assets/stylesheets/custom.css
 extra_javascript:
@@ -84,12 +85,13 @@ nav:
           - OpenID Connect: "documentation/getting-started/authentication/oidc-v2.md"
 
       - Community Guides:
+          - Bring API without internet exposure: "documentation/community-guide/bring-api.md"
+          - Automate Backups with n8n: "documentation/community-guide/n8n-backup-automation.md"
+          - Bulk Url Import: "documentation/community-guide/bulk-url-import.md"
+          - Home Assistant: "documentation/community-guide/home-assistant.md"
+          - Import Bookmarklet: "documentation/community-guide/import-recipe-bookmarklet.md"
           - iOS Shortcuts: "documentation/community-guide/ios.md"
           - Reverse Proxy (SWAG): "documentation/community-guide/swag.md"
-          - Home Assistant: "documentation/community-guide/home-assistant.md"
-          - Bulk Url Import: "documentation/community-guide/bulk-url-import.md"
-          - Import Bookmarklet: "documentation/community-guide/import-recipe-bookmarklet.md"
-          - Automate Backups with n8n: "documentation/community-guide/n8n-backup-automation.md"
 
   - API Reference: "api/redoc.md"
 
@@ -97,6 +99,7 @@ nav:
       - Non-Code: "contributors/non-coders.md"
       - Translating: "contributors/translating.md"
       - Developers Guide:
+          - Building Packages: "contributors/developers-guide/building-packages.md"
           - Code Contributions: "contributors/developers-guide/code-contributions.md"
           - Dev Getting Started: "contributors/developers-guide/starting-dev-server.md"
           - Database Changes: "contributors/developers-guide/database-changes.md"

frontend/components/Domain/Cookbook/CookbookPage.vue

@@ -104,9 +104,12 @@
         }
         const response = await actions.updateOne(editTarget.value);
 
-        // if name changed, redirect to new slug
         if (response?.slug && book.value?.slug !== response?.slug) {
+          // if name changed, redirect to new slug
           router.push(`/g/${route.value.params.groupSlug}/cookbooks/${response?.slug}`);
+        } else {
+          // otherwise reload the page, since the recipe criteria changed
+          router.go(0);
         }
         dialogStates.edit = false;
         editTarget.value = null;

frontend/components/Domain/Recipe/RecipeActionMenu.vue

@@ -34,12 +34,6 @@
         </v-tooltip>
       </div>
 
-      <RecipeTimerMenu
-        fab
-        color="info"
-        class="ml-1"
-      />
-
       <RecipeContextMenu
         show-print
         :menu-top="false"
@@ -53,7 +47,6 @@
         :recipe-id="recipe.id"
         :recipe-scale="recipeScale"
         :use-items="{
-          delete: false,
           edit: false,
           download: loggedIn,
           duplicate: loggedIn,
@@ -63,6 +56,7 @@
           printPreferences: true,
           share: loggedIn,
           recipeActions: true,
+          delete: loggedIn,
         }"
         class="ml-1"
         @print="$emit('print')"
@@ -88,7 +82,6 @@
 import { defineComponent, ref, useContext } from "@nuxtjs/composition-api";
 import RecipeContextMenu from "./RecipeContextMenu.vue";
 import RecipeFavoriteBadge from "./RecipeFavoriteBadge.vue";
-import RecipeTimerMenu from "./RecipeTimerMenu.vue";
 import RecipeTimelineBadge from "./RecipeTimelineBadge.vue";
 import { Recipe } from "~/lib/api/types/recipe";
 
@@ -98,7 +91,7 @@ const CLOSE_EVENT = "close";
 const JSON_EVENT = "json";
 
 export default defineComponent({
-  components: { RecipeContextMenu, RecipeFavoriteBadge, RecipeTimerMenu, RecipeTimelineBadge },
+  components: { RecipeContextMenu, RecipeFavoriteBadge, RecipeTimelineBadge },
   props: {
     recipe: {
       required: true,

frontend/components/Domain/Recipe/RecipeCard.vue

@@ -7,7 +7,7 @@
         :elevation="hover ? 12 : 2"
         :to="recipeRoute"
         :min-height="imageHeight + 75"
-        @click="$emit('click')"
+        @click.self="$emit('click')"
       >
         <RecipeCardImage
           :icon-size="imageHeight"
@@ -39,7 +39,7 @@
 
             <RecipeRating class="pb-1" :value="rating" :recipe-id="recipeId" :slug="slug" :small="true" />
             <v-spacer></v-spacer>
-            <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" />
+            <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" v-on="$listeners" />
 
             <!-- If we're not logged-in, no items display, so we hide this menu -->
             <RecipeContextMenu

frontend/components/Domain/Recipe/RecipeCardMobile.vue

@@ -38,7 +38,7 @@
               <SafeMarkdown :source="description" />
             </v-list-item-subtitle>
             <div class="d-flex flex-wrap justify-start ma-0">
-              <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" />
+              <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" v-on="$listeners" />
             </div>
             <div class="d-flex flex-wrap justify-end align-center">
               <slot name="actions">

frontend/components/Domain/Recipe/RecipeCardSection.vue

@@ -82,6 +82,8 @@
                 :image="recipe.image"
                 :tags="recipe.tags"
                 :recipe-id="recipe.id"
+
+                 v-on="$listeners"
               />
             </v-lazy>
           </v-col>
@@ -105,6 +107,8 @@
                 :image="recipe.image"
                 :tags="recipe.tags"
                 :recipe-id="recipe.id"
+
+                v-on="$listeners"
               />
             </v-lazy>
           </v-col>
@@ -215,27 +219,34 @@ export default defineComponent({
     const router = useRouter();
 
     const queryFilter = computed(() => {
-      const orderBy = props.query?.orderBy || preferences.value.orderBy;
-      const orderByFilter = preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
+      return props.query.queryFilter || null;
 
-      if (props.query.queryFilter && orderByFilter) {
-        return `(${props.query.queryFilter}) AND ${orderByFilter}`;
-      } else if (props.query.queryFilter) {
-        return props.query.queryFilter;
-      } else {
-        return orderByFilter;
-      }
+      // TODO: allow user to filter out null values when ordering by a value that may be null (such as lastMade)
+
+      // const orderBy = props.query?.orderBy || preferences.value.orderBy;
+      // const orderByFilter = preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
+
+      // if (props.query.queryFilter && orderByFilter) {
+      //   return `(${props.query.queryFilter}) AND ${orderByFilter}`;
+      // } else if (props.query.queryFilter) {
+      //   return props.query.queryFilter;
+      // } else {
+      //   return orderByFilter;
+      // }
     });
 
     async function fetchRecipes(pageCount = 1) {
+      const orderDir = props.query?.orderDirection || preferences.value.orderDirection;
+      const orderByNullPosition = props.query?.orderByNullPosition || orderDir === "asc" ? "first" : "last";
       return await fetchMore(
         page.value,
         perPage * pageCount,
         props.query?.orderBy || preferences.value.orderBy,
-        props.query?.orderDirection || preferences.value.orderDirection,
+        orderDir,
+        orderByNullPosition,
         props.query,
         // we use a computed queryFilter to filter out recipes that have a null value for the property we're sorting by
-        queryFilter.value
+        queryFilter.value,
       );
     }
 
@@ -296,6 +307,7 @@ export default defineComponent({
       }, useAsyncKey());
     }, 500);
 
+
     function sortRecipes(sortType: string) {
       if (state.sortLoading || loading.value) {
         return;

frontend/components/Domain/Recipe/RecipeChips.vue

@@ -9,7 +9,8 @@
       color="accent"
       :small="small"
       dark
-      :to="`${baseRecipeRoute}?${urlPrefix}=${category.id}`"
+
+      @click.prevent="() => $emit('item-selected', category, urlPrefix)"
     >
       {{ truncateText(category.name) }}
     </v-chip>

frontend/components/Domain/Recipe/RecipeContextMenu.vue

@@ -276,7 +276,7 @@ export default defineComponent({
       delete: {
         title: i18n.tc("general.delete"),
         icon: $globals.icons.delete,
-        color: "error",
+        color: undefined,
         event: "delete",
         isPublic: false,
       },
@@ -371,7 +371,7 @@ export default defineComponent({
     const groupRecipeActionsStore = useGroupRecipeActions();
 
     async function executeRecipeAction(action: GroupRecipeActionOut) {
-      const response = await groupRecipeActionsStore.execute(action, props.recipe);
+      const response = await groupRecipeActionsStore.execute(action, props.recipe, props.recipeScale);
 
       if (action.actionType === "post") {
         if (!response?.error) {
@@ -383,7 +383,10 @@ export default defineComponent({
     }
 
     async function deleteRecipe() {
-      await api.recipes.deleteOne(props.slug);
+      const { data } = await api.recipes.deleteOne(props.slug);
+      if (data?.slug) {
+        router.push(`/g/${groupSlug.value}`);
+      }
       context.emit("delete", props.slug);
     }
 

frontend/components/Domain/Recipe/RecipeDataTable.vue

@@ -23,13 +23,13 @@
       <a :href="`/g/${groupSlug}/r/${item.slug}`" style="color: inherit; text-decoration: inherit; " @click="$emit('click')">{{ item.name }}</a>
     </template>
     <template #item.tags="{ item }">
-      <RecipeChip small :items="item.tags" :is-category="false" url-prefix="tags" />
+      <RecipeChip small :items="item.tags" :is-category="false" url-prefix="tags" @item-selected="filterItems" />
     </template>
     <template #item.recipeCategory="{ item }">
-      <RecipeChip small :items="item.recipeCategory" />
+      <RecipeChip small :items="item.recipeCategory" @item-selected="filterItems" />
     </template>
     <template #item.tools="{ item }">
-      <RecipeChip small :items="item.tools" url-prefix="tools" />
+      <RecipeChip small :items="item.tools" url-prefix="tools" @item-selected="filterItems" />
     </template>
     <template #item.userId="{ item }">
       <v-list-item class="justify-start">
@@ -48,12 +48,13 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onMounted, ref, useContext } from "@nuxtjs/composition-api";
+import { computed, defineComponent, onMounted, ref, useContext, useRouter } from "@nuxtjs/composition-api";
 import UserAvatar from "../User/UserAvatar.vue";
 import RecipeChip from "./RecipeChips.vue";
-import { Recipe } from "~/lib/api/types/recipe";
+import { Recipe, RecipeCategory, RecipeTool } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
 import { UserSummary } from "~/lib/api/types/user";
+import { RecipeTag } from "~/lib/api/types/household";
 
 const INPUT_EVENT = "input";
 
@@ -106,7 +107,7 @@ export default defineComponent({
   setup(props, context) {
     const { $auth, i18n } = useContext();
     const groupSlug = $auth.user?.groupSlug;
-
+    const router = useRouter();
     function setValue(value: Recipe[]) {
       context.emit(INPUT_EVENT, value);
     }
@@ -167,6 +168,13 @@ export default defineComponent({
       }
     }
 
+    function filterItems(item: RecipeTag | RecipeCategory | RecipeTool, itemType: string) {
+      if (!groupSlug || !item.id) {
+        return;
+      }
+      router.push(`/g/${groupSlug}?${itemType}=${item.id}`);
+    }
+
     onMounted(() => {
       refreshMembers();
     });
@@ -186,6 +194,7 @@ export default defineComponent({
       formatDate,
       members,
       getMember,
+      filterItems,
     };
   },
 

frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue

@@ -138,8 +138,8 @@ import RecipeIngredientListItem from "./RecipeIngredientListItem.vue";
 import { useUserApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
 import { useShoppingListPreferences } from "~/composables/use-users/preferences";
-import { ShoppingListSummary } from "~/lib/api/types/household";
-import { Recipe, RecipeIngredient } from "~/lib/api/types/recipe";
+import { RecipeIngredient, ShoppingListAddRecipeParamsBulk, ShoppingListSummary } from "~/lib/api/types/household";
+import { Recipe } from "~/lib/api/types/recipe";
 
 export interface RecipeWithScale extends Recipe {
   scale: number;
@@ -204,6 +204,10 @@ export default defineComponent({
       shoppingListShowAllToggled: false,
     });
 
+    const userHousehold = computed(() => {
+      return $auth.user?.householdSlug || "";
+    });
+
     const shoppingListChoices = computed(() => {
       return props.shoppingLists.filter((list) => preferences.value.viewAllLists || list.userId === $auth.user?.id);
     });
@@ -248,8 +252,9 @@ export default defineComponent({
         }
 
         const shoppingListIngredients: ShoppingListIngredient[] = recipe.recipeIngredient.map((ing) => {
+          const householdsWithFood = (ing.food?.householdsWithIngredientFood || []);
           return {
-            checked: !ing.food?.onHand,
+            checked: !householdsWithFood.includes(userHousehold.value),
             ingredient: ing,
             disableAmount: recipe.settings?.disableAmount || false,
           }
@@ -276,7 +281,8 @@ export default defineComponent({
           }
 
           // Store the on-hand ingredients for later
-          if (ing.ingredient.food?.onHand) {
+          const householdsWithFood = (ing.ingredient.food?.householdsWithIngredientFood || []);
+          if (householdsWithFood.includes(userHousehold.value)) {
             onHandIngs.push(ing);
             return sections;
           }
@@ -336,12 +342,12 @@ export default defineComponent({
     }
 
     async function addRecipesToList() {
-      const promises: Promise<any>[] = [];
-      recipeIngredientSections.value.forEach((section) => {
-        if (!selectedShoppingList.value) {
-          return;
-        }
+      if (!selectedShoppingList.value) {
+        return;
+      }
 
+      const recipeData: ShoppingListAddRecipeParamsBulk[] = [];
+      recipeIngredientSections.value.forEach((section) => {
         const ingredients: RecipeIngredient[] = [];
         section.ingredientSections.forEach((ingSection) => {
           ingSection.ingredients.forEach((ing) => {
@@ -355,24 +361,18 @@ export default defineComponent({
           return;
         }
 
-        promises.push(api.shopping.lists.addRecipe(
-          selectedShoppingList.value.id,
-          section.recipeId,
-          section.recipeScale,
-          ingredients,
-        ));
+        recipeData.push(
+          {
+            recipeId: section.recipeId,
+            recipeIncrementQuantity: section.recipeScale,
+            recipeIngredients: ingredients,
+          }
+        );
       });
 
-      let success = true;
-      const results = await Promise.allSettled(promises);
-      results.forEach((result) => {
-        if (result.status === "rejected") {
-          success = false;
-        }
-      })
-
-      success ? alert.success(i18n.tc("recipe.successfully-added-to-list"))
-      : alert.error(i18n.tc("failed-to-add-recipes-to-list"))
+      const { error } = await api.shopping.lists.addRecipes(selectedShoppingList.value.id, recipeData);
+      error ? alert.error(i18n.tc("recipe.failed-to-add-recipes-to-list"))
+      : alert.success(i18n.tc("recipe.successfully-added-to-list"));
 
       state.shoppingListDialog = false;
       state.shoppingListIngredientDialog = false;

frontend/components/Domain/Recipe/RecipeExplorerPage.vue

@@ -138,6 +138,7 @@
         :title="$tc('general.recipes')"
         :recipes="recipes"
         :query="passedQueryWithSeed"
+        @item-selected="filterItems"
         @replaceRecipes="replaceRecipes"
         @appendRecipes="appendRecipes"
       />
@@ -387,6 +388,19 @@ export default defineComponent({
       }
     )
 
+    function filterItems(item: RecipeCategory | RecipeTag | RecipeTool, urlPrefix: string) {
+      if (urlPrefix === "categories") {
+        const result = categories.store.value.filter((category) => (category.id as string).includes(item.id as string));
+        selectedCategories.value = result as NoUndefinedField<RecipeTag>[];
+      } else if (urlPrefix === "tags") {
+        const result = tags.store.value.filter((tag) => (tag.id as string).includes(item.id as string));
+        selectedTags.value = result as NoUndefinedField<RecipeTag>[];
+      } else if (urlPrefix === "tools") {
+        const result = tools.store.value.filter((tool) => (tool.id ).includes(item.id || "" ));
+        selectedTags.value = result as NoUndefinedField<RecipeTag>[];
+      }
+    }
+
     async function hydrateSearch() {
       const query = router.currentRoute.query;
       if (query.auto?.length) {
@@ -592,6 +606,8 @@ export default defineComponent({
       removeRecipe,
       replaceRecipes,
       passedQueryWithSeed,
+
+      filterItems,
     };
   },
   head: {},

frontend/components/Domain/Recipe/RecipeLastMade.vue

@@ -86,31 +86,34 @@
       </BaseDialog>
     </div>
     <div>
-      <div class="d-flex justify-center flex-wrap">
-        <v-chip
-          label
-          :small="$vuetify.breakpoint.smAndDown"
-          color="accent custom-transparent"
-          class="ma-1 pa-3"
-        >
-          <v-icon left>
-            {{ $globals.icons.calendar }}
-          </v-icon>
-            {{ $t('recipe.last-made-date', { date: value ? new Date(value).toLocaleDateString($i18n.locale) : $t("general.never") } ) }}
-        </v-chip>
-      </div>
-      <div class="d-flex justify-center flex-wrap mt-1">
-        <BaseButton :small="$vuetify.breakpoint.smAndDown" @click="madeThisDialog = true">
-          <template #icon> {{ $globals.icons.chefHat }} </template>
-          {{ $t('recipe.made-this') }}
-        </BaseButton>
+      <div v-if="lastMadeReady" class="d-flex justify-center flex-wrap">
+        <v-row no-gutters class="d-flex flex-wrap align-center" style="font-size: larger;">
+          <v-tooltip bottom>
+            <template #activator="{ on, attrs }">
+              <v-btn
+                rounded
+                outlined
+                x-large
+                color="primary"
+                v-bind="attrs"
+                v-on="on"
+                @click="madeThisDialog = true"
+              >
+                <v-icon left large>{{ $globals.icons.calendar }}</v-icon>
+                <span class="text--secondary" style="letter-spacing: normal;"><b>{{ $tc("general.last-made") }}</b><br>{{ lastMade ? new Date(lastMade).toLocaleDateString($i18n.locale) : $tc("general.never") }}</span>
+                <v-icon right large>{{ $globals.icons.createAlt }}</v-icon>
+              </v-btn>
+            </template>
+            <span>{{ $tc("recipe.made-this") }}</span>
+          </v-tooltip>
+        </v-row>
       </div>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, reactive, ref, toRefs, useContext } from "@nuxtjs/composition-api";
+import { computed, defineComponent, onMounted, reactive, ref, toRefs, useContext } from "@nuxtjs/composition-api";
 import { whenever } from "@vueuse/core";
 import { VForm } from "~/types/vuetify";
 import { useUserApi } from "~/composables/api";
@@ -119,10 +122,6 @@ import { Recipe, RecipeTimelineEventIn } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
-    value: {
-      type: String,
-      default: null,
-    },
     recipe: {
       type: Object as () => Recipe,
       required: true,
@@ -146,6 +145,20 @@ export default defineComponent({
     const newTimelineEventImagePreviewUrl = ref<string>();
     const newTimelineEventTimestamp = ref<string>();
 
+    const lastMade = ref(props.recipe.lastMade);
+    const lastMadeReady = ref(false);
+    onMounted(async () => {
+      if (!$auth.user?.householdSlug) {
+        lastMade.value = props.recipe.lastMade;
+      } else {
+        const { data } = await userApi.households.getCurrentUserHouseholdRecipe(props.recipe.slug || "");
+        lastMade.value = data?.lastMade;
+      }
+
+      lastMadeReady.value = true;
+    });
+
+
     whenever(
       () => madeThisDialog.value,
       () => {
@@ -195,11 +208,9 @@ export default defineComponent({
       const newEvent = eventResponse.data;
 
       // we also update the recipe's last made value
-      if (!props.value || newTimelineEvent.value.timestamp > props.value) {
+      if (!lastMade.value || newTimelineEvent.value.timestamp > lastMade.value) {
+        lastMade.value = newTimelineEvent.value.timestamp;
         await userApi.recipes.updateLastMade(props.recipe.slug,  newTimelineEvent.value.timestamp);
-
-        // update recipe in parent so the user can see it
-        context.emit("input", newTimelineEvent.value.timestamp);
       }
 
       // update the image, if provided
@@ -234,6 +245,8 @@ export default defineComponent({
       newTimelineEventImage,
       newTimelineEventImagePreviewUrl,
       newTimelineEventTimestamp,
+      lastMade,
+      lastMadeReady,
       createTimelineEvent,
       clearImage,
       uploadImage,

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

@@ -35,7 +35,7 @@
             -->
             <v-col v-if="!isCookMode || isEditForm" cols="12" sm="12" md="4" lg="4">
               <RecipePageIngredientToolsView v-if="!isEditForm" :recipe="recipe" :scale="scale" />
-              <RecipePageOrganizers v-if="$vuetify.breakpoint.mdAndUp" :recipe="recipe" />
+              <RecipePageOrganizers v-if="$vuetify.breakpoint.mdAndUp" :recipe="recipe" @item-selected="chipClicked" />
             </v-col>
             <v-divider v-if="$vuetify.breakpoint.mdAndUp && !isCookMode" class="my-divider" :vertical="true" />
 
@@ -166,7 +166,7 @@ import {
   usePageUser,
 } from "~/composables/recipe-page/shared-state";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
-import { Recipe } from "~/lib/api/types/recipe";
+import { Recipe, RecipeCategory, RecipeTag, RecipeTool } from "~/lib/api/types/recipe";
 import { useRouteQuery } from "~/composables/use-router";
 import { useUserApi } from "~/composables/api";
 import { uuid4, deepCopy } from "~/composables/use-utils";
@@ -329,6 +329,17 @@ export default defineComponent({
      */
     const { user } = usePageUser();
 
+    /** =============================================================
+     * RecipeChip Clicked
+     */
+
+    function chipClicked(item: RecipeTag | RecipeCategory | RecipeTool, itemType: string) {
+      if (!item.id) {
+        return;
+      }
+      router.push(`/g/${groupSlug.value}?${itemType}=${item.id}`);
+    }
+
     return {
       user,
       isOwnGroup,
@@ -350,7 +361,8 @@ export default defineComponent({
       deleteRecipe,
       addStep,
       hasLinkedIngredients,
-      notLinkedIngredients
+      notLinkedIngredients,
+      chipClicked,
     };
   },
   head: {},

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

@@ -34,7 +34,7 @@
       <UserAvatar :tooltip="false" size="40" :user-id="comment.userId" />
       <v-card outlined class="flex-grow-1">
         <v-card-text class="pa-3 pb-0">
-          <p class="">{{ comment.user.username }} • {{ $d(Date.parse(comment.createdAt), "medium") }}</p>
+          <p class="">{{ comment.user.fullName }} • {{ $d(Date.parse(comment.createdAt), "medium") }}</p>
           <SafeMarkdown :source="comment.text" />
         </v-card-text>
         <v-card-actions class="justify-end mt-0 pt-0">

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

@@ -14,15 +14,16 @@
           </v-card-title>
           <v-divider class="my-2" />
           <SafeMarkdown :source="recipe.description" />
-          <v-divider />
-          <v-container class="d-flex flex-row flex-wrap justify-center align-center">
-            <div class="mx-5">
-              <v-row no-gutters class="mb-1">
+          <v-divider v-if="recipe.description" />
+          <v-container class="d-flex flex-row flex-wrap justify-center">
+            <div class="mx-6">
+              <v-row no-gutters>
                 <v-col v-if="recipe.recipeYieldQuantity || recipe.recipeYield" cols="12" class="d-flex flex-wrap justify-center">
                   <RecipeYield
                     :yield-quantity="recipe.recipeYieldQuantity"
                     :yield="recipe.recipeYield"
                     :scale="recipeScale"
+                    class="mb-4"
                   />
                 </v-col>
               </v-row>
@@ -30,20 +31,19 @@
                 <v-col cols="12" class="d-flex flex-wrap justify-center">
                   <RecipeLastMade
                     v-if="isOwnGroup"
-                    :value="recipe.lastMade"
                     :recipe="recipe"
-                    :class="true ? undefined : 'force-bottom'"
+                    class="mb-4"
                   />
                 </v-col>
               </v-row>
             </div>
-            <div class="mx-5">
+            <div class="mx-6">
               <RecipeTimeCard
-                stacked
                 container-class="d-flex flex-wrap justify-center"
                 :prep-time="recipe.prepTime"
                 :total-time="recipe.totalTime"
                 :perform-time="recipe.performTime"
+                class="mb-4"
               />
             </div>
           </v-container>

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

@@ -10,7 +10,7 @@
       <h2 class="mb-2 mt-4">{{ $t('tool.required-tools') }}</h2>
       <v-list-item v-for="(tool, index) in recipe.tools" :key="index" dense>
         <v-checkbox
-          v-model="recipe.tools[index].onHand"
+          v-model="recipeTools[index].onHand"
           hide-details
           class="pt-0 my-auto py-auto"
           color="secondary"
@@ -26,14 +26,18 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from "@nuxtjs/composition-api";
+import { computed, defineComponent } from "@nuxtjs/composition-api";
 import { useLoggedInState } from "~/composables/use-logged-in-state";
 import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
 import { useToolStore } from "~/composables/store";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
-import { Recipe } from "~/lib/api/types/recipe";
+import { Recipe, RecipeTool } from "~/lib/api/types/recipe";
 import RecipeIngredients from "~/components/Domain/Recipe/RecipeIngredients.vue";
 
+interface RecipeToolWithOnHand extends RecipeTool {
+  onHand: boolean;
+}
+
 export default defineComponent({
   components: {
     RecipeIngredients,
@@ -59,9 +63,31 @@ export default defineComponent({
     const { user } = usePageUser();
     const { isEditMode } = usePageState(props.recipe.slug);
 
+    const recipeTools = computed(() => {
+      if (!(user.householdSlug && toolStore)) {
+        return props.recipe.tools.map((tool) => ({ ...tool, onHand: false }) as RecipeToolWithOnHand);
+      } else {
+        return props.recipe.tools.map((tool) => {
+          const onHand = tool.householdsWithTool?.includes(user.householdSlug) || false;
+          return { ...tool, onHand } as RecipeToolWithOnHand;
+        });
+      }
+    })
+
     function updateTool(index: number) {
-      if (user.id && toolStore) {
-        toolStore.actions.updateOne(props.recipe.tools[index]);
+      if (user.id && user.householdSlug && toolStore) {
+        const tool = recipeTools.value[index];
+        if (tool.onHand && !tool.householdsWithTool?.includes(user.householdSlug)) {
+          if (!tool.householdsWithTool) {
+            tool.householdsWithTool = [user.householdSlug];
+          } else {
+            tool.householdsWithTool.push(user.householdSlug);
+          }
+        } else if (!tool.onHand && tool.householdsWithTool?.includes(user.householdSlug)) {
+          tool.householdsWithTool = tool.householdsWithTool.filter((household) => household !== user.householdSlug);
+        }
+
+        toolStore.actions.updateOne(tool);
       } else {
         console.log("no user, skipping server update");
       }
@@ -69,6 +95,7 @@ export default defineComponent({
 
     return {
       toolStore,
+      recipeTools,
       isEditMode,
       updateTool,
     };

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

@@ -14,7 +14,7 @@
           :show-add="true"
           selector-type="categories"
         />
-        <RecipeChips v-else :items="recipe.recipeCategory" />
+        <RecipeChips v-else :items="recipe.recipeCategory" v-on="$listeners" />
       </v-card-text>
     </v-card>
 
@@ -32,7 +32,7 @@
           :show-add="true"
           selector-type="tags"
         />
-        <RecipeChips v-else :items="recipe.tags" url-prefix="tags" />
+        <RecipeChips v-else :items="recipe.tags" url-prefix="tags" v-on="$listeners" />
       </v-card-text>
     </v-card>
 
@@ -41,7 +41,7 @@
       <v-card-title class="py-2"> {{ $t('tool.required-tools') }} </v-card-title>
       <v-divider class="mx-2" />
       <v-card-text class="pt-0">
-        <RecipeOrganizerSelector v-model="recipe.tools" selector-type="tools" />
+        <RecipeOrganizerSelector v-model="recipe.tools" selector-type="tools" v-on="$listeners" />
       </v-card-text>
     </v-card>
 
@@ -82,6 +82,8 @@ export default defineComponent({
     const { user } = usePageUser();
     const { isEditForm } = usePageState(props.recipe.slug);
 
+
+
     return {
       isEditForm,
       user,

frontend/components/Domain/Recipe/RecipePrintView.vue

@@ -30,12 +30,17 @@
                 <span v-html="recipeYield"></span>
               </v-chip>
             </div>
-            <RecipeTimeCard
-              :prep-time="recipe.prepTime"
-              :total-time="recipe.totalTime"
-              :perform-time="recipe.performTime"
-              color="white"
-            />
+            <v-row class="d-flex justify-start">
+              <RecipeTimeCard
+                :prep-time="recipe.prepTime"
+                :total-time="recipe.totalTime"
+                :perform-time="recipe.performTime"
+                small
+                color="white"
+                class="ml-4"
+              />
+            </v-row>
+
             <v-card-text v-if="preferences.showDescription" class="px-0">
               <SafeMarkdown :source="recipe.description" />
             </v-card-text>

frontend/components/Domain/Recipe/RecipeScaleEditButton.vue

@@ -4,11 +4,18 @@
       <div>
         <v-menu v-model="menu" :disabled="!canEditScale" offset-y top nudge-top="6" :close-on-content-click="false">
           <template #activator="{ on, attrs }">
-            <v-card class="pa-1 px-2" dark color="secondary darken-1" small v-bind="attrs" v-on="on">
-              <v-icon small class="mr-2">{{ $globals.icons.edit }}</v-icon>
+            <v-card
+              class="pa-1 px-2"
+              dark
+              color="secondary darken-1"
+              small
+              v-bind="attrs"
+              :style="{ cursor: canEditScale ? '' : 'default' }"
+              v-on="on"
+            >
+              <v-icon v-if="canEditScale" small class="mr-2">{{ $globals.icons.edit }}</v-icon>
               <!-- eslint-disable-next-line vue/no-v-html -->
               <span v-html="yieldDisplay"></span>
-
             </v-card>
           </template>
           <v-card min-width="300px">

frontend/components/Domain/Recipe/RecipeTimeCard.vue

@@ -1,41 +1,37 @@
-<template>
-  <div v-if="stacked">
-    <v-container>
-      <v-row v-for="(time, index) in allTimes" :key="`${index}-stacked`" no-gutters>
-        <v-col cols="12" :class="containerClass">
-          <v-chip
-            :small="$vuetify.breakpoint.smAndDown"
-            label
-            :color="color"
-            class="ma-1"
-          >
-            <v-icon left>
-              {{ $globals.icons.clockOutline }}
-            </v-icon>
-            {{ time.name }} |
-            {{ time.value }}
-          </v-chip>
-        </v-col>
-      </v-row>
-    </v-container>
-  </div>
-  <div v-else>
-    <v-container :class="containerClass">
-      <v-chip
-        v-for="(time, index) in allTimes"
-        :key="index"
-        :small="$vuetify.breakpoint.smAndDown"
-        label
-        :color="color"
-        class="ma-1"
-      >
-        <v-icon left>
+<template v-if="showCards">
+  <div class="text-center">
+    <!-- Total Time -->
+    <div v-if="validateTotalTime" class="time-card-flex mx-auto">
+      <v-row no-gutters class="d-flex flex-no-wrap align-center " :style="fontSize">
+        <v-icon :x-large="!small" left color="primary">
           {{ $globals.icons.clockOutline }}
         </v-icon>
-        {{ time.name }} |
-        {{ time.value }}
-      </v-chip>
-    </v-container>
+        <p class="my-0"><span class="font-weight-bold">{{ validateTotalTime.name }}</span><br>{{ validateTotalTime.value }}</p>
+      </v-row>
+    </div>
+    <v-divider v-if="validateTotalTime && (validatePrepTime || validatePerformTime)" class="my-2" />
+    <!-- Prep Time & Perform Time -->
+    <div v-if="validatePrepTime || validatePerformTime" class="time-card-flex mx-auto">
+      <v-row
+        no-gutters
+        class="d-flex justify-center align-center" :class="{'flex-column': $vuetify.breakpoint.smAndDown}"
+        style="width: 100%;" :style="fontSize"
+      >
+        <div v-if="validatePrepTime" class="d-flex flex-no-wrap my-1">
+          <v-icon :large="!small" :dense="small" left color="primary">
+            {{ $globals.icons.knfife }}
+          </v-icon>
+          <p class="my-0"><span class="font-weight-bold">{{ validatePrepTime.name }}</span><br>{{ validatePrepTime.value }}</p>
+        </div>
+        <v-divider v-if="validatePrepTime && validatePerformTime" vertical class="mx-4" />
+        <div v-if="validatePerformTime" class="d-flex flex-no-wrap my-1">
+          <v-icon :large="!small" :dense="small" left color="primary">
+            {{ $globals.icons.potSteam }}
+          </v-icon>
+          <p class="my-0"><span class="font-weight-bold">{{ validatePerformTime.name }}</span><br>{{ validatePerformTime.value }}</p>
+        </div>
+      </v-row>
+    </div>
   </div>
 </template>
 
@@ -44,10 +40,6 @@ import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
 
 export default defineComponent({
   props: {
-    stacked: {
-      type: Boolean,
-      default: false,
-    },
     prepTime: {
       type: String,
       default: null,
@@ -64,9 +56,9 @@ export default defineComponent({
       type: String,
       default: "accent custom-transparent"
     },
-    containerClass: {
-      type: String,
-      default: undefined,
+    small: {
+      type: Boolean,
+      default: false,
     },
   },
   setup(props) {
@@ -92,13 +84,16 @@ export default defineComponent({
       return !isEmpty(props.performTime) ? { name: i18n.t("recipe.perform-time"), value: props.performTime } : null;
     });
 
-    const allTimes = computed(() => {
-      return [validateTotalTime.value, validatePrepTime.value, validatePerformTime.value].filter((x) => x !== null);
+    const fontSize = computed(() => {
+      return props.small ? { fontSize: "smaller" } : { fontSize: "larger" };
     });
 
     return {
       showCards,
-      allTimes,
+      validateTotalTime,
+      validatePrepTime,
+      validatePerformTime,
+      fontSize,
     };
   },
 });

frontend/components/Domain/Recipe/RecipeTimerMenu.vue

@@ -1,317 +0,0 @@
-<template>
-  <div class="text-center">
-    <v-menu
-      v-model="showMenu"
-      offset-x
-      offset-overflow
-      left
-      allow-overflow
-      close-delay="125"
-      :close-on-content-click="false"
-      content-class="d-print-none"
-      :z-index="2"
-    >
-      <template #activator="{ on, attrs }">
-        <v-badge :value="timerEnded" overlap color="red" content="!">
-          <v-btn :fab="fab" :small="fab" :color="timerEnded ? 'secondary' : color" :icon="!fab" dark v-bind="attrs" v-on="on" @click.prevent>
-            <v-progress-circular
-              v-if="timerInitialized && !timerEnded"
-              :value="timerProgress"
-              :rotate="270"
-              :color="timerRunning ? undefined : 'primary'"
-            >
-              <v-icon small>{{ timerRunning ? $globals.icons.timer : $globals.icons.timerPause }}</v-icon>
-            </v-progress-circular>
-            <v-icon v-else>{{ $globals.icons.timer }}</v-icon>
-          </v-btn>
-        </v-badge>
-      </template>
-      <v-card>
-        <v-card-title>
-          <v-icon class="pr-2">{{ $globals.icons.timer }}</v-icon>
-          {{ $i18n.tc("recipe.timer.kitchen-timer") }}
-        </v-card-title>
-        <div class="mx-auto" style="width: fit-content;">
-          <v-progress-circular
-            :value="timerProgress"
-            :rotate="270"
-            color="primary"
-            class="mb-2"
-            :size="128"
-            :width="24"
-          >
-          <v-icon
-            v-if="timerInitialized && !timerRunning"
-            x-large
-            :color="timerEnded ? 'red' : 'primary'"
-            @click="() => timerEnded ? resetTimer() : resumeTimer()"
-          >
-            {{ timerEnded ? $globals.icons.stop : $globals.icons.pause }}
-          </v-icon>
-          </v-progress-circular>
-        </div>
-        <v-container width="100%" fluid class="ma-0 px-auto py-2">
-          <v-row no-gutters justify="center">
-            <v-col cols="3" align-self="center">
-              <v-text-field
-                :value="timerHours"
-                :min="0"
-                outlined
-                single-line
-                solo
-                hide-details
-                type="number"
-                :disabled="timerInitialized"
-                class="centered-input my-0 py-0"
-                style="font-size: large; width: 100px;"
-                @input="(v) => timerHours = v.toString().padStart(2, '0')"
-              />
-            </v-col>
-            <v-col cols="1" align-self="center" style="text-align: center;">
-              <h1>:</h1>
-            </v-col>
-            <v-col cols="3" align-self="center">
-              <v-text-field
-                :value="timerMinutes"
-                :min="0"
-                outlined
-                single-line
-                solo
-                hide-details
-                type="number"
-                :disabled="timerInitialized"
-                class="centered-input my-0 py-0"
-                style="font-size: large; width: 100px;"
-                @input="(v) => timerMinutes = v.toString().padStart(2, '0')"
-              />
-            </v-col>
-            <v-col cols="1" align-self="center" style="text-align: center;" >
-              <h1>:</h1>
-            </v-col>
-            <v-col cols="3" align-self="center">
-              <v-text-field
-                :value="timerSeconds"
-                :min="0"
-                outlined
-                single-line
-                solo
-                hide-details
-                type="number"
-                :disabled="timerInitialized"
-                class="centered-input my-0 py-0"
-                style="font-size: large; width: 100px;"
-                @input="(v) => timerSeconds = v.toString().padStart(2, '0')"
-              />
-            </v-col>
-          </v-row>
-        </v-container>
-        <div class="mx-auto" style="width: 100%;">
-          <BaseButtonGroup
-            stretch
-            :buttons="timerButtons"
-            @initialize-timer="initializeTimer"
-            @pause-timer="pauseTimer"
-            @resume-timer="resumeTimer"
-            @stop-timer="resetTimer"
-          />
-        </div>
-      </v-card>
-    </v-menu>
-  </div>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, reactive, ref, toRefs, useContext, watch } from "@nuxtjs/composition-api";
-import { ButtonOption } from "~/components/global/BaseButtonGroup.vue";
-
-// @ts-ignore typescript can't find our audio file, but it's there!
-import timerAlarmAudio from "~/assets/audio/kitchen_alarm.mp3";
-
-export default defineComponent({
-  props: {
-    fab: {
-      type: Boolean,
-      default: false,
-    },
-    color: {
-      type: String,
-      default: "primary",
-    },
-  },
-  setup() {
-    const { $globals, i18n } = useContext();
-    const state = reactive({
-      showMenu: false,
-      timerInitialized: false,
-      timerRunning: false,
-      timerEnded: false,
-      timerInitialValue: 0,
-      timerValue: 0,
-    });
-
-    watch(
-      () => state.showMenu,
-      () => {
-        if (state.showMenu && state.timerEnded) {
-          resetTimer();
-        }
-      }
-    );
-
-    // ts doesn't recognize timerAlarmAudio because it's a weird import
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const timerAlarm = new Audio(timerAlarmAudio);
-    timerAlarm.loop = true;
-
-    const timerHours = ref<string | number>("00");
-    const timerMinutes = ref<string | number>("00");
-    const timerSeconds = ref<string | number>("00");
-
-    const initializeButton: ButtonOption = {
-      icon: $globals.icons.timerPlus,
-      text: i18n.tc("recipe.timer.start-timer"),
-      event: "initialize-timer",
-    }
-
-    const pauseButton: ButtonOption = {
-      icon: $globals.icons.pause,
-      text: i18n.tc("recipe.timer.pause-timer"),
-      event: "pause-timer",
-    };
-
-    const resumeButton: ButtonOption = {
-      icon: $globals.icons.play,
-      text: i18n.tc("recipe.timer.resume-timer"),
-      event: "resume-timer",
-    };
-
-    const stopButton: ButtonOption = {
-      icon: $globals.icons.stop,
-      text: i18n.tc("recipe.timer.stop-timer"),
-      event: "stop-timer",
-      color: "red",
-    };
-
-    const timerButtons = computed<ButtonOption[]>(() => {
-      const buttons: ButtonOption[] = [];
-      if (state.timerInitialized) {
-        if (state.timerEnded) {
-          buttons.push(stopButton);
-        } else if (state.timerRunning) {
-          buttons.push(pauseButton, stopButton);
-        } else {
-          buttons.push(resumeButton, stopButton);
-        }
-      } else {
-        buttons.push(initializeButton);
-      }
-
-      // I don't know why this is failing the frontend lint test ¯\_(ツ)_/¯
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-      return buttons;
-    });
-
-    const timerProgress = computed(() => {
-      if(state.timerInitialValue) {
-        return (state.timerValue / state.timerInitialValue) * 100;
-      } else {
-        return 0;
-      }
-    });
-
-    let timerInterval: number | null = null;
-    function decrementTimer() {
-      if (state.timerValue > 0) {
-        state.timerValue -= 1;
-
-        timerHours.value = Math.floor(state.timerValue / 3600).toString().padStart(2, "0");
-        timerMinutes.value = Math.floor(state.timerValue % 3600 / 60).toString().padStart(2, "0");
-        timerSeconds.value = Math.floor(state.timerValue % 3600 % 60).toString().padStart(2, "0");
-      }
-      else {
-        state.timerRunning = false;
-        state.timerEnded = true;
-        timerAlarm.currentTime = 0;
-        timerAlarm.play();
-
-        if (timerInterval) {
-          clearInterval(timerInterval);
-          timerInterval = null;
-        }
-      }
-    }
-
-    function initializeTimer() {
-      state.timerInitialized = true;
-      state.timerRunning = true;
-      state.timerEnded = false;
-
-      console.log(timerSeconds.value);
-
-      const hours = parseFloat(timerHours.value.toString()) > 0 ? parseFloat(timerHours.value.toString()) : 0;
-      const minutes = parseFloat(timerMinutes.value.toString()) > 0 ? parseFloat(timerMinutes.value.toString()) : 0;
-      const seconds = parseFloat(timerSeconds.value.toString()) > 0 ? parseFloat(timerSeconds.value.toString()) : 0;
-
-      state.timerInitialValue = (hours * 3600) + (minutes * 60) + seconds;
-      state.timerValue = state.timerInitialValue;
-
-      timerInterval = setInterval(decrementTimer, 1000) as unknown as number;
-
-      timerHours.value = Math.floor(state.timerValue / 3600).toString().padStart(2, "0");
-      timerMinutes.value = Math.floor(state.timerValue % 3600 / 60).toString().padStart(2, "0");
-      timerSeconds.value = Math.floor(state.timerValue % 3600 % 60).toString().padStart(2, "0");
-    };
-
-    function pauseTimer() {
-      state.timerRunning = false;
-      if (timerInterval) {
-        clearInterval(timerInterval);
-        timerInterval = null;
-      }
-    };
-
-    function resumeTimer() {
-      state.timerRunning = true;
-      timerInterval = setInterval(decrementTimer, 1000) as unknown as number;
-    };
-
-    function resetTimer() {
-      state.timerInitialized = false;
-      state.timerRunning = false;
-      state.timerEnded = false;
-
-      timerAlarm.pause();
-      timerAlarm.currentTime = 0;
-
-      timerHours.value = "00";
-      timerMinutes.value = "00";
-      timerSeconds.value = "00";
-
-      state.timerValue = 0;
-      if (timerInterval) {
-        clearInterval(timerInterval);
-        timerInterval = null;
-      }
-    };
-
-    return {
-      ...toRefs(state),
-      timerHours,
-      timerMinutes,
-      timerSeconds,
-      timerButtons,
-      timerProgress,
-      initializeTimer,
-      pauseTimer,
-      resumeTimer,
-      resetTimer,
-    };
-  },
-});
-</script>
-
-<style scoped>
-    .centered-input >>> input {
-      text-align: center;
-    }
-</style>

frontend/components/Domain/Recipe/RecipeYield.vue

@@ -1,21 +1,20 @@
 <template>
-  <div v-if="displayText" class="d-flex justify-space-between align-center">
-    <v-chip
-      :small="$vuetify.breakpoint.smAndDown"
-      label
-      :color="color"
-    >
-      <v-icon left>
-        {{ $globals.icons.potSteam }}
+  <div v-if="scaledAmount" class="d-flex align-center">
+    <v-row no-gutters class="d-flex flex-wrap align-center" style="font-size: larger;">
+      <v-icon x-large left color="primary">
+        {{ $globals.icons.bread }}
       </v-icon>
-      <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-html="displayText"></span>
-    </v-chip>
+      <p class="my-0">
+        <span class="font-weight-bold">{{ $i18n.tc("recipe.yield") }}</span><br>
+        <!-- eslint-disable-next-line vue/no-v-html -->
+        <span v-html="scaledAmount"></span> {{ text }}
+      </p>
+    </v-row>
   </div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
+import { defineComponent, computed } from "@nuxtjs/composition-api";
 import DOMPurify from "dompurify";
 import { useScaledAmount } from "~/composables/recipes/use-scaled-amount";
 
@@ -39,7 +38,6 @@ export default defineComponent({
     },
   },
   setup(props) {
-    const { i18n } = useContext();
 
     function sanitizeHTML(rawHtml: string) {
       return DOMPurify.sanitize(rawHtml, {
@@ -48,21 +46,15 @@ export default defineComponent({
       });
     }
 
-    const displayText = computed(() => {
-      if (!(props.yieldQuantity || props.yield)) {
-        return "";
-      }
-
-      const { scaledAmountDisplay } = useScaledAmount(props.yieldQuantity, props.scale);
-
-      return i18n.t("recipe.yields-amount-with-text", {
-        amount: scaledAmountDisplay,
-        text: sanitizeHTML(props.yield),
-      }) as string;
+    const scaledAmount = computed(() => {
+      const {scaledAmountDisplay} =  useScaledAmount(props.yieldQuantity, props.scale);
+      return scaledAmountDisplay;
     });
+    const text = sanitizeHTML(props.yield);
 
     return {
-      displayText,
+      scaledAmount,
+      text,
     };
   },
 });

frontend/components/Domain/ShoppingList/ShoppingListItemEditor.vue

@@ -34,6 +34,7 @@
             :label="$t('shopping-list.note')"
             rows="1"
             auto-grow
+            autofocus
             @keypress="handleNoteKeyPress"
           ></v-textarea>
         </div>
@@ -80,37 +81,37 @@
           <v-spacer />
         </div>
       </v-card-text>
+      <v-card-actions class="ma-0 pt-0 pb-1 justify-end">
+        <BaseButtonGroup
+          :buttons="[
+            ...(allowDelete ? [{
+              icon: $globals.icons.delete,
+              text: $t('general.delete'),
+              event: 'delete',
+            }] : []),
+            {
+              icon: $globals.icons.close,
+              text: $t('general.cancel'),
+              event: 'cancel',
+            },
+            {
+              icon: $globals.icons.foods,
+              text: $t('shopping-list.toggle-food'),
+              event: 'toggle-foods',
+            },
+            {
+              icon: $globals.icons.save,
+              text: $t('general.save'),
+              event: 'save',
+            },
+          ]"
+          @save="$emit('save')"
+          @cancel="$emit('cancel')"
+          @delete="$emit('delete')"
+          @toggle-foods="listItem.isFood = !listItem.isFood"
+        />
+      </v-card-actions>
     </v-card>
-    <v-card-actions class="ma-0 pt-0 pb-1 justify-end">
-      <BaseButtonGroup
-        :buttons="[
-          {
-            icon: $globals.icons.delete,
-            text: $t('general.delete'),
-            event: 'delete',
-          },
-          {
-            icon: $globals.icons.close,
-            text: $t('general.cancel'),
-            event: 'cancel',
-          },
-          {
-            icon: $globals.icons.foods,
-            text: $t('shopping-list.toggle-food'),
-            event: 'toggle-foods',
-          },
-          {
-            icon: $globals.icons.save,
-            text: $t('general.save'),
-            event: 'save',
-          },
-        ]"
-        @save="$emit('save')"
-        @cancel="$emit('cancel')"
-        @delete="$emit('delete')"
-        @toggle-foods="listItem.isFood = !listItem.isFood"
-      />
-    </v-card-actions>
   </div>
 </template>
 
@@ -139,6 +140,11 @@ export default defineComponent({
       type: Array as () => IngredientFood[],
       required: true,
     },
+    allowDelete: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
   },
   setup(props, context) {
     const foodStore = useFoodStore();

frontend/components/global/AppLoader.vue

@@ -8,14 +8,14 @@
           </v-icon>
           <div v-if="large" class="text-small">
             <slot>
-              {{ small ? "" : waitingText }}
+              {{ (small || tiny) ? "" : waitingText }}
             </slot>
           </div>
         </div>
       </v-progress-circular>
       <div v-if="!large" class="text-small">
         <slot>
-          {{ small ? "" : waitingTextCalculated }}
+          {{ (small || tiny) ? "" : waitingTextCalculated }}
         </slot>
       </div>
     </div>
@@ -31,6 +31,10 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    tiny: {
+      type: Boolean,
+      default: false,
+    },
     small: {
       type: Boolean,
       default: false,
@@ -50,6 +54,13 @@ export default defineComponent({
   },
   setup(props) {
     const size = computed(() => {
+      if (props.tiny) {
+        return {
+          width: 2,
+          icon: 0,
+          size: 25,
+        };
+      }
       if (props.small) {
         return {
           width: 2,

frontend/composables/recipes/use-recipe-tools.ts

@@ -9,7 +9,6 @@ export const useTools = function (eager = true) {
     id: "",
     name: "",
     slug: "",
-    onHand: false,
   });
 
   const api = useUserApi();

frontend/composables/recipes/use-recipes.ts

@@ -2,7 +2,7 @@ import { useAsync, useRouter, ref } from "@nuxtjs/composition-api";
 import { useAsyncKey } from "../use-utils";
 import { usePublicExploreApi } from "~/composables/api/api-client";
 import { useUserApi } from "~/composables/api";
-import { Recipe } from "~/lib/api/types/recipe";
+import { OrderByNullPosition, Recipe } from "~/lib/api/types/recipe";
 import { RecipeSearchQuery } from "~/lib/api/user/recipes/recipe";
 
 export const allRecipes = ref<Recipe[]>([]);
@@ -11,12 +11,14 @@ export const recentRecipes = ref<Recipe[]>([]);
 function getParams(
   orderBy: string | null = null,
   orderDirection = "desc",
+  orderByNullPosition: OrderByNullPosition | null = null,
   query: RecipeSearchQuery | null = null,
   queryFilter: string | null = null
 ) {
   return {
     orderBy,
     orderDirection,
+    orderByNullPosition,
     paginationSeed: query?._searchSeed, // propagate searchSeed to stabilize random order pagination
     searchSeed: query?._searchSeed, // unused, but pass it along for completeness of data
     search: query?.search,
@@ -47,6 +49,7 @@ export const useLazyRecipes = function (publicGroupSlug: string | null = null) {
     perPage: number,
     orderBy: string | null = null,
     orderDirection = "desc",
+    orderByNullPosition: OrderByNullPosition | null = null,
     query: RecipeSearchQuery | null = null,
     queryFilter: string | null = null,
   ) {
@@ -54,7 +57,7 @@ export const useLazyRecipes = function (publicGroupSlug: string | null = null) {
     const { data, error } = await api.recipes.getAll(
       page,
       perPage,
-      getParams(orderBy, orderDirection, query, queryFilter),
+      getParams(orderBy, orderDirection, orderByNullPosition, query, queryFilter),
     );
 
     if (error?.response?.status === 404) {
@@ -88,7 +91,7 @@ export const useLazyRecipes = function (publicGroupSlug: string | null = null) {
   }
 
   async function getRandom(query: RecipeSearchQuery | null = null, queryFilter: string | null = null) {
-    const { data } = await api.recipes.getAll(1, 1, getParams("random", "desc", query, queryFilter));
+    const { data } = await api.recipes.getAll(1, 1, getParams("random", "desc", null, query, queryFilter));
     if (data?.items.length) {
       return data.items[0];
     }

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

@@ -13,7 +13,6 @@ export const useFoodData = function () {
     name: "",
     description: "",
     labelId: undefined,
-    onHand: false,
   });
 }
 

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

@@ -3,16 +3,21 @@ import { useData, useReadOnlyStore, useStore } from "../partials/use-store-facto
 import { RecipeTool } from "~/lib/api/types/recipe";
 import { usePublicExploreApi, useUserApi } from "~/composables/api";
 
+interface RecipeToolWithOnHand extends RecipeTool {
+  onHand: boolean;
+}
+
 const store: Ref<RecipeTool[]> = ref([]);
 const loading = ref(false);
 const publicLoading = ref(false);
 
 export const useToolData = function () {
-  return useData<RecipeTool>({
+  return useData<RecipeToolWithOnHand>({
     id: "",
     name: "",
     slug: "",
     onHand: false,
+    householdsWithTool: [],
   });
 }
 

frontend/composables/use-group-recipe-actions.ts

@@ -46,17 +46,23 @@ export const useGroupRecipeActions = function (
     return groupRecipeActions.value;
   });
 
-  function parseRecipeActionUrl(url: string, recipe: Recipe): string {
+  function parseRecipeActionUrl(url: string, recipe: Recipe, recipeScale: number): string {
+    const recipeServings = (recipe.recipeServings || 1) * recipeScale;
+    const recipeYieldQuantity = (recipe.recipeYieldQuantity || 1) * recipeScale;
+
     /* eslint-disable no-template-curly-in-string */
     return url
       .replace("${url}", window.location.href)
       .replace("${id}", recipe.id || "")
       .replace("${slug}", recipe.slug || "")
+      .replace("${servings}", recipeServings.toString())
+      .replace("${yieldQuantity}", recipeYieldQuantity.toString())
+      .replace("${yieldText}", recipe.recipeYield || "")
     /* eslint-enable no-template-curly-in-string */
   };
 
-  async function execute(action: GroupRecipeActionOut, recipe: Recipe): Promise<void | RequestResponse<unknown>> {
-    const url = parseRecipeActionUrl(action.url, recipe);
+  async function execute(action: GroupRecipeActionOut, recipe: Recipe, recipeScale: number): Promise<void | RequestResponse<unknown>> {
+    const url = parseRecipeActionUrl(action.url, recipe, recipeScale);
 
     switch (action.actionType) {
       case "link":

frontend/lang/messages/af-ZA.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Verhoog skaal met 1",
     "locked": "Gesluit",
     "public-link": "Openbare skakel",
-    "timer": {
-      "kitchen-timer": "Kombuis timer",
-      "start-timer": "Begin die kombuis timer",
-      "pause-timer": "Onderbreek die kombuis timer",
-      "resume-timer": "Hervat kombuis timer",
-      "stop-timer": "Stop die kombuis timer"
-    },
     "edit-timeline-event": "Wysig tydlyn gebeurtenis",
     "timeline": "Tydlyn",
     "timeline-is-empty": "Nog niks op die tydlyn nie. Probeer hierdie resep maak!",
@@ -586,7 +579,6 @@
     "made-this": "Ek het dit gemaak",
     "how-did-it-turn-out": "Hoe het dit uitgedraai?",
     "user-made-this": "{user} het dit gemaak",
-    "last-made-date": "Laas gemaak {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": "Boodskap sleutel",
     "parse": "Verwerk",

frontend/lang/messages/ar-SA.json

@@ -250,60 +250,60 @@
     "invite": "دعوة",
     "looking-to-update-your-profile": "هل ترغب في تحديث ملفك الشخصي؟",
     "default-recipe-preferences-description": "هذه هي الإعدادات الافتراضية عند إنشاء وصفة جديدة في مجموعتك. يمكن تغيير هذه الوصفات الفردية في قائمة إعدادات الوصفات.",
-    "default-recipe-preferences": "Default Recipe Preferences",
+    "default-recipe-preferences": "تفضيلات الوصفة الافتراضية",
     "group-preferences": "إعدادات المجموعة",
     "private-group": "مجموعة خاصة",
-    "private-group-description": "Setting your group to private will disable all public view options. This overrides any individual public view settings",
-    "enable-public-access": "Enable Public Access",
-    "enable-public-access-description": "Make group recipes public by default, and allow visitors to view recipes without logging-in",
+    "private-group-description": "سيؤدي تعيين مجموعتك إلى الخاص إلى تعطيل جميع خيارات العرض العام. وهذا يلغي أي إعدادات عرض عام فردية",
+    "enable-public-access": "تمكين الوصول للعموم",
+    "enable-public-access-description": "جعل وصفات المجموعة عامة بشكل افتراضي، والسماح للزوار بعرض الوصفات دون تسجيل الدخول",
     "allow-users-outside-of-your-group-to-see-your-recipes": "السماح للمستخدمين خارج مجموعتك لمشاهدة وصفاتك",
-    "allow-users-outside-of-your-group-to-see-your-recipes-description": "When enabled you can use a public share link to share specific recipes without authorizing the user. When disabled, you can only share recipes with users who are in your group or with a pre-generated private link",
+    "allow-users-outside-of-your-group-to-see-your-recipes-description": "عند التمكين يمكنك استخدام رابط المشاركة العامة لمشاركة وصفات محددة دون تفويض المستخدم. عند التعطيل، يمكنك مشاركة الوصفات فقط مع المستخدمين الموجودين في مجموعتك أو مع رابط خاص تم إنشاؤه مسبقاً",
     "show-nutrition-information": "عرض معلومات التغذية",
-    "show-nutrition-information-description": "When enabled the nutrition information will be shown on the recipe if available. If there is no nutrition information available, the nutrition information will not be shown",
-    "show-recipe-assets": "Show recipe assets",
-    "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",
+    "show-nutrition-information-description": "عندما يتم تمكين المعلومات الغذائية ستظهر على الوصفة إذا كانت متاحة. وفي حالة عدم توافر معلومات عن التغذية، لن تظهر المعلومات المتعلقة بالتغذية",
+    "show-recipe-assets": "إظهار أصول الوصفة",
+    "show-recipe-assets-description": "عند تمكين الوصفة، سيتم عرض أصول الوصفة على الوصفة إذا كانت متوفرة",
+    "default-to-landscape-view": "الافتراضي للعرض الأفقي",
+    "default-to-landscape-view-description": "عند تمكين قسم رأس الوصفة سوف يظهر في العرض الأفقي",
     "disable-users-from-commenting-on-recipes": "إيقاف المستخدمين من التعليق على الوصفات",
-    "disable-users-from-commenting-on-recipes-description": "Hides the comment section on the recipe page and disables commenting",
-    "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",
-    "group-recipe-preferences": "Group Recipe Preferences",
+    "disable-users-from-commenting-on-recipes-description": "يخفي قسم التعليق على صفحة الوصفة ويعطل التعليق",
+    "disable-organizing-recipe-ingredients-by-units-and-food": "تعطيل تنظيم عناصر الوصفة حسب الوحدات والطعام",
+    "disable-organizing-recipe-ingredients-by-units-and-food-description": "يخفي حقول الطعام والوحدة والكمية للمكونات ويعامل المكونات كحقول نصية عادية",
+    "general-preferences": "الإعدادات العامة",
+    "group-recipe-preferences": "تفضيلات الوصفة للمجموعة",
     "report": "تقرير",
-    "report-with-id": "Report ID: {id}",
-    "group-management": "Group Management",
-    "admin-group-management": "Admin Group Management",
-    "admin-group-management-text": "Changes to this group will be reflected immediately.",
-    "group-id-value": "Group Id: {0}",
-    "total-households": "Total Households",
-    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
+    "report-with-id": "معرف التقرير: {id}",
+    "group-management": "إدارة المجموعة",
+    "admin-group-management": "إدارة مجموعة المشرف",
+    "admin-group-management-text": "التغييرات التي ستطرأ على هذه المجموعة ستنعكس على الفور.",
+    "group-id-value": "معرف المجموعة: {0}",
+    "total-households": "مجموع المنزل",
+    "you-must-select-a-group-before-selecting-a-household": "يجب عليك تحديد مجموعة قبل تحديد المنزل"
   },
   "household": {
-    "household": "Household",
-    "households": "Households",
-    "user-household": "User Household",
-    "create-household": "Create Household",
-    "household-name": "Household Name",
-    "household-group": "Household Group",
-    "household-management": "Household Management",
-    "manage-households": "Manage Households",
-    "admin-household-management": "Admin Household Management",
-    "admin-household-management-text": "Changes to this household will be reflected immediately.",
-    "household-id-value": "Household Id: {0}",
-    "private-household": "Private Household",
-    "private-household-description": "Setting your household to private will disable all public view options. This overrides any individual public view settings",
-    "lock-recipe-edits-from-other-households": "Lock recipe edits from other households",
-    "lock-recipe-edits-from-other-households-description": "When enabled only users in your household can edit recipes created by your household",
-    "household-recipe-preferences": "Household Recipe Preferences",
-    "default-recipe-preferences-description": "These are the default settings when a new recipe is created in your household. These can be changed for individual recipes in the recipe settings menu.",
-    "allow-users-outside-of-your-household-to-see-your-recipes": "Allow users outside of your household to see your recipes",
-    "allow-users-outside-of-your-household-to-see-your-recipes-description": "When enabled you can use a public share link to share specific recipes without authorizing the user. When disabled, you can only share recipes with users who are in your household or with a pre-generated private link",
-    "household-preferences": "Household Preferences"
+    "household": "المنزل",
+    "households": "المنازل",
+    "user-household": "منزل المستخدم",
+    "create-household": "إنشاء منزل",
+    "household-name": "اسم المنزل",
+    "household-group": "مجموعة المنزل",
+    "household-management": "إدارة المنزل",
+    "manage-households": "إدارة المنازل",
+    "admin-household-management": "إدارة مشرف المنزل",
+    "admin-household-management-text": "التغييرات التي ستطرأ على هذا المنزل ستنعكس على الفور.",
+    "household-id-value": "معرف المنزل: {0}",
+    "private-household": "منزل خاص",
+    "private-household-description": "سيؤدي تعيين المنزل إلى خاص إلى تعطيل جميع خيارات العرض العام. وهذا يلغي أي إعدادات عرض عام فردية",
+    "lock-recipe-edits-from-other-households": "إقفال تحرير الوصفة من المنازل الأخرى",
+    "lock-recipe-edits-from-other-households-description": "عند التمكين, المستخدمين فقط في أسرتك المعيشية يمكنهم تعديل الوصفات التي أنشأتها أسرتك",
+    "household-recipe-preferences": "تفضيلات الوصفة المنزلية",
+    "default-recipe-preferences-description": "هذه هي الإعدادات الافتراضية عند إنشاء وصفة جديدة في منزلك. يمكن تغيير الوصفات الفردية في قائمة إعدادات الوصفة.",
+    "allow-users-outside-of-your-household-to-see-your-recipes": "السماح للمستخدمين خارج منزلك بمشاهدة وصفاتك",
+    "allow-users-outside-of-your-household-to-see-your-recipes-description": "عند التمكين يمكنك استخدام رابط المشاركة العامة لمشاركة وصفات محددة دون تفويض المستخدم. عند التعطيل، يمكنك مشاركة الوصفات فقط مع المستخدمين الموجودين في منزلك أو مع رابط خاص تم إنشاؤه مسبقاً",
+    "household-preferences": "تفضيلات المنزل"
   },
   "meal-plan": {
     "create-a-new-meal-plan": "إنشاء خطة وجبة جديدة",
-    "update-this-meal-plan": "Update this Meal Plan",
+    "update-this-meal-plan": "تحديث خِطَّة الوجبة الغذائية هذه",
     "dinner-this-week": "العشاء لهذا الأسبوع",
     "dinner-today": "العشاء اليوم",
     "dinner-tonight": "العشاء الليلة",
@@ -321,95 +321,95 @@
     "mealplan-settings": "اعدادات خطة الوجبات",
     "mealplan-update-failed": "فشل تحديث خطة الوجبات",
     "mealplan-updated": "تم تحديث خطة الوجبات",
-    "mealplan-households-description": "If no household is selected, recipes can be added from any household",
-    "any-category": "Any Category",
-    "any-tag": "Any Tag",
-    "any-household": "Any Household",
+    "mealplan-households-description": "إذا لم يتم اختيار منزل، يمكن إضافة وصفات من أي منزل",
+    "any-category": "أي فئة",
+    "any-tag": "أي وسم",
+    "any-household": "أي منزل",
     "no-meal-plan-defined-yet": "لم يتم تحديد خطة بعد",
     "no-meal-planned-for-today": "لم يتم تخطيط وجبة لهذا اليوم",
-    "numberOfDays-hint": "Number of days on page load",
-    "numberOfDays-label": "Default Days",
+    "numberOfDays-hint": "عدد الأيام عند تحميل الصفحة",
+    "numberOfDays-label": "الأيام الافتراضية",
     "only-recipes-with-these-categories-will-be-used-in-meal-plans": "فقط الوجبات التي تحتوي على التصنيفات التالية سوف تستخدم لإنشاء خطتك",
     "planner": "المخطط",
-    "quick-week": "Quick Week",
+    "quick-week": "أسبوع سريع",
     "side": "وجبة جانبية",
     "sides": "الوجبات الجانبية",
     "start-date": "تاريخ البدء",
-    "rule-day": "Rule Day",
+    "rule-day": "يوم القاعدة",
     "meal-type": "نوع الوجبة",
     "breakfast": "الإفطار",
     "lunch": "الغداء",
     "dinner": "العشاء",
     "type-any": "أي",
     "day-any": "أي",
-    "editor": "Editor",
+    "editor": "المحرر",
     "meal-recipe": "وصفة الوجبة",
     "meal-title": "عنوان الوجبة",
     "meal-note": "ملاحظة الوجبة",
     "note-only": "ملاحظة فقط",
     "random-meal": "وجبة عشوائية",
     "random-dinner": "عشاء عشوائي",
-    "random-side": "Random Side",
-    "this-rule-will-apply": "This rule will apply {dayCriteria} {mealTypeCriteria}.",
+    "random-side": "جانب عشوائي",
+    "this-rule-will-apply": "هذه القاعدة سوف تطبق على {dayCriteria} {mealTypeCriteria}.",
     "to-all-days": "إلى جميع الأيام",
-    "on-days": "on {0}s",
+    "on-days": "على أيام {0}",
     "for-all-meal-types": "لجميع أنواع الوجبات",
-    "for-type-meal-types": "for {0} meal types",
-    "meal-plan-rules": "Meal Plan Rules",
+    "for-type-meal-types": "لأنواع الوجبات {0}",
+    "meal-plan-rules": "قواعد خِطَّة وجبة الطعام",
     "new-rule": "قاعدة جديدة",
-    "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 rule filters 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.",
+    "meal-plan-rules-description": "يمكنك إنشاء قواعد لاختيار الوصفات التلقائية لخطط وجبتك الغذائية. وتستخدم هذه القواعد من قبل الخادم لتحديد مجموعة عشوائية من الوصفات التي يتم اختيارها من خلال إنشاء خطط الوجبات. لاحظ أنه إذا كانت القواعد تحتوي على نفس قيود اليوم/النوع فسيتم دمج عوامل تصفية القاعدة. من الناحية العملية، ليس من الضروري إنشاء قواعد مكررة، ولكن من الممكن فعل ذلك.",
+    "new-rule-description": "عند إنشاء قاعدة جديدة لخطة وجبة غذائية، يمكنك تقييد القاعدة لتكون قابلة للتطبيق ليوم محدد من الأسبوع و/أو نوع محدد من الوجبات. لتطبيق قاعدة على جميع الأيام أو جميع أنواع الوجبات الغذائية يمكنك تعيين القاعدة إلى \"أي كان\" التي ستطبقها على جميع القيم الممكنة لليوم و/أو نوع الوجبة.",
     "recipe-rules": "قواعد الوصفات",
     "applies-to-all-days": "ينطبق على جميع الأيام",
-    "applies-on-days": "Applies on {0}s",
-    "meal-plan-settings": "Meal Plan Settings"
+    "applies-on-days": "يطبق على أيام {0}",
+    "meal-plan-settings": "إعدادات خِطَّة الوجبات الغذائية"
   },
   "migration": {
-    "migration-data-removed": "Migration data removed",
-    "new-migration": "New Migration",
+    "migration-data-removed": "حذف بيانات الهجرة",
+    "new-migration": "هجرة جديدة",
     "no-file-selected": "لم يتمّ اختيار أيّ ملفّ",
-    "no-migration-data-available": "No Migration Data Available",
-    "previous-migrations": "Previous Migrations",
+    "no-migration-data-available": "لا توجد بيانات هجرة متوفرة",
+    "previous-migrations": "الهجرة السابقة",
     "recipe-migration": "نقل الوصفة",
     "chowdown": {
-      "description": "Migrate data from Chowdown",
-      "description-long": "Mealie natively supports the chowdown repository format. Download the code repository as a .zip file and upload it below.",
-      "title": "Chowdown"
+      "description": "نقل البيانات من \"Chowdown\"",
+      "description-long": "ميلي يدعم بشكل محلي تنسيق مستودع طعام. يجب تنزيل مستودع التعليمات البرمجية CODE REPOSITORY كملف مضغوط ZIP وتحميله أدناه.",
+      "title": "\"Chowdown\""
     },
     "nextcloud": {
-      "description": "Migrate data from a Nextcloud Cookbook instance",
-      "description-long": "Nextcloud recipes can be imported from a zip file that contains the data stored in Nextcloud. See the example folder structure below to ensure your recipes are able to be imported.",
-      "title": "Nextcloud Cookbook"
+      "description": "نقل البيانات من نموذج كتاب طبخ NEXTCLOUD",
+      "description-long": "يمكن استيراد الوصفات السحابية من مِلَفّ مضغوط ZIP يحتوي على البيانات المخزنة في Nextcloud. راجع بنية مجلد المثال أدناه للتأكد من أن وصفاتك قابلة للاستيراد.",
+      "title": "كتاب طبخ <Nextcloud>"
     },
     "copymethat": {
-      "description-long": "Mealie can import recipes from Copy Me That. Export your recipes in HTML format, then upload the .zip below.",
-      "title": "Copy Me That Recipe Manager"
+      "description-long": "يمكن لميلي استيراد الوصفات من نسخ لي. يجب تصدير وصفاتك بتنسيق HTML، ثم تحميل ZIP أدناه.",
+      "title": "انسخ لي مدير الوصفة"
     },
     "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"
+      "description-long": "يمكن لميلي استيراد الوصفات من تطبيق PAPRIKA. يجب تصدير وصفاتك من PAPRIKA، وإعادة تسمية امتداد التصدير إلى .ZIP وتحميله أدناه.",
+      "title": "مدير وصفة بابريكا"
     },
     "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.",
-      "title": "Mealie Pre v1.0"
+      "description-long": "يمكن لميلي استيراد الوصفات من تطبيق ميلي من إصدار قبل 1.0. يجب تصدير وصفاتك من نموذجك القديم، وتحميل المِلَفّ المضغوط أدناه. لاحظ أنه يمكن استيراد الوصفات فقط من التصدير.",
+      "title": "ميلي إصدار قبل 1.0"
     },
     "tandoor": {
-      "description-long": "Mealie can import recipes from Tandoor. Export your data in the \"Default\" format, then upload the .zip below.",
-      "title": "Tandoor Recipes"
+      "description-long": "يمكن لميلي استيراد الوصفات من تندور. يجب تصدير بياناتك بالتنسيق \"الافتراضي\"، ثم يجب تحميل المِلَفّ المضغوط أدناه.",
+      "title": "وصفات تاندور"
     },
-    "recipe-data-migrations": "Recipe Data Migrations",
-    "recipe-data-migrations-explanation": "Recipes can be migrated from another supported application to Mealie. This is a great way to get started with Mealie.",
-    "coming-from-another-application-or-an-even-older-version-of-mealie": "Coming from another application or an even older version of Mealie? Check out migrations and see if your data can be imported.",
-    "choose-migration-type": "Choose Migration Type",
-    "tag-all-recipes": "Tag all recipes with {tag-name} tag",
-    "nextcloud-text": "Nextcloud recipes can be imported from a zip file that contains the data stored in Nextcloud. See the example folder structure below to ensure your recipes are able to be imported.",
+    "recipe-data-migrations": "وصفة 2",
+    "recipe-data-migrations-explanation": "يمكن نقل الوصفات من تطبيق آخر مدعوم إلى ميلي. هذه طريقة رائعة للبدء مع ميلي.",
+    "coming-from-another-application-or-an-even-older-version-of-mealie": "هل تأتي من تطبيق آخر أو حتى إصدار قديم من ميلي؟ يجب التحقق من عمليات الترحيل لمعرفة ما إذا كان يمكن استيراد بياناتك.",
+    "choose-migration-type": "اختر نوع الترحيل",
+    "tag-all-recipes": "وسم جميع الوصفات باستخدام علامة {tag-name}",
+    "nextcloud-text": "يمكن استيراد الوصفات السحابية من مِلَفّ مضغوط Zip يحتوي على البيانات المخزنة في Nextcloud. راجع بنية مجلد المثال أدناه للتأكد من أن وصفاتك قابلة للاستيراد.",
     "chowdown-text": "Mealie natively supports the chowdown repository format. Download the code repository as a .zip file and upload it below.",
-    "recipe-1": "Recipe 1",
-    "recipe-2": "Recipe 2",
+    "recipe-1": "وصفة 1",
+    "recipe-2": "وصفة 2",
     "paprika-text": "Mealie can import recipes from the Paprika application. Export your recipes from paprika, rename the export extension to .zip and upload it below.",
     "mealie-text": "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.",
     "plantoeat": {
-      "title": "Plan to Eat",
+      "title": "خِطَّة تناول الطعام",
       "description-long": "Mealie can import recipies from Plan to Eat."
     },
     "myrecipebox": {
@@ -417,44 +417,44 @@
       "description-long": "Mealie can import recipes from My Recipe Box. Export your recipes in CSV format, then upload the .csv file below."
     },
     "recipekeeper": {
-      "title": "Recipe Keeper",
+      "title": "مدير الوصفة",
       "description-long": "Mealie can import recipes from Recipe Keeper. Export your recipes in zip format, then upload the .zip file below."
     }
   },
   "new-recipe": {
-    "bulk-add": "Bulk Add",
+    "bulk-add": "إضافة مجموعة",
     "error-details": "Only websites containing ld+json or microdata can be imported by Mealie. Most major recipe websites support this data structure. If your site cannot be imported but there is json data in the log, please submit a github issue with the URL and data.",
     "error-title": "Looks Like We Couldn't Find Anything",
-    "from-url": "Import a Recipe",
+    "from-url": "استيراد وصفة",
     "github-issues": "مشاكل GitHub",
     "google-ld-json-info": "معرف Google + معلومات json",
     "must-be-a-valid-url": "يجب أن يكون عنوان URL صالحًا",
     "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Paste in your recipe data. Each line will be treated as an item in a list",
     "recipe-markup-specification": "Recipe Markup Specification",
-    "recipe-url": "Recipe URL",
-    "recipe-html-or-json": "Recipe HTML or JSON",
-    "upload-a-recipe": "Upload a Recipe",
-    "upload-individual-zip-file": "Upload an individual .zip file exported from another Mealie instance.",
-    "url-form-hint": "Copy and paste a link from your favorite recipe website",
-    "view-scraped-data": "View Scraped Data",
-    "trim-whitespace-description": "Trim leading and trailing whitespace as well as blank lines",
-    "trim-prefix-description": "Trim first character from each line",
+    "recipe-url": "رابط الوصفة",
+    "recipe-html-or-json": "وصفة HTML أو JSON",
+    "upload-a-recipe": "تحميل وصفة",
+    "upload-individual-zip-file": "تحميل مِلَفّ zip فردي تم تصديره من مثيل Malie آخر.",
+    "url-form-hint": "نسخ ولصق رابط من موقعك المفضل للوصفة",
+    "view-scraped-data": "عرض البيانات المكشوفة",
+    "trim-whitespace-description": "قص المسافات البيضاء البادئة واللاحقة وكذلك الأسطر الفارغة",
+    "trim-prefix-description": "قص الحرف الأول من كل سطر",
     "split-by-numbered-line-description": "Attempts to split a paragraph by matching '1)' or '1.' patterns",
-    "import-by-url": "Import a recipe by URL",
-    "create-manually": "Create a recipe manually",
-    "make-recipe-image": "Make this the recipe image"
+    "import-by-url": "استيراد وصفة عن طريق عنوان URL",
+    "create-manually": "إنشاء وصفة يدوياً",
+    "make-recipe-image": "اجعل هذه صورة الوصفة"
   },
   "page": {
-    "404-page-not-found": "404 Page not found",
-    "all-recipes": "All Recipes",
-    "new-page-created": "New page created",
+    "404-page-not-found": "404: لم يتم العثور على الصفحة",
+    "all-recipes": "جميع الوصفات",
+    "new-page-created": "تم إنشاء الصفحة الجديدة",
     "page": "الصفحة",
-    "page-creation-failed": "Page creation failed",
+    "page-creation-failed": "فشل إنشاء الصفحة",
     "page-deleted": "تم حذف الصفحة",
     "page-deletion-failed": "حذف الصفحة فشل",
     "page-update-failed": "تحديث الصفحة فشل",
     "page-updated": "تم تحديث صفحة",
-    "pages-update-failed": "Pages update failed",
+    "pages-update-failed": "فشل تحديث الصفحات",
     "pages-updated": "Pages updated",
     "404-not-found": "لم يتم العثور على الصفحة. خطأ 404",
     "an-error-occurred": "حصل خطأ ما"
@@ -500,42 +500,42 @@
     "object-value": "Object Value",
     "original-url": "Original URL",
     "perform-time": "Cook Time",
-    "prep-time": "Prep Time",
-    "protein-content": "Protein",
-    "public-recipe": "Public Recipe",
-    "recipe-created": "Recipe created",
-    "recipe-creation-failed": "Recipe creation failed",
-    "recipe-deleted": "Recipe deleted",
-    "recipe-image": "Recipe Image",
-    "recipe-image-updated": "Recipe image updated",
-    "recipe-name": "Recipe Name",
-    "recipe-settings": "Recipe Settings",
-    "recipe-update-failed": "Recipe update failed",
-    "recipe-updated": "Recipe updated",
-    "remove-from-favorites": "Remove from Favorites",
-    "remove-section": "Remove Section",
-    "saturated-fat-content": "Saturated fat",
-    "save-recipe-before-use": "Save recipe before use",
-    "section-title": "Section Title",
-    "servings": "Servings",
-    "serves-amount": "Serves {amount}",
-    "share-recipe-message": "I wanted to share my {0} recipe with you.",
+    "prep-time": "وقت التحضير",
+    "protein-content": "البروتين",
+    "public-recipe": "وصفة عامة",
+    "recipe-created": "تم إنشاء الوصفة",
+    "recipe-creation-failed": "فشل إنشاء الوصفة",
+    "recipe-deleted": "تم حذف الوصفة",
+    "recipe-image": "صورة الوصفة",
+    "recipe-image-updated": "تم تحديث صورة الوصفة",
+    "recipe-name": "اسم الوصفة",
+    "recipe-settings": "إعدادات الوصفة",
+    "recipe-update-failed": "فشل تحديث الوصفة",
+    "recipe-updated": "تم تحديث الوصفة",
+    "remove-from-favorites": "إزالة من المفضلات",
+    "remove-section": "إزالة القسم",
+    "saturated-fat-content": "الدهون المشبعة",
+    "save-recipe-before-use": "حفظ الوصفة قبل الاستخدام",
+    "section-title": "عنوان القسم",
+    "servings": "حصص الطعام",
+    "serves-amount": "{amount} حصص",
+    "share-recipe-message": "أردت أن أشارككم وصفة {0} الخاصة بي.",
     "show-nutrition-values": "Show Nutrition Values",
-    "sodium-content": "Sodium",
-    "step-index": "Step: {step}",
-    "sugar-content": "Sugar",
-    "title": "Title",
-    "total-time": "Total Time",
-    "trans-fat-content": "Trans-fat",
-    "unable-to-delete-recipe": "Unable to Delete Recipe",
-    "unsaturated-fat-content": "Unsaturated fat",
-    "no-recipe": "No Recipe",
-    "locked-by-owner": "Locked by Owner",
-    "join-the-conversation": "Join the Conversation",
-    "add-recipe-to-mealplan": "Add Recipe to Mealplan",
-    "entry-type": "Entry Type",
-    "date-format-hint": "MM/DD/YYYY format",
-    "date-format-hint-yyyy-mm-dd": "YYYY-MM-DD format",
+    "sodium-content": "صوديوم",
+    "step-index": "الخطوة: {step}",
+    "sugar-content": "سكر",
+    "title": "العنوان",
+    "total-time": "الوقت الإجمالي",
+    "trans-fat-content": "الدهون المتحولة",
+    "unable-to-delete-recipe": "تعذر حذف الوصفة",
+    "unsaturated-fat-content": "دهون غير مشبعة",
+    "no-recipe": "لا يوجد وصفة",
+    "locked-by-owner": "مقفلة من قبل المالك",
+    "join-the-conversation": "انضم للمحادثة",
+    "add-recipe-to-mealplan": "إضافة الوصفة إلى خِطَّة الوجبة",
+    "entry-type": "نوع الإدخال",
+    "date-format-hint": "صيغة MM/DD/YYYYY",
+    "date-format-hint-yyyy-mm-dd": "صيغة YYY-MM-DD",
     "add-to-list": "Add to List",
     "add-to-plan": "Add to Plan",
     "add-to-timeline": "Add to Timeline",
@@ -550,7 +550,7 @@
     "yields-amount-with-text": "Yields {amount} {text}",
     "yield-text": "Yield Text",
     "quantity": "Quantity",
-    "choose-unit": "Choose Unit",
+    "choose-unit": "اختر الوحدة",
     "press-enter-to-create": "Press Enter to Create",
     "choose-food": "Choose Food",
     "notes": "Notes",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -586,7 +579,6 @@
     "made-this": "I Made This",
     "how-did-it-turn-out": "How did it turn out?",
     "user-made-this": "{user} made this",
-    "last-made-date": "Last Made {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",
     "parse": "Parse",

frontend/lang/messages/bg-BG.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Увеличи мащаба с 1",
     "locked": "Заключено",
     "public-link": "Публична връзка",
-    "timer": {
-      "kitchen-timer": "Кухненски таймер",
-      "start-timer": "Стартирай таймера",
-      "pause-timer": "Поставяне таймера на пауза",
-      "resume-timer": "Възобновяване на таймера",
-      "stop-timer": "Спри таймера"
-    },
     "edit-timeline-event": "Редактирай събитие",
     "timeline": "Хронология на събитията",
     "timeline-is-empty": "Няма история на събитията. Опитайте да приготвите рецептата!",
@@ -586,7 +579,6 @@
     "made-this": "Сготвих рецептата",
     "how-did-it-turn-out": "Как се получи?",
     "user-made-this": "{user} направи това",
-    "last-made-date": "Последно приготвена на {date}",
     "api-extras-description": "Екстрите за рецепти са ключова характеристика на Mealie API. Те Ви позволяват да създавате персонализирани JSON двойки ключ/стойност в рамките на рецепта, за да ги препращате към други приложения. Можете да използвате тези ключове, за да предоставите информация за задействане на автоматизация или персонализирани съобщения, за препращане към желаното от Вас устройство.",
     "message-key": "Ключ на съобщението",
     "parse": "Анализирай",

frontend/lang/messages/ca-ES.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Multiplica",
     "locked": "Bloquejat",
     "public-link": "Enllaç públic",
-    "timer": {
-      "kitchen-timer": "Temporitzador de cuina",
-      "start-timer": "Iniciar temporitzador",
-      "pause-timer": "Pausa el temporitzador",
-      "resume-timer": "Reprèn el temporitzador",
-      "stop-timer": "Atura el temporitzador"
-    },
     "edit-timeline-event": "Edita l'esdeveniment de la cronologia",
     "timeline": "Cronologia",
     "timeline-is-empty": "Encara no hi ha res a la cronologia. Prova de fer aquesta recepta!",
@@ -586,7 +579,6 @@
     "made-this": "Ho he fet",
     "how-did-it-turn-out": "Com ha sortit?",
     "user-made-this": "{user} ha fet això",
-    "last-made-date": "Última vegada feta {date}",
     "api-extras-description": "Els extres de receptes són una funcionalitat clau de l'API de Mealie. Permeten crear parells clau/valor JSON personalitzats dins una recepta, per referenciar-los des d'aplicacions de tercers. Pots emprar aquestes claus per proveir informació, per exemple per a desencadenar automatitzacions o missatges personlitzats per a propagar al teu dispositiu desitjat.",
     "message-key": "Clau del missatge",
     "parse": "Analitzar",

frontend/lang/messages/cs-CZ.json

@@ -259,7 +259,7 @@
     "allow-users-outside-of-your-group-to-see-your-recipes": "Povolit uživatelům mimo vaši skupinu vidět vaše recepty",
     "allow-users-outside-of-your-group-to-see-your-recipes-description": "Pokud je tato možnost povolena, můžete použít veřejný odkaz pro sdílení konkrétních receptů bez autorizace uživatele. Pokud je tato možnost vypnutá, můžete sdílet recepty pouze s uživateli, kteří jsou ve vaší skupině, nebo s předem vygenerovaným soukromým odkazem",
     "show-nutrition-information": "Zobrazit nutriční informace",
-    "show-nutrition-information-description": "When enabled the nutrition information will be shown on the recipe if available. If there is no nutrition information available, the nutrition information will not be shown",
+    "show-nutrition-information-description": "Pokud je povoleno, informace o výživě se zobrazí na receptu, pokud je k dispozici. Nejsou-li k dispozici údaje o výživové hodnotě, nebudou zobrazeny údaje o výživové hodnotě",
     "show-recipe-assets": "Zobrazit položky receptu",
     "show-recipe-assets-description": "Pokud je tato možnost povolena, zobrazí se u receptu zdroje, pokud jsou k dispozici",
     "default-to-landscape-view": "Výchozí zobrazení na šířku",
@@ -270,19 +270,19 @@
     "disable-organizing-recipe-ingredients-by-units-and-food-description": "Skryje pole Potravina, Jednotka a Množství pro ingredience a považuje ingredience za textová pole",
     "general-preferences": "Všeobecné předvolby",
     "group-recipe-preferences": "Preference receptů pro skupinu",
-    "report": "Report",
-    "report-with-id": "Report ID: {id}",
+    "report": "Nahlásit",
+    "report-with-id": "ID hlášení: {id}",
     "group-management": "Správa skupin",
     "admin-group-management": "Administrátorská správa skupiny",
     "admin-group-management-text": "Změny v této skupině budou okamžitě zohledněny.",
     "group-id-value": "ID skupiny: {0}",
     "total-households": "Celkem domácností",
-    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
+    "you-must-select-a-group-before-selecting-a-household": "Před výběrem domácnosti musíte vybrat skupinu"
   },
   "household": {
     "household": "Domácnost",
     "households": "Domácnosti",
-    "user-household": "User Household",
+    "user-household": "Uživatelova domácnost",
     "create-household": "Vytvořit domácnost",
     "household-name": "Název domácnosti",
     "household-group": "Skupina domácnosti",
@@ -349,7 +349,7 @@
     "note-only": "Pouze poznámka",
     "random-meal": "Náhodné jídlo",
     "random-dinner": "Náhodná večeře",
-    "random-side": "Random Side",
+    "random-side": "Náhodná příloha",
     "this-rule-will-apply": "Toto pravidlo se použije {dayCriteria} {mealTypeCriteria}.",
     "to-all-days": "na všechny dny",
     "on-days": "on {0}s",
@@ -357,8 +357,8 @@
     "for-type-meal-types": "pro {0} druhy jídel",
     "meal-plan-rules": "Pravidla tvůrce jídelníčků",
     "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 rule filters 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.",
+    "meal-plan-rules-description": "Můžete vytvořit pravidla pro automatický výběr receptů pro vaše stravovací plány. Tato pravidla používají server k určení náhodného souboru receptů, ze kterých se při vytváření plánů jídla vybírat. Všimněte si, že pokud mají pravidla stejná omezení den/typ, budou filtry pravidel sloučeny. V praxi je zbytečné vytvářet duplicitní pravidla, ale je to možné.",
+    "new-rule-description": "Při vytváření nového pravidla pro plán jídla můžete omezit použití pravidla pro konkrétní den v týdnu a/nebo konkrétní druh jídla. Chcete-li použít pravidlo pro všechny dny nebo všechny typy jídla, můžete nastavit pravidlo na \"Jakékoliv\", které se použije na všechny možné hodnoty pro den a/nebo druh jídla.",
     "recipe-rules": "Pravidla receptu",
     "applies-to-all-days": "Použije se na všechny dny",
     "applies-on-days": "Platí pro {0}",
@@ -373,7 +373,7 @@
     "recipe-migration": "Přenést recept",
     "chowdown": {
       "description": "Migrovat data z aplikace Chowdown",
-      "description-long": "Mealie natively supports the chowdown repository format. Download the code repository as a .zip file and upload it below.",
+      "description-long": "Mealie nativně podporuje formát chowdown. Stáhněte si z repozitáře kód jako .zip soubor a nahrajte ho níže.",
       "title": "Chowdown"
     },
     "nextcloud": {
@@ -403,7 +403,7 @@
     "choose-migration-type": "Zvolte si typ migrace",
     "tag-all-recipes": "Označit všechny recepty pomocí štítku {tag-name}",
     "nextcloud-text": "Nextcloud recepty lze importovat ze souboru zip, který obsahuje data uložená v Nextcloudu. Podívejte se na příklad struktury složek níže, abyste se ujistili, že vaše recepty lze importovat.",
-    "chowdown-text": "Mealie natively supports the chowdown repository format. Download the code repository as a .zip file and upload it below.",
+    "chowdown-text": "Mealie nativně podporuje formát chowdown. Stáhněte si z repozitáře kód jako .zip soubor a nahrajte ho níže.",
     "recipe-1": "Recept 1",
     "recipe-2": "Recept 2",
     "paprika-text": "Mealie může importovat recepty z aplikace Paprika. Exportujte své recepty z papriky, přejmenujte příponu exportovaného souboru na .zip a nahrajte jej níže.",
@@ -414,7 +414,7 @@
     },
     "myrecipebox": {
       "title": "My Recipe Box",
-      "description-long": "Mealie can import recipes from My Recipe Box. Export your recipes in CSV format, then upload the .csv file below."
+      "description-long": "Mealie může importovat recepty z My Recipe Box. Exportujte recepty ve formátu CSV, poté nahrajte soubor .zip níže."
     },
     "recipekeeper": {
       "title": "Recipe Keeper",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Zvýšit násobení o 1",
     "locked": "Uzamčeno",
     "public-link": "Veřejný odkaz",
-    "timer": {
-      "kitchen-timer": "Kuchyňský časovač",
-      "start-timer": "Spustit časovač",
-      "pause-timer": "Pozastavit časovač",
-      "resume-timer": "Obnovit časovač",
-      "stop-timer": "Zastavit časovač"
-    },
     "edit-timeline-event": "Upravit událost časové osy",
     "timeline": "Časová osa",
     "timeline-is-empty": "Zatím nic na časové ose není. Zkuste vytvořit tento recept!",
@@ -586,10 +579,9 @@
     "made-this": "Toto jsem uvařil",
     "how-did-it-turn-out": "Jak to dopadlo?",
     "user-made-this": "{user} udělal toto",
-    "last-made-date": "Naposledy uvařeno {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",
-    "parse": "Parse",
+    "api-extras-description": "Recepty jsou klíčovým rysem rozhraní pro API Mealie. Umožňují vytvářet vlastní klíče/hodnoty JSON v rámci receptu pro odkazy na aplikace třetích stran. Tyto klíče můžete použít pro poskytnutí informací, například pro aktivaci automatizace nebo vlastních zpráv pro přenos do požadovaného zařízení.",
+    "message-key": "Klíč zprávy",
+    "parse": "Analyzovat",
     "attach-images-hint": "Přiložit obrázky přetažením jich do editoru",
     "drop-image": "Vložit obrázek",
     "enable-ingredient-amounts-to-use-this-feature": "Chcete-li tuto funkci používat, povolte množství ingrediencí",
@@ -614,9 +606,9 @@
     "debug-scraper": "Ladící Scraper",
     "create-a-recipe-by-providing-the-name-all-recipes-must-have-unique-names": "Vytvořte recept zadáním názvu. Všechny recepty musí mít jedinečná jména.",
     "new-recipe-names-must-be-unique": "Názvy receptů musí být jedinečné",
-    "scrape-recipe": "Scrape Recipe",
-    "scrape-recipe-description": "Scrape a recipe by url. Provide the url for the site you want to scrape, and Mealie will attempt to scrape the recipe from that site and add it to your collection.",
-    "scrape-recipe-have-a-lot-of-recipes": "Have a lot of recipes you want to scrape at once?",
+    "scrape-recipe": "Zpracovat recept",
+    "scrape-recipe-description": "Zpracovat recept na url. Uveďte adresu url pro str8nku, kterou chcete zpracovat a Mealie se pokusí zpracovat recept z tohoto webu a přidat jej do vaší sbírky.",
+    "scrape-recipe-have-a-lot-of-recipes": "Máte spoustu receptů, které chcete zpracovat najednou?",
     "scrape-recipe-suggest-bulk-importer": "Vyzkoušejte hromadný import",
     "scrape-recipe-have-raw-html-or-json-data": "Máte surová data HTML nebo JSON?",
     "scrape-recipe-you-can-import-from-raw-data-directly": "Můžete importovat přímo ze surových dat",
@@ -632,19 +624,19 @@
     "create-a-recipe-by-uploading-a-scan": "Vytvořte recept nahráním skenu.",
     "upload-a-png-image-from-a-recipe-book": "Nahrát png obrázek z knihy receptů",
     "recipe-bulk-importer": "Hromadný import receptů",
-    "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": "Hromadný import receptů vám umožní importovat více receptů najednou tím, že ve frontě stránek na podpůrné vrstvě bude spuštěn úkol na pozadí. To může být užitečné při počáteční migraci na Mealie, nebo když chcete importovat velké množství receptů.",
     "set-categories-and-tags": "Nastavte kategorie a štítky",
     "bulk-imports": "Hromadný import",
     "bulk-import-process-has-started": "Proces hromadného importu byl zahájen",
     "bulk-import-process-has-failed": "Proces hromadného importu se nezdařil",
     "report-deletion-failed": "Odstranění reportu se nezdařilo",
-    "recipe-debugger": "Recipe Debugger",
-    "recipe-debugger-description": "Grab the URL of the recipe you want to debug and paste it here. The URL will be scraped by the recipe scraper and the results will be displayed. If you don't see any data returned, the site you are trying to scrape is not supported by Mealie or its scraper library.",
+    "recipe-debugger": "Ladění receptů",
+    "recipe-debugger-description": "Získejte URL receptu, který chcete ladit a vložte jej zde. URL bude zpracováno procesorem receptů a budou zobrazeny výsledky. Pokud nevidíte žádná data, stránka, kterou se pokoušíte zpracovat, není podporována ani v Mealie ani jeho knihovně pro zpracování.",
     "use-openai": "Použít OpenAI",
-    "recipe-debugger-use-openai-description": "Use OpenAI to parse the results instead of relying on the scraper library. When creating a recipe via URL, this is done automatically if the scraper library fails, but you may test it manually here.",
+    "recipe-debugger-use-openai-description": "Použijte OpenAI k analýze výsledků namísto spoléhání se na knihovnu pro zpracování. Při vytváření receptu prostřednictvím adresy URL se to provádí automaticky, pokud knihovna pro zpracování selže, ale můžete to zde otestovat ručně.",
     "debug": "Ladit",
     "tree-view": "Stromové zobrazení",
-    "recipe-servings": "Recipe Servings",
+    "recipe-servings": "Počet porcí",
     "recipe-yield": "Recipe Yield",
     "recipe-yield-text": "Recipe Yield Text",
     "unit": "Jednotka",
@@ -654,14 +646,14 @@
     "nextStep": "Další krok",
     "recipe-actions": "Akce receptu",
     "parser": {
-      "experimental-alert-text": "Mealie uses natural language processing to parse and create units and food items for your recipe ingredients. This feature is experimental and may not always work as expected. If you prefer not to use the parsed results, you can select 'Cancel' and your changes will not be saved.",
-      "ingredient-parser": "Ingredient Parser",
-      "explanation": "To use the ingredient parser, click the 'Parse All' button to start the process. Once the processed ingredients are available, you can review the items and verify that they were parsed correctly. The model's confidence score is displayed on the right of the item title. This score is an average of all the individual scores and may not always be completely accurate.",
-      "alerts-explainer": "Alerts will be displayed if a matching foods or unit is found but does not exists in the database.",
-      "select-parser": "Select Parser",
+      "experimental-alert-text": "Mealie používá přirozené zpracování jazyka k analýze a vytváření jednotek a položek jídla pro vaše ingredience. Tato funkce je experimentální a nemusí vždy fungovat podle očekávání. Pokud raději nepoužíváte analyzované výsledky, můžete zvolit 'Zrušit' a vaše změny nebudou uloženy.",
+      "ingredient-parser": "Analyzátor ingrediencí",
+      "explanation": "Chcete-li použít analyzátor ingrediencí, klikněte na tlačítko \"Analyzovat vše\" pro zahájení procesu. Jakmile budou zpracované suroviny k dispozici, můžete zkontrolovat položky a ověřit, že byly správně analyzovány. Skóre důvěry modelu se zobrazuje vpravo od názvu položky. Toto skóre je průměrem všech jednotlivých skóre a nemusí být vždy zcela přesné.",
+      "alerts-explainer": "Upozornění se zobrazí v případě, že je nalezena odpovídající potravina nebo jednotka, ale v databázi neexistuje.",
+      "select-parser": "Vyberte analyzátor",
       "natural-language-processor": "Natural Language Processor",
       "brute-parser": "Brute Parser",
-      "openai-parser": "OpenAI Parser",
+      "openai-parser": "Analyzátor OpenAI",
       "parse-all": "Parsovat vše",
       "no-unit": "Žádná jednotka",
       "missing-unit": "Vytvořit chybějící jednotku: {unit}",
@@ -669,22 +661,22 @@
       "no-food": "Žádné jídlo"
     },
     "reset-servings-count": "Resetovat počet porcí",
-    "not-linked-ingredients": "Additional Ingredients"
+    "not-linked-ingredients": "Další ingredience"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
-    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
-    "selected-ingredients": "Selected Ingredients",
-    "no-ingredients-selected": "No ingredients selected",
+    "recipe-finder": "Vyhledávač receptů",
+    "recipe-finder-description": "Vyhledávání receptů na základě přísad, které máte na ruce. Můžete také filtrovat pomocí nástrojů, které máte k dispozici, a nastavit maximální počet chybějících ingrediencí nebo nástrojů.",
+    "selected-ingredients": "Vybrané ingredience",
+    "no-ingredients-selected": "Nebyly vybrány žádné ingredience",
     "missing": "Chybějící",
     "no-recipes-found": "Nebyly nalezeny žádné recepty",
-    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
-    "include-ingredients-on-hand": "Include Ingredients On Hand",
-    "include-tools-on-hand": "Include Tools On Hand",
-    "max-missing-ingredients": "Max Missing Ingredients",
-    "max-missing-tools": "Max Missing Tools",
-    "selected-tools": "Selected Tools",
-    "other-filters": "Other Filters",
+    "no-recipes-found-description": "Zkuste do hledání přidat další ingredience nebo upravit své filtry",
+    "include-ingredients-on-hand": "Zahrnout ingredience jež k dispozici",
+    "include-tools-on-hand": "Zahrnout nástroje, které máte po ruce",
+    "max-missing-ingredients": "Maximální počet chybějících ingrediencí",
+    "max-missing-tools": "Maximální počet chybějících nástrojů",
+    "selected-tools": "Vybrané nástroje",
+    "other-filters": "Jiné filtry",
     "ready-to-make": "Ready to Make",
     "almost-ready-to-make": "Almost Ready to Make"
   },
@@ -725,9 +717,9 @@
       "import-summary": "Shrnutí importu",
       "partial-backup": "Částečná záloha",
       "unable-to-delete-backup": "Zálohu nelze odstranit.",
-      "experimental-description": "Backups are total snapshots of the database and data directory of the site. This includes all data and cannot be set to exclude subsets of data. You can think of this as a snapshot of Mealie at a specific time. These serve as a database agnostic way to export and import data, or back up the site to an external location.",
+      "experimental-description": "Zálohy jsou celkové snímky databáze a datového adresáře webu. Tato položka zahrnuje všechny údaje a nelze ji nastavit pro vyloučení podsouborů údajů. Můžete ji brát jako snímek Mealie v určitém čase. Tyto slouží jako způsob, jak nezávisle na databázi exportovat a importovat data nebo zálohovat stránky na externí umístění.",
       "backup-restore": "Obnova zálohy",
-      "back-restore-description": "Restoring this backup will overwrite all the current data in your database and in the data directory and replace them with the contents of this backup. {cannot-be-undone} If the restoration is successful, you will be logged out.",
+      "back-restore-description": "Obnovení této zálohy přepíše všechna aktuální data ve vaší databázi a v datovém adresáři a nahradí je obsahem této zálohy. {cannot-be-undone} Pokud je obnovení úspěšné, budete odhlášeni.",
       "cannot-be-undone": "Tuto akci nelze vrátit zpět - používejte ji s opatrností.",
       "postgresql-note": "Pokud používáte PostgreSQL, před obnovením si prosím přečtete {backup-restore-process}.",
       "backup-restore-process-in-the-documentation": "proces zálohy/obnovení v dokumentaci",
@@ -820,11 +812,11 @@
       "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."
     },
     "bug-report": "Chybové hlášení",
-    "bug-report-information": "Use this information to report a bug. Providing details of your instance to developers is the best way to get your issues resolved quickly.",
+    "bug-report-information": "Použijte tyto informace k nahlášení chyby. Poskytnutí podrobností vaší instance vývojářům je nejlepší způsob, jak rychle vyřešit vaše problémy.",
     "tracker": "Tracker",
     "configuration": "Konfigurace",
     "docker-volume": "Volume dockeru",
-    "docker-volume-help": "Mealie requires that the frontend container and the backend share the same docker volume or storage. This ensures that the frontend container can properly access the images and assets stored on disk.",
+    "docker-volume-help": "Mealie vyžaduje, aby kontejner prostředí a podpůrné vrstvy sdílely stejný úložný prostor dockeru. Tím se zajistí, že kontejner prostředí bude moci správně přistupovat k obrázkům a informacím uloženým na disku.",
     "volumes-are-misconfigured": "Svazky jsou špatně nakonfigurovány.",
     "volumes-are-configured-correctly": "Volumy jsou nastaveny správně.",
     "status-unknown-try-running-a-validation": "Neznámý stav. Zkuste provést validaci.",
@@ -891,7 +883,7 @@
     "are-you-sure-you-want-to-check-all-items": "Opravdu chcete vybrat všechny položky?",
     "are-you-sure-you-want-to-uncheck-all-items": "Opravdu chcete zrušit výběr všech položek?",
     "are-you-sure-you-want-to-delete-checked-items": "Opravdu chcete odstranit všechny vybrané položky?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "Nebyly nalezeny žádné nákupní seznamy"
   },
   "sidebar": {
     "all-recipes": "Všechny recepty",
@@ -1066,14 +1058,14 @@
       "food-label": "Označení jídla",
       "edit-food": "Upravit jídlo",
       "food-data": "Data jídla",
-      "example-food-singular": "ex: Onion",
-      "example-food-plural": "ex: Onions",
+      "example-food-singular": "např.: Brambora",
+      "example-food-plural": "např.: Brambory",
       "label-overwrite-warning": "Toto přiřadí vybraný štítek všem vybraným jídlům a může přepsat stávající štítky.",
       "on-hand-checkbox-label": "Nastavením tohoto příznaku bude tato potravina při přidávání receptu do nákupního seznamu ve výchozím nastavení odškrtnuta."
     },
     "units": {
       "seed-dialog-text": "Naplnit databázi s běžnými jednotkami používanými ve vašem jazyce.",
-      "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": "Zkombinování zvolených jednotek spojí zdrojovou a cílovou jednotku do jedné. {source-unit-will-be-deleted} a všechny odkazy na ni budou upraveny na cílovou jednotku.",
       "combine-unit": "Kombinovaná jednotka",
       "source-unit": "Zdrojová jednotka",
       "target-unit": "Cílová jednotka",
@@ -1088,10 +1080,10 @@
       "unit-data": "Data jednotky",
       "use-abbv": "Používat zkratky",
       "fraction": "Zlomek",
-      "example-unit-singular": "ex: Tablespoon",
-      "example-unit-plural": "ex: Tablespoons",
-      "example-unit-abbreviation-singular": "ex: Tbsp",
-      "example-unit-abbreviation-plural": "ex: Tbsps"
+      "example-unit-singular": "např.: Čajová lžička",
+      "example-unit-plural": "např.: Čajové lžičky",
+      "example-unit-abbreviation-singular": "např.: čl",
+      "example-unit-abbreviation-plural": "např.: čl"
     },
     "labels": {
       "seed-dialog-text": "Naplnit databázi s běžnými popisky používanými ve vašem jazyce.",
@@ -1303,7 +1295,7 @@
   "profile": {
     "welcome-user": "👋 Vítejte, {0}!",
     "description": "Spravujte svůj profil, recepty a nastavení skupiny.",
-    "invite-link": "Invite Link",
+    "invite-link": "Odkaz pozvánky",
     "get-invite-link": "Získat odkaz na pozvánku",
     "get-public-link": "Získat veřejný odkaz",
     "account-summary": "Přehled účtu",
@@ -1353,8 +1345,8 @@
   "cookbook": {
     "cookbooks": "Kuchařky",
     "description": "Kuchařky jsou dalším způsobem, jak uspořádat recepty vytvořením průřezů receptů, organizátorů a dalších filtrů. Vytvořením kuchařky se přidá položka na postranní panel a v kuchařce se zobrazí všechny recepty s vybranými filtry.",
-    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
-    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
+    "hide-cookbooks-from-other-households": "Skrýt kuchařky ostatních domácností",
+    "hide-cookbooks-from-other-households-description": "Pokud je povoleno, objeví se na postranním panelu pouze kuchařské knihy z vaší domácnosti",
     "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",

frontend/lang/messages/da-DK.json

@@ -277,7 +277,7 @@
     "admin-group-management-text": "Ændringer i denne gruppe vil træde i kraft øjeblikkeligt.",
     "group-id-value": "Gruppe-ID: {0}",
     "total-households": "Husholdninger i Alt",
-    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
+    "you-must-select-a-group-before-selecting-a-household": "Du skal vælge en gruppe, før du vælger en husstand"
   },
   "household": {
     "household": "Husholdning",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Forøg skala med 1",
     "locked": "Låst",
     "public-link": "Offentligt link",
-    "timer": {
-      "kitchen-timer": "Køkken Ur",
-      "start-timer": "Start timer",
-      "pause-timer": "Sæt timer på pause",
-      "resume-timer": "Genoptag Timer",
-      "stop-timer": "Stop timer"
-    },
     "edit-timeline-event": "Rediger tidslinjebegivenhed",
     "timeline": "Tidslinje",
     "timeline-is-empty": "Intet på tidslinjen endnu. Prøv at lave denne opskrift!",
@@ -586,7 +579,6 @@
     "made-this": "Jeg har lavet denne",
     "how-did-it-turn-out": "Hvordan blev det?",
     "user-made-this": "{user} lavede denne",
-    "last-made-date": "Sidst tilberedt den {date}",
     "api-extras-description": "Opskrifter ekstra er en central feature i Mealie API. De giver dig mulighed for at oprette brugerdefinerede JSON nøgle / værdi par inden for en opskrift, at henvise til fra 3. parts applikationer. Du kan bruge disse nøgler til at give oplysninger, for eksempel til at udløse automatiseringer eller brugerdefinerede beskeder til at videresende til din ønskede enhed.",
     "message-key": "Beskednøgle",
     "parse": "Behandl data",
@@ -672,21 +664,21 @@
     "not-linked-ingredients": "Additional Ingredients"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
+    "recipe-finder": "Opskrift Finder",
     "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
-    "selected-ingredients": "Selected Ingredients",
-    "no-ingredients-selected": "No ingredients selected",
-    "missing": "Missing",
-    "no-recipes-found": "No recipes found",
-    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
-    "include-ingredients-on-hand": "Include Ingredients On Hand",
-    "include-tools-on-hand": "Include Tools On Hand",
-    "max-missing-ingredients": "Max Missing Ingredients",
+    "selected-ingredients": "Valgte Ingredienser",
+    "no-ingredients-selected": "Ingen ingredienser valgt",
+    "missing": "Mangler",
+    "no-recipes-found": "Ingen opskrifter fundet",
+    "no-recipes-found-description": "Prøv at tilføje flere ingredienser til din søgning eller justere dine filtre",
+    "include-ingredients-on-hand": "Inkluder ingredienser du allerede har",
+    "include-tools-on-hand": "Inkluder værktøjer du allerede har",
+    "max-missing-ingredients": "Maksimum Manglende Ingredienser",
     "max-missing-tools": "Max Missing Tools",
     "selected-tools": "Selected Tools",
-    "other-filters": "Other Filters",
-    "ready-to-make": "Ready to Make",
-    "almost-ready-to-make": "Almost Ready to Make"
+    "other-filters": "Andre filtre",
+    "ready-to-make": "Klar til at lave",
+    "almost-ready-to-make": "Næsten klar til at lave"
   },
   "search": {
     "advanced-search": "Avanceret søgning",
@@ -891,7 +883,7 @@
     "are-you-sure-you-want-to-check-all-items": "Er du sikker på, at du vil markere alle elementer?",
     "are-you-sure-you-want-to-uncheck-all-items": "Er du sikker på, at du vil fjerne markeringen af alle elementer?",
     "are-you-sure-you-want-to-delete-checked-items": "Er du sikker på, at du vil sletter de valgte elementer?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "Ingen Indkøbslister fundet"
   },
   "sidebar": {
     "all-recipes": "Alle opskr.",
@@ -1303,7 +1295,7 @@
   "profile": {
     "welcome-user": "👋 Velkommen, {0}!",
     "description": "Administrer din profil, opskrifter og gruppeindstillinger.",
-    "invite-link": "Invite Link",
+    "invite-link": "Invitationslink",
     "get-invite-link": "Få Invitationslink",
     "get-public-link": "Offentligt link",
     "account-summary": "Kontooversigt",
@@ -1353,8 +1345,8 @@
   "cookbook": {
     "cookbooks": "Kogebøger",
     "description": "Kogebøger er en anden måde at organisere opskrifter ved at skabe tværsnit af opskrifter, arrangører, og andre filtre. Oprettelse af en kogebog vil tilføje et link i sidemenuen, og alle opskrifter med de valgte filtre vil blive vist i kogebogen.",
-    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
-    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
+    "hide-cookbooks-from-other-households": "Skjul kogebøger fra andre husholdninger",
+    "hide-cookbooks-from-other-households-description": "Når aktiveret, kun kogebøger fra din husstand vises på sidepanelet",
     "public-cookbook": "Offentlig kogebog",
     "public-cookbook-description": "Offentlige kogebøger kan deles med personer, der ikke er oprettet som brugere i Mealie og vil blive vist på din gruppe side.",
     "filter-options": "Filtreringsindstillinger",

frontend/lang/messages/de-DE.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Maßstab um 1 erhöhen",
     "locked": "Gesperrt",
     "public-link": "Öffentlicher Link",
-    "timer": {
-      "kitchen-timer": "Küchenwecker",
-      "start-timer": "Wecker starten",
-      "pause-timer": "Wecker pausieren",
-      "resume-timer": "Wecker fortsetzen",
-      "stop-timer": "Wecker stoppen"
-    },
     "edit-timeline-event": "Zeitstrahl-Ereignis bearbeiten",
     "timeline": "Zeitstrahl",
     "timeline-is-empty": "Noch nichts auf dem Zeitstrahl. Probier dieses Rezept aus!",
@@ -586,7 +579,6 @@
     "made-this": "Ich hab's gemacht",
     "how-did-it-turn-out": "Wie ist es geworden?",
     "user-made-this": "{user} hat's gemacht",
-    "last-made-date": "Zuletzt gemacht {date}",
     "api-extras-description": "Rezepte-Extras sind ein Hauptmerkmal der Mealie API. Sie ermöglichen es dir, benutzerdefinierte JSON Key-Value-Paare zu einem Rezept zu erstellen, um Drittanbieter-Anwendungen zu steuern. Du kannst diese dazu verwenden, um Automatisierungen auszulösen oder benutzerdefinierte Nachrichten an bestimmte Geräte zu senden.",
     "message-key": "Nachrichten-Schlüssel",
     "parse": "Parsen",

frontend/lang/messages/el-GR.json

@@ -174,7 +174,7 @@
     "wednesday": "Τετάρτη",
     "yes": "Ναι",
     "foods": "Τρόφιμα",
-    "units": "Μονάδες",
+    "units": "Μονάδες μέτρησης",
     "back": "Πίσω",
     "next": "Επόμενο",
     "start": "Εναρξη",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Αύξηση κλίμακας κατά 1",
     "locked": "Κλειδωμένο",
     "public-link": "Δημόσιος σύνδεσμος",
-    "timer": {
-      "kitchen-timer": "Χρονόμετρο Κουζίνας",
-      "start-timer": "Εναρξη χρονομέτρου",
-      "pause-timer": "Παύση χρονόμετρου",
-      "resume-timer": "Συνέχιση χρονομέτρου",
-      "stop-timer": "Διακοπή χρονόμετρου"
-    },
     "edit-timeline-event": "Επεξεργασία συμβάντος χρονοδιαγράμματος",
     "timeline": "Χρονοδιάγραμμα",
     "timeline-is-empty": "Δεν υπάρχει τίποτα ακόμα στο χρονοδιάγραμμα. Δοκιμάστε να κάνετε αυτή τη συνταγή!",
@@ -586,7 +579,6 @@
     "made-this": "Το έφτιαξα",
     "how-did-it-turn-out": "Ποιό ήταν το αποτέλεσμα;",
     "user-made-this": "Ο/η {user} το έφτιαξε αυτό",
-    "last-made-date": "Τελευταία παρασκευή {date}",
     "api-extras-description": "Τα extras συνταγών αποτελούν βασικό χαρακτηριστικό του Mealie API. Σας επιτρέπουν να δημιουργήσετε προσαρμοσμένα ζεύγη κλειδιού/τιμής JSON μέσα σε μια συνταγή, να παραπέμψετε σε εφαρμογές τρίτων. Μπορείτε να χρησιμοποιήσετε αυτά τα κλειδιά για την παροχή πληροφοριών, για παράδειγμα πυροδότηση αυτοματισμών ή μετάδοση προσαρμοσμένων μηνυμάτων στη συσκευή που επιθυμείτε.",
     "message-key": "Κλειδί Μηνύματος",
     "parse": "Ανάλυση",

frontend/lang/messages/en-GB.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -586,7 +579,6 @@
     "made-this": "I Made This",
     "how-did-it-turn-out": "How did it turn out?",
     "user-made-this": "{user} made this",
-    "last-made-date": "Last Made {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",
     "parse": "Parse",

frontend/lang/messages/en-US.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -586,7 +579,6 @@
     "made-this": "I Made This",
     "how-did-it-turn-out": "How did it turn out?",
     "user-made-this": "{user} made this",
-    "last-made-date": "Last Made {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",
     "parse": "Parse",

frontend/lang/messages/es-ES.json

@@ -277,7 +277,7 @@
     "admin-group-management-text": "Los cambios en este grupo se reflejarán inmediatamente.",
     "group-id-value": "Id del Grupo: {0}",
     "total-households": "Total de Casas",
-    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
+    "you-must-select-a-group-before-selecting-a-household": "Debe seleccionar un grupo antes de seleccionar un hogar"
   },
   "household": {
     "household": "Casa",
@@ -469,7 +469,7 @@
     "categories": "Categorías",
     "cholesterol-content": "Colesterol",
     "comment-action": "Comentar",
-    "comment": "Comentar",
+    "comment": "Comentario",
     "comments": "Comentarios",
     "delete-confirmation": "¿Estás seguro de eliminar esta receta?",
     "delete-recipe": "Borrar receta",
@@ -518,7 +518,7 @@
     "save-recipe-before-use": "Guardar la receta antes de usar",
     "section-title": "Título de la sección",
     "servings": "Porciones",
-    "serves-amount": "Serves {amount}",
+    "serves-amount": "Personas {amount}",
     "share-recipe-message": "Quería compartir mi receta {0} contigo.",
     "show-nutrition-values": "Mostrar valores nutricionales",
     "sodium-content": "Sodio",
@@ -547,8 +547,8 @@
     "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",
-    "yields-amount-with-text": "Yields {amount} {text}",
-    "yield-text": "Yield Text",
+    "yields-amount-with-text": "Raciones {amount} {text}",
+    "yield-text": "Texto de raciones",
     "quantity": "Cantidad",
     "choose-unit": "Elija unidad",
     "press-enter-to-create": "Presione Intro para crear",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Aumentar escala en 1",
     "locked": "Bloqueada",
     "public-link": "Enlace público",
-    "timer": {
-      "kitchen-timer": "Temporizador de cocina",
-      "start-timer": "Iniciar Temporizador",
-      "pause-timer": "Pausar Temporizador",
-      "resume-timer": "Reanudar Temporizador",
-      "stop-timer": "Detener temporizador"
-    },
     "edit-timeline-event": "Editar evento en la cronología",
     "timeline": "Cronología",
     "timeline-is-empty": "Aún no hay nada en la línea de tiempo. ¡Intenta hacer esta receta!",
@@ -586,7 +579,6 @@
     "made-this": "Lo hice",
     "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": "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",
@@ -644,9 +636,9 @@
     "recipe-debugger-use-openai-description": "Utilice OpenAI para analizar los resultados en lugar de depender de la biblioteca de analizadores. Cuando se crea una receta a través de la URL, esto se hace automáticamente si la biblioteca del analizador falla, pero puede probarla manualmente aquí.",
     "debug": "Depuración",
     "tree-view": "Vista en árbol",
-    "recipe-servings": "Recipe Servings",
+    "recipe-servings": "Cantidad de personas",
     "recipe-yield": "Porciones",
-    "recipe-yield-text": "Recipe Yield Text",
+    "recipe-yield-text": "Texto de raciones totales",
     "unit": "Unidades",
     "upload-image": "Subir imagen",
     "screen-awake": "Mantener la pantalla encendida",
@@ -669,24 +661,24 @@
       "no-food": "Sin Comida"
     },
     "reset-servings-count": "Restablecer contador de porciones",
-    "not-linked-ingredients": "Additional Ingredients"
+    "not-linked-ingredients": "Ingredientes adicionales"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
-    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
+    "recipe-finder": "Buscador de recetas",
+    "recipe-finder-description": "Busca recetas basadas en los ingredientes que tengas disponibles. También puede filtrar por utensilios disponibles, y establecer un número máximo de ingredientes o herramientas que faltan.",
     "selected-ingredients": "Ingredientes seleccionados",
     "no-ingredients-selected": "Ningún ingrediente seleccionado",
-    "missing": "Missing",
+    "missing": "Faltan",
     "no-recipes-found": "No se encontraron recetas",
     "no-recipes-found-description": "Intenta añadir más ingredientes a tu búsqueda o ajustar tus filtros",
     "include-ingredients-on-hand": "Incluye ingredientes a mano",
-    "include-tools-on-hand": "Include Tools On Hand",
-    "max-missing-ingredients": "Max Missing Ingredients",
-    "max-missing-tools": "Max Missing Tools",
-    "selected-tools": "Selected Tools",
-    "other-filters": "Other Filters",
-    "ready-to-make": "Ready to Make",
-    "almost-ready-to-make": "Almost Ready to Make"
+    "include-tools-on-hand": "Incluye utensilios disponibles",
+    "max-missing-ingredients": "Máximo de ingredientes que faltan",
+    "max-missing-tools": "Máximo de utensilios que faltan",
+    "selected-tools": "Utensilios seleccionados",
+    "other-filters": "Otros filtros",
+    "ready-to-make": "Listo para hacer",
+    "almost-ready-to-make": "Casi listo para hacer"
   },
   "search": {
     "advanced-search": "Búsqueda avanzada",
@@ -891,7 +883,7 @@
     "are-you-sure-you-want-to-check-all-items": "¿Seguro que quieres seleccionar todos los elementos?",
     "are-you-sure-you-want-to-uncheck-all-items": "¿Seguro que quieres de-seleccionar todos los elementos?",
     "are-you-sure-you-want-to-delete-checked-items": "¿Está seguro que deseas eliminar los elementos seleccionados?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "No hay listas de la compra"
   },
   "sidebar": {
     "all-recipes": "Recetas",
@@ -1303,7 +1295,7 @@
   "profile": {
     "welcome-user": "👋 ¡Bienvenido, {0}!",
     "description": "Administra tu perfil, recetas y ajustes de grupo.",
-    "invite-link": "Invite Link",
+    "invite-link": "Link de invitación",
     "get-invite-link": "Obtener enlace de invitación",
     "get-public-link": "Obtener enlace público",
     "account-summary": "Información de la cuenta",
@@ -1353,7 +1345,7 @@
   "cookbook": {
     "cookbooks": "Recetarios",
     "description": "Los recetarios son otra forma de organizar recetas creando secciones cruzadas de recetas y etiquetas. Crear un recetario añadirá una entrada a la barra lateral y todas las recetas con las etiquetas y categorías elegidas se mostrarán en el recetario.",
-    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
+    "hide-cookbooks-from-other-households": "Ocultar libros de cocina de otros grupos/hogares",
     "hide-cookbooks-from-other-households-description": "Cuando esté habilitado, sólo los libros de cocina de su hogar aparecerán en la barra lateral",
     "public-cookbook": "Recetario público",
     "public-cookbook-description": "Los recetarios públicos se pueden compartir con usuarios externos y se mostrarán en su página de grupos.",

frontend/lang/messages/fi-FI.json

@@ -23,7 +23,7 @@
     "support": "Tuki",
     "version": "Versio",
     "unknown-version": "tuntematon",
-    "sponsor": "Yhteistyökumppani"
+    "sponsor": "Sponsori"
   },
   "asset": {
     "assets": "Liitteet",
@@ -72,7 +72,7 @@
     "enable-notifier": "Ota ilmoittaja käyttöön",
     "what-events": "Mistä tapahtumista tulisi ilmoittaa?",
     "user-events": "Käyttäjän tapahtumat",
-    "mealplan-events": "Ateriasuunnittelun tapahtumat",
+    "mealplan-events": "Ateriasuunnitelman Tapahtumat",
     "when-a-user-in-your-group-creates-a-new-mealplan": "Kun ryhmäsi käyttäjä tekee ateriasuunnitelman",
     "shopping-list-events": "Ostoslistatapahtumat",
     "cookbook-events": "Keittokirjatapahtumat",
@@ -277,7 +277,7 @@
     "admin-group-management-text": "Muutokset tähän ryhmään tulevat näkymään välittömästi.",
     "group-id-value": "Ryhmän tunniste: {0}",
     "total-households": "Kotitaloudet Yhteensä",
-    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
+    "you-must-select-a-group-before-selecting-a-household": "Sinun tulee valita ryhmä ennen kuin valitset kotitalouden"
   },
   "household": {
     "household": "Kotitalous",
@@ -518,7 +518,7 @@
     "save-recipe-before-use": "Tallenna resepti ennen käyttöä",
     "section-title": "Osion otsikko",
     "servings": "Annokset",
-    "serves-amount": "Serves {amount}",
+    "serves-amount": "{amount} annosta",
     "share-recipe-message": "Halusin jakaa reseptin {0} kanssasi.",
     "show-nutrition-values": "Näytä ravintoarvot",
     "sodium-content": "Natrium",
@@ -532,7 +532,7 @@
     "no-recipe": "Ei reseptiä",
     "locked-by-owner": "Omistajan lukitsema",
     "join-the-conversation": "Liity keskusteluun",
-    "add-recipe-to-mealplan": "Lisää resepti ateriasuunnitelmaan",
+    "add-recipe-to-mealplan": "Lisää resepti Ateriasuunnitelmaan",
     "entry-type": "Merkinnän tyyppi",
     "date-format-hint": "KK/PP/VVVV-muoto",
     "date-format-hint-yyyy-mm-dd": "VVVV-KK-PP-muoto",
@@ -546,9 +546,9 @@
     "failed-to-add-recipes-to-list": "Luetteloon lisääminen epäonnistui",
     "failed-to-add-recipe-to-mealplan": "Reseptiä ei voitu lisätä ateriasuunnitelmaan",
     "failed-to-add-to-list": "Luetteloon lisääminen epäonnistui",
-    "yield": "Sato",
-    "yields-amount-with-text": "Yields {amount} {text}",
-    "yield-text": "Yield Text",
+    "yield": "Tuotto",
+    "yields-amount-with-text": "Tuottaa {amount} {text}",
+    "yield-text": "Tuotosteksti",
     "quantity": "Määrä",
     "choose-unit": "Valitse Yksikkö",
     "press-enter-to-create": "Luo painamalla Enter",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Suurenna mittakaavaa yhdellä",
     "locked": "Lukittu",
     "public-link": "Julkinen Linkki",
-    "timer": {
-      "kitchen-timer": "Munakello",
-      "start-timer": "Käynnistä ajastin",
-      "pause-timer": "Keskeytä ajastin",
-      "resume-timer": "Jatka ajastusta",
-      "stop-timer": "Pysäytä ajastin"
-    },
     "edit-timeline-event": "Muokkaa Aikajanan Tapahtumaa",
     "timeline": "Aikajana",
     "timeline-is-empty": "Aikajana on tyhjä. Tee resepti.",
@@ -586,7 +579,6 @@
     "made-this": "Tein tämän",
     "how-did-it-turn-out": "Miten se onnistui?",
     "user-made-this": "{user} teki tämän",
-    "last-made-date": "Viimeksi valmistettu {date}",
     "api-extras-description": "Reseptiekstrat ovat Mealien API:n tärkeä ominaisuus. Niiden avulla voidaan luoda mukautettuja JSON-avain/arvo-pareja reseptin sisällä viitaten kolmannen osapuolen sovelluksiin. Näitä avaimia voi käyttää tiedon antamiseksi, esimerkiksi automaattisen toiminnon tai mukautetun viestin käynnistämiseksi haluamaasi laitteeseen.",
     "message-key": "Viestiavain",
     "parse": "Jäsennä",
@@ -644,9 +636,9 @@
     "recipe-debugger-use-openai-description": "Käytä OpenAI:ta kaavinkirjaston sijaan tulosten jäsentämiseen. Luodessa reseptiä URL:n kautta tämä tehdään ilman eri kysymystä, kun kaavinkirjasto ei toimi, mutta voit kokeilla sitä tässä manuaalisesti.",
     "debug": "Vianhaku",
     "tree-view": "Puunäkymä",
-    "recipe-servings": "Recipe Servings",
-    "recipe-yield": "Reseptin tekijä",
-    "recipe-yield-text": "Recipe Yield Text",
+    "recipe-servings": "Reseptin annokset",
+    "recipe-yield": "Reseptin tuotto",
+    "recipe-yield-text": "Reseptin tuotosteksti",
     "unit": "Yksikkö",
     "upload-image": "Lataa kuva",
     "screen-awake": "Pidä näyttö aina päällä",
@@ -668,25 +660,25 @@
       "missing-food": "Luo puuttuva ruoka: {food}",
       "no-food": "Ei ruokaa"
     },
-    "reset-servings-count": "Reset Servings Count",
-    "not-linked-ingredients": "Additional Ingredients"
+    "reset-servings-count": "Palauta Annoksien Määrä",
+    "not-linked-ingredients": "Muut ainesosat"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
-    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
-    "selected-ingredients": "Selected Ingredients",
-    "no-ingredients-selected": "No ingredients selected",
-    "missing": "Missing",
-    "no-recipes-found": "No recipes found",
-    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
-    "include-ingredients-on-hand": "Include Ingredients On Hand",
-    "include-tools-on-hand": "Include Tools On Hand",
-    "max-missing-ingredients": "Max Missing Ingredients",
-    "max-missing-tools": "Max Missing Tools",
-    "selected-tools": "Selected Tools",
-    "other-filters": "Other Filters",
-    "ready-to-make": "Ready to Make",
-    "almost-ready-to-make": "Almost Ready to Make"
+    "recipe-finder": "Reseptin etsijä",
+    "recipe-finder-description": "Etsi sopivia reseptejä saatavilla olevien ainesosien perusteella. Voit myös suodattaa tulokset saatavilla olevien ruoanvalmistusvälineiden perusteella, ja asettaa enimmäismäärän puuttuvia ainesosia tai välineitä.",
+    "selected-ingredients": "Valitut ainesosat",
+    "no-ingredients-selected": "Ei valittuja ainesosia",
+    "missing": "Puuttuu",
+    "no-recipes-found": "Reseptejä ei löytynyt",
+    "no-recipes-found-description": "Kokeile lisätä enemmän ainesosia hakuun tai säätää suodattimia",
+    "include-ingredients-on-hand": "Sisällytä saatavilla olevat ainesosat",
+    "include-tools-on-hand": "Sisällytä saatavilla olevat välineet",
+    "max-missing-ingredients": "Puuttuvien ainesten enimmäismäärä",
+    "max-missing-tools": "Puuttuvien välineiden enimmäismäärä",
+    "selected-tools": "Valitut välineet",
+    "other-filters": "Muut suodattimet",
+    "ready-to-make": "Valmis tekemään",
+    "almost-ready-to-make": "Melkein valmis tekemään"
   },
   "search": {
     "advanced-search": "Tarkennettu haku",
@@ -697,7 +689,7 @@
     "or": "Tai",
     "has-any": "On Mikä Tahansa",
     "has-all": "On Kaikki",
-    "clear-selection": "Clear Selection",
+    "clear-selection": "Tyhjennä valinnat",
     "results": "Tulokset",
     "search": "Hae",
     "search-mealie": "Hae Mealiestä (paina /)",
@@ -891,7 +883,7 @@
     "are-you-sure-you-want-to-check-all-items": "Haluatko varmasti valita kaikki kohteet?",
     "are-you-sure-you-want-to-uncheck-all-items": "Haluatko varmasti poistaa kaikki valinnat?",
     "are-you-sure-you-want-to-delete-checked-items": "Haluatko varmasti poistaa kaikki valitut kohteet?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "Ostoslistoja ei löytynyt"
   },
   "sidebar": {
     "all-recipes": "Reseptit",
@@ -988,7 +980,7 @@
     "register": "Rekisteröidy",
     "reset-password": "Palauta salasana",
     "sign-in": "Kirjaudu",
-    "total-mealplans": "Ateriasuunnitelmia",
+    "total-mealplans": "Ateriasuunnitelma Yhteensä",
     "total-users": "Käyttäjien määrä",
     "upload-photo": "Tuo kuva",
     "use-8-characters-or-more-for-your-password": "Salasanan pituuden on oltava vähintään kahdeksan merkkiä",
@@ -1037,7 +1029,7 @@
     "administrator": "Ylläpitäjä",
     "user-can-invite-other-to-group": "Käyttäjä voi kutsua muita ryhmään",
     "user-can-manage-group": "Käyttäjä voi hallita ryhmää",
-    "user-can-manage-household": "User can manage household",
+    "user-can-manage-household": "Käyttäjä voi hallita kotitaloutta",
     "user-can-organize-group-data": "Käyttäjä voi järjestellä ryhmän tietoja",
     "enable-advanced-features": "Salli edistyneemmät ominaisuudet",
     "it-looks-like-this-is-your-first-time-logging-in": "Tämä vaikuttaa olevan ensimmäinen kirjautumisesi.",
@@ -1220,7 +1212,7 @@
         "result": "Valittu teksti tulee näkymään aiemmin valitun kentän sisällä."
       },
       "pan-and-zoom-mode": "Kääntö- ja zoomaustila",
-      "pan-and-zoom-desc": "Select pan and zoom by clicking the icon. This mode allows to zoom inside the image and move around to make using big images easier.",
+      "pan-and-zoom-desc": "Valitse panorointi ja zoomaus klikkaamalla kuvaketta. Tämä tila mahdollistaa zoomauksen kuvan sisällä ja liikkumisen niin, että isojen kuvien käyttö on helpompaa.",
       "split-text-mode": "Jaa tekstitila",
       "split-modes": {
         "line-mode": "Rivitila (oletus)",
@@ -1239,37 +1231,37 @@
       "summary-title": "Yhteenveto",
       "button-label-get-summary": "Hae Yhteenveto",
       "button-label-open-details": "Tiedot",
-      "info-description-data-dir-size": "Datahakemiston Koko",
+      "info-description-data-dir-size": "Datahakemiston koko",
       "info-description-log-file-size": "Lokitiedoston Koko",
-      "info-description-cleanable-directories": "Siivottavat Hakemistot",
-      "info-description-cleanable-images": "Siivottavat Kuvat",
+      "info-description-cleanable-directories": "Siivottavat hakemistot",
+      "info-description-cleanable-images": "Siivottavat kuvat",
       "storage": {
-        "title-temporary-directory": "Väliaikainen Hakemisto (.temp)",
+        "title-temporary-directory": "Väliaikainen hakemisto (.temp)",
         "title-backups-directory": "Varmuuskopiointihakemisto (varmuuskopiot)",
-        "title-groups-directory": "Ryhmien Hakemisto (ryhmät)",
+        "title-groups-directory": "Ryhmien hakemisto (ryhmät)",
         "title-recipes-directory": "Reseptihakemisto (reseptit)",
         "title-user-directory": "Käyttäjähakemisto (käyttäjä)"
       },
       "action-delete-log-files-name": "Poista Lokitiedostot",
       "action-delete-log-files-description": "Poistaa kaikki lokitiedostot",
-      "action-clean-directories-name": "Puhdista Hakemistot",
+      "action-clean-directories-name": "Puhdista hakemistot",
       "action-clean-directories-description": "Poistaa kaikki reseptikansiot, jotka eivät ole kelvollisia UUID-koodeja",
       "action-clean-temporary-files-name": "Poista väliaikaiset tiedostot",
       "action-clean-temporary-files-description": "Poistaa kaikki tiedostot ja kansiot .temp kansiosta",
-      "action-clean-images-name": "Puhdista Kuvat",
+      "action-clean-images-name": "Puhdista kuvat",
       "action-clean-images-description": "Poistaa kaikki kuvat, jotka eivät pääty .webp",
-      "actions-description": "Maintenance actions are {destructive_in_bold} and should be used with caution. Performing any of these actions is {irreversible_in_bold}.",
-      "actions-description-destructive": "lopullinen",
-      "actions-description-irreversible": "peruuttamaton",
+      "actions-description": "Huoltotoimenpiteet ovat {destructive_in_bold} ja niitä tulisi käyttää varoen. Kaikkien näiden toimenpiteiden suorittaminen on {irreversible_in_bold}.",
+      "actions-description-destructive": "tuhoisia",
+      "actions-description-irreversible": "peruuttamatonta",
       "logs-action-refresh": "Päivitä lokit",
       "logs-page-title": "Mealie- Lokit",
-      "logs-tail-lines-label": "Tail Lines"
+      "logs-tail-lines-label": "Loppurivit"
     },
     "mainentance": {
       "actions-title": "Toiminnot"
     },
     "ingredients-natural-language-processor": "Ingredients Natural Language Processor",
-    "ingredients-natural-language-processor-explanation": "Mealie uses Conditional Random Fields (CRFs) for parsing and processing ingredients. The model used for ingredients is based off a data set of over 100,000 ingredients from a dataset compiled by the New York Times. Note that as the model is trained in English only, you may have varied results when using the model in other languages. This page is a playground for testing the model.",
+    "ingredients-natural-language-processor-explanation": "Mealie käyttää Conditional Random Fields (CRF) ainesosien jäsentämiseen ja prosessointiin. Ainesosien osalta käytetty malli perustuu yli 100000 ainesosan aineistoon New York Timesin kokoamasta aineistosta. Huomaa, että koska malli on koulutettu vain englanniksi, mallilla voi olla vaihtelevia tuloksia, kun käytät mallia muilla kielillä. Tämä sivu on mallin testaamiseen tarkoitettu leikkipaikka.",
     "ingredients-natural-language-processor-explanation-2": "Se ei ole täydellinen, mutta se tuottaa hyviä tuloksia yleensä ja on hyvä lähtökohta manuaalisesti jäsentää ainesosia yksittäisiin kenttiin. Vaihtoehtoisesti voit myös käyttää Brute-prosessori, joka käyttää kuvion täsmäystekniikkaa tunnistamaan ainesosia.",
     "nlp": "NLP",
     "brute": "Brute",
@@ -1286,24 +1278,24 @@
     "setup": {
       "first-time-setup": "Ensiasetukset",
       "welcome-to-mealie-get-started": "Tervetuloa Mealieen! Aloitetaan",
-      "already-set-up-bring-to-homepage": "I'm already set up, just bring me to the homepage",
-      "common-settings-for-new-sites": "Here are some common settings for new sites",
-      "setup-complete": "Setup Complete!",
+      "already-set-up-bring-to-homepage": "Olen jo valmis, vie minut kotisivulle",
+      "common-settings-for-new-sites": "Tässä muutamia yleisiä asetuksia uusille sivustoille",
+      "setup-complete": "Asennus valmis.",
       "here-are-a-few-things-to-help-you-get-started": "Näillä muutamilla asioilla pääset alkuun",
       "restore-from-v1-backup": "Onko sinulla varmuuskopio aiemmasta Mealie v1 -instanssista? Palauta se tästä.",
       "manage-profile-or-get-invite-link": "Hallitse profiiliasi tai hanki kutsulinkki muille."
     },
-    "debug-openai-services": "Debug OpenAI Services",
-    "debug-openai-services-description": "Use this page to debug OpenAI services. You can test your OpenAI connection and see the results here. If you have image services enabled, you can also provide an image.",
-    "run-test": "Run Test",
-    "test-results": "Test Results",
-    "group-delete-note": "Groups with users or households cannot be deleted",
-    "household-delete-note": "Households with users cannot be deleted"
+    "debug-openai-services": "Debuggaa OpenAI-palveluita",
+    "debug-openai-services-description": "Käytä tätä sivua OpenAI-palveluiden debuggaamiseen. Voit testata OpenAI-yhteytesi ja nähdä tulokset täällä. Jos kuvapalvelut ovat käytössä, voit myös antaa kuvan.",
+    "run-test": "Suorita testi",
+    "test-results": "Testitulokset",
+    "group-delete-note": "Ryhmiä, joilla on käyttäjiä tai kotitalouksia, ei voi poistaa",
+    "household-delete-note": "Kotitalouksia, joissa on käyttäjiä, ei voi poistaa"
   },
   "profile": {
     "welcome-user": "👋 Tervetuloa, {0}!",
     "description": "Hallitse profiiliasi, reseptejäsi ja ryhmäasetuksiasi.",
-    "invite-link": "Invite Link",
+    "invite-link": "",
     "get-invite-link": "Hanki Kutsulinkki",
     "get-public-link": "Julkinen linkki",
     "account-summary": "Tilin Yhteenveto",
@@ -1352,9 +1344,9 @@
   },
   "cookbook": {
     "cookbooks": "Keittokirjat",
-    "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
-    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
-    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
+    "description": "Keittokirjat ovat toinen tapa järjestää reseptejä luomalla poikkileikkauksia resepteistä, järjestäjistä, sekä muista suodattimista. Keittokirjan luominen lisää merkinnän sivupalkkiin, ja kaikki reseptit näkyvät keittokirjassa valittujen suodatinten mukaisesti.",
+    "hide-cookbooks-from-other-households": "Piilota keittokirjat muista kotitalouksista",
+    "hide-cookbooks-from-other-households-description": "Kun käytössä, sivupalkissa näkyy vain oman kotitaloutesi keittokirjoja",
     "public-cookbook": "Julkinen Keittokirja",
     "public-cookbook-description": "Julkisia keittokirjoja voidaan jakaa ei-Mealien käyttäjille, ja ne näkyvät ryhmäsi sivulla.",
     "filter-options": "Suodatuksen asetukset",
@@ -1370,25 +1362,25 @@
   },
   "query-filter": {
     "logical-operators": {
-      "and": "AND",
-      "or": "OR"
+      "and": "JA",
+      "or": "TAI"
     },
     "relational-operators": {
-      "equals": "equals",
-      "does-not-equal": "does not equal",
-      "is-greater-than": "is greater than",
-      "is-greater-than-or-equal-to": "is greater than or equal to",
-      "is-less-than": "is less than",
-      "is-less-than-or-equal-to": "is less than or equal to"
+      "equals": "on yhtä kuin",
+      "does-not-equal": "ei ole yhtä kuin",
+      "is-greater-than": "on suurempi kuin",
+      "is-greater-than-or-equal-to": "on suurempi tai yhtäsuuri kuin",
+      "is-less-than": "on vähemmän kuin",
+      "is-less-than-or-equal-to": "on vähemmän tai yhtäsuuri kuin"
     },
     "relational-keywords": {
-      "is": "is",
-      "is-not": "is not",
-      "is-one-of": "is one of",
-      "is-not-one-of": "is not one of",
-      "contains-all-of": "contains all of",
-      "is-like": "is like",
-      "is-not-like": "is not like"
+      "is": "on",
+      "is-not": "ei ole",
+      "is-one-of": "on yksi näistä",
+      "is-not-one-of": "ei ole yksi näistä",
+      "contains-all-of": "sisältää kaikki nämä",
+      "is-like": "on kuin",
+      "is-not-like": "ei ole kuin"
     }
   }
 }

frontend/lang/messages/fr-BE.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Augmenter l’échelle de 1",
     "locked": "Verrouillé",
     "public-link": "Lien public",
-    "timer": {
-      "kitchen-timer": "Minuteur",
-      "start-timer": "Démarrer le minuteur",
-      "pause-timer": "Mettre en pause le minuteur",
-      "resume-timer": "Reprendre le minuteur",
-      "stop-timer": "Arrêter le minuteur"
-    },
     "edit-timeline-event": "Modifier l’événement dans l’historique",
     "timeline": "Historique",
     "timeline-is-empty": "Pas encore d’historique. Essayez de cuisiner cette recette !",
@@ -586,7 +579,6 @@
     "made-this": "Je l’ai cuisiné",
     "how-did-it-turn-out": "C’était bon ?",
     "user-made-this": "{user} l’a cuisiné",
-    "last-made-date": "Cuisiné le {date}",
     "api-extras-description": "Les suppléments des recettes sont une fonctionnalité clé de l’API Mealie. Ils permettent de créer des paires JSON clé/valeur personnalisées dans une recette, qui peuvent être référencées depuis des applications tierces. Ces clés peuvent être utilisées par exemple pour déclencher des tâches automatisées ou des messages personnalisés à transmettre à l’appareil souhaité.",
     "message-key": "Clé de message",
     "parse": "Analyser",
@@ -1352,7 +1344,7 @@
   },
   "cookbook": {
     "cookbooks": "Livres de recettes",
-    "description": "Les livres de recettes sont un autre moyen d’organiser des recettes en sélectionnant un ensemble précis de recettes, de classification et de filtres. La création d'un livre de recettes ajoute une entrée à la barre latérale et toutes les recettes avec les filtres choisies seront affichées dans le livre de recettes.",
+    "description": "Les livres de recettes sont un autre moyen d'organiser des recettes en sélectionnant un ensemble précis de recettes, de classification et de filtres. La création d'un livre de recettes ajoute une entrée à la barre latérale et toutes les recettes avec les filtres choisies seront affichées dans le livre de recettes.",
     "hide-cookbooks-from-other-households": "Masquer les livres de cuisine des autres foyers",
     "hide-cookbooks-from-other-households-description": "Lorsque cette option est activée, seuls les livres de cuisine de votre foyer apparaîtront dans la barre latérale",
     "public-cookbook": "Livre de recettes public",
@@ -1384,8 +1376,8 @@
     "relational-keywords": {
       "is": "est",
       "is-not": "n’est pas",
-      "is-one-of": "est un de",
-      "is-not-one-of": "n'est pas un de",
+      "is-one-of": "fait partie de",
+      "is-not-one-of": "ne fait pas partie de",
       "contains-all-of": "contient tout",
       "is-like": "est comme",
       "is-not-like": "n'est pas similaire à"

frontend/lang/messages/fr-CA.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Augmenter l'échelle de 1",
     "locked": "Verrouillé",
     "public-link": "Lien public",
-    "timer": {
-      "kitchen-timer": "Minuteur",
-      "start-timer": "Démarrer le minuteur",
-      "pause-timer": "Mettre en pause le minuteur",
-      "resume-timer": "Reprendre le minuteur",
-      "stop-timer": "Arrêter le minuteur"
-    },
     "edit-timeline-event": "Modifier l’événement dans l’historique",
     "timeline": "Historique",
     "timeline-is-empty": "Pas encore d’historique. Essayez de cuisiner cette recette !",
@@ -586,7 +579,6 @@
     "made-this": "Je l’ai cuisiné",
     "how-did-it-turn-out": "C’était bon ?",
     "user-made-this": "{user} l’a cuisiné",
-    "last-made-date": "Cuisiné le {date}",
     "api-extras-description": "Les suppléments des recettes sont une fonctionnalité clé de l’API Mealie. Ils permettent de créer des paires JSON clé/valeur personnalisées dans une recette, qui peuvent être référencées depuis des applications tierces. Ces clés peuvent être utilisées par exemple pour déclencher des tâches automatisées ou des messages personnalisés à transmettre à l’appareil souhaité.",
     "message-key": "Clé de message",
     "parse": "Analyser",

frontend/lang/messages/fr-FR.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Augmenter l’échelle de 1",
     "locked": "Verrouillé",
     "public-link": "Lien public",
-    "timer": {
-      "kitchen-timer": "Minuteur",
-      "start-timer": "Démarrer le minuteur",
-      "pause-timer": "Mettre en pause le minuteur",
-      "resume-timer": "Reprendre le minuteur",
-      "stop-timer": "Arrêter le minuteur"
-    },
     "edit-timeline-event": "Modifier l’événement dans l’historique",
     "timeline": "Historique",
     "timeline-is-empty": "Pas encore d’historique. Essayez de cuisiner cette recette !",
@@ -586,7 +579,6 @@
     "made-this": "Je l’ai cuisiné",
     "how-did-it-turn-out": "C’était bon ?",
     "user-made-this": "{user} l’a cuisiné",
-    "last-made-date": "Cuisiné le {date}",
     "api-extras-description": "Les suppléments des recettes sont une fonctionnalité clé de l’API Mealie. Ils permettent de créer des paires JSON clé/valeur personnalisées dans une recette, qui peuvent être référencées depuis des applications tierces. Ces clés peuvent être utilisées par exemple pour déclencher des tâches automatisées ou des messages personnalisés à transmettre à l’appareil souhaité.",
     "message-key": "Clé de message",
     "parse": "Analyser",

frontend/lang/messages/gl-ES.json

@@ -182,7 +182,7 @@
     "date": "Data",
     "id": "Id",
     "owner": "Dono",
-    "change-owner": "Change Owner",
+    "change-owner": "Mudar Proprietario",
     "date-added": "Engadida o",
     "none": "Nada",
     "run": "Executar",
@@ -214,10 +214,10 @@
     "confirm-delete-generic-items": "Estás seguro de que queres eliminar os seguintes elementos?",
     "organizers": "Organizadores",
     "caution": "Coidado",
-    "show-advanced": "Show Advanced",
-    "add-field": "Add Field",
+    "show-advanced": "Mostrar Avanzadas",
+    "add-field": "Adicionar Campo",
     "date-created": "Date Created",
-    "date-updated": "Date Updated"
+    "date-updated": "Data de Atualización"
   },
   "group": {
     "are-you-sure-you-want-to-delete-the-group": "Estás seguro de que queres eliminar <b>{groupName}<b/>?",
@@ -295,11 +295,11 @@
     "private-household-description": "Setting your household to private will disable all public view options. This overrides any individual public view settings",
     "lock-recipe-edits-from-other-households": "Lock recipe edits from other households",
     "lock-recipe-edits-from-other-households-description": "When enabled only users in your household can edit recipes created by your household",
-    "household-recipe-preferences": "Household Recipe Preferences",
+    "household-recipe-preferences": "Preferencias de receitas da casa",
     "default-recipe-preferences-description": "These are the default settings when a new recipe is created in your household. These can be changed for individual recipes in the recipe settings menu.",
     "allow-users-outside-of-your-household-to-see-your-recipes": "Allow users outside of your household to see your recipes",
     "allow-users-outside-of-your-household-to-see-your-recipes-description": "When enabled you can use a public share link to share specific recipes without authorizing the user. When disabled, you can only share recipes with users who are in your household or with a pre-generated private link",
-    "household-preferences": "Household Preferences"
+    "household-preferences": "Preferencias da Casa"
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Crea un Novo Menú",
@@ -322,9 +322,9 @@
     "mealplan-update-failed": "Produciuse un erro na actualización do menú",
     "mealplan-updated": "Menú Actualizado",
     "mealplan-households-description": "If no household is selected, recipes can be added from any household",
-    "any-category": "Any Category",
-    "any-tag": "Any Tag",
-    "any-household": "Any Household",
+    "any-category": "Calquer Categoria",
+    "any-tag": "Calquer Etiqueta",
+    "any-household": "Calquer Casa",
     "no-meal-plan-defined-yet": "Aínda non se definiu ningún menú",
     "no-meal-planned-for-today": "Non hai ningunha comida prevista para hoxe",
     "numberOfDays-hint": "Número de días ao cargar a páxina",
@@ -395,7 +395,7 @@
     },
     "tandoor": {
       "description-long": "Mealie can import recipes from Tandoor. Export your data in the \"Default\" format, then upload the .zip below.",
-      "title": "Tandoor Recipes"
+      "title": "Receitas do Tandoor"
     },
     "recipe-data-migrations": "Recipe Data Migrations",
     "recipe-data-migrations-explanation": "Recipes can be migrated from another supported application to Mealie. This is a great way to get started with Mealie.",
@@ -404,8 +404,8 @@
     "tag-all-recipes": "Tag all recipes with {tag-name} tag",
     "nextcloud-text": "Nextcloud recipes can be imported from a zip file that contains the data stored in Nextcloud. See the example folder structure below to ensure your recipes are able to be imported.",
     "chowdown-text": "Mealie admite de forma nativa o formato do repositorio de chowdown. Descarga o repositorio de códigos como ficheiro .zip e cárgao a continuación.",
-    "recipe-1": "Recipe 1",
-    "recipe-2": "Recipe 2",
+    "recipe-1": "Receita 1",
+    "recipe-2": "Receita 2",
     "paprika-text": "Mealie can import recipes from the Paprika application. Export your recipes from paprika, rename the export extension to .zip and upload it below.",
     "mealie-text": "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.",
     "plantoeat": {
@@ -424,15 +424,15 @@
   "new-recipe": {
     "bulk-add": "Bulk Add",
     "error-details": "Only websites containing ld+json or microdata can be imported by Mealie. Most major recipe websites support this data structure. If your site cannot be imported but there is json data in the log, please submit a github issue with the URL and data.",
-    "error-title": "Looks Like We Couldn't Find Anything",
-    "from-url": "Import a Recipe",
-    "github-issues": "GitHub Issues",
+    "error-title": "Parece que non conseguimos encontrar nada",
+    "from-url": "Importar unha Receita",
+    "github-issues": "Problemas no GitHub",
     "google-ld-json-info": "Google ld+json Info",
-    "must-be-a-valid-url": "Must be a Valid URL",
-    "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Paste in your recipe data. Each line will be treated as an item in a list",
-    "recipe-markup-specification": "Recipe Markup Specification",
-    "recipe-url": "Recipe URL",
-    "recipe-html-or-json": "Recipe HTML or JSON",
+    "must-be-a-valid-url": "Precisa ser un URL válido",
+    "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Pegue os datos da sua receita. Cada liña será tratada como un item nunha lista",
+    "recipe-markup-specification": "Especificación Markup da Receita",
+    "recipe-url": "URL da Receita",
+    "recipe-html-or-json": "Receita en HTML ou JSON",
     "upload-a-recipe": "Upload a Recipe",
     "upload-individual-zip-file": "Upload an individual .zip file exported from another Mealie instance.",
     "url-form-hint": "Copy and paste a link from your favorite recipe website",
@@ -440,13 +440,13 @@
     "trim-whitespace-description": "Trim leading and trailing whitespace as well as blank lines",
     "trim-prefix-description": "Trim first character from each line",
     "split-by-numbered-line-description": "Attempts to split a paragraph by matching '1)' or '1.' patterns",
-    "import-by-url": "Import a recipe by URL",
+    "import-by-url": "Importar unha receita por URL",
     "create-manually": "Create a recipe manually",
     "make-recipe-image": "Make this the recipe image"
   },
   "page": {
-    "404-page-not-found": "404 Page not found",
-    "all-recipes": "All Recipes",
+    "404-page-not-found": "404 Páxina non encontrada",
+    "all-recipes": "Todas as receitas",
     "new-page-created": "New page created",
     "page": "Páxina",
     "page-creation-failed": "Produciuse un erro ao creala páxina",
@@ -467,7 +467,7 @@
     "calories-suffix": "calorías",
     "carbohydrate-content": "Carbohidratos",
     "categories": "Categorías",
-    "cholesterol-content": "Cholesterol",
+    "cholesterol-content": "Colesterol",
     "comment-action": "Comentar",
     "comment": "Comentario",
     "comments": "Comentarios",
@@ -535,7 +535,7 @@
     "add-recipe-to-mealplan": "Add Recipe to Mealplan",
     "entry-type": "Entry Type",
     "date-format-hint": "Formato MM/DD/YYYY",
-    "date-format-hint-yyyy-mm-dd": "YYYY-MM-DD format",
+    "date-format-hint-yyyy-mm-dd": "Formato AAAA-MM-DD",
     "add-to-list": "Add to List",
     "add-to-plan": "Add to Plan",
     "add-to-timeline": "Add to Timeline",
@@ -553,7 +553,7 @@
     "choose-unit": "Choose Unit",
     "press-enter-to-create": "Press Enter to Create",
     "choose-food": "Choose Food",
-    "notes": "Notes",
+    "notes": "Notas",
     "toggle-section": "Toggle Section",
     "see-original-text": "See Original Text",
     "original-text-with-value": "Original Text: {originalText}",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -586,7 +579,6 @@
     "made-this": "I Made This",
     "how-did-it-turn-out": "How did it turn out?",
     "user-made-this": "{user} fixo isto",
-    "last-made-date": "Feito por Última Vez {date}",
     "api-extras-description": "Os extras de receitas son unha característica clave da API de Mealie. Permítenche crear pares de clave/valor JSON personalizados dentro dunha receita, para facer referencia desde aplicacións de terceiros. Podes usar estas teclas para proporcionar información, por exemplo, para activar automatizacións ou mensaxes personalizadas para transmitir ao dispositivo que desexes.",
     "message-key": "Message Key",
     "parse": "Parse",
@@ -1201,8 +1193,8 @@
     "demo_password": "Password: {password}"
   },
   "ocr-editor": {
-    "ocr-editor": "Ocr editor",
-    "toolbar": "Toolbar",
+    "ocr-editor": "Editor OCR",
+    "toolbar": "Barra de ferramentas",
     "selection-mode": "Selection mode",
     "pan-and-zoom-picture": "Pan and zoom picture",
     "split-text": "Split text",
@@ -1210,7 +1202,7 @@
     "split-by-block": "Split by text block",
     "flatten": "Flatten regardless of original formating",
     "help": {
-      "help": "Help",
+      "help": "Axuda",
       "mouse-modes": "Mouse modes",
       "selection-mode": "Selection Mode (default)",
       "selection-mode-desc": "The selection mode is the main mode that can be used to enter data:",

frontend/lang/messages/he-IL.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "העלה קנה מידה ב-1",
     "locked": "נעול",
     "public-link": "כתובת פומבית",
-    "timer": {
-      "kitchen-timer": "טיימר למטבח",
-      "start-timer": "התחל את הטיימר",
-      "pause-timer": "השהה את הטיימר",
-      "resume-timer": "המשך את הטיימר",
-      "stop-timer": "עצור את הטיימר"
-    },
     "edit-timeline-event": "עריכת אירוע ציר זמן",
     "timeline": "ציר זמן",
     "timeline-is-empty": "אין כלום בציר הזמן. נסה לעשות את המתכון הזה!",
@@ -586,7 +579,6 @@
     "made-this": "הכנתי את זה",
     "how-did-it-turn-out": "איך יצא?",
     "user-made-this": "{user} הכין את זה",
-    "last-made-date": "נעשה לאחרונה ב{date}",
     "api-extras-description": "מתכונים נוספים הם יכולת מפתח של Mealie API. הם מאפשרים ליצור צמדי key/value בצורת JSON על מנת לקרוא אותם בתוכנת צד שלישית. תוכלו להשתמש בצמדים האלה כדי לספק מידע, לדוגמא להפעיל אוטומציות או הודעות מותאמות אישית למכשירים מסויימים.",
     "message-key": "מפתח הודעה",
     "parse": "ניתוח",

frontend/lang/messages/hr-HR.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Povećaj skaliranje za 1",
     "locked": "Zaključano",
     "public-link": "Javni Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Uredi Događaj Vremenske Crte",
     "timeline": "Vremenska Crta",
     "timeline-is-empty": "Još nema ništa na vremenskoj crti. Pokušajte napraviti ovaj recept!",
@@ -586,7 +579,6 @@
     "made-this": "Napravio/la sam ovo",
     "how-did-it-turn-out": "Kako je ispalo?",
     "user-made-this": "{user} je napravio/la ovo",
-    "last-made-date": "Zadnji put napravljeno {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": "Ključ poruke",
     "parse": "Razluči (parsiraj)",

frontend/lang/messages/hu-HU.json

@@ -277,7 +277,7 @@
     "admin-group-management-text": "A csoporthoz tartozó változtatások azonnal megjelennek.",
     "group-id-value": "Csoport azonosító: {0}",
     "total-households": "Háztartások száma",
-    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
+    "you-must-select-a-group-before-selecting-a-household": "A háztartás kiválasztása előtt ki kell választania egy csoportot"
   },
   "household": {
     "household": "Háztartás",
@@ -518,7 +518,7 @@
     "save-recipe-before-use": "Recept mentése használat előtt",
     "section-title": "Szakasz címe",
     "servings": "Adag",
-    "serves-amount": "Serves {amount}",
+    "serves-amount": "Adag {amount}",
     "share-recipe-message": "Szeretném megossztani veled a {0} receptemet.",
     "show-nutrition-values": "Tápértékek megjelenítése",
     "sodium-content": "Nátrium",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Skála növelése 1-gyel",
     "locked": "Zárolt",
     "public-link": "Nyilvános link",
-    "timer": {
-      "kitchen-timer": "Konyhai időzítő",
-      "start-timer": "Időzítő elindítása",
-      "pause-timer": "Időzítő megállítása",
-      "resume-timer": "Időzítő folytatása",
-      "stop-timer": "Időzítő leállítása"
-    },
     "edit-timeline-event": "Idővonal-esemény szerkesztése",
     "timeline": "Idővonal",
     "timeline-is-empty": "Az idővonalon még semmi sincs. Próbálja meg elkészíteni ezt a receptet!",
@@ -586,7 +579,6 @@
     "made-this": "Elkészítettem ezt",
     "how-did-it-turn-out": "Hogyan sikerült?",
     "user-made-this": "ezt {user} készítette el",
-    "last-made-date": "Utoljára elkészítve {date}",
     "api-extras-description": "A receptek extrái a Mealie API egyik legfontosabb szolgáltatása. Lehetővé teszik, hogy egyéni JSON kulcs/érték párokat hozzon létre egy receptben, amelyekre harmadik féltől származó alkalmazásokból hivatkozhat. Ezeket a kulcsokat információszolgáltatásra használhatja, például automatizmusok vagy egyéni üzenetek indítására, amelyeket a kívánt eszközre küldhet.",
     "message-key": "Üzenetkulcs",
     "parse": "Előkészítés",
@@ -644,7 +636,7 @@
     "recipe-debugger-use-openai-description": "Használja az OpenAI-t az eredmények elemzésére, ahelyett, hogy a scraper könyvtárra hagyatkozna. Ha URL-címen keresztül hoz létre receptet, ez automatikusan megtörténik, ha a scraper könyvtár nem működik, ám itt manuálisan is tesztelheti.",
     "debug": "Hibakeresés",
     "tree-view": "Fa nézet",
-    "recipe-servings": "Recipe Servings",
+    "recipe-servings": "Recept tálalások",
     "recipe-yield": "Adagonkénti információk",
     "recipe-yield-text": "Recipe Yield Text",
     "unit": "Mennyiségi egység",
@@ -669,24 +661,24 @@
       "no-food": "Élelmiszer nélküli"
     },
     "reset-servings-count": "Adagok számának visszaállítása",
-    "not-linked-ingredients": "Additional Ingredients"
+    "not-linked-ingredients": "Kiegészítő hozzávalók"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
-    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
-    "selected-ingredients": "Selected Ingredients",
-    "no-ingredients-selected": "No ingredients selected",
-    "missing": "Missing",
-    "no-recipes-found": "No recipes found",
-    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
-    "include-ingredients-on-hand": "Include Ingredients On Hand",
-    "include-tools-on-hand": "Include Tools On Hand",
-    "max-missing-ingredients": "Max Missing Ingredients",
-    "max-missing-tools": "Max Missing Tools",
-    "selected-tools": "Selected Tools",
-    "other-filters": "Other Filters",
-    "ready-to-make": "Ready to Make",
-    "almost-ready-to-make": "Almost Ready to Make"
+    "recipe-finder": "Receptkereső",
+    "recipe-finder-description": "Keressen recepteket a kéznél lévő összetevők alapján. A rendelkezésre álló eszközök alapján is szűrhet, és beállíthatja a hiányzó összetevők vagy eszközök maximális számát.",
+    "selected-ingredients": "Kiválasztott összetevők",
+    "no-ingredients-selected": "Nincsenek kiválasztott összetevők",
+    "missing": "Hiányzó",
+    "no-recipes-found": "Nem található recept",
+    "no-recipes-found-description": "Próbáljon meg több összetevőt hozzáadni a kereséshez, vagy állítsa be a szűrőket",
+    "include-ingredients-on-hand": "Beleértve a kéznél lévő összetevőket",
+    "include-tools-on-hand": "Beleértve a kéznél lévő eszközöket",
+    "max-missing-ingredients": "Maximálisan hiányzó összetevők száma",
+    "max-missing-tools": "Maximálisan hiányzó eszközök száma",
+    "selected-tools": "Kiválasztott eszközök",
+    "other-filters": "További szűrők",
+    "ready-to-make": "Előkészítve",
+    "almost-ready-to-make": "Majdnem készen áll"
   },
   "search": {
     "advanced-search": "Részletes keresés",
@@ -891,7 +883,7 @@
     "are-you-sure-you-want-to-check-all-items": "Biztos, hogy minden elemet be akar jelölni?",
     "are-you-sure-you-want-to-uncheck-all-items": "Biztos, hogy minden elem kijelölését visszavonja?",
     "are-you-sure-you-want-to-delete-checked-items": "Biztosan törölni akarja az összes bejelölt elemet?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "Nem találhatók bevásárlólisták"
   },
   "sidebar": {
     "all-recipes": "Minden recept",
@@ -1303,7 +1295,7 @@
   "profile": {
     "welcome-user": "👋 Üdvözöljük, {0}!",
     "description": "Profiljának, receptjeinek és csoportbeállításainak kezelése.",
-    "invite-link": "Invite Link",
+    "invite-link": "Meghívó link",
     "get-invite-link": "Meghívó link beszerzése",
     "get-public-link": "Nyilvánon link beszerzése",
     "account-summary": "Fiók áttekintése",
@@ -1333,7 +1325,7 @@
     "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": "Az Ön Mealie adatainak kezelése: alapanyagok, mértékegységek, kategóriák, címkék, stb.",
-    "data-migrations": "Adat migráció",
+    "data-migrations": "Adatmigráció",
     "data-migrations-description": "Migrálja meglévő adatait más alkalmazásokból, például Nextcloud Recipes vagy Chowdown.",
     "email-sent": "E-mail elküldve",
     "error-sending-email": "Hiba történt az e-Mail küldésénél",
@@ -1348,13 +1340,13 @@
     "manage-members": "Tagok Kezelése",
     "manage-webhooks": "Webhookok kezelése",
     "manage-notifiers": "Értesítések kezelése",
-    "manage-data-migrations": "Adatok migrációjának kezelése"
+    "manage-data-migrations": "Adatmigráció kezelése"
   },
   "cookbook": {
     "cookbooks": "Szakácskönyvek",
     "description": "A szakácskönyvek egy másik módja a receptek rendszerezésének a receptek, szervezők és egyéb szűrők keresztmetszeteinek létrehozásával. Egy szakácskönyv létrehozása egy bejegyzést ad az oldalsávhoz, és a kiválasztott szűrőkkel rendelkező összes recept megjelenik a szakácskönyvben.",
-    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
-    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
+    "hide-cookbooks-from-other-households": "Szakácskönyvek elrejtése más háztartásoktól",
+    "hide-cookbooks-from-other-households-description": "Ha engedélyezve van, csak az Ön háztartásának szakácskönyvei jelennek meg az oldalsávban",
     "public-cookbook": "Nyilvános szakácskönyv",
     "public-cookbook-description": "A nyilvános szakácskönyvek megoszthatók a nem mealie felhasználókkal, és megjelennek a csoportod oldalán.",
     "filter-options": "Szűrési beállítások",

frontend/lang/messages/is-IS.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -586,7 +579,6 @@
     "made-this": "I Made This",
     "how-did-it-turn-out": "How did it turn out?",
     "user-made-this": "{user} made this",
-    "last-made-date": "Last Made {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",
     "parse": "Parse",

frontend/lang/messages/it-IT.json

@@ -517,7 +517,7 @@
     "saturated-fat-content": "Grassi saturi",
     "save-recipe-before-use": "Salva la ricetta prima dell'uso",
     "section-title": "Titolo Sezione",
-    "servings": "Portate",
+    "servings": "Porzioni",
     "serves-amount": "Porzioni {amount}",
     "share-recipe-message": "Volevo condividere la mia {0} ricetta con te.",
     "show-nutrition-values": "Mostra Valori Nutrizionali",
@@ -526,7 +526,7 @@
     "sugar-content": "Zuccheri",
     "title": "Titolo",
     "total-time": "Tempo Totale",
-    "trans-fat-content": "Trans-fat",
+    "trans-fat-content": "Grassi trans",
     "unable-to-delete-recipe": "Impossibile eliminare ricetta",
     "unsaturated-fat-content": "Grassi insaturi",
     "no-recipe": "Nessuna Ricetta",
@@ -546,9 +546,9 @@
     "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",
-    "yields-amount-with-text": "Yields {amount} {text}",
-    "yield-text": "Yield Text",
+    "yield": "Quantità prodotta",
+    "yields-amount-with-text": "Quantità prodotta: {amount} {text}",
+    "yield-text": "Unità della quantità prodotta",
     "quantity": "Quantità",
     "choose-unit": "Scegli Unità",
     "press-enter-to-create": "Premi invio per creare",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Aumenta la scala di 1",
     "locked": "Bloccato",
     "public-link": "Link Pubblico",
-    "timer": {
-      "kitchen-timer": "Contaminuti da cucina",
-      "start-timer": "Avvia timer",
-      "pause-timer": "Metti in pausa il contaminuti",
-      "resume-timer": "Riprendi il contaminuti",
-      "stop-timer": "Arresta il Timer"
-    },
     "edit-timeline-event": "Modifica evento sulla linea temporale",
     "timeline": "Linea temporale",
     "timeline-is-empty": "Niente sulla linea temporale. Prova a fare questa ricetta!",
@@ -586,7 +579,6 @@
     "made-this": "L'Ho Preparato",
     "how-did-it-turn-out": "Come è venuto?",
     "user-made-this": "{user} l'ha preparato",
-    "last-made-date": "Ultima Preparazione {date}",
     "api-extras-description": "Le opzioni extra delle ricette sono una caratteristica fondamentale dell'API Mealie. Consentono di creare json personalizzati con coppie di chiavi/valore all'interno di una ricetta a cui fare riferimento tramite applicazioni terze. È possibile utilizzare queste chiavi per inserire informazioni, per esempio per attivare automazioni oppure per inoltrare messaggi personalizzati al dispositivo desiderato.",
     "message-key": "Chiave Messaggio",
     "parse": "Analizza",
@@ -624,9 +616,9 @@
     "stay-in-edit-mode": "Rimani in modalità Modifica",
     "import-from-zip": "Importa da Zip",
     "import-from-zip-description": "Importa una singola ricetta esportata da un'altra istanza di Mealie.",
-    "import-from-html-or-json": "Import from HTML or JSON",
-    "import-from-html-or-json-description": "Import a single recipe from raw HTML or JSON. This is useful if you have a recipe from a site that Mealie can't scrape normally, or from some other external source.",
-    "json-import-format-description-colon": "To import via JSON, it must be in valid format:",
+    "import-from-html-or-json": "Importa da HTML o JSON",
+    "import-from-html-or-json-description": "Importa una singola ricetta da HTML o JSON grezzi. Utile se si ha una ricetta proveniente da siti da cui solitamente Mealie non riesce a importare, o da qualche altra fonte esterna.",
+    "json-import-format-description-colon": "Per importare tramite JSON, deve essere in un formato valido:",
     "json-editor": "Editor JSON",
     "zip-files-must-have-been-exported-from-mealie": "I file .zip devono essere stati esportati da Mealie",
     "create-a-recipe-by-uploading-a-scan": "Crea una ricetta caricando una scansione.",
@@ -644,9 +636,9 @@
     "recipe-debugger-use-openai-description": "Usa OpenAI per analizzare i risultati invece di affidarsi alla libreria scraper. Quando si crea una ricetta tramite URL, questo viene fatto automaticamente se la libreria scraper fallisce, ma è possibile testarlo manualmente qui.",
     "debug": "Debug",
     "tree-view": "Visualizzazione ad Albero",
-    "recipe-servings": "Recipe Servings",
+    "recipe-servings": "Porzioni ricetta",
     "recipe-yield": "Resa Ricetta",
-    "recipe-yield-text": "Recipe Yield Text",
+    "recipe-yield-text": "Testo del rendimento ricetta",
     "unit": "Unità",
     "upload-image": "Carica immagine",
     "screen-awake": "Mantieni lo schermo acceso",
@@ -668,19 +660,19 @@
       "missing-food": "Crea cibo mancante: {food}",
       "no-food": "Nessun Alimento"
     },
-    "reset-servings-count": "Reset Servings Count",
+    "reset-servings-count": "Reimposta conteggio porzioni",
     "not-linked-ingredients": "Ingredienti Aggiuntivi"
   },
   "recipe-finder": {
     "recipe-finder": "Trova ricette",
-    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
+    "recipe-finder-description": "Cerca ricette in base agli ingredienti a portata di mano. Si può anche filtrare in base agli utensili che si ha a disposizione e impostare un numero massimo d'ingredienti o utensili mancanti.",
     "selected-ingredients": "Seleziona ingredienti",
     "no-ingredients-selected": "Nessun ingrediente selezionato",
     "missing": "Mancante",
     "no-recipes-found": "Nessuna ricetta trovata",
     "no-recipes-found-description": "Prova ad aggiungere altri ingredienti alla tua ricerca o a regolare i tuoi filtri",
-    "include-ingredients-on-hand": "Include Ingredients On Hand",
-    "include-tools-on-hand": "Include Tools On Hand",
+    "include-ingredients-on-hand": "Includi ingredienti a mano",
+    "include-tools-on-hand": "Includi strumenti a mano",
     "max-missing-ingredients": "Max Ingredienti Mancanti",
     "max-missing-tools": "Massimo Strumenti Mancanti",
     "selected-tools": "Strumenti Selezionati",
@@ -1298,7 +1290,7 @@
     "run-test": "Esegui test",
     "test-results": "Risultati dei test",
     "group-delete-note": "I gruppi con utenti o famiglie non possono essere eliminati",
-    "household-delete-note": "Households with users cannot be deleted"
+    "household-delete-note": "Le famiglie con utenti non possono essere eliminate"
   },
   "profile": {
     "welcome-user": "👋 Benvenutǝ, {0}!",
@@ -1352,9 +1344,9 @@
   },
   "cookbook": {
     "cookbooks": "Ricettari",
-    "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
-    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
-    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
+    "description": "I libri di cucina sono un altro modo per organizzare le ricette creando insiemi di ricette, ordinamenti e altri filtri. La creazione di un libro di cucina aggiungerà una voce alla barra laterale e tutte le ricette con i filtri scelti verranno visualizzate nel libro di cucina.",
+    "hide-cookbooks-from-other-households": "Nascondi i libri di cucina delle altre famiglie",
+    "hide-cookbooks-from-other-households-description": "Se abilitata, nella barra laterale appariranno solo libri di cucina della propria famiglia",
     "public-cookbook": "Ricettario Pubblico",
     "public-cookbook-description": "I ricettari pubblici possono essere condivisi con gli utenti non-mealie e saranno visualizzati nella pagina dei gruppi.",
     "filter-options": "Opzioni Filtro",

frontend/lang/messages/ja-JP.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "スケールを 1 ずつ増やす",
     "locked": "ロック済み",
     "public-link": "公開リンク",
-    "timer": {
-      "kitchen-timer": "キッチンタイマー",
-      "start-timer": "タイマー開始",
-      "pause-timer": "タイマーを一時停止",
-      "resume-timer": "タイマーを再開",
-      "stop-timer": "タイマーを停止"
-    },
     "edit-timeline-event": "タイムラインイベントの編集",
     "timeline": "タイムライン",
     "timeline-is-empty": "タイムラインにはまだ何もありません。レシピを作ってみてください！",
@@ -586,7 +579,6 @@
     "made-this": "これを作りました",
     "how-did-it-turn-out": "どうなりましたか？",
     "user-made-this": "{user} がこれを作りました",
-    "last-made-date": "最後は {date} に作りました",
     "api-extras-description": "レシピの追加機能はMealie APIの主な機能です。 サードパーティアプリから参照するために、レシピ内にカスタムJSONキー/値のペアを作成することができます。 これらのキーを使用して情報を提供することができます。例えば、自動化をトリガーしたり、カスタムメッセージをお使いのデバイスにリレーするなどです。",
     "message-key": "メッセージキー",
     "parse": "解析",

frontend/lang/messages/ko-KR.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "잠김",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "타이머 시작",
-      "pause-timer": "타이머 일시 정지",
-      "resume-timer": "타이머 재개",
-      "stop-timer": "타이머 정지"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "타임라인",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -586,7 +579,6 @@
     "made-this": "I Made This",
     "how-did-it-turn-out": "How did it turn out?",
     "user-made-this": "{user} made this",
-    "last-made-date": "Last Made {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",
     "parse": "Parse",

frontend/lang/messages/lt-LT.json

@@ -121,7 +121,7 @@
     "loading": "Kraunasi",
     "loading-events": "Užkrovimo įvykiai",
     "loading-recipe": "Receptai kraunasi...",
-    "loading-ocr-data": "Loading OCR data...",
+    "loading-ocr-data": "Įkeliami OCR duomenys...",
     "loading-recipes": "Receptai kraunasi",
     "message": "Pranešimas",
     "monday": "Pirmadienis",
@@ -210,14 +210,14 @@
     "upload-file": "Įkelti failą",
     "created-on-date": "Sukurta: {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": "Nepavyko nukopijuoti į iškarpinę.",
     "confirm-delete-generic-items": "Are you sure you want to delete the following items?",
     "organizers": "Organizers",
     "caution": "Caution",
-    "show-advanced": "Show Advanced",
-    "add-field": "Add Field",
-    "date-created": "Date Created",
-    "date-updated": "Date Updated"
+    "show-advanced": "Rodyti plačiau",
+    "add-field": "Pridėti lauką",
+    "date-created": "Sukūrimo data",
+    "date-updated": "Atnaujinimo data"
   },
   "group": {
     "are-you-sure-you-want-to-delete-the-group": "Ar tikrai norite ištrinti <b>{groupName}<b/>?",
@@ -322,7 +322,7 @@
     "mealplan-update-failed": "Mitybos plano atnaujinti nepavyko",
     "mealplan-updated": "Mitybos planas atnaujintas",
     "mealplan-households-description": "If no household is selected, recipes can be added from any household",
-    "any-category": "Any Category",
+    "any-category": "Bet kuri kategorija",
     "any-tag": "Any Tag",
     "any-household": "Any Household",
     "no-meal-plan-defined-yet": "Nėra nustatytų mitybos planų",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Padidinti mastelį 1 k.",
     "locked": "Užrakinta",
     "public-link": "Vieša nuoroda",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Redaguoti laiko juostos įvykį",
     "timeline": "Laiko juosta",
     "timeline-is-empty": "Laiko juosta tuščia. Pabandykit pagaminti šį receptą!",
@@ -586,7 +579,6 @@
     "made-this": "Aš tai gaminau",
     "how-did-it-turn-out": "Kaip tai pavyko?",
     "user-made-this": "{user} gamino šį patiekalą",
-    "last-made-date": "Paskutinį kartą gaminta {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": "Žinutės raktas",
     "parse": "Nuskaityti",

frontend/lang/messages/lv-LV.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Palieliniet skalu par 1",
     "locked": "Bloķēts",
     "public-link": "Publiskā saite",
-    "timer": {
-      "kitchen-timer": "Virtuves taimeris",
-      "start-timer": "Sākuma taimeris",
-      "pause-timer": "Pauzes taimeris",
-      "resume-timer": "Atjaunot taimeri",
-      "stop-timer": "Apturēšanas taimeris"
-    },
     "edit-timeline-event": "Laika skalas notikuma rediģēšana",
     "timeline": "Laika skala",
     "timeline-is-empty": "Pagaidām nekas laika skalā. Mēģiniet pagatavot šo recepti!",
@@ -586,7 +579,6 @@
     "made-this": "Es to pagatavoju",
     "how-did-it-turn-out": "Kā tas izrādījās?",
     "user-made-this": "{user}izdarīja šo",
-    "last-made-date": "Pēdējo reizi izgatavots {date}",
     "api-extras-description": "Recepšu ekstras ir galvenā Mealie API iezīme. Tie ļauj jums izveidot pielāgotus JSON atslēgu/vērtību pārus receptē, lai atsaucotos no trešo pušu lietojumprogrammām. Varat izmantot šos taustiņus, lai sniegtu informāciju, piemēram, aktivizētu automatizāciju vai pielāgotus ziņojumus, lai tos pārsūtītu uz vēlamo ierīci.",
     "message-key": "Ziņojuma atslēga",
     "parse": "Parsēšana",

frontend/lang/messages/nl-NL.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Verhoog de schaal met 1",
     "locked": "Vergrendeld",
     "public-link": "Openbare link",
-    "timer": {
-      "kitchen-timer": "Kookwekker",
-      "start-timer": "Kookwekker starten",
-      "pause-timer": "Kookwekker pauzeren",
-      "resume-timer": "Kookwekker hervatten",
-      "stop-timer": "Kookwekker stoppen"
-    },
     "edit-timeline-event": "Bewerk tijdlijngebeurtenis",
     "timeline": "Tijdlijn",
     "timeline-is-empty": "Nog niets op de tijdlijn. Probeer dit recept te maken!",
@@ -586,7 +579,6 @@
     "made-this": "Ik heb dit gemaakt",
     "how-did-it-turn-out": "Hoe was je gerecht?",
     "user-made-this": "{user} heeft dit gemaakt",
-    "last-made-date": "Laatst gemaakt op {date}",
     "api-extras-description": "Extra's bij recepten zijn een belangrijke functie van de Mealie API. Hiermee kun je aangepaste JSON key/value paren maken bij een recept om naar te verwijzen vanuit applicaties van derden. Je kunt deze sleutels gebruiken om extra informatie te bieden, bijvoorbeeld om automatisering aan te sturen of aangepaste berichten naar je gewenste apparaat te laten versturen.",
     "message-key": "Berichtsleutel",
     "parse": "Ontleed",

frontend/lang/messages/no-NO.json

@@ -8,7 +8,7 @@
     "database-type": "Databasetype",
     "database-url": "URL til database",
     "default-group": "Standardgruppe",
-    "default-household": "Standard hushold",
+    "default-household": "Standard husholdning",
     "demo": "Demo",
     "demo-status": "Demostatus",
     "development": "Utvikling",
@@ -51,7 +51,7 @@
     "category": "Kategori"
   },
   "events": {
-    "apprise-url": "Apprise URL",
+    "apprise-url": "Apprise-URL",
     "database": "Database",
     "delete-event": "Slett hendelse",
     "event-delete-confirmation": "Er du sikker på at du ønsker å slette denne hendelsen?",
@@ -66,9 +66,9 @@
     "subscribed-events": "Abonnerte hendelser",
     "test-message-sent": "Testmelding sendt",
     "message-sent": "Melding sendt",
-    "new-notification": "Ny varsel",
+    "new-notification": "Nytt varsel",
     "event-notifiers": "Hendelsesvarsler",
-    "apprise-url-skipped-if-blank": "Apprise URL (hoppes over hvis tom)",
+    "apprise-url-skipped-if-blank": "Apprise-URL (hoppes over hvis tom)",
     "enable-notifier": "Aktiver varslingsagenten",
     "what-events": "Hvilke hendelser skal denne varslingsagenten abonnere på?",
     "user-events": "Brukerhendelser",
@@ -87,7 +87,7 @@
     "clear": "Tøm",
     "close": "Lukk",
     "confirm": "Bekreft",
-    "confirm-how-does-everything-look": "Hvordan ser alt ut?",
+    "confirm-how-does-everything-look": "Hvordan ser ting ut?",
     "confirm-delete-generic": "Er du sikker på at du vil slette denne?",
     "copied_message": "Kopiert!",
     "create": "Opprett",
@@ -148,7 +148,7 @@
     "share": "Del",
     "show-all": "Vis alle",
     "shuffle": "Tilfeldig rekkefølge",
-    "sort": "Sortér",
+    "sort": "Sorter",
     "sort-ascending": "Sorter stigende",
     "sort-descending": "Sortere synkende",
     "sort-alphabetically": "Alfabetisk",
@@ -193,7 +193,7 @@
     "confirm-delete-own-admin-account": "Vær oppmerksom på at du holder på å slette din egen administrator-konto! Dette kan ikke angres og vil slette kontoen din permanent!",
     "organizer": "Organisator",
     "transfer": "Overfør",
-    "copy": "Kopiér",
+    "copy": "Kopier",
     "color": "Farge",
     "timestamp": "Tidsstempel",
     "last-made": "Sist laget",
@@ -281,25 +281,25 @@
   },
   "household": {
     "household": "Husholdning",
-    "households": "Husholdning",
+    "households": "Husholdninger",
     "user-household": "Brukers husholdning",
     "create-household": "Opprett husholdning",
-    "household-name": "Husholdningenes navn",
-    "household-group": "Husholdningenes gruppe",
-    "household-management": "Administrer husholdninger",
+    "household-name": "Husholdningens navn",
+    "household-group": "Husholdningens gruppe",
+    "household-management": "Administrering av husholdninger",
     "manage-households": "Administrer husholdninger",
     "admin-household-management": "Admin husholdningsadministrasjon",
     "admin-household-management-text": "Endringer i denne husholdningen vil umiddelbart gjelde.",
-    "household-id-value": "Husholdningenes id: {0}",
+    "household-id-value": "Husholdningens id: {0}",
     "private-household": "Privat husholdning",
     "private-household-description": "Setting your household to private will disable all public view options. This overrides any individual public view settings",
-    "lock-recipe-edits-from-other-households": "Lock recipe edits from other households",
+    "lock-recipe-edits-from-other-households": "Lås redigering av oppskrifter fra andre husholdninger",
     "lock-recipe-edits-from-other-households-description": "When enabled only users in your household can edit recipes created by your household",
     "household-recipe-preferences": "Husholdningenes oppskriftsinnstillinger",
     "default-recipe-preferences-description": "Dette er standardinnstillingene når en ny oppskrift blir opprettet i din husholdning. Disse kan endres for individuelle oppskrifter i oppskrifters innstillinger.",
     "allow-users-outside-of-your-household-to-see-your-recipes": "Tillat brukere utenfor din husholdning å se oppskriftene dine",
     "allow-users-outside-of-your-household-to-see-your-recipes-description": "Når aktivert, kan du bruke en offentlig lenke for å dele spesifikke oppskrifter uten å autorisere brukeren. Når deaktivert, kan du kun dele oppskrifter med brukere som er i husholdningen din eller med en forhåndsgenerert privat lenke",
-    "household-preferences": "Husholdnings innstillinger"
+    "household-preferences": "Innstillinger for husholdning"
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Opprett en ny måltidsplan",
@@ -313,12 +313,12 @@
     "main": "Hovedrett",
     "meal-planner": "Måltidsplanlegger",
     "meal-plans": "Måltidsplaner",
-    "mealplan-categories": "MÅLTIDSPLANKATEGORIER",
+    "mealplan-categories": "MÅLTIDSPLAN-KATEGORIER",
     "mealplan-created": "Måltidsplan opprettet",
     "mealplan-creation-failed": "Opprettelse av måltidsplan mislyktes",
     "mealplan-deleted": "Måltidsplan slettet",
     "mealplan-deletion-failed": "Sletting av måltidsplan mislyktes",
-    "mealplan-settings": "Måltidsplaninnstillinger",
+    "mealplan-settings": "Innstillinger for måltidsplan",
     "mealplan-update-failed": "Oppdatering av måltidsplan mislyktes",
     "mealplan-updated": "Måltidsplan oppdatert",
     "mealplan-households-description": "If no household is selected, recipes can be added from any household",
@@ -426,7 +426,7 @@
     "error-details": "Bare nettsteder som inneholder ld+json eller mikrodata kan importeres av Mealie. De største oppskriftsnettstedene støtter denne datastrukturen. Dersom nettstedet ditt ikke kan importeres, men det er json-data i loggen, må du rapportere et GitHub-problem med nettadressen og data.",
     "error-title": "Ser ut til at ingenting ble funnet",
     "from-url": "Importer en oppskrift",
-    "github-issues": "GitHub-problemer",
+    "github-issues": "GitHub Issues",
     "google-ld-json-info": "Google ld+json-informasjon",
     "must-be-a-valid-url": "Må være en gyldig nettadresse",
     "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Lim inn oppskriftsdataene. Hver linje blir behandlet som et element i en liste",
@@ -467,7 +467,7 @@
     "calories-suffix": "kalorier",
     "carbohydrate-content": "Karbohydrater",
     "categories": "Kategorier",
-    "cholesterol-content": "Cholesterol",
+    "cholesterol-content": "Kolesterol",
     "comment-action": "Kommenter",
     "comment": "Kommentar",
     "comments": "Kommentarer",
@@ -514,7 +514,7 @@
     "recipe-updated": "Oppskrift oppdatert",
     "remove-from-favorites": "Fjern fra favoritter",
     "remove-section": "Fjern seksjon",
-    "saturated-fat-content": "Saturated fat",
+    "saturated-fat-content": "Mettet fett",
     "save-recipe-before-use": "Lagre oppskrift før bruk",
     "section-title": "Seksjonstittel",
     "servings": "Porsjoner",
@@ -526,9 +526,9 @@
     "sugar-content": "Sukker",
     "title": "Tittel",
     "total-time": "Total tid",
-    "trans-fat-content": "Trans-fat",
+    "trans-fat-content": "Transfett",
     "unable-to-delete-recipe": "Kan ikke slette oppskrift",
-    "unsaturated-fat-content": "Unsaturated fat",
+    "unsaturated-fat-content": "Umettet fett",
     "no-recipe": "Ingen oppskrift",
     "locked-by-owner": "Låst av eier",
     "join-the-conversation": "Delta i samtalen",
@@ -547,7 +547,7 @@
     "failed-to-add-recipe-to-mealplan": "Klarte ikke å legge til oppskrift i måltidsplan",
     "failed-to-add-to-list": "Klarte ikke å legge til oppskrift i listen",
     "yield": "Gir",
-    "yields-amount-with-text": "Yields {amount} {text}",
+    "yields-amount-with-text": "Gir {amount} {text}",
     "yield-text": "Yield Text",
     "quantity": "Antall",
     "choose-unit": "Velg enhet",
@@ -570,23 +570,15 @@
     "increase-scale-label": "Øk skala med 1",
     "locked": "Låst",
     "public-link": "Offentlig lenke",
-    "timer": {
-      "kitchen-timer": "Kjøkkentimer",
-      "start-timer": "Start nedtelling",
-      "pause-timer": "Pause nedtelling",
-      "resume-timer": "Fortsett nedtelling",
-      "stop-timer": "Stopp nedtelling"
-    },
     "edit-timeline-event": "Endre tidslinjehendelser",
     "timeline": "Tidslinje",
     "timeline-is-empty": "Ingenting på tidslinjen ennå. Prøv å lage denne oppskriften!",
     "timeline-no-events-found-try-adjusting-filters": "Ingen hendelser funnet. Prøv å endre søkefiltrene.",
     "group-global-timeline": "{groupName} Global tidslinje",
     "open-timeline": "Åpne tidslinje",
-    "made-this": "Jeg har laget denne",
-    "how-did-it-turn-out": "Hvordan ble den?",
-    "user-made-this": "{user} har laget denne",
-    "last-made-date": "Sist laget: {date}",
+    "made-this": "Jeg har laget dette",
+    "how-did-it-turn-out": "Hvordan ble det?",
+    "user-made-this": "{user} har laget dette",
     "api-extras-description": "Ekstramaterialer til oppskrifter er en viktig funksjon i Mealie API-en. De lar deg opprette egendefinerte JSON-nøkkel/verdi-par innenfor en oppskrift for å referere fra tredjepartsapplikasjoner. Du kan bruke disse nøklene til å gi informasjon for eksempel for å utløse automatiseringer eller egendefinerte meldinger som skal videreformidles til ønsket enhet.",
     "message-key": "Meldingsnøkkel",
     "parse": "Analyser",
@@ -617,7 +609,7 @@
     "scrape-recipe": "Skrap oppskrift",
     "scrape-recipe-description": "Skrap en oppskrift ved bruk av nettadresse. Oppgi nettadressen til nettstedet du vil skrape, så vil Mealie forsøke å skrape oppskriften fra den siden og legge den til i samlingen din.",
     "scrape-recipe-have-a-lot-of-recipes": "Har du mange oppskrifter du ønsker å skrape samtidig?",
-    "scrape-recipe-suggest-bulk-importer": "Prøv masseimporten",
+    "scrape-recipe-suggest-bulk-importer": "Prøv masseimportering",
     "scrape-recipe-have-raw-html-or-json-data": "Have raw HTML or JSON data?",
     "scrape-recipe-you-can-import-from-raw-data-directly": "You can import from raw data directly",
     "import-original-keywords-as-tags": "Importer originale søkeord som emneord",
@@ -644,7 +636,7 @@
     "recipe-debugger-use-openai-description": "Bruke OpenAI til å analysere resultatene i stedet for å basere seg på scraper-biblioteket. Når du oppretter en oppskrift via URL, blir dette gjort automatisk hvis scraper-biblioteket mislykkes, men du kan teste det manuelt her.",
     "debug": "Feilsøk",
     "tree-view": "Trevisning",
-    "recipe-servings": "Recipe Servings",
+    "recipe-servings": "Oppskriftsporsjoner",
     "recipe-yield": "Utbytte av oppskrift",
     "recipe-yield-text": "Recipe Yield Text",
     "unit": "Enhet",
@@ -655,7 +647,7 @@
     "recipe-actions": "Oppskriftshandlinger",
     "parser": {
       "experimental-alert-text": "Mealie bruker naturlig språkbehandling til å analysere og lage enheter og matvarer til oppskriftsingrediensene dine. Denne funksjonen er eksperimentell og fungerer kanskje ikke som forventet. Hvis du foretrekker ikke å bruke de foreslåtte resultatene, kan du velge 'Avbryt', og endringene dine vil ikke bli lagret.",
-      "ingredient-parser": "Ingrediens-parser",
+      "ingredient-parser": "Ingrediens-analyserer",
       "explanation": "For å bruke ingrediens-forslag, klikk på 'Analyser alle' for å starte prosessen. Når de prosesserte ingrediensene er tilgjengelige, kan du se gjennom elementene og kontrollere at de er sjekket korrekt. Modellens tillitsverdi vises på høyre side av elementet. Denne scoren er et gjennomsnitt av alle de individuelle poengene og alltid er ikke helt nøyaktige.",
       "alerts-explainer": "Varsler vil bli vist dersom en matchende matvare eller enhet blir funnet, men ikke finnes i databasen.",
       "select-parser": "Velg analyserer",
@@ -668,25 +660,25 @@
       "missing-food": "Opprett manglende mat: {food}",
       "no-food": "Ingen matvarer"
     },
-    "reset-servings-count": "Reset Servings Count",
-    "not-linked-ingredients": "Additional Ingredients"
+    "reset-servings-count": "Nullstill antall porsjoner",
+    "not-linked-ingredients": "Tilleggsingredienser"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
+    "recipe-finder": "Oppskriftsfinner",
     "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
-    "selected-ingredients": "Selected Ingredients",
-    "no-ingredients-selected": "No ingredients selected",
-    "missing": "Missing",
-    "no-recipes-found": "No recipes found",
+    "selected-ingredients": "Velg ingredienser",
+    "no-ingredients-selected": "Ingen ingredienser valgt",
+    "missing": "Mangler",
+    "no-recipes-found": "Ingen oppskrifter funnet",
     "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
     "include-ingredients-on-hand": "Include Ingredients On Hand",
     "include-tools-on-hand": "Include Tools On Hand",
-    "max-missing-ingredients": "Max Missing Ingredients",
-    "max-missing-tools": "Max Missing Tools",
-    "selected-tools": "Selected Tools",
-    "other-filters": "Other Filters",
-    "ready-to-make": "Ready to Make",
-    "almost-ready-to-make": "Almost Ready to Make"
+    "max-missing-ingredients": "Maks antall manglende ingredienser",
+    "max-missing-tools": "Maks antall manglende redskaper",
+    "selected-tools": "Velg redskaper",
+    "other-filters": "Andre filtre",
+    "ready-to-make": "Klar til å lages",
+    "almost-ready-to-make": "Nesten klar til å lages"
   },
   "search": {
     "advanced-search": "Avansert søk",
@@ -891,7 +883,7 @@
     "are-you-sure-you-want-to-check-all-items": "Er du sikker på at du vil velge alle elementer?",
     "are-you-sure-you-want-to-uncheck-all-items": "Er du sikker på at du vil fjerne valg av alle elementer?",
     "are-you-sure-you-want-to-delete-checked-items": "Er du sikker på at du vil slette alle valgte elementer?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "Ingen handlelister funnet"
   },
   "sidebar": {
     "all-recipes": "Alle oppskrifter",
@@ -1293,17 +1285,17 @@
       "restore-from-v1-backup": "Har du en sikkerhetskopi fra en tidligere forekomst av Mealie v1? Du kan gjenopprette den her.",
       "manage-profile-or-get-invite-link": "Administrer din egen profil, eller hent en invitasjonslenke for å dele med andre."
     },
-    "debug-openai-services": "Debug OpenAI Services",
+    "debug-openai-services": "Feilsøk OpenAI-tjenester",
     "debug-openai-services-description": "Use this page to debug OpenAI services. You can test your OpenAI connection and see the results here. If you have image services enabled, you can also provide an image.",
-    "run-test": "Run Test",
-    "test-results": "Test Results",
+    "run-test": "Kjør test",
+    "test-results": "Testresultater",
     "group-delete-note": "Groups with users or households cannot be deleted",
     "household-delete-note": "Households with users cannot be deleted"
   },
   "profile": {
     "welcome-user": "Velkommen, {0}!",
     "description": "Administrer din profil, oppskrifter og gruppeinnstillinger.",
-    "invite-link": "Invite Link",
+    "invite-link": "Invitasjonslenke",
     "get-invite-link": "Få invitasjonslenke",
     "get-public-link": "Få offentlig lenke",
     "account-summary": "Kontosammendrag",
@@ -1370,25 +1362,25 @@
   },
   "query-filter": {
     "logical-operators": {
-      "and": "AND",
-      "or": "OR"
+      "and": "OG",
+      "or": "ELLER"
     },
     "relational-operators": {
-      "equals": "equals",
-      "does-not-equal": "does not equal",
-      "is-greater-than": "is greater than",
-      "is-greater-than-or-equal-to": "is greater than or equal to",
-      "is-less-than": "is less than",
-      "is-less-than-or-equal-to": "is less than or equal to"
+      "equals": "er lik",
+      "does-not-equal": "er ikke lik",
+      "is-greater-than": "er større enn",
+      "is-greater-than-or-equal-to": "er større enn eller lik",
+      "is-less-than": "er mindre enn",
+      "is-less-than-or-equal-to": "er mindre enn eller lik"
     },
     "relational-keywords": {
-      "is": "is",
-      "is-not": "is not",
-      "is-one-of": "is one of",
-      "is-not-one-of": "is not one of",
-      "contains-all-of": "contains all of",
-      "is-like": "is like",
-      "is-not-like": "is not like"
+      "is": "er",
+      "is-not": "er ikke",
+      "is-one-of": "er en av",
+      "is-not-one-of": "er ikke en av",
+      "contains-all-of": "inneholder alle",
+      "is-like": "er som",
+      "is-not-like": "er ikke som"
     }
   }
 }

frontend/lang/messages/pl-PL.json

@@ -518,7 +518,7 @@
     "save-recipe-before-use": "Zapisz przepis przed użyciem",
     "section-title": "Tytuł rozdziału",
     "servings": "Porcje",
-    "serves-amount": "{amount} porcji",
+    "serves-amount": "Porcje {amount}",
     "share-recipe-message": "Chcę podzielić się z Tobą moim przepisem na {0}.",
     "show-nutrition-values": "Pokaż wartości odżywcze",
     "sodium-content": "Sód",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Zwiększ Skalę o 1",
     "locked": "Zablokowany",
     "public-link": "Link publiczny",
-    "timer": {
-      "kitchen-timer": "Minutnik",
-      "start-timer": "Włącz minutnik",
-      "pause-timer": "Zatrzymaj minutnik",
-      "resume-timer": "Wznów minutnik",
-      "stop-timer": "Zatrzymaj minutnik"
-    },
     "edit-timeline-event": "Edytuj zdarzenie osi czasu",
     "timeline": "Oś czasu",
     "timeline-is-empty": "Nie ma jeszcze nic na osi czasu. Spróbuj przygotować ten przepis!",
@@ -586,7 +579,6 @@
     "made-this": "Ugotowałem to",
     "how-did-it-turn-out": "Jak się to udało?",
     "user-made-this": "{user} ugotował(a) to",
-    "last-made-date": "Ostatnio ugotowano {date}",
     "api-extras-description": "Dodatki w przepisach są kluczową cechą API Mealie. Pozwalają na tworzenie niestandardowych par kluczy/wartości JSON w przepisie do odwoływania się przez zewnętrzne aplikacje. Możesz użyć tych kluczy do wyzwalania automatyzacji lub przekazywania niestandardowych wiadomości do twoich wybranych urządzeń.",
     "message-key": "Klucz Wiadomości",
     "parse": "Analizuj",

frontend/lang/messages/pt-BR.json

@@ -8,7 +8,7 @@
     "database-type": "Tipo do Banco de Dados",
     "database-url": "URL do banco de dados",
     "default-group": "Grupo Padrão",
-    "default-household": "Default Household",
+    "default-household": "Casa Padrão",
     "demo": "Demonstração",
     "demo-status": "Status da Demonstração",
     "development": "Desenvolvimento",
@@ -182,7 +182,7 @@
     "date": "Data",
     "id": "Id",
     "owner": "Proprietário",
-    "change-owner": "Change Owner",
+    "change-owner": "Alterar Dono",
     "date-added": "Data de inclusão",
     "none": "Nenhum",
     "run": "Executar",
@@ -214,10 +214,10 @@
     "confirm-delete-generic-items": "Tem certeza que quer excluir os itens seguintes?",
     "organizers": "Organizadores",
     "caution": "Cuidado",
-    "show-advanced": "Show Advanced",
-    "add-field": "Add Field",
-    "date-created": "Date Created",
-    "date-updated": "Date Updated"
+    "show-advanced": "Mostrar Avançado",
+    "add-field": "Adicionar Campo",
+    "date-created": "Data de Criação",
+    "date-updated": "Data de Atualização"
   },
   "group": {
     "are-you-sure-you-want-to-delete-the-group": "Tem certeza que deseja excluir o grupo <b>{groupName}<b/>?",
@@ -244,9 +244,9 @@
       "keep-my-recipes-private-description": "Define o seu grupo e todas as receitas padrão como privadas. Você sempre pode mudar isso mais tarde."
     },
     "manage-members": "Gerenciar membros",
-    "manage-members-description": "Manage the permissions of the members in your household. {manage} allows the user to access the data-management page, and {invite} allows the user to generate invitation links for other users. Group owners cannot change their own permissions.",
+    "manage-members-description": "Gerencie as permissões dos membros da sua casa. {manage} permite ao usuário acessar a página de gerenciamento de dados, e {invite} permite ao usuário gerar links de convites para outros usuários. Os proprietários de grupos não podem mudar suas próprias permissões.",
     "manage": "Gerenciar",
-    "manage-household": "Manage Household",
+    "manage-household": "Gerenciar Casa",
     "invite": "Convidar",
     "looking-to-update-your-profile": "Procurando atualizar seu perfil?",
     "default-recipe-preferences-description": "Estas são as configurações padrão quando uma nova receita é criada no seu grupo. Elas podem ser alteradas para receitas individuais no menu de configurações de receitas.",
@@ -267,7 +267,7 @@
     "disable-users-from-commenting-on-recipes": "Desabilitar usuários de comentar em receitas",
     "disable-users-from-commenting-on-recipes-description": "Oculta a seção de comentários na página de receita e desativa os comentários",
     "disable-organizing-recipe-ingredients-by-units-and-food": "Desativar a organização de ingredientes de receita por unidades e alimentos",
-    "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",
+    "disable-organizing-recipe-ingredients-by-units-and-food-description": "Oculta os campos Comida, Unidade e Quantidade de ingredientes e trata os ingredientes como campos de texto simples",
     "general-preferences": "Preferências Gerais",
     "group-recipe-preferences": "Preferências de Grupo de Receitas",
     "report": "Denunciar",
@@ -280,8 +280,8 @@
     "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
   },
   "household": {
-    "household": "Household",
-    "households": "Households",
+    "household": "Casa",
+    "households": "Casas",
     "user-household": "User Household",
     "create-household": "Create Household",
     "household-name": "Household Name",
@@ -467,7 +467,7 @@
     "calories-suffix": "calorias",
     "carbohydrate-content": "Carboidrato",
     "categories": "Categorias",
-    "cholesterol-content": "Cholesterol",
+    "cholesterol-content": "Colesterol",
     "comment-action": "Comentário",
     "comment": "Comentário",
     "comments": "Comentários",
@@ -514,11 +514,11 @@
     "recipe-updated": "Receita atualizada",
     "remove-from-favorites": "Remover dos Favoritos",
     "remove-section": "Remover Seção",
-    "saturated-fat-content": "Saturated fat",
+    "saturated-fat-content": "Gorduras saturadas",
     "save-recipe-before-use": "Salve a receita antes de utilizar",
     "section-title": "Título da Seção",
     "servings": "Porções",
-    "serves-amount": "Serves {amount}",
+    "serves-amount": "Serve {amount}",
     "share-recipe-message": "Eu quero compartilhar minha receita de {0} com você.",
     "show-nutrition-values": "Mostrar informações nutricionais",
     "sodium-content": "Sódio",
@@ -528,7 +528,7 @@
     "total-time": "Tempo Total",
     "trans-fat-content": "Trans-fat",
     "unable-to-delete-recipe": "Não foi possível apagar a receita",
-    "unsaturated-fat-content": "Unsaturated fat",
+    "unsaturated-fat-content": "Gorduras não saturadas",
     "no-recipe": "Nenhuma Receita",
     "locked-by-owner": "Bloqueado pelo Proprietário",
     "join-the-conversation": "Participe da conversa",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Aumentar Escala por 1",
     "locked": "Bloqueado",
     "public-link": "Link público",
-    "timer": {
-      "kitchen-timer": "Temporizador da Cozinha",
-      "start-timer": "Iniciar Temporizador",
-      "pause-timer": "Pausar Temporizador",
-      "resume-timer": "Continuar Temporizador",
-      "stop-timer": "Parar Temporizador"
-    },
     "edit-timeline-event": "Editar Linha do Tempo do Evento",
     "timeline": "Linha do Tempo",
     "timeline-is-empty": "Nada na linha do tempo ainda. Tente fazer esta receita!",
@@ -586,7 +579,6 @@
     "made-this": "Eu Fiz Isso",
     "how-did-it-turn-out": "Como que ficou?",
     "user-made-this": "{user} fez isso",
-    "last-made-date": "Feito pela última vez em {date}",
     "api-extras-description": "Extras de receitas são atributos-chave da API do Mealie. Assim, você pode criar pares chave/valor JSON personalizados dentro de uma receita, referenciando aplicações de terceiros. Você pode usar as chaves para fornecer informações, como por ex. ativar automações ou mensagens que serão enviadas a seus dispositivos.",
     "message-key": "Chave de mensagem",
     "parse": "Analisar",
@@ -607,9 +599,9 @@
     "create-recipe-from-an-image": "Create Recipe from an Image",
     "create-recipe-from-an-image-description": "Create a recipe by uploading an image of it. Mealie will attempt to extract the text from the image using AI and create a recipe from it.",
     "crop-and-rotate-the-image": "Crop and rotate the image so that only the text is visible, and it's in the correct orientation.",
-    "create-from-image": "Create from Image",
-    "should-translate-description": "Translate the recipe into my language",
-    "please-wait-image-procesing": "Please wait, the image is processing. This may take some time.",
+    "create-from-image": "Criar a partir da imagem",
+    "should-translate-description": "Traduza a receita para o meu idioma",
+    "please-wait-image-procesing": "Por favor aguarde, a imagem está sendo processada. Isto pode levar algum tempo.",
     "bulk-url-import": "Importação de URL em massa",
     "debug-scraper": "Debug Scraper",
     "create-a-recipe-by-providing-the-name-all-recipes-must-have-unique-names": "Crie uma receita fornecendo o nome. Todas as receitas devem ter nomes exclusivos.",
@@ -618,7 +610,7 @@
     "scrape-recipe-description": "Scrape uma receita por url. Forneça o Url para o site que você deseja scrape, e Mealie tentará raspar a receita desse site e adicioná-la à sua coleção.",
     "scrape-recipe-have-a-lot-of-recipes": "Tem muitas receitas a extrair de uma vez?",
     "scrape-recipe-suggest-bulk-importer": "Tente o importador em massa",
-    "scrape-recipe-have-raw-html-or-json-data": "Have raw HTML or JSON data?",
+    "scrape-recipe-have-raw-html-or-json-data": "Tem dados HTML ou JSON brutos?",
     "scrape-recipe-you-can-import-from-raw-data-directly": "You can import from raw data directly",
     "import-original-keywords-as-tags": "Importar palavras-chave originais como marcadores",
     "stay-in-edit-mode": "Permanecer no modo de edição",
@@ -669,22 +661,22 @@
       "no-food": "Sem Comida"
     },
     "reset-servings-count": "Reset Servings Count",
-    "not-linked-ingredients": "Additional Ingredients"
+    "not-linked-ingredients": "Ingredientes adicionais"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
-    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
-    "selected-ingredients": "Selected Ingredients",
-    "no-ingredients-selected": "No ingredients selected",
-    "missing": "Missing",
-    "no-recipes-found": "No recipes found",
+    "recipe-finder": "Localizador de Receitas",
+    "recipe-finder-description": "Procure por receitas baseadas em ingredientes que você tem na mão. Você também pode filtrar por ferramentas disponíveis e definir um número máximo de ingredientes ou ferramentas que faltam.",
+    "selected-ingredients": "Ingredientes selecionados",
+    "no-ingredients-selected": "Nenhum ingrediente selecionado",
+    "missing": "Ausente",
+    "no-recipes-found": "Nenhuma receita encontrada",
     "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
     "include-ingredients-on-hand": "Include Ingredients On Hand",
     "include-tools-on-hand": "Include Tools On Hand",
     "max-missing-ingredients": "Max Missing Ingredients",
     "max-missing-tools": "Max Missing Tools",
-    "selected-tools": "Selected Tools",
-    "other-filters": "Other Filters",
+    "selected-tools": "Ferramentas Selecionadas",
+    "other-filters": "Outros Filtros",
     "ready-to-make": "Ready to Make",
     "almost-ready-to-make": "Almost Ready to Make"
   },
@@ -697,7 +689,7 @@
     "or": "Ou",
     "has-any": "Tem alguma",
     "has-all": "Tem todos",
-    "clear-selection": "Clear Selection",
+    "clear-selection": "Limpar Seleção",
     "results": "Resultados",
     "search": "Pesquisar",
     "search-mealie": "Pesquisar no Mealie (pressione /)",
@@ -891,7 +883,7 @@
     "are-you-sure-you-want-to-check-all-items": "Tem certeza que deseja marcar todos os itens?",
     "are-you-sure-you-want-to-uncheck-all-items": "Tem certeza que deseja desmarcar todos os itens?",
     "are-you-sure-you-want-to-delete-checked-items": "Tem certeza que deseja apagar todos os itens marcados?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "Nenhuma lista de compras encontrada"
   },
   "sidebar": {
     "all-recipes": "Todas as Receitas",
@@ -1293,17 +1285,17 @@
       "restore-from-v1-backup": "Tem uma cópia de segurança de uma instância anterior do Mealie v1? Você pode restaurá-la aqui.",
       "manage-profile-or-get-invite-link": "Gerencie seu próprio perfil, ou pegue um link de convite para compartilhar."
     },
-    "debug-openai-services": "Debug OpenAI Services",
-    "debug-openai-services-description": "Use this page to debug OpenAI services. You can test your OpenAI connection and see the results here. If you have image services enabled, you can also provide an image.",
-    "run-test": "Run Test",
-    "test-results": "Test Results",
+    "debug-openai-services": "Debug de Serviços OpenAI",
+    "debug-openai-services-description": "Use esta página para depurar serviços OpenAI. Você pode testar a sua conexão OpenAI e ver os resultados aqui. Se você tiver os serviços de imagem ativados, você também pode fornecer uma imagem.",
+    "run-test": "Executar teste",
+    "test-results": "Resultados do teste",
     "group-delete-note": "Groups with users or households cannot be deleted",
     "household-delete-note": "Households with users cannot be deleted"
   },
   "profile": {
     "welcome-user": "👋 Bem-vindo(a), {0}!",
     "description": "Gerencie seu perfil, receitas e configurações de grupo.",
-    "invite-link": "Invite Link",
+    "invite-link": "Link de convite",
     "get-invite-link": "Obter link de convite",
     "get-public-link": "Obter link público",
     "account-summary": "Resumo da conta",
@@ -1374,21 +1366,21 @@
       "or": "OR"
     },
     "relational-operators": {
-      "equals": "equals",
-      "does-not-equal": "does not equal",
-      "is-greater-than": "is greater than",
-      "is-greater-than-or-equal-to": "is greater than or equal to",
-      "is-less-than": "is less than",
-      "is-less-than-or-equal-to": "is less than or equal to"
+      "equals": "igual a",
+      "does-not-equal": "não é igual a",
+      "is-greater-than": "é maior que",
+      "is-greater-than-or-equal-to": "é maior ou igual a",
+      "is-less-than": "é menor que",
+      "is-less-than-or-equal-to": "é menor ou igual a"
     },
     "relational-keywords": {
-      "is": "is",
-      "is-not": "is not",
-      "is-one-of": "is one of",
-      "is-not-one-of": "is not one of",
-      "contains-all-of": "contains all of",
-      "is-like": "is like",
-      "is-not-like": "is not like"
+      "is": "é",
+      "is-not": "não é",
+      "is-one-of": "é um(a) de",
+      "is-not-one-of": "não é um de",
+      "contains-all-of": "contém todos de",
+      "is-like": "é como",
+      "is-not-like": "não é como"
     }
   }
 }

frontend/lang/messages/pt-PT.json

@@ -277,7 +277,7 @@
     "admin-group-management-text": "As alterações a este grupo serão aplicadas imediatamente.",
     "group-id-value": "ID do Grupo: {0}",
     "total-households": "Total de Lares",
-    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
+    "you-must-select-a-group-before-selecting-a-household": "Tens de selecionar um grupo antes de selecionar uma casa"
   },
   "household": {
     "household": "Casa",
@@ -518,7 +518,7 @@
     "save-recipe-before-use": "Guardar receita antes de usar",
     "section-title": "Título da secção",
     "servings": "Porções",
-    "serves-amount": "Serves {amount}",
+    "serves-amount": "Serve {amount}",
     "share-recipe-message": "Eu queria partilhar a minha {0} receita consigo.",
     "show-nutrition-values": "Mostrar valores nutricionais",
     "sodium-content": "Sódio",
@@ -547,8 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Erro ao adicionar receita ao plano de refeições",
     "failed-to-add-to-list": "Erro ao adicionar à lista",
     "yield": "Rendimento",
-    "yields-amount-with-text": "Yields {amount} {text}",
-    "yield-text": "Yield Text",
+    "yields-amount-with-text": "Rendimentos {amount} {text}",
+    "yield-text": "Rendimento Texto",
     "quantity": "Quantidade",
     "choose-unit": "Escolha uma unidade",
     "press-enter-to-create": "Prima 'Enter' para criar",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Aumentar Escala em 1",
     "locked": "Bloqueado",
     "public-link": "Link público",
-    "timer": {
-      "kitchen-timer": "Temporizador de cozinha",
-      "start-timer": "Iniciar Temporizador",
-      "pause-timer": "Pausar Temporizador",
-      "resume-timer": "Retomar Temporizador",
-      "stop-timer": "Parar Temporizador"
-    },
     "edit-timeline-event": "Editar evento da Cronologia",
     "timeline": "Cronologia",
     "timeline-is-empty": "Nada na Cronologia, ainda. Tente fazer esta receita!",
@@ -586,7 +579,6 @@
     "made-this": "Eu fiz isto",
     "how-did-it-turn-out": "Que tal ficou?",
     "user-made-this": "{user} fez isto",
-    "last-made-date": "Última vez {date}",
     "api-extras-description": "Extras para receitas são funcionalidades chave da API Mealie. Estas permitem criar, dentro de uma receita, pares personalizados de chave/valor em JSON, para referência a partir de aplicações de terceiros. Pode usar essas chaves para fornecer informações, por exemplo, para acionar automações ou mensagens personalizadas para transmitir a um determinado dispositivo.",
     "message-key": "Chave de Mensagem",
     "parse": "Interpretar",
@@ -644,9 +636,9 @@
     "recipe-debugger-use-openai-description": "Utilize o OpenAI para analisar os resultados em vez de depender da biblioteca de scrapers. Ao criar uma receita através de um URL, isto é feito automaticamente se a biblioteca de scrapers falhar, mas pode testá-la manualmente aqui.",
     "debug": "Depurar",
     "tree-view": "Vista em árvore",
-    "recipe-servings": "Recipe Servings",
+    "recipe-servings": "Porções por receita",
     "recipe-yield": "Rendimento da receita",
-    "recipe-yield-text": "Recipe Yield Text",
+    "recipe-yield-text": "Rendimento da Receita Texto",
     "unit": "Unidade",
     "upload-image": "Carregar imagem",
     "screen-awake": "Manter ecrã ligado",
@@ -669,24 +661,24 @@
       "no-food": "Nenhum Ingrediente"
     },
     "reset-servings-count": "Reiniciar Contador de Doses",
-    "not-linked-ingredients": "Additional Ingredients"
+    "not-linked-ingredients": "Ingredientes Adicionais"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
-    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
-    "selected-ingredients": "Selected Ingredients",
-    "no-ingredients-selected": "No ingredients selected",
-    "missing": "Missing",
-    "no-recipes-found": "No recipes found",
-    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
-    "include-ingredients-on-hand": "Include Ingredients On Hand",
-    "include-tools-on-hand": "Include Tools On Hand",
-    "max-missing-ingredients": "Max Missing Ingredients",
-    "max-missing-tools": "Max Missing Tools",
-    "selected-tools": "Selected Tools",
-    "other-filters": "Other Filters",
-    "ready-to-make": "Ready to Make",
-    "almost-ready-to-make": "Almost Ready to Make"
+    "recipe-finder": "Localizador de Receitas",
+    "recipe-finder-description": "Procure receitas com base nos ingredientes que tem em mãos. Pode também filtrar pelas ferramentas disponíveis e definir um número máximo de ingredientes ou ferramentas ausentes.",
+    "selected-ingredients": "Ingredientes Selecionados",
+    "no-ingredients-selected": "Nenhum ingrediente selecionado",
+    "missing": "Em falta",
+    "no-recipes-found": "Nenhuma receita encontrada",
+    "no-recipes-found-description": "Experimente adicionar mais ingredientes à sua pesquisa ou ajustar os seus filtros",
+    "include-ingredients-on-hand": "Incluir ingredientes disponíveis",
+    "include-tools-on-hand": "Incluir ferramentas disponíveis",
+    "max-missing-ingredients": "Máximo de ingredientes em falta",
+    "max-missing-tools": "Máximo de ferramentas em falta",
+    "selected-tools": "Ferramentas selecionadas",
+    "other-filters": "Outros filtros",
+    "ready-to-make": "Pronto para fazer",
+    "almost-ready-to-make": "Quase Pronto para fazer"
   },
   "search": {
     "advanced-search": "Pesquisa Avançada",
@@ -891,7 +883,7 @@
     "are-you-sure-you-want-to-check-all-items": "Tem a certeza de que pretende selecionar todos os itens?",
     "are-you-sure-you-want-to-uncheck-all-items": "Tem a certeza de que pretende desmarcar todos os itens?",
     "are-you-sure-you-want-to-delete-checked-items": "Tem a certeza de que pretende eliminar todos os itens selecionados?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "Nenhuma lista de compras encontrada"
   },
   "sidebar": {
     "all-recipes": "Todas as Receitas",
@@ -1303,7 +1295,7 @@
   "profile": {
     "welcome-user": "👋 Bem-vindo, {0}!",
     "description": "Gira o seu perfil, receitas e definições de grupo.",
-    "invite-link": "Invite Link",
+    "invite-link": "Link de convite",
     "get-invite-link": "Obter ligação de convite",
     "get-public-link": "Obter ligação pública",
     "account-summary": "Resumo da conta",
@@ -1353,8 +1345,8 @@
   "cookbook": {
     "cookbooks": "Livros de Receitas",
     "description": "Os livros de receitas são outra forma de organizar as receitas, criando secções cruzadas de receitas, organizadores e outros filtros. A criação de um livro de receitas adicionará uma entrada à barra lateral e todas as receitas com os filtros selecionados serão apresentadas no livro de receitas.",
-    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
-    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
+    "hide-cookbooks-from-other-households": "Ocultar livros de receitas de outras famílias",
+    "hide-cookbooks-from-other-households-description": "Quando ativado, apenas os livros de receitas da sua família aparecerão na barra lateral",
     "public-cookbook": "Livro de Receitas público",
     "public-cookbook-description": "Os Livros de Receitas públicos podem ser partilhados com utilizadores não registados e serão exibidos na sua página de grupos.",
     "filter-options": "Opções de Filtro",

frontend/lang/messages/ru-RU.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Добавить порцию",
     "locked": "Заблокировано",
     "public-link": "Публичная ссылка",
-    "timer": {
-      "kitchen-timer": "Кухонный таймер",
-      "start-timer": "Запустить таймер",
-      "pause-timer": "Приостановить таймер",
-      "resume-timer": "Возобновить таймер",
-      "stop-timer": "Остановить таймер"
-    },
     "edit-timeline-event": "Редактировать событие в истории",
     "timeline": "История",
     "timeline-is-empty": "В истории пока ничего нет. Попробуйте сделать этот рецепт!",
@@ -586,7 +579,6 @@
     "made-this": "Я сделал это",
     "how-did-it-turn-out": "Что получилось?",
     "user-made-this": "{user} сделал это",
-    "last-made-date": "Последний раз сделано {date}",
     "api-extras-description": "Дополнения к рецептам являются ключевым элементом Mealie API. Они позволяют создавать пользовательские пары json ключ/значение в рецепте для ссылания на другие приложения. Вы можете использовать эти ключи, чтобы сохранить нужную информацию, например, для автоматизаций или уведомлений на ваши устройства.",
     "message-key": "Ключ сообщения",
     "parse": "Обработать",
@@ -608,7 +600,7 @@
     "create-recipe-from-an-image-description": "Create a recipe by uploading an image of it. Mealie will attempt to extract the text from the image using AI and create a recipe from it.",
     "crop-and-rotate-the-image": "Crop and rotate the image so that only the text is visible, and it's in the correct orientation.",
     "create-from-image": "Create from Image",
-    "should-translate-description": "Translate the recipe into my language",
+    "should-translate-description": "Перевести рецепт на мой язык",
     "please-wait-image-procesing": "Подождите, идет обработка изображения.",
     "bulk-url-import": "Массовый импорт по URL",
     "debug-scraper": "Отладка сканирования",
@@ -618,16 +610,16 @@
     "scrape-recipe-description": "Отсканировать рецепт по ссылке. Предоставьте ссылку на страницу, которую вы хотите отсканировать, и Mealie попытается вырезать рецепт с этого сайта и добавить его в свою коллекцию.",
     "scrape-recipe-have-a-lot-of-recipes": "Хотите отсканировать несколько рецептов за раз?",
     "scrape-recipe-suggest-bulk-importer": "Воспользуйтесь массовым импортом",
-    "scrape-recipe-have-raw-html-or-json-data": "Have raw HTML or JSON data?",
+    "scrape-recipe-have-raw-html-or-json-data": "У Вас есть данные HTML или JSON?",
     "scrape-recipe-you-can-import-from-raw-data-directly": "You can import from raw data directly",
     "import-original-keywords-as-tags": "Импортировать исходные ключевые слова как теги",
     "stay-in-edit-mode": "Остаться в режиме редактирования",
     "import-from-zip": "Импорт из архива",
     "import-from-zip-description": "Импорт одного рецепта, который был экспортирован из другого экземпляра Mealie.",
-    "import-from-html-or-json": "Import from HTML or JSON",
+    "import-from-html-or-json": "Импортировать из HTML или JSON",
     "import-from-html-or-json-description": "Import a single recipe from raw HTML or JSON. This is useful if you have a recipe from a site that Mealie can't scrape normally, or from some other external source.",
     "json-import-format-description-colon": "To import via JSON, it must be in valid format:",
-    "json-editor": "JSON Editor",
+    "json-editor": "Редактор JSON",
     "zip-files-must-have-been-exported-from-mealie": ".zip файлы должны быть экспортированы из Mealie",
     "create-a-recipe-by-uploading-a-scan": "Создайте рецепт, загрузив скан.",
     "upload-a-png-image-from-a-recipe-book": "Загрузить png изображение из книги рецептов",
@@ -668,16 +660,16 @@
       "missing-food": "Create missing food: {food}",
       "no-food": "Нет еды"
     },
-    "reset-servings-count": "Reset Servings Count",
-    "not-linked-ingredients": "Additional Ingredients"
+    "reset-servings-count": "Сбросить количество порций",
+    "not-linked-ingredients": "Дополнительные ингредиенты"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
+    "recipe-finder": "Поиск рецептов",
     "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
-    "selected-ingredients": "Selected Ingredients",
+    "selected-ingredients": "Выбранные ингредиенты",
     "no-ingredients-selected": "No ingredients selected",
     "missing": "Missing",
-    "no-recipes-found": "No recipes found",
+    "no-recipes-found": "Рецепты не найдены",
     "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
     "include-ingredients-on-hand": "Include Ingredients On Hand",
     "include-tools-on-hand": "Include Tools On Hand",
@@ -888,10 +880,10 @@
     "completed-on": "Выполнено в {date}",
     "you-are-offline": "Вы не в сети",
     "you-are-offline-description": "Not all features are available while offline. You can still add, modify, and remove items, but you will not be able to sync your changes to the server until you are back online.",
-    "are-you-sure-you-want-to-check-all-items": "Are you sure you want to check all items?",
+    "are-you-sure-you-want-to-check-all-items": "Вы уверены, что хотите выбрать все элементы?",
     "are-you-sure-you-want-to-uncheck-all-items": "Are you sure you want to uncheck all items?",
     "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "Списки покупок не найдены"
   },
   "sidebar": {
     "all-recipes": "Все рецепты",
@@ -1293,17 +1285,17 @@
       "restore-from-v1-backup": "Have a backup from a previous instance of Mealie v1? You can restore it here.",
       "manage-profile-or-get-invite-link": "Manage your own profile, or grab an invite link to share with others."
     },
-    "debug-openai-services": "Debug OpenAI Services",
+    "debug-openai-services": "Отладка OpenAI сервисов",
     "debug-openai-services-description": "Use this page to debug OpenAI services. You can test your OpenAI connection and see the results here. If you have image services enabled, you can also provide an image.",
-    "run-test": "Run Test",
-    "test-results": "Test Results",
+    "run-test": "Запустить тест",
+    "test-results": "Результаты тестов",
     "group-delete-note": "Groups with users or households cannot be deleted",
     "household-delete-note": "Households with users cannot be deleted"
   },
   "profile": {
     "welcome-user": "👋 Добро пожаловать, {0}!",
     "description": "Управление настройками профиля, рецептов и группы.",
-    "invite-link": "Invite Link",
+    "invite-link": "Ссылка-приглашение",
     "get-invite-link": "Получить ссылку для приглашения",
     "get-public-link": "Получить публичную ссылку",
     "account-summary": "Cведения об учетной записи",

frontend/lang/messages/sk-SK.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Zvýšiť škálovanie o 1",
     "locked": "Zamknuté",
     "public-link": "Verejný odkaz",
-    "timer": {
-      "kitchen-timer": "Kuchynský časovač",
-      "start-timer": "Spustiť časovač",
-      "pause-timer": "Pozastaviť časovač",
-      "resume-timer": "Znova spustiť časovač",
-      "stop-timer": "Zastaviť časovač"
-    },
     "edit-timeline-event": "Upraviť udalosť na časovej osi",
     "timeline": "Časová os",
     "timeline-is-empty": "Na časovej osi zatiaľ nič nie je. Skúste pripraviť tento recept!",
@@ -586,7 +579,6 @@
     "made-this": "Toto som uvaril",
     "how-did-it-turn-out": "Ako to dopadlo?",
     "user-made-this": "{user} toto uvaril/-a",
-    "last-made-date": "Posledne pripravené {date}",
     "api-extras-description": "API dolnky receptov sú kľúčovou funkcionalitou Mealie API. Umožňujú užívateľom vytvárať vlastné JSON páry kľúč/hodnota v rámci receptu, a využiť v aplikáciách tretích strán. Údaje uložené pod jednotlivými kľúčmi je možné využiť napríklad ako spúšťač automatizovaných procesov, či pri zasielaní vlastných správ do vami zvolených zariadení.",
     "message-key": "Kľúč správy",
     "parse": "Analyzovať",

frontend/lang/messages/sl-SI.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Zvišaj merilo za 1",
     "locked": "Zaklenjeno",
     "public-link": "Javna povezava",
-    "timer": {
-      "kitchen-timer": "Kuhinjski časovnik",
-      "start-timer": "Zaženi časovnik",
-      "pause-timer": "Ustavi časovnik",
-      "resume-timer": "Nadaljuj časovnik",
-      "stop-timer": "Ustavi časovnik"
-    },
     "edit-timeline-event": "Uredi dogodek na časovnici",
     "timeline": "Časovnica",
     "timeline-is-empty": "Zaenkrat je časovnica prazna. Poskusi tale recept!",
@@ -586,7 +579,6 @@
     "made-this": "Naredil sem to",
     "how-did-it-turn-out": "Kako se je izkazalo?",
     "user-made-this": "{user} je tole pripravil/a",
-    "last-made-date": "Nazadnje pripravljen {date}",
     "api-extras-description": "Dodatni podatki za recepte so ključna funkcionalnost Mealie APIja. Omogočajo ustvarjanje lastnih JSON ključ / vrednost parov v okviru recepta, da lahko do njih dostopajo zunanje aplikacije. Te ključe lahko uporabiš za posredovanje informacij, na primer za sprožanje avtomatike ali sporočanje prilagojenih sporočil na poljubno napravo.",
     "message-key": "Ključ sporočila",
     "parse": "Razloči",

frontend/lang/messages/sr-SP.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Уреди догађај на временској линији",
     "timeline": "Временска линија",
     "timeline-is-empty": "Још увек нема ништа на временској линији. Покушајте направити овај рецепт!",
@@ -586,7 +579,6 @@
     "made-this": "I Made This",
     "how-did-it-turn-out": "How did it turn out?",
     "user-made-this": "{user} made this",
-    "last-made-date": "Последњи пут прављено {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",
     "parse": "Parse",

frontend/lang/messages/sv-SE.json

@@ -45,7 +45,7 @@
     "category-filter": "Kategorifilter",
     "category-update-failed": "Kategori gick inte att uppdatera",
     "category-updated": "Kategori uppdaterad",
-    "uncategorized-count": "Ingen Kategori {count}",
+    "uncategorized-count": "Utan kategori {count}",
     "create-a-category": "Skapa kategori",
     "category-name": "Kategorinamn",
     "category": "Kategori"
@@ -570,13 +570,6 @@
     "increase-scale-label": "Skala upp med 1",
     "locked": "Låst",
     "public-link": "Publik länk",
-    "timer": {
-      "kitchen-timer": "Kökstimer",
-      "start-timer": "Starta Timer",
-      "pause-timer": "Pausa Timer",
-      "resume-timer": "Återuppta Timer",
-      "stop-timer": "Stoppa Timer"
-    },
     "edit-timeline-event": "Redigera tidslinjehändelse",
     "timeline": "Tidslinje",
     "timeline-is-empty": "Inget på tidslinjen än. Försök att göra detta recept!",
@@ -586,7 +579,6 @@
     "made-this": "Jag lagade den här",
     "how-did-it-turn-out": "Hur blev rätten?",
     "user-made-this": "{user} lagade detta",
-    "last-made-date": "Senast lagad {date}",
     "api-extras-description": "Recept API-tillägg är en viktig funktion i Mealie's API. Med hjälp av dem kan du skapa anpassade JSON-nyckel/värdepar i ett recept, som du kan referera till från tredjepartsapplikationer. Du kan använda dessa nycklar för att tillhandahålla information, till exempel för att trigga automatiseringar eller anpassade meddelanden som ska vidarebefordras till önskad enhet.",
     "message-key": "Meddelandenyckel",
     "parse": "Läs in",

frontend/lang/messages/tr-TR.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Ölçeği 1 artır",
     "locked": "Kilitli",
     "public-link": "Genel bağlantı",
-    "timer": {
-      "kitchen-timer": "Mutfak Saati",
-      "start-timer": "Zamanlayıcıyı Başlat",
-      "pause-timer": "Zamanlayıcıyı Duraklat",
-      "resume-timer": "Zamanlayıcıyı Sürdür",
-      "stop-timer": "Zamanlayıcıyı Durdur"
-    },
     "edit-timeline-event": "Zaman Çizelgesi Etkinliğini Düzenle",
     "timeline": "Zaman çizelgesi",
     "timeline-is-empty": "Zaman çizelgesinde henüz bir şey yok. Bu tarifi yapmayı deneyin!",
@@ -586,7 +579,6 @@
     "made-this": "Bunu ben yaptım",
     "how-did-it-turn-out": "Nasıl oldu?",
     "user-made-this": "{user} bunu yaptı",
-    "last-made-date": "En Son {date} Yapıldı",
     "api-extras-description": "Tarif ekstraları Mealie API'nin önemli bir özelliğidir. Üçüncü taraf uygulamalardan referans almak üzere bir tarif içinde özel JSON anahtar/değer çiftleri oluşturmanıza olanak tanır. Bu tuşları, örneğin otomasyonları tetiklemek veya istediğiniz cihaza iletilecek özel mesajları bilgi sağlamak için kullanabilirsiniz.",
     "message-key": "İleti Anahtarı",
     "parse": "Ayrıştırma",

frontend/lang/messages/uk-UA.json

@@ -5,7 +5,7 @@
     "api-docs": "Документація API",
     "api-port": "Порт API",
     "application-mode": "Режим додатку",
-    "database-type": "Тип бази данних",
+    "database-type": "Тип бази даних",
     "database-url": "URL-адреса бази даних",
     "default-group": "Групи за замовчуванням",
     "default-household": "Сімʼя за замовчуванням",
@@ -190,7 +190,7 @@
     "a-name-is-required": "Необхідно вказати назву",
     "delete-with-name": "Видалити {name}",
     "confirm-delete-generic-with-name": "Ви дійсно хочете видалити {name}?",
-    "confirm-delete-own-admin-account": "Зверніть увагу, що ви намагаєтеся видалити свій обліковий запис адміністратора! Цю дію неможливо скасувати і ви остаточно видалите ваш обліковий запис?",
+    "confirm-delete-own-admin-account": "Зверніть увагу, що ви намагаєтеся видалити свій обліковий запис адміністратора! Цю дію неможливо скасувати й ви остаточно видалите ваш обліковий запис?",
     "organizer": "Організатор",
     "transfer": "Передача",
     "copy": "Скопіювати",
@@ -200,7 +200,7 @@
     "learn-more": "Дізнатися більше",
     "this-feature-is-currently-inactive": "Ця функція наразі не активна",
     "clipboard-not-supported": "Буфер обміну не підтримується",
-    "copied-to-clipboard": "Скопійовано до буферу обміну",
+    "copied-to-clipboard": "Скопійовано до буфера обміну",
     "your-browser-does-not-support-clipboard": "Ваш браузер не підтримує буфер обміну",
     "copied-items-to-clipboard": "Жоден елемент не скопійовано в буфер обміну|Один елемент скопійовано в буфер обміну|Скопійовано {count} елементів в буфер обміну",
     "actions": "Дії",
@@ -246,14 +246,14 @@
     "manage-members": "Керування Користувачами",
     "manage-members-description": "Керуйте дозволами учасників вашої сімʼї. {manage} дозволяє користувачеві отримати доступ до сторінки керування даними {invite} дозволяє користувачеві генерувати посилання запрошення для інших користувачів. Власники групи не можуть змінити власні дозволи.",
     "manage": "Керування",
-    "manage-household": "Manage Household",
+    "manage-household": "Керувати сімʼєю",
     "invite": "Запрошення",
     "looking-to-update-your-profile": "Бажаєте оновити свій профіль?",
     "default-recipe-preferences-description": "Це типові налаштування, коли створюється новий рецепт у вашій групі. Ці параметри можна змінити для окремих рецептів в меню налаштувань рецептів.",
     "default-recipe-preferences": "Параметри за умовчанням",
     "group-preferences": "Налаштування групи",
     "private-group": "Приватна група",
-    "private-group-description": "Setting your group to private will disable all public view options. This overrides any individual public view settings",
+    "private-group-description": "Якщо зробити групу приватною, то всі налаштування публічного перегляду буде скинуто. Це замінить індивідуальні налаштування публічного перегляду",
     "enable-public-access": "Дозволити загальний доступ",
     "enable-public-access-description": "Робить групові рецепти загальнодоступними за замовчуванням і дозволяє користувачам переглядати рецепти без входу в систему",
     "allow-users-outside-of-your-group-to-see-your-recipes": "Дозволити користувачам за межами вашої групи бачити ваші рецепти",
@@ -277,7 +277,7 @@
     "admin-group-management-text": "Зміни до цієї групи будуть відображені негайно.",
     "group-id-value": "Id групи: {0}",
     "total-households": "Всього сімей",
-    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
+    "you-must-select-a-group-before-selecting-a-household": "Ви маєте вибрати групу перед тим, як вибирати сім'ю"
   },
   "household": {
     "household": "Сімʼя",
@@ -292,9 +292,9 @@
     "admin-household-management-text": "Зміни до цієї сімʼї будуть відображені негайно.",
     "household-id-value": "Ідентифікатор сімʼї: {0}",
     "private-household": "Приватна сімʼя",
-    "private-household-description": "Setting your household to private will disable all public view options. This overrides any individual public view settings",
-    "lock-recipe-edits-from-other-households": "Lock recipe edits from other households",
-    "lock-recipe-edits-from-other-households-description": "When enabled only users in your household can edit recipes created by your household",
+    "private-household-description": "Якщо зробити сім'ю приватною, то всі налаштування публічного перегляду буде скинуто. Це замінить індивідуальні налаштування публічного перегляду",
+    "lock-recipe-edits-from-other-households": "Заблокувати редагування рецептів іншими сім'ями",
+    "lock-recipe-edits-from-other-households-description": "Якщо увімкнено, тільки члени вашої сім'ї зможуть редагувати рецепти, які були створені вашою сім'єю",
     "household-recipe-preferences": "Налаштування рецептів сімʼї",
     "default-recipe-preferences-description": "Це типові налаштування для нового рецепта у вашій сімʼї. Ці параметри можна змінити для окремих рецептів в меню налаштувань рецептів.",
     "allow-users-outside-of-your-household-to-see-your-recipes": "Дозволити користувачам за межами вашої сімʼї бачити ваші рецепти",
@@ -321,10 +321,10 @@
     "mealplan-settings": "Налаштування плану харчування",
     "mealplan-update-failed": "Не вдалося оновити план харчування",
     "mealplan-updated": "План харчування оновлено",
-    "mealplan-households-description": "If no household is selected, recipes can be added from any household",
+    "mealplan-households-description": "Якщо жодної сім'ї не вибрано, рецепти можуть бути доданими з будь-якої сім'ї",
     "any-category": "Будь-яка категорія",
     "any-tag": "Будь-який тег",
-    "any-household": "Any Household",
+    "any-household": "Будь-яка сім'я",
     "no-meal-plan-defined-yet": "Не створено жодного плану харчування",
     "no-meal-planned-for-today": "Не заплановано харчування на сьогодні",
     "numberOfDays-hint": "Скільки днів завантажувати на сторінку",
@@ -357,7 +357,7 @@
     "for-type-meal-types": "для {0} типів харчування",
     "meal-plan-rules": "Правила планів харчування",
     "new-rule": "Нове правило",
-    "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 rule filters will be merged. In practice, it's unnecessary to create duplicate rules, but it's possible to do so.",
+    "meal-plan-rules-description": "Ви можете створити правила для автоматичного вибору рецептів для ваших планів харчування. Ці правила використовуються сервером для вибору рецептів при створенні плану харчування. Зверніть увагу, що якщо правила мають обмеження на день/тип, то їх категорії будуть об'єднані. Дублювати правила немає сенсу, але можливо.",
     "new-rule-description": "При створенні нового правила для плану харчування, ви можете обмежити правило на певний день тижня та/або певний тип їжі. Щоб застосувати правило до всіх днів або всіх типів їжі, ви можете встановити правило \"Будь-який\", що застосовуватиме його до всіх можливих значень для дня та/або типу їжі.",
     "recipe-rules": "Правила рецептів",
     "applies-to-all-days": "Застосовується до всіх днів",
@@ -518,7 +518,7 @@
     "save-recipe-before-use": "Зберегти рецепт перед використанням",
     "section-title": "Назва розділу",
     "servings": "Порції",
-    "serves-amount": "Serves {amount}",
+    "serves-amount": "Порцій: {amount}",
     "share-recipe-message": "Я хотів би поділитися з тобою своїм рецептом {0}.",
     "show-nutrition-values": "Показати харчову цінність",
     "sodium-content": "Натрій",
@@ -547,8 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Не вдалося додати рецепт до плану харчування",
     "failed-to-add-to-list": "Не вдалося додати до списку",
     "yield": "Вихід",
-    "yields-amount-with-text": "Yields {amount} {text}",
-    "yield-text": "Yield Text",
+    "yields-amount-with-text": "Вийде: {amount} {text}",
+    "yield-text": "Текст виходу",
     "quantity": "Кількість",
     "choose-unit": "Виберіть одиниці вимірювання",
     "press-enter-to-create": "Натисніть Enter, щоб створити",
@@ -570,13 +570,6 @@
     "increase-scale-label": "Збільшити масштабування на 1",
     "locked": "Заблоковано",
     "public-link": "Публічне посилання",
-    "timer": {
-      "kitchen-timer": "Кухонний таймер",
-      "start-timer": "Запустити таймер",
-      "pause-timer": "Призупинити таймер",
-      "resume-timer": "Відновити таймер",
-      "stop-timer": "Зупинити таймер"
-    },
     "edit-timeline-event": "Редагувати подію хронології",
     "timeline": "Хронологія",
     "timeline-is-empty": "Хронологія порожня. Спробуйте зробити цей рецепт!",
@@ -586,7 +579,6 @@
     "made-this": "Я це приготував",
     "how-did-it-turn-out": "Як вийшло?",
     "user-made-this": "{user} зробив це",
-    "last-made-date": "Востаннє приготовано {date}",
     "api-extras-description": "Додатки в рецептах - ключова функція API Mealie. Вони дозволяють створювати користувацьку пару JSON ключів та значень в рецепті для сторонніх додатків. Це можна використовувати для автоматизації або для створення користувацьких повідомлень для сторонніх сервісів.",
     "message-key": "Ключ повідомлення",
     "parse": "Проаналізувати",
@@ -669,24 +661,24 @@
       "no-food": "Немає їжі"
     },
     "reset-servings-count": "Скинути кількість порцій",
-    "not-linked-ingredients": "Additional Ingredients"
+    "not-linked-ingredients": "Додаткові продукти"
   },
   "recipe-finder": {
-    "recipe-finder": "Recipe Finder",
-    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
-    "selected-ingredients": "Selected Ingredients",
-    "no-ingredients-selected": "No ingredients selected",
-    "missing": "Missing",
-    "no-recipes-found": "No recipes found",
-    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
-    "include-ingredients-on-hand": "Include Ingredients On Hand",
-    "include-tools-on-hand": "Include Tools On Hand",
-    "max-missing-ingredients": "Max Missing Ingredients",
-    "max-missing-tools": "Max Missing Tools",
-    "selected-tools": "Selected Tools",
-    "other-filters": "Other Filters",
-    "ready-to-make": "Ready to Make",
-    "almost-ready-to-make": "Almost Ready to Make"
+    "recipe-finder": "Шукач рецептів",
+    "recipe-finder-description": "Пошук рецептів базується на продуктах, які ви маєте. Ви також можете фільтрувати за наявними інструментами та встановити максимальну кількість відсутніх продуктів або інструментів.",
+    "selected-ingredients": "Вибрані продукти",
+    "no-ingredients-selected": "Жодного продукту не вибрано",
+    "missing": "Відсутні",
+    "no-recipes-found": "Рецептів не знайдено",
+    "no-recipes-found-description": "Спробуйте додати більше продуктів до пошукового списку або підлаштувати фільтри",
+    "include-ingredients-on-hand": "Включити наявні продукти",
+    "include-tools-on-hand": "Включити наявні інструменти",
+    "max-missing-ingredients": "Максимум відсутніх продуктів",
+    "max-missing-tools": "Максимум відсутніх інструментів",
+    "selected-tools": "Вибрані інструменти",
+    "other-filters": "Інші фільтри",
+    "ready-to-make": "Готове до приготування",
+    "almost-ready-to-make": "Майже готове до приготування"
   },
   "search": {
     "advanced-search": "Розширений пошук",
@@ -891,7 +883,7 @@
     "are-you-sure-you-want-to-check-all-items": "Ви впевнені, що хочете відмітити всі елементи?",
     "are-you-sure-you-want-to-uncheck-all-items": "Ви впевнені, що хочете зняти відмітку з усіх елементів?",
     "are-you-sure-you-want-to-delete-checked-items": "Ви впевнені, що хочете видалити всі відмічені елементи?",
-    "no-shopping-lists-found": "No Shopping Lists Found"
+    "no-shopping-lists-found": "Списків покупок не знайдено"
   },
   "sidebar": {
     "all-recipes": "Всі рецепти",
@@ -1037,7 +1029,7 @@
     "administrator": "Адміністратор",
     "user-can-invite-other-to-group": "Користувач може запрошувати інших в групу",
     "user-can-manage-group": "Користувач може керувати групою",
-    "user-can-manage-household": "User can manage household",
+    "user-can-manage-household": "Користувач може управляти сім'єю",
     "user-can-organize-group-data": "Користувач може впорядковувати дані групи",
     "enable-advanced-features": "Увімкнути додаткові функції",
     "it-looks-like-this-is-your-first-time-logging-in": "Схоже, ви заходите вперше.",
@@ -1297,13 +1289,13 @@
     "debug-openai-services-description": "Використовуйте цю сторінку, щоб налагодити служби OpenAI. Ви можете перевірити ваше з'єднання з OpenAI й побачити результати тут. Якщо ввімкнено служби зображень, ви також можете надати зображення.",
     "run-test": "Запустити перевірку",
     "test-results": "Результати перевірки",
-    "group-delete-note": "Groups with users or households cannot be deleted",
-    "household-delete-note": "Households with users cannot be deleted"
+    "group-delete-note": "Не можна видалити групи з користувачами чи сім'ями в ній",
+    "household-delete-note": "Не можна видалити сім'ю з користувачами в ній"
   },
   "profile": {
     "welcome-user": "👋 Ласкаво просимо, {0}!",
     "description": "Керування вашим профілем, рецептами та налаштуваннями групи.",
-    "invite-link": "Invite Link",
+    "invite-link": "Посилання-запрошення",
     "get-invite-link": "Отримати посилання-запрошення",
     "get-public-link": "Отримати публічне посилання",
     "account-summary": "Аккаунт",
@@ -1352,9 +1344,9 @@
   },
   "cookbook": {
     "cookbooks": "Кулінарні книги",
-    "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
-    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
-    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
+    "description": "Кулінарні книги - це ще один спосіб організовувати рецепти за допомогою розділів та інших фільтрів. Нова кулінарна книга з'явиться на боковій панелі, і всі рецепти, які відповідають обраним фільтрам, будуть показуватися в кулінарній книзі.",
+    "hide-cookbooks-from-other-households": "Приховати кулінарні книги від інших сімей",
+    "hide-cookbooks-from-other-households-description": "Якщо вибрано, тільки кулінарні книги вашої сім'ї буде видно на боковій панелі",
     "public-cookbook": "Публічна кулінарна книга",
     "public-cookbook-description": "Публічними кулінарними книгами можна поділитися з будь-ким, і вони будуть відображатися на сторінці вашої групи.",
     "filter-options": "Параметри фільтра",

frontend/lang/messages/vi-VN.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -586,7 +579,6 @@
     "made-this": "I Made This",
     "how-did-it-turn-out": "How did it turn out?",
     "user-made-this": "{user} made this",
-    "last-made-date": "Last Made {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",
     "parse": "Parse",

frontend/lang/messages/zh-CN.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "加1倍",
     "locked": "已锁定",
     "public-link": "公开链接",
-    "timer": {
-      "kitchen-timer": "厨房计时器",
-      "start-timer": "开始计时",
-      "pause-timer": "暂停计时",
-      "resume-timer": "继续计时",
-      "stop-timer": "终止计时"
-    },
     "edit-timeline-event": "编辑时间轴事件",
     "timeline": "时间轴",
     "timeline-is-empty": "时间轴还空空如也，试着先去制作一个食谱吧！",
@@ -586,7 +579,6 @@
     "made-this": "我做了这道菜",
     "how-did-it-turn-out": "成品怎么样?",
     "user-made-this": "{user}做了",
-    "last-made-date": "上次制作于{date}",
     "api-extras-description": "食谱扩展是Mealie API的关键功能之一。它允许你在食谱中添加自定义JSON键值对，以供第三方程序使用。你可以利用这些键提供信息，实现更多功能，例如触发自动化，或转发自定义信息到指定的设备上。",
     "message-key": "键名",
     "parse": "自动解析",

frontend/lang/messages/zh-TW.json

@@ -570,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -586,7 +579,6 @@
     "made-this": "I Made This",
     "how-did-it-turn-out": "How did it turn out?",
     "user-made-this": "{user} made this",
-    "last-made-date": "Last Made {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",
     "parse": "Parse",

frontend/lib/api/types/admin.ts

@@ -161,7 +161,7 @@ export interface RecipeTool {
   id: string;
   name: string;
   slug: string;
-  onHand?: boolean;
+  householdsWithTool?: string[];
   [k: string]: unknown;
 }
 export interface CustomPageImport {