From 4c87440691ce231974036666163e10faefdd706b Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 4 Nov 2021 12:31:32 +0100
Subject: [PATCH] updated translations

---
 cookbook/locale/ca/LC_MESSAGES/django.mo    |  Bin 26343 -> 24294 bytes
 cookbook/locale/ca/LC_MESSAGES/django.po    | 1001 ++++++++--------
 cookbook/locale/de/LC_MESSAGES/django.mo    |  Bin 43274 -> 53783 bytes
 cookbook/locale/de/LC_MESSAGES/django.po    | 1147 ++++++++++---------
 cookbook/locale/en/LC_MESSAGES/django.mo    |  Bin 421 -> 380 bytes
 cookbook/locale/en/LC_MESSAGES/django.po    |  885 +++++++-------
 cookbook/locale/es/LC_MESSAGES/django.mo    |  Bin 33400 -> 27861 bytes
 cookbook/locale/es/LC_MESSAGES/django.po    | 1104 ++++++++++--------
 cookbook/locale/fr/LC_MESSAGES/django.mo    |  Bin 47338 -> 42357 bytes
 cookbook/locale/fr/LC_MESSAGES/django.po    | 1114 ++++++++++--------
 cookbook/locale/hu_HU/LC_MESSAGES/django.mo |  Bin 1978 -> 1749 bytes
 cookbook/locale/hu_HU/LC_MESSAGES/django.po |  905 +++++++--------
 cookbook/locale/hy/LC_MESSAGES/django.mo    |  Bin 47622 -> 47581 bytes
 cookbook/locale/it/LC_MESSAGES/django.mo    |  Bin 49761 -> 44804 bytes
 cookbook/locale/it/LC_MESSAGES/django.po    | 1118 ++++++++++--------
 cookbook/locale/lv/LC_MESSAGES/django.mo    |  Bin 26591 -> 24519 bytes
 cookbook/locale/lv/LC_MESSAGES/django.po    | 1000 ++++++++--------
 cookbook/locale/nl/LC_MESSAGES/django.mo    |  Bin 60882 -> 55793 bytes
 cookbook/locale/nl/LC_MESSAGES/django.po    | 1127 +++++++++---------
 cookbook/locale/pl/LC_MESSAGES/django.mo    |  Bin 37964 -> 37923 bytes
 cookbook/locale/pt/LC_MESSAGES/django.mo    |  Bin 10907 -> 9928 bytes
 cookbook/locale/pt/LC_MESSAGES/django.po    |  944 +++++++--------
 cookbook/locale/rn/LC_MESSAGES/django.mo    |  Bin 429 -> 388 bytes
 cookbook/locale/rn/LC_MESSAGES/django.po    |  885 +++++++-------
 cookbook/locale/ru/LC_MESSAGES/django.mo    |  Bin 8713 -> 8672 bytes
 cookbook/locale/tr/LC_MESSAGES/django.mo    |  Bin 1991 -> 1950 bytes
 cookbook/locale/tr/LC_MESSAGES/django.po    |  885 +++++++-------
 cookbook/locale/zh_CN/LC_MESSAGES/django.mo |  Bin 12108 -> 11733 bytes
 cookbook/locale/zh_CN/LC_MESSAGES/django.po |  923 ++++++++-------
 recipes/locale/ca/LC_MESSAGES/django.mo     |  Bin 421 -> 380 bytes
 recipes/locale/ca/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/de/LC_MESSAGES/django.mo     |  Bin 493 -> 452 bytes
 recipes/locale/de/LC_MESSAGES/django.po     |   32 +-
 recipes/locale/en/LC_MESSAGES/django.mo     |  Bin 421 -> 380 bytes
 recipes/locale/en/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/es/LC_MESSAGES/django.mo     |  Bin 421 -> 380 bytes
 recipes/locale/es/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/fr/LC_MESSAGES/django.mo     |  Bin 420 -> 379 bytes
 recipes/locale/fr/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/hu_HU/LC_MESSAGES/django.mo  |  Bin 378 -> 337 bytes
 recipes/locale/hu_HU/LC_MESSAGES/django.po  |   30 +-
 recipes/locale/it/LC_MESSAGES/django.mo     |  Bin 421 -> 380 bytes
 recipes/locale/it/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/lv/LC_MESSAGES/django.mo     |  Bin 456 -> 415 bytes
 recipes/locale/lv/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/nl/LC_MESSAGES/django.mo     |  Bin 421 -> 380 bytes
 recipes/locale/nl/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/pt/LC_MESSAGES/django.mo     |  Bin 421 -> 380 bytes
 recipes/locale/pt/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/rn/LC_MESSAGES/django.mo     |  Bin 378 -> 337 bytes
 recipes/locale/rn/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/tr/LC_MESSAGES/django.mo     |  Bin 420 -> 379 bytes
 recipes/locale/tr/LC_MESSAGES/django.po     |   30 +-
 recipes/locale/zh_CN/LC_MESSAGES/django.mo  |  Bin 378 -> 337 bytes
 recipes/locale/zh_CN/LC_MESSAGES/django.po  |   30 +-
 55 files changed, 7027 insertions(+), 6403 deletions(-)

diff --git a/cookbook/locale/ca/LC_MESSAGES/django.mo b/cookbook/locale/ca/LC_MESSAGES/django.mo
index 17840261ed16950f888e110b0968d1a07c5f7677..2bd8520d76c6682bb9fe6b46a603f910d00190c4 100644
GIT binary patch
delta 5599
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
Spe-)%fgxjE-j9dX@%t}nwtCtC

delta 7476
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
V#ht*4MDw2U!vYgiuPky}{SUC(iVOe%

diff --git a/cookbook/locale/ca/LC_MESSAGES/django.po b/cookbook/locale/ca/LC_MESSAGES/django.po
index 1cb6b41a2..4f8c5510e 100644
--- a/cookbook/locale/ca/LC_MESSAGES/django.po
+++ b/cookbook/locale/ca/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2020-06-02 19:28+0000\n"
 "Last-Translator: Miguel Canteras <mcanteras@gmail.com>, 2021\n"
 "Language-Team: Catalan (https://www.transifex.com/django-recipes/"
@@ -27,11 +27,11 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Ingredients"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -39,13 +39,13 @@ msgstr ""
 "Color de la barra de navegació superior. No tots els colors funcionen amb "
 "tots els temes, només cal provar-los."
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 "Unitat per defecte que s'utilitzarà quan s'insereixi un ingredient nou en "
 "una recepta."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -53,7 +53,11 @@ msgstr ""
 "Permet l'ús de fraccions de quantitats d'ingredients (p.ex.: converteix els "
 "decimals a fraccions automàticament)"
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -61,19 +65,19 @@ msgstr ""
 "Els usuaris que han creat elements d'un pla de menjars/llistat de compra "
 "s'haurien de compartir per defecte."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "Mostra les receptes vistes recentment a la pàgina de cerca."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "Nombre de decimals dels ingredients."
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr "Si vols poder crear i veure comentaris a sota de les receptes."
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -86,11 +90,11 @@ msgstr ""
 "diverses persones, però pot fer servir una mica de dades mòbils. Si és "
 "inferior al límit d’instància, es restablirà quan es desa."
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -98,91 +102,59 @@ msgstr ""
 "Tots dos camps són opcionals. Si no se'n dóna cap, es mostrarà el nom "
 "d'usuari"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "Nom"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Paraules clau"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "Temps de preparació en minuts"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Temps d'espera (cocció/fornejat) en minuts"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "Ruta"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "UID Emmagatzematge"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr "Per defecte"
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "Nova Unitat"
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr "Nova unitat per la qual se substitueix una altra."
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "Unitat Antiga"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr "Unitat que s’hauria de substituir."
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "Menjar Nou"
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr "Nou menjar que altres substitueixen."
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "Antic Menjar"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr "Menjar que s’hauria de substituir."
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "Afegir el teu comentari:"
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 "Deixeu-lo buit per a Dropbox i introduïu la contrasenya de l'aplicació per a "
 "nextcloud."
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr "Deixeu-lo buit per a nextcloud i introduïu el token API per a Dropbox."
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -190,25 +162,25 @@ msgstr ""
 "Deixeu-lo buit per a Dropbox i introduïu només l'URL base per a nextcloud "
 "(<code>/remote.php/webdav/ s'afegeix automàticament)"
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr "Cerca Cadena"
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "ID d'Arxiu"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr "Has de proporcionar com a mínim una recepta o un títol."
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 "Podeu llistar els usuaris predeterminats amb els quals voleu compartir "
 "receptes a la configuració."
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -216,99 +188,105 @@ msgstr ""
 "Podeu utilitzar el marcador per donar format a aquest camp. Consulteu els <a "
 "href=\"/docs/markdown/\">documents aquí </a>"
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr ""
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 #, fuzzy
 #| msgid "Search"
 msgid "Search Method"
 msgstr "Cerca"
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr ""
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 #, fuzzy
 #| msgid "Search"
 msgid "Fuzzy Search"
 msgstr "Cerca"
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 #, fuzzy
 #| msgid "Text"
 msgid "Full Text"
@@ -321,7 +299,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "No heu iniciat la sessió i, per tant, no podeu veure aquesta pàgina."
 
@@ -331,9 +309,9 @@ msgstr "No heu iniciat la sessió i, per tant, no podeu veure aquesta pàgina."
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr "No teniu els permisos necessaris per veure aquesta pàgina!"
 
@@ -349,36 +327,36 @@ msgstr ""
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importar"
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, fuzzy, python-format
 #| msgid "Imported new recipe!"
 msgid "Imported %s recipes."
@@ -402,8 +380,8 @@ msgstr ""
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr "Racions"
 
@@ -457,104 +435,120 @@ msgstr "Sopar"
 msgid "Other"
 msgstr "Un altre"
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr "Cerca"
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr "Plans de Menjar"
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Receptes"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr "Petit"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr "Gran"
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr "Nova"
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "Text"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr "Temps"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "ID d'Arxiu"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Recepta"
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Food"
+msgid "Food Alias"
+msgstr "Menjar"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Units"
+msgid "Unit Alias"
+msgstr "Unitats"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "Paraules clau"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr ""
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr "Edita"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr "Esborra"
@@ -583,7 +577,7 @@ msgstr ""
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -620,6 +614,7 @@ msgid "Re-send Verification"
 msgstr ""
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr "Eliminar"
@@ -663,7 +658,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr "Confirma"
 
@@ -675,7 +670,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr "Iniciar Sessió"
 
@@ -723,6 +718,10 @@ msgstr ""
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 #, fuzzy
 #| msgid "Changes saved!"
 msgid "Change Password"
@@ -730,7 +729,7 @@ msgstr "Canvis desats!"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 #, fuzzy
 #| msgid "Settings"
 msgid "Password"
@@ -763,6 +762,32 @@ msgid ""
 "within a few minutes."
 msgstr ""
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#, fuzzy
+#| msgid "API Token"
+msgid "Bad Token"
+msgstr "Token API"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+#, fuzzy
+#| msgid "Changes saved!"
+msgid "change password"
+msgstr "Canvis desats!"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -816,7 +841,7 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentació API "
@@ -837,67 +862,96 @@ msgid "Units"
 msgstr "Unitats"
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermercat"
 
 #: .\cookbook\templates\base.html:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarket Category"
+msgstr "Supermercat"
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+#, fuzzy
+#| msgid "Information"
+msgid "Automations"
+msgstr "Informació"
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+#, fuzzy
+#| msgid "File ID"
+msgid "Files"
+msgstr "ID d'Arxiu"
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr "Edició per lots"
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Historial"
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr "Exporta"
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr "Importa recepta"
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr "Crea"
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:259
+#: .\cookbook\templates\generic\list_template.html:14
+#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
+msgid "External Recipes"
+msgstr "Receptes Externes"
+
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 #, fuzzy
 #| msgid "Settings"
 msgid "Space Settings"
 msgstr "Opcions"
 
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Sistema"
 
-#: .\cookbook\templates\base.html:214
+#: .\cookbook\templates\base.html:269
 msgid "Admin"
 msgstr "Admin"
 
-#: .\cookbook\templates\base.html:218
+#: .\cookbook\templates\base.html:273
 msgid "Markdown Guide"
 msgstr "Guia Markdown"
 
-#: .\cookbook\templates\base.html:220
+#: .\cookbook\templates\base.html:275
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:224
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
 msgid "API Browser"
 msgstr "Navegador API"
 
-#: .\cookbook\templates\base.html:227
+#: .\cookbook\templates\base.html:284
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
-#: .\cookbook\templates\generic\list_template.html:14
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Receptes Externes"
-
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Edició per lots de Categoria"
@@ -973,18 +1027,6 @@ msgstr "Llibres de Receptes"
 msgid "Export Recipes"
 msgstr "Exporta Receptes"
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr "Exporta"
-
-#: .\cookbook\templates\files.html:7
-#, fuzzy
-#| msgid "File ID"
-msgid "Files"
-msgstr "ID d'Arxiu"
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -994,11 +1036,10 @@ msgstr "Importa nova Recepta"
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr "Desa"
 
@@ -1038,12 +1079,20 @@ msgstr "Combina"
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Estàs segur que vols combinar aquests dos ingredients?"
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr "Segur que vols esborrar el %(title)s:<b>%(object)s</b>"
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1104,9 +1153,6 @@ msgstr "Valoració"
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr "Tanca"
 
@@ -1158,8 +1204,8 @@ msgstr "Restableix la cerca"
 msgid "Last viewed"
 msgstr "Darrera visualització"
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr "Receptes"
 
@@ -1318,157 +1364,19 @@ msgstr "Capçalera"
 msgid "Cell"
 msgstr "Cel·la"
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
-msgstr "Nova Entrada"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
+msgstr "Vista del pla de menjars"
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr "Cerca Recepta"
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr "Títol"
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr "Nota (opcional)"
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-"Pots utilitzar marcadors per donar format a aquest camp. Consulteu <a href="
-"\"/docs/markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">els "
-"documents aquí</a>"
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr "Crear només nota"
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr "Llista de la Compra"
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr "La llista de la compra està buida actualment"
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr "Llista de la Compra Oberta"
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr "Pla"
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr "Nombre de dies"
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr "Desplaçament entre setmana"
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-"Nombre de dies començant pel primer dia de la setmana per a desplaçar la "
-"vista actual"
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr "Edita el tipus de pla"
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr "Mostra ajuda"
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr "Exportació iCal setmanal"
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Nota"
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr "Creat per"
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr "Compartit per"
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr "Afegir a la compra"
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr "nou tipus de menú"
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr "Ajuda del pla de menjars"
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr "Vista del pla de menjars"
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1580,24 +1488,24 @@ msgstr "Comentaris"
 msgid "by"
 msgstr "per"
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Comentari"
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr "Imatge de la Recepta"
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr "Temps de Preparació ca."
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr "Temps d'Espera ca."
 
@@ -1615,7 +1523,7 @@ msgstr "Receptes"
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 #, fuzzy
 #| msgid "Search String"
 msgid "Search Settings"
@@ -1778,62 +1686,62 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr "Compte"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 #, fuzzy
 #| msgid "Settings"
 msgid "API-Settings"
 msgstr "Opcions"
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 #, fuzzy
 #| msgid "Search String"
 msgid "Search-Settings"
 msgstr "Cerca Cadena"
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 #, fuzzy
 #| msgid "Settings"
 msgid "Name Settings"
 msgstr "Opcions"
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 #, fuzzy
 #| msgid "Settings"
 msgid "Account Settings"
 msgstr "Opcions"
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 #, fuzzy
 #| msgid "Settings"
 msgid "Emails"
 msgstr "Opcions"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr "Idioma"
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr "Estil"
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr "Token API"
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1841,7 +1749,7 @@ msgstr ""
 "Podeu utilitzar tant l’autenticació bàsica com l’autenticació basada en "
 "token per accedir a l’API REST."
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1849,10 +1757,62 @@ msgstr ""
 "Utilitzeu el testimoni com a capçalera d'autorització prefixada per la "
 "paraula símbol tal com es mostra als exemples següents:"
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr "o"
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr "Opcions del Cookbook"
@@ -1872,65 +1832,81 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr "Crear compte de superusuari"
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr "Llista de la Compra"
+
+#: .\cookbook\templates\shopping_list.html:34
+#, fuzzy
+#| msgid "Open Shopping List"
+msgid "Try the new shopping list"
+msgstr "Llista de la Compra Oberta"
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr "Cerca Recepta"
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr "Llista de Compra de Receptes"
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr "Recepta no sel·leccionada"
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr "Quantitat"
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr "Selecciona Unitat"
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr "Selecciona"
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr "Selecciona Menjar"
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr "Seleccioni supermercat"
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr "Selecciona usuari"
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr "Acabat"
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr ""
 "Estàs fora de línia, és possible que la llista de compra no es sincronitzi."
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr "Copia/Exporta"
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr "Prefix de Llista"
 
@@ -2221,156 +2197,160 @@ msgstr "Marcador desat!"
 msgid "Enter website URL"
 msgstr "Introduïu l'URL del lloc web"
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 #, fuzzy
 #| msgid "View Recipe"
 msgid "Preview Recipe Data"
 msgstr "Veure Recepta"
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 #, fuzzy
 #| msgid "Preparation Time"
 msgid "Prep Time"
 msgstr "Temps de preparació"
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 #, fuzzy
 #| msgid "Time"
 msgid "Cook Time"
 msgstr "Temps"
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr "Instruccions"
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 #, fuzzy
 #| msgid "Discovered Recipes"
 msgid "Discovered Attributes"
 msgstr "Receptes Descobertes"
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 #, fuzzy
 #| msgid "Show as header"
 msgid "Show Blank Field"
 msgstr "Mostra com a capçalera"
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 #, fuzzy
 #| msgid "Delete Step"
 msgid "Delete Text"
 msgstr "Esborra Pas"
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 #, fuzzy
 #| msgid "Delete Recipe"
 msgid "Delete image"
 msgstr "Esborra Recepta"
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr "Nom de la Recepta"
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 #, fuzzy
 #| msgid "Recipe Markup Specification"
 msgid "Recipe Description"
 msgstr "Especificació de marcatge de receptes"
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr "Sel·lecciona un"
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr "Nota"
+
+#: .\cookbook\templates\url_import.html:585
 #, fuzzy
 #| msgid "All Keywords"
 msgid "Add Keyword"
 msgstr "Totes les paraules clau"
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr "Totes les paraules clau"
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr "Importa totes les paraules clau, no només les ja existents."
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr "Informació"
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2389,15 +2369,15 @@ msgstr ""
 "un exemple a\n"
 "problemes de github."
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr "Google ld+json Info"
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr "Problemes de GitHub"
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr "Especificació de marcatge de receptes"
 
@@ -2412,8 +2392,7 @@ msgstr "El paràmetre filter_list té un format incorrecte"
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr ""
 
@@ -2426,70 +2405,70 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr "Sincronització correcte"
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr "Error de sincronització amb emmagatzematge"
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 "El lloc sol·licitat proporcionava dades malformades i no es pot llegir."
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr "No s'ha pogut trobar la pàgina sol·licitada."
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2497,29 +2476,29 @@ msgstr ""
 "El lloc sol·licitat no proporciona cap format de dades reconegut des d’on "
 "importar la recepta."
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 #, fuzzy
 #| msgid "The requested page could not be found."
 msgid "No useable data could be found."
 msgstr "No s'ha pogut trobar la pàgina sol·licitada."
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr ""
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
@@ -2527,32 +2506,31 @@ msgstr[0] "Edició per lots Completada. %(count)d La Recepta s’ha actualitzat.
 msgstr[1] ""
 "Edició per lots Completada. %(count)d Les receptes s’han actualitzat."
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr "Monitoratge"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Backend d'emmagatzematge"
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 "No s'ha pogut suprimir aquest fons d'emmagatzematge, ja que s'utilitza en "
 "almenys un monitor."
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr "Llibre de Receptes"
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr "Marcadors"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr "Enllaç de invitació"
 
@@ -2572,27 +2550,19 @@ msgstr "S'ha produït un error en actualitzar aquest backend d'emmagatzematge."
 msgid "Storage"
 msgstr "Emmagatzematge"
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr "Canvis desats!"
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr "Error al desar canvis!"
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr "Unitats fusionades!"
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr "Menjars Fusionats!"
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
@@ -2626,6 +2596,12 @@ msgstr "Supermercat"
 msgid "Shopping Categories"
 msgstr "Llista de Compra de Receptes"
 
+#: .\cookbook\views\lists.py:232
+#, fuzzy
+#| msgid "Shopping List"
+msgid "New Shopping List"
+msgstr "Llista de la Compra"
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Nova Recepta importada!"
@@ -2634,83 +2610,83 @@ msgstr "Nova Recepta importada!"
 msgid "There was an error importing this recipe!"
 msgstr "S'ha produït un error en importar la recepta!"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
 msgstr ""
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr "No teniu els permisos necessaris per dur a terme aquesta acció!"
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr "Comentari Desat!"
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
@@ -2720,44 +2696,131 @@ msgstr ""
 "Si heu oblidat les vostres credencials de superusuari, consulteu la "
 "documentació de django sobre com restablir les contrasenyes."
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr "Les contrasenyes no coincideixen!"
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr "L'usuari s'ha creat, si us plau inicieu la sessió!"
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr "S'ha proporcionat un enllaç d'invitació mal format."
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 #, fuzzy
 #| msgid "You are not logged in and therefore cannot view this page!"
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr "No heu iniciat la sessió i, per tant, no podeu veure aquesta pàgina."
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr "L'enllaç d'invitació no és vàlid o ja s'ha utilitzat."
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "New Unit"
+#~ msgstr "Nova Unitat"
+
+#~ msgid "New unit that other gets replaced by."
+#~ msgstr "Nova unitat per la qual se substitueix una altra."
+
+#~ msgid "Old Unit"
+#~ msgstr "Unitat Antiga"
+
+#~ msgid "Unit that should be replaced."
+#~ msgstr "Unitat que s’hauria de substituir."
+
+#~ msgid "New Food"
+#~ msgstr "Menjar Nou"
+
+#~ msgid "New food that other gets replaced by."
+#~ msgstr "Nou menjar que altres substitueixen."
+
+#~ msgid "Old Food"
+#~ msgstr "Antic Menjar"
+
+#~ msgid "Food that should be replaced."
+#~ msgstr "Menjar que s’hauria de substituir."
+
+#~ msgid "New Entry"
+#~ msgstr "Nova Entrada"
+
+#~ msgid "Title"
+#~ msgstr "Títol"
+
+#~ msgid "Note (optional)"
+#~ msgstr "Nota (opcional)"
+
+#~ msgid ""
+#~ "You can use markdown to format this field. See the <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
+#~ msgstr ""
+#~ "Pots utilitzar marcadors per donar format a aquest camp. Consulteu <a "
+#~ "href=\"/docs/markdown/\" target=\"_blank\" rel=\"noopener noreferrer"
+#~ "\">els documents aquí</a>"
+
+#~ msgid "Create only note"
+#~ msgstr "Crear només nota"
+
+#~ msgid "Shopping list currently empty"
+#~ msgstr "La llista de la compra està buida actualment"
+
+#~ msgid "Plan"
+#~ msgstr "Pla"
+
+#~ msgid "Number of Days"
+#~ msgstr "Nombre de dies"
+
+#~ msgid "Weekday offset"
+#~ msgstr "Desplaçament entre setmana"
+
+#~ msgid ""
+#~ "Number of days starting from the first day of the week to offset the "
+#~ "default view."
+#~ msgstr ""
+#~ "Nombre de dies començant pel primer dia de la setmana per a desplaçar la "
+#~ "vista actual"
+
+#~ msgid "Edit plan types"
+#~ msgstr "Edita el tipus de pla"
+
+#~ msgid "Show help"
+#~ msgstr "Mostra ajuda"
+
+#~ msgid "Week iCal export"
+#~ msgstr "Exportació iCal setmanal"
+
+#~ msgid "Add to Shopping"
+#~ msgstr "Afegir a la compra"
+
+#~ msgid "New meal type"
+#~ msgstr "nou tipus de menú"
+
+#~ msgid "Meal Plan Help"
+#~ msgstr "Ajuda del pla de menjars"
+
+#~ msgid "Units merged!"
+#~ msgstr "Unitats fusionades!"
+
+#~ msgid "Foods merged!"
+#~ msgstr "Menjars Fusionats!"
+
 #~ msgid "Utensils"
 #~ msgstr "Estris"
 
diff --git a/cookbook/locale/de/LC_MESSAGES/django.mo b/cookbook/locale/de/LC_MESSAGES/django.mo
index 8dee8bac02c9dab78a29583545e1801c05e11c09..f89c8bc993fad5c3a55386130fb6fa84f9ac63c1 100644
GIT binary patch
literal 53783
zcmeI5d7Nccb?;9^KpT`nMFf%4rBL14b-Ni<Y@nffE_$S^nie#|t*TR1m%4Rtafhz%
zc0k1`#(>5t;((e)MR8VCM5C6*>BUSEV`3&XFAmYCzC>d*=6!!_?S0O<w+jL<d4Igm
zCl^lt&bWuQ*Is+Awb$PD*C#*l)d{~Z{92Mc8hrXglO%gUlDt6|{MMYEBzJ)4fPVvi
z2i(fLUl>f1S@5KlNpckU?8hg`KZ4JDLXvC;8$<s7$16$lbFN>%I!R6=-B+KJBx|{T
z-+4*0KziRlKS?%nJ@G^?j!BYtJSj<jz<ak{lq9d={%bEu5<X2T!%1=$_zdvD;0wUx
zz#GAnz?;MU+ri_xz5_fJTm+8=zX3iB{5E(Z_%Glx@WJbo<Ye&Spwb-#mF_v<Bf*Qo
z3&Fjh-g^ajG<X<10emN@{O$y)YVvtd`Ti87I>`welH^M86mT;*4_*U)1Y8TAx-m&0
zK{5(bq~s;w0Qe<P<@*7sa{mjc{Ey${-=7JpoX-W%0AB{G9Pb2GkB@*ygP#WXfS(Wd
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
YN?WvyL}l+%V0w=&AGW~G85I8i1Ls7N4FCWD

delta 13420
zcmb7~33yf2wa3qefDFp0%!EUbnS?N?OfrT!VT{a5ZgNkOYwi&5Ku8p>D2kvWa-6Ug
z6mdXpMQ_Ckt!-Kb>#WaO>saelsdH`Bs_*wdX9uv)_r34!?_2k`_Hg!Id#$ziIYF=8
z(|pSd%`$Iv%DLL2><(B~FF5Q3%gS$NSrdAw)v`X#v#cd8E$cJ5pZcu9mh~q50nXx?
zH-}hOb2w<2WgUjY@-3?vb|3DKt1PsvYpBl{VOca;uaC5>*6@T;metm>GFDfVjx_Xx
z>No`+4=2HHuoxZ(9oQL0VH>ysc7m5dJ+})op|uxwh4;bn@M+i{wjS+|?+#l~9|qgA
zzBLj>3r>Xva6Z(+>meJru7%6tPFM#21;@eVr&t!MbrqZf4?&z{wLR50umE<ZJ{HQ*
z5?BVypbY&D?9KYt(<s`(M^Kji11^H!n)Z38`GzcmT3|KIffvAba1&&c)-_PiKM9w?
z=b$_{c#J=81Z+ipGF1C)nCXJD&~#Ko8FG%Pp9{6XMktG2SPXZ;TzDADLv6?U9_$3W
zQSSpaehgG-i(m)11onniP$9f%EdG~8+f2g_D9iT18SpNs1-^iq@EfR5wZ#7?!p>0b
zgP_KZh9|-CP#akYdBj?2cr}zE&q8_dt#SBY4e!#RiN1nLmS$v*PD3X+0S<?iFaous
z7om3WF4TgbLL0VZuwp(C%AoO39-Io5TMMB!d_L5=n=>e~<a(%`?}EeNZBVg%32LHO
zp&oo2%7uS}oK&mT>6TRsyFeMV32Nutq56Lg<*_@U=DFXrKMG}N<|)(hmf`zQhI|ZV
zz*naJZ>U_!nMizLPgnxS!|8A{)Pm1KJ@-1)&fkGr_;V-&zlIu@Gs)}ESe;PR(HD|W
z)-Wg+J5VvMGrSBgrGAs?{~F4rZ6{k+2#$mD<SwXC?lIg4<$(iGE<Xg-|0*1y^Zy=-
z2AselR!0vw01kjMtORz2%b+|{3l)mBh8v)Eyanp{ZH7OGIL*2p*1`86>1CZY)%VyA
zxQX?xH&JAH)ii&C2-JjY;VQV^wEr3EB6%Mw6yHD@)Un7P-yJHZeN256)W*g_d1?mi
z1Jh8?Ukx*g(OoEt$;0qTcnB_pR}om<+3!J(>oUV<f2brI4fWhaC_{>&3@<hH6)=Z-
zIn=l+C<D__q1`+K|2Ie3NrNWb4dvRqpj>~SsXqq$Q$GYX(I=+<ovHVm=^Hiz>iNk~
z3(bbw@tIJDtb;n<7eE=heJ1|b&aR_DybbE=-46%B*0cO%90`>JMNkH;g2%zLVKbP3
ztzg=4Jv@{8Ca9cv7b<k0L4_n|wr@bk42mZ13WvbqPz$VpGN>93gLP0B%^p|)AA;J^
zhp;95*wp_4FQWbp%!B98@eQ~cwx)hJ)G2rnDg>D)QF@}h3FWeHp%!jG*Pl2SDn$LE
z9vE!eC&ISWr$g;%A=D1fGVSM>_H|J6ZGl>6hv~l$;=zpd8x*}X4#8INFHk%B2x{Wb
zq3(kpOub{Vzw=zEas8k?HpFm@;S8wfN?{vV2^F$)pgd3yTk8C8L1|0Fl~6ml!PNH|
z9)OzQAavl1Pz#PN@xOd#LK!}H9`Aqv3qsY?^ZgjFhnjyQRQool=Xbz%tZ&_hB8&FJ
z-tY-ie-~=uub^TVSm5VETd19kftql#sn3RT^+G7mltE>A6+9kBO?v~>xD7C)*W)%6
zS@<N>f-gfo_%_r+@5A=+6R2@NKuyq=OG4v%z#h<s>K_l4oHL;eFNPi95-7u}pgbL0
zi2pUg2Gg+#%F?Y+$@Vj-iT1(C@IJ$@U@rC37FkvyTmlEdP4H5<4-SA67W<!W6_EFi
z^$7e0{5Kp3?<mFpgHc{6wX6~9fM>u0elCL>;YiqViJweGuru`~usb{(%D|0K8`%tF
z@CulO-@`dDvDEkMBTyke2sQq_42qKBFqBKbfeJzEWxnMn!Yb-9sD)mJC&NF(6;NNM
z%7K+o{UK8iLwPa*<(Ujr2yTZ8>4Q+uWqyOA9X<*5viT0`ysuz(J#ZG3VR1Meu7^F~
z@8CH2CL9fWtmN+jI3Mz&v#x`h?^SpzJdKL#F@83}KR_PMSPQr(<&ryLcX$X+g73iV
zV865ci4VXc>Md6LxiAM3X6sTo9=-wfe2+5!r8OEV<{>B#+zd$@>nWIqxk25e8QyXz
z+HoV)UH$}=E1xv=XJLQpFTjrQUr?@VQ|{+NXZU!4go2X@>c<t9buaw|VeSg}HXK3!
zeP?3`e7}Z7gdL)mmCB$zL&mg*(`uQV2TIPtU2sOi&xQ3+$7(Z_0arsEtJ_Td9%xf<
zgo^E7p-#_X(;pxc<(bZ~Gt7rw;1rnYiLwkuS)YOm#gniH`~b2ct9i=Lh1ReW^&U_z
z&xg4%3^nc&sO;Yg*^BiZoC{<4y97Q2l_Raz_%El0Yw*8zl%hd~TnxLx-EcE}7;5L!
z>--%ogsRs-?X(UmsWPVhH7L(~07t;jp$t2Dtv~M&IGOr1s8hCaE%7JMtSe~HgMWuz
z;6KfPcJ=;(-Jx9A-_$2T<-lCSQm9jMCOi>FU>V#1hr+)=&EKxUze&5nKGX+gP;|^@
zL3v_1><nvQf2e+)<6EF6xEIO;2cQf%2o<{LO?}|G{(VwtI1y^zVyJn}g4%fv)H<0p
zD4KW+oCL3eGvP~6JL+|w|G-eF*q;hD;cTc0R>FQT4i`cf5;f~xcoJN-&Yvd%ZR#6f
zPq-U0PsVx_MLT*9YQopx>F`simqo#P-({yj#d13ITn|T4FNMm5OQ6PYGyT^>x%fud
z9X<x*@Kq>J%pvrxbpDqj3PG9SIZzW_0ChEQhP~jmPz(JEYJvk$9y$bN*ej<04cLwP
zd(ehIz%po`?}uswlqdfPbLg}FhN6i+f%3%nPz$%&;1BEu<(Z*ShE9T0;R4g|LM833
zPzyf-xr3~ip>{s*0^g&hkON_Dhq~a}T!{a*V0#qptS3}1^n-fe=R+BGIxK+2ru|%~
z9Jmw~!W&HcGccF>8&FC19h9e9ZS?0q3CdHwq2}+m(VYKLG)$ynIwWtbjc@`CT;$*R
z6Cnw1T?jS7_fQ_nx!4a?C&&r2x<e(MYq%Hoq5f;AjlBt#J0C)M^z)1HzdX=#lYirN
zf&;1N!vXLNsMwze6|)^s58ee2!N*`3+;WNk$LmK>J3o1|zw_Zx^$AcOn`!FHp*#@E
zpvZs}%z@`aEpQRk!aJZI+z*?>gHStv3Ton4p<Mi~;pea~^&g<d_1)qh&*4xTSPXSR
zRl+tfb1sUK<YG7i-U#L57od{u6?h!{5GofwgR)%TS*t(?cp8jCEpQ9$3Lh}_=b)Z{
z2R4Hr!8Y(?h~XLQYm{;tT3+Ta5Qd83TBwD#!j^C+R4i|SO2*&A9`H*j!`ff&haeaB
zqrMa>ht7ra>;s0682%QXuk-%|ief!$tMAG<l*`XE+zREg8=-El`%L|L!}nlo+P{TL
zt`=ALhP8t-d@$6G3k}CZg?I++$okd_(-AQpbx;dkYT9pua^byDu6+m|4_|;<_)T~M
z{1AFCFQ^6DZS(u{pbQxX+rm*$<0rw4EG|Lm0GB{nS_QRW0xG5rru}l*f%<h&A=(Su
z!(T&r>{+Pi--Zh5Vb}rAzmgAISO#VA%I!QC;IFCe_+OT!T|enAgtBlmRQuJ2H^X++
z?}3`|F_;IRhYHP?roZ)7{<v;%6zv0{x1gZ|<+(Ui(w}z~{?|^gp+Q-{(+t=H<+6KV
zXZQe|44;BB@Pw;<b~o$~<;f9HhK_?;Xf{+Rmp~<90_ujWgYwih85FtjCaBom19k2X
zLK*Nblxq(|8TvicLM^ZH7iteRJ{M|%@o+Mn45z>iPzyG~(eN+uWZ3muZb_J#fHD&0
zIXDY8zmD%YSPVIt)_$n|sXP3CN=-w(p6`ZH_;>g-xbk}c`27=}NWGB8E^s>R4p%`L
zxCYA8=R)?9u{NM^gsrYW_y6MA1Ld0Up>DF)H~29e3VTvN1<E4}p<G-6Bd`{(fUiS&
zXv|LkPrE5_DfJqtc^jc};u+}u`~NGZ;R7hwd=8a-U3d8|?+-O$KAa3sg>|qF>Pr3u
z_JChN?YP~IT(hu0><a7QRCuM~OR$W3*PA#28I-jsCGZV62@c!se?CW`Lhw3V55qV6
zuiFpcK<eH1_#vAD_fp>i=fKgo@P!LAQ1wRWz;?I#p-Vv-d@sx>wojwz0qZvZPo*L#
zS4QE*@F1KB=ilz{c&p)dD9>C2bKovG5blBc5P1s9)$c+r_z4WaUm~>#C1WjB3#F3}
zYZP^5rpjZ;4C=MWhv>gSa?t0&%Ms;6HS#E;G91xHDj0J%91E{TbZ3;oJmlD-e}DA;
zU0;pk=}aU0(f^DrLMKD5N*F>uMQ<t(p+sm?8EUB5_d*{6PlSV!k;q%rRkolP!F>29
zNZwml=<h#H(2;U2^>dM9%lW3Rtp5kHk@^=fgv>=$>S+542H}@50oNlsA-_UO(6>UB
ztI+5Bs+EaT>5rU^5N2x_Y$}t{9prNwE-{UpO#hkGpGJO0U4Oi)^g*T?UG<*mNu;xB
z+Xgw+RuLQo$%%|55A@b(%6ka+kXOFum%GQh02zfem`SFie~;Lvt`qbs!m;<R<|}Dm
zhyDPfQi`08<f=m1hLoFUrz-v(sI>9A{GTZJxf#HTvR*;H^Sdk?PC=CIa~bnKydHTL
zX)3xKno5IFmN9mAQzQJq=x1v8x-3+Fi#+UU{?ETbTl!ZaDks1!+=RS|OrWj{W&onn
zAE~G94tNp5HQ|*7{1za(13vRw_%{MLhp`LqG7Ul(8b+IX3f_%0A}^XYL07HHV#bc}
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

diff --git a/cookbook/locale/de/LC_MESSAGES/django.po b/cookbook/locale/de/LC_MESSAGES/django.po
index b180cbbff..e59253dbe 100644
--- a/cookbook/locale/de/LC_MESSAGES/django.po
+++ b/cookbook/locale/de/LC_MESSAGES/django.po
@@ -14,11 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2021-11-04 11:29+0000\n"
 "Last-Translator: vabene1111 <vabene1234@googlemail.com>\n"
-"Language-Team: German <http://translate.tandoor.dev/projects/tandoor/"
-"recipes-backend/de/>\n"
+"Language-Team: German <http://translate.tandoor.dev/projects/tandoor/recipes-"
+"backend/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,11 +29,11 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Zutaten"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -41,13 +41,13 @@ msgstr ""
 "Farbe der oberen Navigationsleiste. Nicht alle Farben passen, daher einfach "
 "mal ausprobieren!"
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 "Standardeinheit, die beim Einfügen einer neuen Zutat in ein Rezept zu "
 "verwenden ist."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -55,7 +55,11 @@ msgstr ""
 "Unterstützung für Brüche in Zutaten aktivieren. Dadurch werden Dezimalzahlen "
 "mit Brüchen ersetzt, z.B. 0.5 mit ½."
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -63,21 +67,21 @@ msgstr ""
 "Nutzer, mit denen neue Pläne und Einkaufslisten standardmäßig geteilt werden "
 "sollen."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "Zuletzt angeschaute Rezepte bei der Suche anzeigen."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "Anzahl an Dezimalstellen, auf die gerundet werden soll."
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 "Wenn du in der Lage sein willst, Kommentare unter Rezepten zu erstellen und "
 "zu sehen."
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -89,11 +93,11 @@ msgstr ""
 "aktualisiert. Dies ist nützlich, wenn mehrere Personen eine Liste beim "
 "Einkaufen verwenden, benötigt jedoch etwas Datenvolumen."
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr "Navigationsleiste wird oben angeheftet."
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -101,39 +105,39 @@ msgstr ""
 "Beide Felder sind optional. Wenn keins von beiden gegeben ist, wird der "
 "Nutzername angezeigt"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "Name"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Stichwörter"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "Zubereitungszeit in Minuten"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Wartezeit (kochen/backen) in Minuten"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "Pfad"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "Speicher-UID"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr "Standard"
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
@@ -141,51 +145,19 @@ msgstr ""
 "Um Duplikate zu vermeiden werden Rezepte mit dem gleichen Namen ignoriert. "
 "Aktivieren Sie dieses Kontrollkästchen, um alles zu importieren."
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "Neue Einheit"
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr "Neue Einheit, welche die alte ersetzt."
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "Alte Einheit"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr "Einheit, die ersetzt werden soll."
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "Neue Zutat"
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr "Neue Zutat, welche die alte ersetzt."
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "Alte Zutat"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr "Zutat, die ersetzt werden soll."
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "Schreibe einen Kommentar: "
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr "Für Dropbox leer lassen, bei Nextcloud App-Passwort eingeben."
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr "Für Nextcloud leer lassen, für Dropbox API-Token eingeben."
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -193,25 +165,25 @@ msgstr ""
 "Für Dropbox leer lassen, für Nextcloud Server-URL angeben (<code>/remote.php/"
 "webdav/</code> wird automatisch hinzugefügt)"
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr "Suchwort"
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "Datei-ID"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr "Mindestens ein Rezept oder ein Titel müssen angegeben werden."
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 "Sie können in den Einstellungen Standardbenutzer auflisten, für die Sie "
 "Rezepte freigeben möchten."
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -219,15 +191,15 @@ msgstr ""
 "Markdown kann genutzt werden, um dieses Feld zu formatieren. Siehe <a href="
 "\"/docs/markdown/\">hier</a> für weitere Information"
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr "Maximale Nutzer-Anzahl wurde für diesen Space erreicht."
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr "Email-Adresse ist bereits vergeben!"
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
@@ -235,15 +207,21 @@ msgstr ""
 "Eine Email-Adresse wird nicht benötigt, aber falls vorhanden, wird der "
 "Einladungslink zum Benutzer geschickt."
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr "Name wird bereits verwendet."
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr "AGBs und Datenschutz akzeptieren"
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
@@ -251,7 +229,7 @@ msgstr ""
 "Suchmethode auswählen. Klicke <a href=\"/docs/search/\">hier</a> für eine "
 "Auflistung der Optionen."
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
@@ -259,7 +237,7 @@ msgstr ""
 "Benutze Fuzzy-Suche für Einheiten, Schlüsselwörter und Zutaten beim ändern "
 "und importieren von Rezepten."
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
@@ -268,7 +246,7 @@ msgstr ""
 "kann die Suchqualität abhängig von der Sprache verbessern oder "
 "verschlechtern."
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
@@ -276,7 +254,7 @@ msgstr ""
 "Felder welche auf partielle Treffer durchsucht werden.  (z.B. eine Suche "
 "nach \"Spa\" wird \"Spaghetti\", \"Spargel\" und \"Grünspargel\" liefern.)"
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
@@ -284,7 +262,7 @@ msgstr ""
 "Felder welche auf übereinstimmenden Wortbeginn durchsucht werden. (z.B. eine "
 "Suche nach \"Spa\" wird \"Spaghetti\" und \"Spargel\" liefern.)"
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
@@ -293,7 +271,7 @@ msgstr ""
 "\"Kuhcen\" wird \"Kuchen\" liefern.)  Tipp: Diese Option konfligiert mit den "
 "\"web\" und \"raw\" Suchtypen."
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
@@ -301,31 +279,31 @@ msgstr ""
 "Felder welche im Volltext durchsucht werden sollen. Tipp: Die Suchtypen \"web"
 "\", \"raw\" und \"phrase\" funktionieren nur mit Volltext-Feldern."
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 msgid "Search Method"
 msgstr "Suchmethode"
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr "Unpräzise Suche"
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr "Akzente ignorieren"
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr "Teilweise Übereinstimmung"
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr "Beginnt mit"
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 msgid "Fuzzy Search"
 msgstr "Unpräzise Suche"
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 msgid "Full Text"
 msgstr "Volltext"
 
@@ -338,7 +316,7 @@ msgstr ""
 "warte ein paar Minuten und versuche es erneut."
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "Du bist nicht angemeldet, daher kannst du diese Seite nicht sehen!"
 
@@ -348,9 +326,9 @@ msgstr "Du bist nicht angemeldet, daher kannst du diese Seite nicht sehen!"
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr "Du hast nicht die notwendigen Rechte um diese Seite zu sehen!"
 
@@ -366,20 +344,20 @@ msgstr ""
 msgid "Could not parse template code."
 msgstr "Konnte den Template code nicht verarbeiten."
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importieren"
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
@@ -387,7 +365,7 @@ msgstr ""
 "Importer erwartet eine .zip Datei. Hast du den richtigen Importer-Typ für "
 "deine Daten ausgewählt?"
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
@@ -395,11 +373,11 @@ msgstr ""
 "Ein unerwarteter Fehler trat beim Importieren auf. Bitte stelle sicher, dass "
 "die hochgeladene Datei gültig ist."
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr "Die folgenden Rezepte wurden ignoriert da sie bereits existieren:"
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, python-format
 msgid "Imported %s recipes."
 msgstr "%s Rezepte importiert."
@@ -418,8 +396,8 @@ msgstr "Quelle"
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr "Portionen"
 
@@ -475,7 +453,7 @@ msgstr "Abendessen"
 msgid "Other"
 msgstr "Andere"
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
@@ -483,96 +461,112 @@ msgstr ""
 "Maximale Datei-Speichergröße in MB. 0 für unbegrenzt, -1 um den Datei-Upload "
 "zu deaktivieren."
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr "Suchen"
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr "Essensplan"
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Bücher"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr "Klein"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr "Groß"
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr "Neu"
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr " ist Teil eines Rezepts und kann nicht gelöscht werden"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "Text"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr "Zeit"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "File"
 msgstr "Datei"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Rezept"
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr "Einfach"
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr "Satz"
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr "Web"
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr "Rohdaten"
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Foods"
+msgid "Food Alias"
+msgstr "Lebensmittel"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Units"
+msgid "Unit Alias"
+msgstr "Einheiten"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "Stichwörter"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr "Datei-Uploads sind in diesem Space nicht aktiviert."
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr "Du hast Dein Datei-Uploadlimit erreicht."
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr "Löschen"
@@ -601,7 +595,7 @@ msgstr "Email-Adressen"
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -636,6 +630,7 @@ msgid "Re-send Verification"
 msgstr "Verifikation erneut senden"
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr "Entfernen"
@@ -684,7 +679,7 @@ msgstr ""
 "             ist."
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -699,7 +694,7 @@ msgstr ""
 "            <a href=\"%(email_url)s\">beantrage einen neuen Email-"
 "Bestätigungslink</a>."
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr "Anmelden"
 
@@ -747,12 +742,16 @@ msgstr "Willst du dich wirklich ausloggen?"
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr "Passwort ändern"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 msgid "Password"
 msgstr "Passwort"
 
@@ -787,6 +786,32 @@ msgstr ""
 "Wir haben Dir eine Email gesendet. Bitte kontaktiere uns, falls du sie nicht "
 "innerhalb der nächsten Minuten erhältst."
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#, fuzzy
+#| msgid "API Token"
+msgid "Bad Token"
+msgstr "API-Token"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+#, fuzzy
+#| msgid "Change Password"
+msgid "change password"
+msgstr "Passwort ändern"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -838,7 +863,7 @@ msgstr "Registrierung geschlossen"
 msgid "We are sorry, but the sign up is currently closed."
 msgstr "Es tut uns Leid, aber die Registrierung ist derzeit geschlossen."
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "API-Dokumentation"
@@ -859,65 +884,92 @@ msgid "Units"
 msgstr "Einheiten"
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #: .\cookbook\templates\base.html:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarket Category"
+msgstr "Supermarkt"
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+#, fuzzy
+#| msgid "Information"
+msgid "Automations"
+msgstr "Information"
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+msgid "Files"
+msgstr "Dateien"
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr "Massenbearbeitung"
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Verlauf"
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr "Exportieren"
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr "Rezept importieren"
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr "Erstellen"
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
-#: .\cookbook\templates\space.html:19
-msgid "Space Settings"
-msgstr "Space Einstellungen"
-
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
-msgid "System"
-msgstr "System"
-
-#: .\cookbook\templates\base.html:214
-msgid "Admin"
-msgstr "Admin"
-
-#: .\cookbook\templates\base.html:218
-msgid "Markdown Guide"
-msgstr "Markdown-Anleitung"
-
-#: .\cookbook\templates\base.html:220
-msgid "GitHub"
-msgstr "GitHub"
-
-#: .\cookbook\templates\base.html:224
-msgid "API Browser"
-msgstr "API Browser"
-
-#: .\cookbook\templates\base.html:227
-msgid "Log out"
-msgstr "Ausloggen"
-
-#: .\cookbook\templates\base.html:229
+#: .\cookbook\templates\base.html:259
 #: .\cookbook\templates\generic\list_template.html:14
 #: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
 msgid "External Recipes"
 msgstr "Externe Rezepte"
 
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\space.html:19
+msgid "Space Settings"
+msgstr "Space Einstellungen"
+
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
+msgid "System"
+msgstr "System"
+
+#: .\cookbook\templates\base.html:269
+msgid "Admin"
+msgstr "Admin"
+
+#: .\cookbook\templates\base.html:273
+msgid "Markdown Guide"
+msgstr "Markdown-Anleitung"
+
+#: .\cookbook\templates\base.html:275
+msgid "GitHub"
+msgstr "GitHub"
+
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
+msgid "API Browser"
+msgstr "API Browser"
+
+#: .\cookbook\templates\base.html:284
+msgid "Log out"
+msgstr "Ausloggen"
+
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Kategorie-Massenbearbeitung"
@@ -989,16 +1041,6 @@ msgstr "Rezeptbuch"
 msgid "Export Recipes"
 msgstr "Rezepte exportieren"
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr "Exportieren"
-
-#: .\cookbook\templates\files.html:7
-msgid "Files"
-msgstr "Dateien"
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -1008,11 +1050,10 @@ msgstr "Rezept importieren"
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr "Speichern"
 
@@ -1057,13 +1098,21 @@ msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 "Bist du dir sicher, dass du diese beiden Zutaten zusammenführen möchtest?"
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 "Bist du sicher, dass %(title)s: <b>%(object)s</b> gelöscht werden soll? "
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1124,9 +1173,6 @@ msgstr "Bewertung"
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr "Schließen"
 
@@ -1154,8 +1200,8 @@ msgstr ""
 "        <b>Password und Token</b> werden im <b>Klartext</b> in der Datenbank "
 "gespeichert.\n"
 "        Dies ist notwendig da Passwort oder Token benötigt werden, um API-"
-"Anfragen zu stellen, bringt jedoch auch ein Sicherheitsrisiko mit sich. <br/>"
-"\n"
+"Anfragen zu stellen, bringt jedoch auch ein Sicherheitsrisiko mit sich. <br/"
+">\n"
 "        Um das Risiko zu minimieren sollten, wenn möglich, Tokens oder "
 "Accounts mit limitiertem Zugriff verwendet werden.\n"
 "    "
@@ -1180,8 +1226,8 @@ msgstr "Suche zurücksetzen"
 msgid "Last viewed"
 msgstr "Zuletzt angesehen"
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr "Rezepte"
 
@@ -1341,179 +1387,19 @@ msgstr "Überschrift"
 msgid "Cell"
 msgstr "Zelle"
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
-msgstr "Neuer Eintrag"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
+msgstr "Plan-Ansicht"
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr "Rezept suchen"
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr "Titel"
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr "Notiz (optional)"
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-"Dieses Feld Unterstützt Markdown Formatierung. Siehe <a href=\"/docs/"
-"markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">Dokumentation</a>"
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr "Anzahl Portionen"
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr "Nur Notiz erstellen"
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr "Einkaufsliste"
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr "Die Einkaufsliste ist aktuell leer"
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr "Einkaufsliste öffnen"
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr "Plan"
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr "Anzahl an Tagen"
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr "Wochentage verschieben"
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-"Anzahl der Tage von ersten Tag der Woche, die der Plan standardmäßig "
-"verschoben sein soll."
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr "Plantypen editieren"
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr "Hilfe anzeigen"
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr "Woche als iCal exportieren"
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Notiz"
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr "Erstellt von"
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr "Geteilt mit"
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr "Zur Einkaufsliste hinzufügen"
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr "Neue Mahlzeit"
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr "Plan-Hilfe"
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-"\n"
-"                            <p>Das Planmodul erlaubt das Planen mithilfe von "
-"Rezepten und Notizen.</p>\n"
-"                            <p>Einfach ein Rezept aussuchen und an die "
-"Stelle im Plan ziehen, an der es gekocht werden soll. Es kann außerdem eine "
-"Notiz und ein Titel hinzugefügt werden. Einen Eintrag nur als Notiz zu "
-"erstellen ist durch Eingabe einer Notiz und Schieben des Notiz-Blocks in den "
-"Plan möglich.</p>\n"
-"                            <p>Durch Klicken auf ein Rezept öffnet sich die "
-"Detailansicht. Da kann das Rezept auch auf die Einkaufsliste hinzugefügt "
-"werden. Es können auch alle Rezepte eines Tages auf die Einkaufsliste "
-"gesetzt werden, indem der Einkaufswagen im Tabellenkopf angeklickt wird.</"
-"p>\n"
-"                            <p>Da Pläne häufig für mehrere Nutzer erstellt "
-"werden, können Nutzer in den Einstellungen angegeben werden, mit denen neue "
-"Pläne automatisch geteilt werden sollen.\n"
-"                            </p>\n"
-"                            <p>Die Mahlzeiten, die geplant werden sollen, "
-"können bearbeitet werden. Wenn Pläne zwischen Nutzern mit unterschiedlichen "
-"Mahlzeiten geteilt werden, erscheinen alle Mahlzeiten. Um Duplikate zu "
-"vermeiden (z.B. Mittagessen und Mittag) sollten Mahlzeiten teilender Nutzer "
-"gleich benannt werden, dadurch kann das System sie zusammenfassen.</p>\n"
-"                        "
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr "Plan-Ansicht"
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1630,24 +1516,24 @@ msgstr "Kommentare"
 msgid "by"
 msgstr "von"
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Kommentar"
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr "Rezeptbild"
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr "Zubereitungszeit ca."
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr "Wartezeit ca."
 
@@ -1665,7 +1551,7 @@ msgstr "Rezept-Hauptseite"
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 msgid "Search Settings"
 msgstr "Sucheinstellungen"
 
@@ -1714,8 +1600,8 @@ msgstr ""
 "            Es sind verschiedene Methoden verfügbar, welche weiter unten "
 "genau beschrieben werden. Diese beeinflussen das Suchergebnis bei einer "
 "Suche mit mehreren Wörtern.\n"
-"            Technische Details können auf der Website von <a href=https://www"
-".postgresql.org/docs/current/textsearch-controls.html#TEXTSEARCH-PARSING-"
+"            Technische Details können auf der Website von <a href=https://"
+"www.postgresql.org/docs/current/textsearch-controls.html#TEXTSEARCH-PARSING-"
 "QUERIES>PostgreSQL.</a> eingesehen werden.\n"
 "            "
 
@@ -1733,8 +1619,8 @@ msgstr ""
 "            Einfache Suchen ignorieren Satzzeichen und Stoppwörter wie \"und"
 "\", \"der\", \"doch\". Getrennte Wörter werden als erforderlich gewertet.\n"
 "            Eine Suche nach \"Der Apfel und Mehl\" wird alle Rezepte liefern "
-"die \"Apfel\" oder \"Mehl\" in einem der ausgewählten Suchfeldern enthalten."
-"\n"
+"die \"Apfel\" oder \"Mehl\" in einem der ausgewählten Suchfeldern "
+"enthalten.\n"
 "            "
 
 #: .\cookbook\templates\search_info.html:34
@@ -1782,8 +1668,8 @@ msgstr ""
 "            '-' ist als Ausschluss nutzbar, so werden nur Rezepte gefunden "
 "die nicht das folgende Wort (oder die Phrase) enthalten. \n"
 "            Beispiel: Eine Suche nach \"'Apfelkuchen mit Sahne' or Torte -"
-"Butter\" liefert alle Suchergebnisse die entweder \"Apfelkuchen mit Sahne\" "
-"\n"
+"Butter\" liefert alle Suchergebnisse die entweder \"Apfelkuchen mit Sahne"
+"\" \n"
 "            oder Torte enthalten, schließt aber Ergebnisse welche Butter "
 "enthalten aus.\n"
 "            "
@@ -1818,8 +1704,8 @@ msgstr ""
 "            Eine weitere Suchmethode (welche ebenfalls PostgreSQL erfordert) "
 "ist die Unscharfe Suche oder Trigramm Suche. Ein Trigramm sind 3 "
 "aufeinanderfolgende Zeichen.\n"
-"            Beispiel: Die Suche nach \"Apfel\" erzeugt die Trigramme \"Apf\""
-", \"pfl\" und \"fel\". Die Suchergebnisse erhalten dann eine Wertung "
+"            Beispiel: Die Suche nach \"Apfel\" erzeugt die Trigramme \"Apf"
+"\", \"pfl\" und \"fel\". Die Suchergebnisse erhalten dann eine Wertung "
 "abhängig davon wie gut sie mit den Trigrammen übereinstimmen.\n"
 "            Ein Vorteil der Trigramm Suche ist das korrekte Suchwörter wie "
 "\"Apfel\", Tippfehler in Suchfeldern (wie z.B. \"Afpel\") finden.\n"
@@ -1910,52 +1796,52 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr "Account"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr "Präferenzen"
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 msgid "API-Settings"
 msgstr "API-Einstellungen"
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 msgid "Search-Settings"
 msgstr "Sucheinstellungen"
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 msgid "Name Settings"
 msgstr "Namen-Einstellungen"
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 msgid "Account Settings"
 msgstr "Account-Einstellungen"
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 msgid "Emails"
 msgstr "E-Mail Adressen"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr "Social"
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr "Sprache"
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr "Stil"
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr "API-Token"
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1963,7 +1849,7 @@ msgstr ""
 "Sowohl Basic Authentication als auch tokenbasierte Authentifizierung können "
 "für die REST-API verwendet werden."
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1971,10 +1857,62 @@ msgstr ""
 "Nutz den Token als Authorization-Header mit der Präfix \"Token\" wie in "
 "folgendem Beispiel:"
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr "oder"
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr "Kochbuch-Setup"
@@ -1994,64 +1932,80 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr "Administrator-Account Erstellen"
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr "Einkaufsliste"
+
+#: .\cookbook\templates\shopping_list.html:34
+#, fuzzy
+#| msgid "Open Shopping List"
+msgid "Try the new shopping list"
+msgstr "Einkaufsliste öffnen"
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr "Rezept suchen"
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr "Einkaufs-Rezepte"
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr "Keine Rezepte ausgewählt"
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr "Eintrags-Modus"
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr "Eintrag hinzufügen"
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr "Menge"
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr "Einheit wählen"
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr "Auswählen"
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr "Zutat auswählen"
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr "Supermarkt auswählen"
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr "Nutzer auswählen"
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr "Erledigt"
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr "Du bist offline, die Einkaufsliste wird ggf. nicht synchronisiert."
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr "Kopieren/Exportieren"
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr "Listenpräfix"
 
@@ -2245,8 +2199,8 @@ msgid ""
 "        "
 msgstr ""
 "Das direkte ausliefern von Mediendateien mit gunicorn/python ist <b>nicht "
-"empfehlenswert</b>! Bitte folge den beschriebenen Schritten <a href=\"https\\"
-"://github.com/vabene1111/recipes/releases/tag/0.8.1\">hier</a>, um Ihre "
+"empfehlenswert</b>! Bitte folge den beschriebenen Schritten <a href=\"https"
+"\\://github.com/vabene1111/recipes/releases/tag/0.8.1\">hier</a>, um Ihre "
 "Installation zu aktualisieren.\n"
 "        "
 
@@ -2272,8 +2226,8 @@ msgid ""
 "        "
 msgstr ""
 "\n"
-"            Du hast keinen <code>SECRET_KEY</code> in deiner <code>."
-"env</code>-Datei konfiguriert. Django verwendet standardmäßig den mit der "
+"            Du hast keinen <code>SECRET_KEY</code> in deiner <code>.env</"
+"code>-Datei konfiguriert. Django verwendet standardmäßig den mit der "
 "Installation gelieferten Standardschlüssel, der öffentlich bekannt und "
 "unsicher ist! Bitte setze den <code>SECRET_KEY</code> in der "
 "Konfigurationsdatei <code>.env</code>.\n"
@@ -2338,142 +2292,146 @@ msgstr "Lesezeichen speichern!"
 msgid "Enter website URL"
 msgstr "Webseite-URL eingeben"
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr "Wähle Rezept-Dateien zum Importieren oder platziere sie hier..."
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr "Füge JSON- oder HTML-Daten hier ein um das Rezept zu laden."
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 msgid "Preview Recipe Data"
 msgstr "Rezept-Daten ansehen"
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr "Ziehe Rezepteigenschaften von Rechts in die entsprechende Box unten."
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr "Inhalte leeren"
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr "Text welcher hierhin gezogen wird, wird an den Namen angehängt."
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr "Beschreibung"
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr "Text welcher hierhin gezogen wird, wird an die Beschreibung angehängt."
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 "Stichworte welche hierhin gezogen werden, werden zur aktuellen Liste "
 "hinzugefügt"
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr "Bild"
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 msgid "Prep Time"
 msgstr "Vorbereitungszeit"
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 msgid "Cook Time"
 msgstr "Kochzeit"
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 "Zutaten welche hierhin gezogen werden, werden zur aktuellen Liste "
 "hinzugefügt."
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr "Anleitung"
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 msgid "Discovered Attributes"
 msgstr "Entdeckte Attribute"
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 msgid "Show Blank Field"
 msgstr "Leeres Feld anzeigen"
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr "Leeres Feld"
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 msgid "Delete Text"
 msgstr "Text löschen"
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 msgid "Delete image"
 msgstr "Bild löschen"
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr "Rezeptname"
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr "Rezept Beschreibung"
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr "Auswählen"
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr "Notiz"
+
+#: .\cookbook\templates\url_import.html:585
 msgid "Add Keyword"
 msgstr "Schlagwort hinzufügen"
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr "Alle Schlagwörter"
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr "Alle Schlagwörter importieren, nicht nur die bereits bestehenden."
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr "Information"
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2488,15 +2446,15 @@ msgstr ""
 "importiert werden kann, sie aber strukturierte Daten aufweist, kann ein "
 "GitHub-Issue geöffnet werden."
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr "Google ld+json Informationen"
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr "GitHub-Issues"
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr "Rezept-Markup-Spezifikation"
 
@@ -2509,8 +2467,7 @@ msgstr "Der Parameter updated_at ist falsch formatiert"
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr "Zusammenführen mit selben Objekt nicht möglich!"
 
@@ -2523,100 +2480,100 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr "Zusammenführen mit untergeordnetem Objekt nicht möglich!"
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr "{source.name} wurde erfolgreich mit {target.name} zusammengeführt"
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 "Beim zusammenführen von {source.name} mit {target.name} ist ein Fehler "
 "aufgetreten"
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr "Diese Funktion ist in der Demo-Version nicht verfügbar!"
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr "Synchronisation erfolgreich!"
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr "Fehler beim Synchronisieren"
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr "Nichts zu tun."
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 "Die angefragte Seite hat ungültige Daten zurückgegeben oder die Daten "
 "konnten nicht verarbeitet werden."
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr "Die angefragte Seite konnte nicht gefunden werden."
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 "Die angefragte Seite stellt keine bekannten Datenformate zur Verfügung."
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr "Es konnten keine nutzbaren Daten gefunden werden."
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr "Ich konnte nichts zu tun finden."
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr "Du hast die maximale Anzahl an Rezepten für Deinen Space erreicht."
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr "Du hast mehr Benutzer in Deinem Space als erlaubt."
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
@@ -2624,32 +2581,31 @@ msgstr[0] "Massenbearbeitung erfolgreich. %(count)d Rezept wurde aktualisiert."
 msgstr[1] ""
 "Massenbearbeitung erfolgreich. %(count)d Rezepte wurden aktualisiert."
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr "Überwachen"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Speicherquelle"
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 "Speicherquelle konnte nicht gelöscht werden, da sie in mindestens einem "
 "Monitor verwendet wird."
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr "Rezeptbuch"
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr "Einladungslink"
 
@@ -2669,27 +2625,19 @@ msgstr "Es gab einen Fehler beim Aktualisieren dieser Speicherquelle!"
 msgid "Storage"
 msgstr "Speicher"
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr "Änderungen gespeichert!"
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr "Fehler beim Speichern der Daten!"
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr "Einheiten zusammengeführt!"
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr "Zutaten zusammengeführt!"
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr "Importieren ist für diesen Anbieter noch nicht implementiert"
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr "Exportieren ist für diesen Anbieter noch nicht implementiert"
 
@@ -2717,6 +2665,12 @@ msgstr "Supermärkte"
 msgid "Shopping Categories"
 msgstr "Einkaufskategorien"
 
+#: .\cookbook\views\lists.py:232
+#, fuzzy
+#| msgid "Shopping List"
+msgid "New Shopping List"
+msgstr "Einkaufsliste"
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Neues Rezept importiert!"
@@ -2725,49 +2679,49 @@ msgstr "Neues Rezept importiert!"
 msgid "There was an error importing this recipe!"
 msgstr "Beim Importieren des Rezeptes ist ein Fehler aufgetreten!"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr "Hallo"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr "Du wurdest eingeladen von "
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr " um deren Tandoor Recipes Instanz beizutreten "
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr "Klicke auf den folgenden Link, um deinen Account zu aktivieren: "
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 "Falls der Link nicht funktioniert, benutze den folgenden Code um dem Space "
 "manuell beizutreten: "
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr "Die Einladung ist gültig bis "
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 "Tandoor Recipes ist ein Open-Source Rezept-Manager. Mehr Informationen sind "
 "auf GitHub zu finden "
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr "Tandoor Recipes Einladung"
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr "Einladungslink erfolgreich an Benutzer gesendet."
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
@@ -2775,13 +2729,13 @@ msgstr ""
 "Du hast zu viele Email gesendet. Bitte teile den Link manuell oder warte ein "
 "paar Stunden."
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 "Email konnte an den Benutzer nicht gesendet werden. Bitte teile den Link "
 "manuell."
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
@@ -2789,20 +2743,20 @@ msgstr ""
 "Du hast erfolgreich deinen eigenen Rezept-Space erstellt. Beginne, indem Du "
 "ein paar Rezepte hinzufügst oder weitere Leute einlädst."
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 "Du hast nicht die notwendige Berechtigung, um diese Aktion durchzuführen!"
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr "Kommentar gespeichert!"
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr "Es muss mindestens ein Feld ausgewählt sein!"
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
@@ -2810,11 +2764,11 @@ msgstr ""
 "Um diese Suchmethode zu verwenden muss mindestens ein Feld für die "
 "Volltextsuche ausgewählt sein!"
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr "Die \"Ungenaue\" Suche ist mit diesem Suchtyp nicht kompatibel!"
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
@@ -2823,33 +2777,33 @@ msgstr ""
 "Die Setup-Seite kann nur für den ersten Nutzer verwendet werden. Zum "
 "Zurücksetzen von Passwörtern bitte der Django-Dokumentation folgen."
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr "Passwörter stimmen nicht überein!"
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr "Benutzer wurde erstellt, bitte einloggen!"
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr "Fehlerhafter Einladungslink angegeben!"
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 "Du bist bereits Mitglied eines Space, daher kannst du diesem Space nicht "
 "beitreten."
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr "Space erfolgreich beigetreten."
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr "Einladungslink ungültig oder bereits genutzt!"
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
@@ -2857,7 +2811,7 @@ msgstr ""
 "Das melden von Links ist in dieser Instanz nicht aktiviert. Bitte "
 "kontaktieren sie den Seitenadministrator um Probleme zu melden."
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
@@ -2865,6 +2819,155 @@ msgstr ""
 "Dieser Link wurde deaktiviert! Bitte kontaktieren sie den "
 "Seitenadministrator für weitere Informationen."
 
+#~ msgid "New Unit"
+#~ msgstr "Neue Einheit"
+
+#~ msgid "New unit that other gets replaced by."
+#~ msgstr "Neue Einheit, welche die alte ersetzt."
+
+#~ msgid "Old Unit"
+#~ msgstr "Alte Einheit"
+
+#~ msgid "Unit that should be replaced."
+#~ msgstr "Einheit, die ersetzt werden soll."
+
+#~ msgid "New Food"
+#~ msgstr "Neue Zutat"
+
+#~ msgid "New food that other gets replaced by."
+#~ msgstr "Neue Zutat, welche die alte ersetzt."
+
+#~ msgid "Old Food"
+#~ msgstr "Alte Zutat"
+
+#~ msgid "Food that should be replaced."
+#~ msgstr "Zutat, die ersetzt werden soll."
+
+#~ msgid "New Entry"
+#~ msgstr "Neuer Eintrag"
+
+#~ msgid "Title"
+#~ msgstr "Titel"
+
+#~ msgid "Note (optional)"
+#~ msgstr "Notiz (optional)"
+
+#~ msgid ""
+#~ "You can use markdown to format this field. See the <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
+#~ msgstr ""
+#~ "Dieses Feld Unterstützt Markdown Formatierung. Siehe <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">Dokumentation</"
+#~ "a>"
+
+#~ msgid "Serving Count"
+#~ msgstr "Anzahl Portionen"
+
+#~ msgid "Create only note"
+#~ msgstr "Nur Notiz erstellen"
+
+#~ msgid "Shopping list currently empty"
+#~ msgstr "Die Einkaufsliste ist aktuell leer"
+
+#~ msgid "Plan"
+#~ msgstr "Plan"
+
+#~ msgid "Number of Days"
+#~ msgstr "Anzahl an Tagen"
+
+#~ msgid "Weekday offset"
+#~ msgstr "Wochentage verschieben"
+
+#~ msgid ""
+#~ "Number of days starting from the first day of the week to offset the "
+#~ "default view."
+#~ msgstr ""
+#~ "Anzahl der Tage von ersten Tag der Woche, die der Plan standardmäßig "
+#~ "verschoben sein soll."
+
+#~ msgid "Edit plan types"
+#~ msgstr "Plantypen editieren"
+
+#~ msgid "Show help"
+#~ msgstr "Hilfe anzeigen"
+
+#~ msgid "Week iCal export"
+#~ msgstr "Woche als iCal exportieren"
+
+#~ msgid "Add to Shopping"
+#~ msgstr "Zur Einkaufsliste hinzufügen"
+
+#~ msgid "New meal type"
+#~ msgstr "Neue Mahlzeit"
+
+#~ msgid "Meal Plan Help"
+#~ msgstr "Plan-Hilfe"
+
+#~ msgid ""
+#~ "\n"
+#~ "                            <p>The meal plan module allows planning of "
+#~ "meals both with recipes and notes.</p>\n"
+#~ "                            <p>Simply select a recipe from the list of "
+#~ "recently viewed recipes or search the one you\n"
+#~ "                                want and drag it to the desired plan "
+#~ "position. You can also add a note and a title and\n"
+#~ "                                then drag the recipe to create a plan "
+#~ "entry with a custom title and note. Creating only\n"
+#~ "                                Notes is possible by dragging the create "
+#~ "note box into the plan.</p>\n"
+#~ "                            <p>Click on a recipe in order to open the "
+#~ "detailed view. There you can also add it to the\n"
+#~ "                                shopping list. You can also add all "
+#~ "recipes of a day to the shopping list by\n"
+#~ "                                clicking the shopping cart at the top of "
+#~ "the table.</p>\n"
+#~ "                            <p>Since a common use case is to plan meals "
+#~ "together you can define\n"
+#~ "                                users you want to share your plan with in "
+#~ "the settings.\n"
+#~ "                            </p>\n"
+#~ "                            <p>You can also edit the types of meals you "
+#~ "want to plan. If you share your plan with\n"
+#~ "                                someone with\n"
+#~ "                                different meals, their meal types will "
+#~ "appear in your list as well. To prevent\n"
+#~ "                                duplicates (e.g. Other and Misc.)\n"
+#~ "                                name your meal types the same as the "
+#~ "users you share your meals with and they will be\n"
+#~ "                                merged.</p>\n"
+#~ "                        "
+#~ msgstr ""
+#~ "\n"
+#~ "                            <p>Das Planmodul erlaubt das Planen mithilfe "
+#~ "von Rezepten und Notizen.</p>\n"
+#~ "                            <p>Einfach ein Rezept aussuchen und an die "
+#~ "Stelle im Plan ziehen, an der es gekocht werden soll. Es kann außerdem "
+#~ "eine Notiz und ein Titel hinzugefügt werden. Einen Eintrag nur als Notiz "
+#~ "zu erstellen ist durch Eingabe einer Notiz und Schieben des Notiz-Blocks "
+#~ "in den Plan möglich.</p>\n"
+#~ "                            <p>Durch Klicken auf ein Rezept öffnet sich "
+#~ "die Detailansicht. Da kann das Rezept auch auf die Einkaufsliste "
+#~ "hinzugefügt werden. Es können auch alle Rezepte eines Tages auf die "
+#~ "Einkaufsliste gesetzt werden, indem der Einkaufswagen im Tabellenkopf "
+#~ "angeklickt wird.</p>\n"
+#~ "                            <p>Da Pläne häufig für mehrere Nutzer "
+#~ "erstellt werden, können Nutzer in den Einstellungen angegeben werden, mit "
+#~ "denen neue Pläne automatisch geteilt werden sollen.\n"
+#~ "                            </p>\n"
+#~ "                            <p>Die Mahlzeiten, die geplant werden sollen, "
+#~ "können bearbeitet werden. Wenn Pläne zwischen Nutzern mit "
+#~ "unterschiedlichen Mahlzeiten geteilt werden, erscheinen alle Mahlzeiten. "
+#~ "Um Duplikate zu vermeiden (z.B. Mittagessen und Mittag) sollten "
+#~ "Mahlzeiten teilender Nutzer gleich benannt werden, dadurch kann das "
+#~ "System sie zusammenfassen.</p>\n"
+#~ "                        "
+
+#~ msgid "Units merged!"
+#~ msgstr "Einheiten zusammengeführt!"
+
+#~ msgid "Foods merged!"
+#~ msgstr "Zutaten zusammengeführt!"
+
 #~ msgid "Utensils"
 #~ msgstr "Utensilien"
 
diff --git a/cookbook/locale/en/LC_MESSAGES/django.mo b/cookbook/locale/en/LC_MESSAGES/django.mo
index 4855a0f561313a546fde88de85e293d5134a3291..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845 100644
GIT binary patch
delta 15
WcmZ3={D*0R3Zv6R)xeGO*%$#Ukp%nz

delta 54
zcmeyvw3K;*3S;&})j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?<Ui~z^i4%h$y

diff --git a/cookbook/locale/en/LC_MESSAGES/django.po b/cookbook/locale/en/LC_MESSAGES/django.po
index 2f5d77e68..444dc9073 100644
--- a/cookbook/locale/en/LC_MESSAGES/django.po
+++ b/cookbook/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,45 +21,49 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr ""
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
 msgstr ""
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr ""
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr ""
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -67,215 +71,189 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr ""
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr ""
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr ""
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr ""
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr ""
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr ""
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr ""
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr ""
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr ""
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr ""
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr ""
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr ""
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr ""
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr ""
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr ""
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr ""
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr ""
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 msgid "Search Method"
 msgstr ""
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr ""
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 msgid "Fuzzy Search"
 msgstr ""
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 msgid "Full Text"
 msgstr ""
 
@@ -286,7 +264,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr ""
 
@@ -296,9 +274,9 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr ""
 
@@ -313,36 +291,36 @@ msgstr ""
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, python-format
 msgid "Imported %s recipes."
 msgstr ""
@@ -361,8 +339,8 @@ msgstr ""
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr ""
 
@@ -416,102 +394,112 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr ""
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr ""
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr ""
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr ""
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr ""
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr ""
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "File"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr ""
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+msgid "Food Alias"
+msgstr ""
+
+#: .\cookbook\models.py:912
+msgid "Unit Alias"
+msgstr ""
+
+#: .\cookbook\models.py:912
+msgid "Keyword Alias"
+msgstr ""
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr ""
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr ""
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr ""
@@ -540,7 +528,7 @@ msgstr ""
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -575,6 +563,7 @@ msgid "Re-send Verification"
 msgstr ""
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr ""
@@ -616,7 +605,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr ""
 
@@ -628,7 +617,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr ""
 
@@ -676,12 +665,16 @@ msgstr ""
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 msgid "Password"
 msgstr ""
 
@@ -712,6 +705,28 @@ msgid ""
 "within a few minutes."
 msgstr ""
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+msgid "Bad Token"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+msgid "change password"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -763,7 +778,7 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr ""
@@ -784,65 +799,88 @@ msgid "Units"
 msgstr ""
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
 #: .\cookbook\templates\base.html:163
+msgid "Supermarket Category"
+msgstr ""
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+msgid "Automations"
+msgstr ""
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+msgid "Files"
+msgstr ""
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr ""
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr ""
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr ""
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr ""
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:259
+#: .\cookbook\templates\generic\list_template.html:14
+#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
+msgid "External Recipes"
+msgstr ""
+
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:214
+#: .\cookbook\templates\base.html:269
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:218
+#: .\cookbook\templates\base.html:273
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:220
+#: .\cookbook\templates\base.html:275
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:224
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:227
+#: .\cookbook\templates\base.html:284
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
-#: .\cookbook\templates\generic\list_template.html:14
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr ""
@@ -908,16 +946,6 @@ msgstr ""
 msgid "Export Recipes"
 msgstr ""
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr ""
-
-#: .\cookbook\templates\files.html:7
-msgid "Files"
-msgstr ""
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -927,11 +955,10 @@ msgstr ""
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr ""
 
@@ -967,12 +994,20 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1033,9 +1068,6 @@ msgstr ""
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr ""
 
@@ -1080,8 +1112,8 @@ msgstr ""
 msgid "Last viewed"
 msgstr ""
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr ""
 
@@ -1224,152 +1256,19 @@ msgstr ""
 msgid "Cell"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr ""
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1475,24 +1374,24 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr ""
 
@@ -1510,7 +1409,7 @@ msgstr ""
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 msgid "Search Settings"
 msgstr ""
 
@@ -1665,67 +1564,119 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 msgid "Search-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr ""
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr ""
@@ -1743,64 +1694,78 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:34
+msgid "Try the new shopping list"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr ""
 
@@ -2051,138 +2016,142 @@ msgstr ""
 msgid "Enter website URL"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 msgid "Preview Recipe Data"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 msgid "Prep Time"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 msgid "Cook Time"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 msgid "Discovered Attributes"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 msgid "Show Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 msgid "Delete Text"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 msgid "Delete image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr ""
+
+#: .\cookbook\templates\url_import.html:585
 msgid "Add Keyword"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2193,15 +2162,15 @@ msgid ""
 "                                    github issues."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr ""
 
@@ -2214,8 +2183,7 @@ msgstr ""
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr ""
 
@@ -2228,125 +2196,124 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr ""
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr ""
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr ""
 
@@ -2366,27 +2333,19 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr ""
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
@@ -2414,6 +2373,10 @@ msgstr ""
 msgid "Shopping Categories"
 msgstr ""
 
+#: .\cookbook\views\lists.py:232
+msgid "New Shopping List"
+msgstr ""
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
@@ -2422,120 +2385,120 @@ msgstr ""
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
 msgstr ""
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
 "on how to reset passwords."
 msgstr ""
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
diff --git a/cookbook/locale/es/LC_MESSAGES/django.mo b/cookbook/locale/es/LC_MESSAGES/django.mo
index ff1023d1b3e9c77f8f027d56cc4598496f829270..18e2bb53471580729871408784a55111f89db664 100644
GIT binary patch
delta 6141
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

delta 10611
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

diff --git a/cookbook/locale/es/LC_MESSAGES/django.po b/cookbook/locale/es/LC_MESSAGES/django.po
index 560eb104b..0e96a20c6 100644
--- a/cookbook/locale/es/LC_MESSAGES/django.po
+++ b/cookbook/locale/es/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2020-06-02 19:28+0000\n"
 "Last-Translator: Miguel Canteras <mcanteras@gmail.com>, 2021\n"
 "Language-Team: Spanish (https://www.transifex.com/django-recipes/"
@@ -28,11 +28,11 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Ingredientes"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -40,13 +40,13 @@ msgstr ""
 "Color de la barra de navegación superior. No todos los colores funcionan con "
 "todos los temas, ¡pruébalos!"
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 "Unidad predeterminada que se utilizará al insertar un nuevo ingrediente en "
 "una receta."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -54,7 +54,11 @@ msgstr ""
 "Permite utilizar fracciones en cantidades de ingredientes (e.g. convierte "
 "los decimales en fracciones automáticamente)"
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -62,19 +66,19 @@ msgstr ""
 "Usuarios con los que las entradas recién creadas del plan de comida/lista de "
 "la compra deben compartirse de forma predeterminada."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "Muestra recetas vistas recientemente en la página de búsqueda."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "Número de decimales para redondear los ingredientes."
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr "Si desea poder crear y ver comentarios debajo de las recetas."
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -88,11 +92,11 @@ msgstr ""
 "valor establecido es inferior al límite de la instancia, este se "
 "restablecerá al guardar."
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr "Hace la barra de navegación fija en la parte superior de la página."
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -104,92 +108,60 @@ msgstr ""
 " \n"
 " "
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "Nombre"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "Tiempo de preparación en minutos"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Tiempo de espera (cocinar/hornear) en minutos"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "Ruta"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "UID de almacenamiento"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr "Por defecto"
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "Nueva Unidad"
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr "Nueva unidad que reemplaza a la anterior."
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "Antigua unidad"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr "Unidad que se va a reemplazar."
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "Nuevo Alimento"
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr "Nuevo alimento que remplaza al anterior."
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "Antiguo alimento"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr "Alimento que se va a reemplazar."
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "Añada su comentario:"
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 "Déjelo vacío para Dropbox e ingrese la contraseña de la aplicación para "
 "nextcloud."
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 "Déjelo en blanco para nextcloud e ingrese el token de api para dropbox."
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -197,25 +169,25 @@ msgstr ""
 "Dejar vació para Dropbox e introducir sólo la URL base para Nextcloud "
 "(<code>/remote.php/webdav/</code> se añade automáticamente)"
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr "Cadena de búsqueda"
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "ID de Fichero"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr "Debe proporcionar al menos una receta o un título."
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 "Puede enumerar los usuarios predeterminados con los que compartir recetas en "
 "la configuración."
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -223,99 +195,105 @@ msgstr ""
 "Puede utilizar Markdown para formatear este campo. Vea la <a href=\"/docs/"
 "markdown/\">documentación aqui</a>"
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr ""
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 #, fuzzy
 #| msgid "Search"
 msgid "Search Method"
 msgstr "Buscar"
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr ""
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 #, fuzzy
 #| msgid "Search"
 msgid "Fuzzy Search"
 msgstr "Buscar"
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 #, fuzzy
 #| msgid "Text"
 msgid "Full Text"
@@ -328,7 +306,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "¡No ha iniciado sesión y por lo tanto no puede ver esta página!"
 
@@ -338,9 +316,9 @@ msgstr "¡No ha iniciado sesión y por lo tanto no puede ver esta página!"
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr "¡No tienes los permisos necesarios para ver esta página!"
 
@@ -355,20 +333,20 @@ msgstr "¡No puede interactuar con este objeto ya que no es de tu propiedad!"
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importar"
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
@@ -376,17 +354,17 @@ msgstr ""
 "El importador esperaba un fichero.zip. ¿Has escogido el tipo de importador "
 "correcto para tus datos?"
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, fuzzy, python-format
 #| msgid "Imported new recipe!"
 msgid "Imported %s recipes."
@@ -410,8 +388,8 @@ msgstr ""
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr "Raciones"
 
@@ -465,104 +443,120 @@ msgstr "Cena"
 msgid "Other"
 msgstr "Otro"
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr "Buscar"
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr "Régimen de comidas"
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Libros"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr "Pequeño"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr "Grande"
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr "Nuevo"
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "Texto"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr "Tiempo"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "ID de Fichero"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Receta"
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Food"
+msgid "Food Alias"
+msgstr "Comida"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Units"
+msgid "Unit Alias"
+msgstr "Unidades"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "Palabras clave"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr ""
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr "Editar"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr "Eliminar"
@@ -591,7 +585,7 @@ msgstr ""
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -628,6 +622,7 @@ msgid "Re-send Verification"
 msgstr ""
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr "Eliminar"
@@ -671,7 +666,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -683,7 +678,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr "Iniciar sesión"
 
@@ -734,6 +729,10 @@ msgstr "¿Seguro que quieres salir?"
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 #, fuzzy
 #| msgid "Changes saved!"
 msgid "Change Password"
@@ -741,7 +740,7 @@ msgstr "¡Cambios guardados!"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 #, fuzzy
 #| msgid "Password Reset"
 msgid "Password"
@@ -776,6 +775,32 @@ msgid ""
 "within a few minutes."
 msgstr ""
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#, fuzzy
+#| msgid "API Token"
+msgid "Bad Token"
+msgstr "Token API"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+#, fuzzy
+#| msgid "Changes saved!"
+msgid "change password"
+msgstr "¡Cambios guardados!"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -831,7 +856,7 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentación de API"
@@ -852,67 +877,96 @@ msgid "Units"
 msgstr "Unidades"
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #: .\cookbook\templates\base.html:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarket Category"
+msgstr "Supermercado"
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+#, fuzzy
+#| msgid "Information"
+msgid "Automations"
+msgstr "Información"
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+#, fuzzy
+#| msgid "File ID"
+msgid "Files"
+msgstr "ID de Fichero"
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr "Edición Masiva"
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Historial"
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr "Exportar"
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr "Importar receta"
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr "Crear"
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:259
+#: .\cookbook\templates\generic\list_template.html:14
+#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
+msgid "External Recipes"
+msgstr "Recetas Externas"
+
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 #, fuzzy
 #| msgid "Settings"
 msgid "Space Settings"
 msgstr "Opciones"
 
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Sistema"
 
-#: .\cookbook\templates\base.html:214
+#: .\cookbook\templates\base.html:269
 msgid "Admin"
 msgstr "Administrador"
 
-#: .\cookbook\templates\base.html:218
+#: .\cookbook\templates\base.html:273
 msgid "Markdown Guide"
 msgstr "Guia Markdown"
 
-#: .\cookbook\templates\base.html:220
+#: .\cookbook\templates\base.html:275
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:224
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
 msgid "API Browser"
 msgstr "Explorador de API"
 
-#: .\cookbook\templates\base.html:227
+#: .\cookbook\templates\base.html:284
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
-#: .\cookbook\templates\generic\list_template.html:14
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Recetas Externas"
-
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Edición masiva de Categorías"
@@ -988,18 +1042,6 @@ msgstr "Libros de recetas"
 msgid "Export Recipes"
 msgstr "Exportar recetas"
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr "Exportar"
-
-#: .\cookbook\templates\files.html:7
-#, fuzzy
-#| msgid "File ID"
-msgid "Files"
-msgstr "ID de Fichero"
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -1009,11 +1051,10 @@ msgstr "Importar nueva receta"
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr "Guardar"
 
@@ -1056,12 +1097,20 @@ msgstr "Combinar"
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "¿Estás seguro de que quieres combinar estos dos ingredientes?"
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr "¿Estás seguro de que quieres borrar el %(title)s: <b>%(object)s</b>?"
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1122,9 +1171,6 @@ msgstr "Calificación"
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1178,8 +1224,8 @@ msgstr "Restablecer búsqueda"
 msgid "Last viewed"
 msgstr "Visto por última vez"
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr "Recetas"
 
@@ -1340,189 +1386,19 @@ msgstr "Cabecera"
 msgid "Cell"
 msgstr "Celda"
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
-msgstr "Nueva entrada"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
+msgstr "Vista de menú"
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr "Buscar Receta"
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr "Titulo"
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr "Nota (opcional)"
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-"Puedes utilizar Markdown para dar formato a este campo. Consulta la <a href="
-"\"/docs/markdown/\" target=\"_blank\" rel=\"noopener noreferrer"
-"\">documentación aquí</a>"
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr "Número de raciones"
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr "Crear sólo una nota"
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr "Lista de la Compra"
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr "Lista de la compra vacía"
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr "Abrir Lista de la Compra"
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr "Menú"
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr "Número de Días"
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr "Compensar día inicial"
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-"Número de días a partir del primer día de la semana para compensar la vista "
-"por defecto."
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr "Modificar el tipo de menú"
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr "Mostrar Ayuda"
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr "Exportar a iCal"
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Nota"
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr "Creado por"
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr "Compartido con"
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr "Añadir para comprar"
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr "Nuevo tipo de comida"
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr "Ayuda del menú"
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-"\n"
-"                            <p>El módulo de menú permite planificar las "
-"comidas con recetas o con notas.</p>\n"
-"                            <p>Simplemente selecciona una receta de la lista "
-"de recetas vistas recientemente o busca la que\n"
-"                                quieras y arrastrala a la posición deseada "
-"del menú. También puede añadir una nota y un título y\n"
-"                                luego arrastrar la receta para crear una "
-"entrada del plan con un título y una nota personalizados. Es posible crear\n"
-"                                solamente notas arrastrando el cuadro de "
-"creación de notas al menú.</p>\n"
-"                            <p>Haga clic en una receta para abrir la vista "
-"detallada. Desde aquí también puedes añadirla a la\n"
-"                                lista de la compra. También puedes añadir "
-"todas las recetas de un día a la lista de la compra\n"
-"                                haciendo clic en el carrito de la compra en "
-"la parte superior de la tabla.</p>\n"
-"                            <p>Ya que un caso de uso común es planificar las "
-"comidas juntos, en los ajustes\n"
-"                                puedes definir los usuarios con los que "
-"quieres compartir el menú.\n"
-"                            </p>\n"
-"                            <p>También puedes editar los tipos de comidas "
-"del menú. Si compartes tu menú con\n"
-"                                alguien con\n"
-"                                diferentes tipos de comidas, sus tipos de "
-"comida aparecerán también en tu listado. Para prevenir\n"
-"                                duplicados (p. ej. Otros y Misc.)\n"
-"                                nombra los tipos de comida igual que el "
-"resto de usuarios con los que compartes tus comidas y serán\n"
-"                                combinados.</p>\n"
-"                        "
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr "Vista de menú"
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1643,24 +1519,24 @@ msgstr "Comentarios"
 msgid "by"
 msgstr "por"
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Comentario"
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr "Imagen de la receta"
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr "Tiempo de preparación ca."
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr "Tiempo de espera ca."
 
@@ -1678,7 +1554,7 @@ msgstr "Página de inicio"
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 #, fuzzy
 #| msgid "Search String"
 msgid "Search Settings"
@@ -1841,64 +1717,64 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr "Cuenta"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 #, fuzzy
 #| msgid "Settings"
 msgid "API-Settings"
 msgstr "Opciones"
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 #, fuzzy
 #| msgid "Search String"
 msgid "Search-Settings"
 msgstr "Cadena de búsqueda"
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 #, fuzzy
 #| msgid "Settings"
 msgid "Name Settings"
 msgstr "Opciones"
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 #, fuzzy
 #| msgid "Account Connections"
 msgid "Account Settings"
 msgstr "Conexiones de la cuenta"
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 #, fuzzy
 #| msgid "Settings"
 msgid "Emails"
 msgstr "Opciones"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 #, fuzzy
 #| msgid "Social Login"
 msgid "Social"
 msgstr "Inicio de sesión social"
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr "Idioma"
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr "Estilo"
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr "Token API"
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1906,7 +1782,7 @@ msgstr ""
 "Puedes utilizar tanto la autenticación básica como la autenticación basada "
 "en tokens para acceder a la API REST."
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1914,10 +1790,62 @@ msgstr ""
 "Utilice el token como cabecera de autorización usando como prefijo la "
 "palabra token, tal y como se muestra en los siguientes ejemplos:"
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr "o"
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr "Configuración del libro de recetas"
@@ -1937,64 +1865,80 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr "Crear cuenta de Superusuario"
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr "Lista de la Compra"
+
+#: .\cookbook\templates\shopping_list.html:34
+#, fuzzy
+#| msgid "Open Shopping List"
+msgid "Try the new shopping list"
+msgstr "Abrir Lista de la Compra"
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr "Buscar Receta"
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr "Recetas en el carro de la compra"
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr "No hay recetas seleccionadas"
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr "Modo de entrada"
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr "Añadir entrada"
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr "Cantidad"
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr "Seleccionar unidad"
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr "Seleccionar"
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr "Seleccionar Alimento"
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr "Seleccionar supermercado"
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr "Seleccionar Usuario"
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr "Completada"
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr "Estás desconectado, la lista de la compra no se sincronizará."
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr "Copiar/Exportar"
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr "Prefijo de la lista"
 
@@ -2300,156 +2244,160 @@ msgstr "¡Marcador guardado!"
 msgid "Enter website URL"
 msgstr "Introduce la URL del sitio web"
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 #, fuzzy
 #| msgid "View Recipe"
 msgid "Preview Recipe Data"
 msgstr "Ver la receta"
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr "Descripción"
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 #, fuzzy
 #| msgid "Preparation Time"
 msgid "Prep Time"
 msgstr "Tiempo de Preparación"
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 #, fuzzy
 #| msgid "Time"
 msgid "Cook Time"
 msgstr "Tiempo"
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr "Instrucciones"
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 #, fuzzy
 #| msgid "Discovered Recipes"
 msgid "Discovered Attributes"
 msgstr "Recetas Descubiertas"
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 #, fuzzy
 #| msgid "Show as header"
 msgid "Show Blank Field"
 msgstr "Mostrar como encabezado"
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 #, fuzzy
 #| msgid "Delete Step"
 msgid "Delete Text"
 msgstr "Eliminar paso"
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 #, fuzzy
 #| msgid "Delete Recipe"
 msgid "Delete image"
 msgstr "Eliminar receta"
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr "Nombre de la Receta"
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 #, fuzzy
 #| msgid "Description"
 msgid "Recipe Description"
 msgstr "Descripción"
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr "Seleccione uno"
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr "Nota"
+
+#: .\cookbook\templates\url_import.html:585
 #, fuzzy
 #| msgid "All Keywords"
 msgid "Add Keyword"
 msgstr "Todas las palabras clave."
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr "Todas las palabras clave."
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr "Importar todas las palabras clave, no solo las ya existentes."
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr "Información"
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2468,15 +2416,15 @@ msgstr ""
 "no dudes en poner un ejemplo en las\n"
 "                                    propuestas de GitHub."
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr "Información de Google ld+json"
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr "Propuestas de GitHub"
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr "Especificación de anotaciones de la receta"
 
@@ -2491,8 +2439,7 @@ msgstr "Parámetro filter_list formateado incorrectamente"
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr "¡No se puede unir con el mismo objeto!"
 
@@ -2507,71 +2454,71 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr "¡No se puede unir con el mismo objeto!"
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr "¡Esta funcionalidad no está disponible en la versión demo!"
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr "¡Sincronización exitosa!"
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr "Error de sincronización con el almacenamiento"
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 "El sitio solicitado proporcionó datos con formato incorrecto y no se puede "
 "leer."
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr "La página solicitada no pudo ser encontrada."
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2579,61 +2526,60 @@ msgstr ""
 "El sitio solicitado no proporciona ningún formato de datos reconocido para "
 "importar la receta."
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 #, fuzzy
 #| msgid "The requested page could not be found."
 msgid "No useable data could be found."
 msgstr "La página solicitada no pudo ser encontrada."
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr ""
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
 msgstr[0] "Edición por lotes realizada. %(count)d Receta fue actualizada."
 msgstr[1] "Edición masiva realizada. %(count)d Recetas fueron actualizadas."
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr "Monitor"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Backend de Almacenamiento"
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 "No se pudo borrar este backend de almacenamiento ya que se utiliza en al "
 "menos un monitor."
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr "Libro de recetas"
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr "Enlace de invitación"
 
@@ -2653,27 +2599,19 @@ msgstr "¡Hubo un error al actualizar este backend de almacenamiento!"
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr "¡Cambios guardados!"
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr "¡Error al guardar los cambios!"
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr "¡Unidades fusionadas!"
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr "¡Alimentos fusionados!"
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr "La importación no está implementada para este proveedor"
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr "La exportación no está implementada para este proveedor"
 
@@ -2707,6 +2645,12 @@ msgstr "Supermercado"
 msgid "Shopping Categories"
 msgstr "Recetas en el carro de la compra"
 
+#: .\cookbook\views\lists.py:232
+#, fuzzy
+#| msgid "Shopping List"
+msgid "New Shopping List"
+msgstr "Lista de la Compra"
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "¡Nueva receta importada!"
@@ -2715,83 +2659,83 @@ msgstr "¡Nueva receta importada!"
 msgid "There was an error importing this recipe!"
 msgstr "¡Hubo un error al importar esta receta!"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
 msgstr ""
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr "¡No tienes los permisos necesarios para realizar esta acción!"
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr "¡Comentario guardado!"
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
@@ -2801,44 +2745,202 @@ msgstr ""
 "usuario. Si has olvidado tus credenciales de superusuario, por favor "
 "consulta la documentación de django sobre cómo restablecer las contraseñas."
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr "¡Las contraseñas no coinciden!"
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr "El usuario ha sido creado, ¡inicie sesión!"
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr "¡Se proporcionó un enlace de invitación con formato incorrecto!"
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 #, fuzzy
 #| msgid "You are not logged in and therefore cannot view this page!"
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr "¡No ha iniciado sesión y por lo tanto no puede ver esta página!"
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr "¡El enlace de invitación no es válido o ya se ha utilizado!"
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "New Unit"
+#~ msgstr "Nueva Unidad"
+
+#~ msgid "New unit that other gets replaced by."
+#~ msgstr "Nueva unidad que reemplaza a la anterior."
+
+#~ msgid "Old Unit"
+#~ msgstr "Antigua unidad"
+
+#~ msgid "Unit that should be replaced."
+#~ msgstr "Unidad que se va a reemplazar."
+
+#~ msgid "New Food"
+#~ msgstr "Nuevo Alimento"
+
+#~ msgid "New food that other gets replaced by."
+#~ msgstr "Nuevo alimento que remplaza al anterior."
+
+#~ msgid "Old Food"
+#~ msgstr "Antiguo alimento"
+
+#~ msgid "Food that should be replaced."
+#~ msgstr "Alimento que se va a reemplazar."
+
+#~ msgid "New Entry"
+#~ msgstr "Nueva entrada"
+
+#~ msgid "Title"
+#~ msgstr "Titulo"
+
+#~ msgid "Note (optional)"
+#~ msgstr "Nota (opcional)"
+
+#~ msgid ""
+#~ "You can use markdown to format this field. See the <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
+#~ msgstr ""
+#~ "Puedes utilizar Markdown para dar formato a este campo. Consulta la <a "
+#~ "href=\"/docs/markdown/\" target=\"_blank\" rel=\"noopener noreferrer"
+#~ "\">documentación aquí</a>"
+
+#~ msgid "Serving Count"
+#~ msgstr "Número de raciones"
+
+#~ msgid "Create only note"
+#~ msgstr "Crear sólo una nota"
+
+#~ msgid "Shopping list currently empty"
+#~ msgstr "Lista de la compra vacía"
+
+#~ msgid "Plan"
+#~ msgstr "Menú"
+
+#~ msgid "Number of Days"
+#~ msgstr "Número de Días"
+
+#~ msgid "Weekday offset"
+#~ msgstr "Compensar día inicial"
+
+#~ msgid ""
+#~ "Number of days starting from the first day of the week to offset the "
+#~ "default view."
+#~ msgstr ""
+#~ "Número de días a partir del primer día de la semana para compensar la "
+#~ "vista por defecto."
+
+#~ msgid "Edit plan types"
+#~ msgstr "Modificar el tipo de menú"
+
+#~ msgid "Show help"
+#~ msgstr "Mostrar Ayuda"
+
+#~ msgid "Week iCal export"
+#~ msgstr "Exportar a iCal"
+
+#~ msgid "Add to Shopping"
+#~ msgstr "Añadir para comprar"
+
+#~ msgid "New meal type"
+#~ msgstr "Nuevo tipo de comida"
+
+#~ msgid "Meal Plan Help"
+#~ msgstr "Ayuda del menú"
+
+#~ msgid ""
+#~ "\n"
+#~ "                            <p>The meal plan module allows planning of "
+#~ "meals both with recipes and notes.</p>\n"
+#~ "                            <p>Simply select a recipe from the list of "
+#~ "recently viewed recipes or search the one you\n"
+#~ "                                want and drag it to the desired plan "
+#~ "position. You can also add a note and a title and\n"
+#~ "                                then drag the recipe to create a plan "
+#~ "entry with a custom title and note. Creating only\n"
+#~ "                                Notes is possible by dragging the create "
+#~ "note box into the plan.</p>\n"
+#~ "                            <p>Click on a recipe in order to open the "
+#~ "detailed view. There you can also add it to the\n"
+#~ "                                shopping list. You can also add all "
+#~ "recipes of a day to the shopping list by\n"
+#~ "                                clicking the shopping cart at the top of "
+#~ "the table.</p>\n"
+#~ "                            <p>Since a common use case is to plan meals "
+#~ "together you can define\n"
+#~ "                                users you want to share your plan with in "
+#~ "the settings.\n"
+#~ "                            </p>\n"
+#~ "                            <p>You can also edit the types of meals you "
+#~ "want to plan. If you share your plan with\n"
+#~ "                                someone with\n"
+#~ "                                different meals, their meal types will "
+#~ "appear in your list as well. To prevent\n"
+#~ "                                duplicates (e.g. Other and Misc.)\n"
+#~ "                                name your meal types the same as the "
+#~ "users you share your meals with and they will be\n"
+#~ "                                merged.</p>\n"
+#~ "                        "
+#~ msgstr ""
+#~ "\n"
+#~ "                            <p>El módulo de menú permite planificar las "
+#~ "comidas con recetas o con notas.</p>\n"
+#~ "                            <p>Simplemente selecciona una receta de la "
+#~ "lista de recetas vistas recientemente o busca la que\n"
+#~ "                                quieras y arrastrala a la posición "
+#~ "deseada del menú. También puede añadir una nota y un título y\n"
+#~ "                                luego arrastrar la receta para crear una "
+#~ "entrada del plan con un título y una nota personalizados. Es posible "
+#~ "crear\n"
+#~ "                                solamente notas arrastrando el cuadro de "
+#~ "creación de notas al menú.</p>\n"
+#~ "                            <p>Haga clic en una receta para abrir la "
+#~ "vista detallada. Desde aquí también puedes añadirla a la\n"
+#~ "                                lista de la compra. También puedes añadir "
+#~ "todas las recetas de un día a la lista de la compra\n"
+#~ "                                haciendo clic en el carrito de la compra "
+#~ "en la parte superior de la tabla.</p>\n"
+#~ "                            <p>Ya que un caso de uso común es planificar "
+#~ "las comidas juntos, en los ajustes\n"
+#~ "                                puedes definir los usuarios con los que "
+#~ "quieres compartir el menú.\n"
+#~ "                            </p>\n"
+#~ "                            <p>También puedes editar los tipos de comidas "
+#~ "del menú. Si compartes tu menú con\n"
+#~ "                                alguien con\n"
+#~ "                                diferentes tipos de comidas, sus tipos de "
+#~ "comida aparecerán también en tu listado. Para prevenir\n"
+#~ "                                duplicados (p. ej. Otros y Misc.)\n"
+#~ "                                nombra los tipos de comida igual que el "
+#~ "resto de usuarios con los que compartes tus comidas y serán\n"
+#~ "                                combinados.</p>\n"
+#~ "                        "
+
+#~ msgid "Units merged!"
+#~ msgstr "¡Unidades fusionadas!"
+
+#~ msgid "Foods merged!"
+#~ msgstr "¡Alimentos fusionados!"
+
 #~ msgid "Utensils"
 #~ msgstr "Utensilios"
 
diff --git a/cookbook/locale/fr/LC_MESSAGES/django.mo b/cookbook/locale/fr/LC_MESSAGES/django.mo
index 963e5c42e0a9556c2aacd2e87e2dab5325760902..1bd956b4b7c2c690da30e06cb195c70896bba059 100644
GIT binary patch
delta 9289
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
b(4d^m!Xw)YybX4}L_d4B`*~Y?_XYe9x9!3C

delta 13397
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

diff --git a/cookbook/locale/fr/LC_MESSAGES/django.po b/cookbook/locale/fr/LC_MESSAGES/django.po
index d1f23c5f0..0649eddf4 100644
--- a/cookbook/locale/fr/LC_MESSAGES/django.po
+++ b/cookbook/locale/fr/LC_MESSAGES/django.po
@@ -13,11 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2021-11-04 09:06+0000\n"
 "Last-Translator: FrenchAnon <qdskyhwfeu@email.ucms.edu.pk>\n"
-"Language-Team: French <http://translate.tandoor.dev/projects/tandoor/"
-"recipes-backend/fr/>\n"
+"Language-Team: French <http://translate.tandoor.dev/projects/tandoor/recipes-"
+"backend/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Ingrédients"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -40,13 +40,13 @@ msgstr ""
 "La couleur de la barre de navigation du haut. Toutes les couleurs ne "
 "marchent pas avec tous les thèmes, essayez-les !"
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 "L'unité par défaut utilisée lors de l'ajout d'un nouvel ingrédient dans une "
 "recette."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -54,7 +54,11 @@ msgstr ""
 "Autorise l'usage des fractions dans les quantités des ingrédients (convertit "
 "les décimales en fractions automatiquement)"
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -62,21 +66,21 @@ msgstr ""
 "Utilisateurs avec lesquels les listes de courses et plans de repas "
 "nouvellement créés seront partagés par défaut."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "Afficher les recettes récemment consultées sur la page de recherche."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "Nombre de décimales pour arrondir les ingrédients."
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 "Si vous souhaitez pouvoir créer et consulter des commentaires en-dessous des "
 "recettes."
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -90,11 +94,11 @@ msgstr ""
 "données mobiles. Si la valeur est plus petite que les limites de l'instance, "
 "le paramètre sera réinitialisé."
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr "Épingler la barre de navigation en haut de la page."
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -102,39 +106,39 @@ msgstr ""
 "Les deux champs sont facultatifs. Si aucun n'est rempli, le nom "
 "d'utilisateur sera affiché à la place"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "Nom"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "Le temps de préparation en minutes"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Temps d'attente (pose/cuisson) en minutes"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "Chemin"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "UID de stockage"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr "Par défaut"
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
@@ -142,54 +146,22 @@ msgstr ""
 "Pour éviter les doublons, les recettes de même nom seront ignorées. Cocher "
 "cette case pour tout importer."
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "Nouvelle unité"
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr "La nouvelle unité qui remplacera l'autre."
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "Ancienne unité"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr "L'unité qui doit être remplacée."
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "Nouvel aliment"
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr "Nouvel aliment qui remplace les autres."
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "Ancien aliment"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr "Aliment qui devrait être remplacé."
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "Ajoutez votre commentaire : "
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 "Laissez vide pour Dropbox et renseigner votre mot de passe d'application "
 "pour Nextcloud."
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 "Laissez vide pour Nextcloud et renseignez vote jeton d'API pour Dropbox."
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -197,25 +169,25 @@ msgstr ""
 "Laisser vide pour Dropbox et saisissez seulement l'URL de base pour "
 "Nextcloud (<code>/remote.php/webdav/</code> est ajouté automatiquement)"
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr "Texte recherché"
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "ID du fichier"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr "Vous devez au moins fournir une recette ou un titre."
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 "Vous pouvez lister les utilisateurs par défaut avec qui partager des "
 "recettes dans les paramètres."
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -223,15 +195,15 @@ msgstr ""
 "Vous pouvez utiliser du markdown pour mettre en forme ce champ. Voir la <a "
 "href=\"/docs/markdown/\">documentation ici</a>"
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr "Nombre maximum d'utilisateurs atteint pour ce groupe."
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr "Adresse mail déjà utilisée !"
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
@@ -239,85 +211,91 @@ msgstr ""
 "Une adresse mail n'est pas requise mais le lien d'invitation sera envoyé à "
 "l'utilisateur si elle est présente."
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr "Nom déjà pris."
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr "Accepter les conditions d'utilisation"
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 #, fuzzy
 #| msgid "Search"
 msgid "Search Method"
 msgstr "Rechercher"
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr "correspondance partielle"
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr "Commence par"
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 #, fuzzy
 #| msgid "Search"
 msgid "Fuzzy Search"
 msgstr "Rechercher"
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 #, fuzzy
 #| msgid "Text"
 msgid "Full Text"
@@ -332,7 +310,7 @@ msgstr ""
 "minutes et réessayez."
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "Vous n'êtes pas connecté et ne pouvez donc pas afficher cette page !"
 
@@ -342,9 +320,9 @@ msgstr "Vous n'êtes pas connecté et ne pouvez donc pas afficher cette page !"
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr "Vous n'avez pas les droits suffisants pour afficher cette page !"
 
@@ -361,20 +339,20 @@ msgstr ""
 msgid "Could not parse template code."
 msgstr "Le code du modèle n'a pas pu être analysé."
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importer"
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
@@ -382,7 +360,7 @@ msgstr ""
 "Un fichier .zip était attendu à l'importation. Avez-vous choisi le bon "
 "format pour vos données ?"
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
@@ -390,11 +368,11 @@ msgstr ""
 "Une erreur imprévue est survenue durant l'importation. Vérifiez que vous "
 "avez téléverser un fichier valide."
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr "Les recettes suivantes ont été ignorées car elles existaient déjà :"
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, python-format
 msgid "Imported %s recipes."
 msgstr "%s recettes importées."
@@ -413,8 +391,8 @@ msgstr "Source"
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr "Portions"
 
@@ -468,7 +446,7 @@ msgstr "Dîner"
 msgid "Other"
 msgstr "Autre"
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
@@ -476,96 +454,112 @@ msgstr ""
 "Le stockage maximal de fichiers pour ce groupe en Mo. Mettre 0 pour ne pas "
 "avoir de limite et -1 pour empêcher le téléversement de fichiers."
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr "Rechercher"
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr "Menu de la semaine"
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Livres"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr "Petit"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr "Grand"
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr "Nouveau/Nouvelle"
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "Texte"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr "Temps"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "File"
 msgstr "Fichier"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Recette"
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Food"
+msgid "Food Alias"
+msgstr "Aliment"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Units"
+msgid "Unit Alias"
+msgstr "Unités"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "Mots-clés"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr "Le téléversement de fichiers n'est pas autorisé pour ce groupe."
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr "Vous avez atteint votre limite de téléversement de fichiers."
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr "Modifier"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr "Supprimer"
@@ -594,7 +588,7 @@ msgstr "Adresses mail"
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -629,6 +623,7 @@ msgid "Re-send Verification"
 msgstr "Renvoyer le mail de vérification"
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr "Supprimer"
@@ -674,7 +669,7 @@ msgstr ""
 "l'utilisateur %(user_display)s."
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -688,7 +683,7 @@ msgstr ""
 "Ce lien de confirmation par mail est expiré ou invalide. Veuillez <a href="
 "\"%(email_url)s\">demander une nouvelle vérification par mail</a>."
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr "Connexion"
 
@@ -736,12 +731,16 @@ msgstr "Êtes-vous sûr de vouloir vous déconnecter ?"
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr "Modifier le mot de passe"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -777,6 +776,32 @@ msgstr ""
 "Un email a été envoyé. Contactez-nous si vous ne le recevez pas dans les "
 "minutes à suivre."
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#, fuzzy
+#| msgid "API Token"
+msgid "Bad Token"
+msgstr "Jeton API"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+#, fuzzy
+#| msgid "Change Password"
+msgid "change password"
+msgstr "Modifier le mot de passe"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -828,7 +853,7 @@ msgstr "Inscriptions closes"
 msgid "We are sorry, but the sign up is currently closed."
 msgstr "Nous sommes désolés, mais les inscriptions sont closes pour le moment."
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentation API"
@@ -849,65 +874,92 @@ msgid "Units"
 msgstr "Unités"
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #: .\cookbook\templates\base.html:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarket Category"
+msgstr "Supermarché"
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+#, fuzzy
+#| msgid "Information"
+msgid "Automations"
+msgstr "Information"
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+msgid "Files"
+msgstr "Fichiers"
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr "Modification en masse"
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Historique"
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr "Exporter"
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr "Importer une recette"
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr "Créer"
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
-#: .\cookbook\templates\space.html:19
-msgid "Space Settings"
-msgstr "Paramètres de groupe"
-
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
-msgid "System"
-msgstr "Système"
-
-#: .\cookbook\templates\base.html:214
-msgid "Admin"
-msgstr "Admin"
-
-#: .\cookbook\templates\base.html:218
-msgid "Markdown Guide"
-msgstr "Guide Markdown"
-
-#: .\cookbook\templates\base.html:220
-msgid "GitHub"
-msgstr "GitHub"
-
-#: .\cookbook\templates\base.html:224
-msgid "API Browser"
-msgstr "Navigateur API"
-
-#: .\cookbook\templates\base.html:227
-msgid "Log out"
-msgstr "Déconnexion"
-
-#: .\cookbook\templates\base.html:229
+#: .\cookbook\templates\base.html:259
 #: .\cookbook\templates\generic\list_template.html:14
 #: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
 msgid "External Recipes"
 msgstr "Recettes externes"
 
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\space.html:19
+msgid "Space Settings"
+msgstr "Paramètres de groupe"
+
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
+msgid "System"
+msgstr "Système"
+
+#: .\cookbook\templates\base.html:269
+msgid "Admin"
+msgstr "Admin"
+
+#: .\cookbook\templates\base.html:273
+msgid "Markdown Guide"
+msgstr "Guide Markdown"
+
+#: .\cookbook\templates\base.html:275
+msgid "GitHub"
+msgstr "GitHub"
+
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
+msgid "API Browser"
+msgstr "Navigateur API"
+
+#: .\cookbook\templates\base.html:284
+msgid "Log out"
+msgstr "Déconnexion"
+
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Modifier en masse les catégories"
@@ -983,16 +1035,6 @@ msgstr "Livres de recettes"
 msgid "Export Recipes"
 msgstr "Exporter des ecettes"
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr "Exporter"
-
-#: .\cookbook\templates\files.html:7
-msgid "Files"
-msgstr "Fichiers"
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -1002,11 +1044,10 @@ msgstr "Importer une nouvelle recette"
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -1048,12 +1089,20 @@ msgstr "Fusionner"
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Êtes-vous sûr(e) de vouloir fusionner ces deux ingrédients ?"
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr "Êtes-vous certain de vouloir supprimer %(title)s : <b>%(object)s</b> "
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1114,9 +1163,6 @@ msgstr "Note"
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr "Fermer"
 
@@ -1169,8 +1215,8 @@ msgstr "Réinitialiser la recherche"
 msgid "Last viewed"
 msgstr "Dernières recettes vues"
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr "Recettes"
 
@@ -1334,177 +1380,19 @@ msgstr "En-tête"
 msgid "Cell"
 msgstr "Cellule"
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
-msgstr "Nouvelle ligne"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
+msgstr "Vue des menus"
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr "Rechercher une recette"
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr "Titre"
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr "Note (facultatif)"
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-"Vous pouvez utiliser du markdown pour mettre en forme ce champ. Consultez la "
-"<a href=\"/docs/markdown/\" target=\"_blank\" rel=\"noopener noreferrer"
-"\">documentation ici</a>"
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr "Nombre de parts"
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr "Créer uniquement une note"
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr "Liste de courses"
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr "La liste de courses est actuellement vide"
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr "Ouvrir la liste de courses"
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr "Menu"
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr "Nombre de jours"
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr "Décalage du jour"
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-"Permet de décaler le premier jour de la semaine dans la vue par défaut."
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr "Modifier l'organisation du menu"
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr "Afficher l'aide"
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr "Export iCal"
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Notes"
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr "Créé par"
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr "Partagé avec"
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr "Ajouter aux courses"
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr "Nouveau type de repas"
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr "Aide sur le menu de la semaine"
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-"\n"
-"                            <p>Le module menu de la semaine permet de "
-"planifier les repas grâce à des recettes et des notes.</p>\n"
-"<p>Choisissez simplement une recette dans la liste des recettes récemment "
-"vues ou cherchez celle de votre choix et glissez-la à l'emplacement désiré. "
-"Vous pouvez aussi ajouter une notre et un titre puis glisser la recette pour "
-"créer une entrée personnalisée. Il est possible de n'utiliser que des notes "
-"en glissant la boîte de création de notes dans le menu.</p>\n"
-"<p>Cliquez sur une recette pour ouvrir la vue détaillée. Là, vous pouvez "
-"aussi l'ajouter à la liste de courses.Vous pouvez aussi ajouter toutes les "
-"recettes d'une journée à la liste de courses en cliquant sur le caddy en "
-"haut du tableau.</p>\n"
-"<p>Étant donné que les menus de la semaine sont souvent préparés ensemble, "
-"vous pouvez définir des utilisateurs avec qui partager votre menu dans les "
-"paramètres.</p>\n"
-"<p>Vous pouvez aussi modifier le type de repas que vous voulez planifier. Si "
-"vous partagez le menu avec quelqu'un qui a d'autres types de repas, leurs "
-"repas apparaîtront aussi dans votre liste. Pour éviter les doublons, nommez "
-"vos types de repas de la même façon que les utilisateurs avec qui vous "
-"l'avez partager afin qu'ils soient fusionnés.</p>\n"
-"                        "
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr "Vue des menus"
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1622,24 +1510,24 @@ msgstr "Commentaires"
 msgid "by"
 msgstr "par"
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Commentaire"
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr "Image de la recette"
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr "Temps moyen de préparation"
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr "Temps moyen d'attente"
 
@@ -1657,7 +1545,7 @@ msgstr "Page d'accueil"
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 #, fuzzy
 #| msgid "Search String"
 msgid "Search Settings"
@@ -1820,54 +1708,54 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr "Compte"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr "Préférences"
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 msgid "API-Settings"
 msgstr "Paramètres d'API"
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 #, fuzzy
 #| msgid "Search String"
 msgid "Search-Settings"
 msgstr "Texte recherché"
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 msgid "Name Settings"
 msgstr "Paramètres de noms"
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 msgid "Account Settings"
 msgstr "Paramètres de compte"
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 msgid "Emails"
 msgstr "Adresses mail"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr "Réseaux sociaux"
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr "Langue"
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr "Style"
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr "Jeton API"
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1875,7 +1763,7 @@ msgstr ""
 "Vous pouvez utiliser à la fois l'authentification classique et "
 "l'authentification par jeton pour accéder à l'API REST."
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1883,10 +1771,62 @@ msgstr ""
 "Utilisez le jeton dans l'entête d'autorisation préfixé par le mot \"token\" "
 "comme indiqué dans les exemples suivants :"
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr "ou"
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr "Paramètres du livre de recettes"
@@ -1906,64 +1846,80 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr "Créer un compte superutilisateur"
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr "Liste de courses"
+
+#: .\cookbook\templates\shopping_list.html:34
+#, fuzzy
+#| msgid "Open Shopping List"
+msgid "Try the new shopping list"
+msgstr "Ouvrir la liste de courses"
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr "Rechercher une recette"
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr "Recettes dans le panier"
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr "Pas de recettes sélectionnées"
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr "Mode d'ajout"
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr "Ajouter une entrée"
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr "Quantité"
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr "Sélectionnez l'unité"
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr "Sélectionner"
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr "Sélectionnez l'aliment"
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr "Sélectionner un supermarché"
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr "Sélectionnez un utilisateur"
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr "Terminé"
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr "Vous êtes hors-ligne, la liste de courses n'est pas synchronisée."
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr "Copier/exporter"
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr "Préfixe de la liste"
 
@@ -2250,86 +2206,86 @@ msgstr "Mettez-moi en favori !"
 msgid "Enter website URL"
 msgstr "Saisissez l'URL du site web"
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr "Sélectionnez des fichiers de recettes à importer ou glissez-les ici…"
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr "Collez une source json ou html pour charger la recette."
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 msgid "Preview Recipe Data"
 msgstr "Prévisualiser les informations de la recette"
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 "Glissez les attributs de la recette depuis la droite dans la boîte "
 "appropriée ci-dessous."
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr "Effacer le contenu"
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr "Le texte glissé ici sera ajouté au nom."
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr "Description"
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr "Le texte glissé ici sera ajouté à la description."
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr "Les mots-clés ajoutés ici seront ajoutés à la liste actuelle"
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr "Image"
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 msgid "Prep Time"
 msgstr "Temps de préparation"
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 msgid "Cook Time"
 msgstr "Temps de cuisson"
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr "Les ingrédients glissés ici seront ajoutés à la liste actuelle."
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr "Instructions"
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 "Les instructions de recette glissés ici seront ajoutés aux instructions "
 "actuelles."
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 msgid "Discovered Attributes"
 msgstr "Attributs découverts"
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
@@ -2337,57 +2293,61 @@ msgstr ""
 "Glissez les attributs de recettes d'en-dessous vers la boîte appropriée à "
 "gauche. Cliquez sur un nœud pour voir toutes ses propriétés."
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 msgid "Show Blank Field"
 msgstr "Afficher un champ vierge"
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr "Champ vierge"
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr "Les objets glissés dans le champ vierge seront ajoutés."
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 msgid "Delete Text"
 msgstr "Supprimer le texte"
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 msgid "Delete image"
 msgstr "Supprimer l'image"
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr "Nom de la recette"
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr "Description de la recette"
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr "Faites votre choix"
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr "Notes"
+
+#: .\cookbook\templates\url_import.html:585
 msgid "Add Keyword"
 msgstr "Ajouter un mot-clé"
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr "Tous les mots-clés"
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr "Importer tous les mots-clés, pas uniquement ceux déjà existant."
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr "Information"
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2404,15 +2364,15 @@ msgstr ""
 "de données correctement structurées,\n"
 "n'hésitez pas à publier un exemple dans un ticket sur GitHub."
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr "Informations Google ld+json"
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr "Ticket GitHub"
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr "Spécification Recipe Markup"
 
@@ -2425,8 +2385,7 @@ msgstr "Le paramètre « update_at » n'est pas correctement formatté"
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr "Un objet ne peut être fusionné avec lui-même !"
 
@@ -2441,69 +2400,69 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr "Un objet ne peut être fusionné avec lui-même !"
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr "Cette fonctionnalité n'est pas disponible dans la version d'essai !"
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr "Synchro réussie !"
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr "Erreur lors de la synchronisation avec le stockage"
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr "Rien à faire."
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr "Le site web a renvoyé des données malformées et ne peut être lu."
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr "La page souhaitée n'a pas été trouvée."
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2511,27 +2470,27 @@ msgstr ""
 "Le site web est dans un format qui ne permet pas d'importer automatiquement "
 "la recette."
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr "Aucune information utilisable n'a été trouvée."
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr "Je n'ai rien trouvé à faire."
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr "Vous avez atteint le nombre maximum de recettes pour votre groupe."
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr "Vous avez plus d'utilisateurs qu'autorisés dans votre groupe."
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
@@ -2540,32 +2499,31 @@ msgstr[0] ""
 msgstr[1] ""
 "Modification en masse effectuée. %(count)drecettes ont été mises à jour."
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr "Surveiller"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Espace de stockage"
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 "Impossible de supprimer cet espace de stockage car il est utilisé dans au "
 "moins un dossier surveillé."
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr "Livre de recettes"
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr "Favoris"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr "Lien d'invitation"
 
@@ -2586,27 +2544,19 @@ msgstr ""
 msgid "Storage"
 msgstr "Stockage"
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr "Modifications sauvegardées !"
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr "Erreur lors de la sauvegarde des modifications !"
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr "Unités fusionnées !"
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr "Aliments fusionnés !"
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr "L'importation n'est pas implémentée pour ce fournisseur"
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr "L'exportation n'est pas implémentée pour ce fournisseur"
 
@@ -2640,6 +2590,12 @@ msgstr "Supermarché"
 msgid "Shopping Categories"
 msgstr "Recettes dans le panier"
 
+#: .\cookbook\views\lists.py:232
+#, fuzzy
+#| msgid "Shopping List"
+msgid "New Shopping List"
+msgstr "Liste de courses"
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Nouvelle recette importée !"
@@ -2648,49 +2604,49 @@ msgstr "Nouvelle recette importée !"
 msgid "There was an error importing this recipe!"
 msgstr "Une erreur s\\\\'est produite lors de l\\\\'import de cette recette !"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr "Bonjour"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr "Vous avez été invité par "
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr " pour rejoindre leur groupe Tandoor Recipes "
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr "Cliquez le lien suivant pour activer votre compte : "
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 "Si le lien ne fonctionne pas, utilisez le code suivant manuellement pour "
 "rejoindre le groupe : "
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr "L'invitation est valide jusqu'au "
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 "Tandoor Recipes sont un gestionnaire de recettes open source. Venez-voir "
 "notre Github "
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr "Invitation Tandoor Recipes"
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr "Le lien d'invitation a été correctement envoyé à l'utilisateur."
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
@@ -2698,13 +2654,13 @@ msgstr ""
 "Vous avez envoyé trop de mails, partagez le lien manuellement ou attendez "
 "quelques heures."
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 "Le mail n'a pas pu être envoyé à l'utilisateur, veuillez envoyer le lien "
 "manuellement."
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
@@ -2713,29 +2669,29 @@ msgstr ""
 "Commencez à ajoutez des recettes ou invitez d'autres personnes à vous "
 "rejoindre."
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr "Vous n'avez pas la permission d'effectuer cette action !"
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr "Commentaire enregistré !"
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
@@ -2746,32 +2702,32 @@ msgstr ""
 "utilisateur, counsultez la documentation Django pour savoir comment "
 "réinitialiser le mot de passe."
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr "Les mots de passe ne correspondent pas !"
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr "L'utilisateur a été créé, veuillez vous connecter !"
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr "Le lien d'invitation fourni est mal formé !"
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 "Vous êtes déjà membre d'un groupe, ainsi, vous ne pouvez rejoindre celui-ci."
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr "Vous avez bien rejoint le groupe."
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr "Le lien d'invitation est invalide ou déjà utilisé !"
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
@@ -2779,7 +2735,7 @@ msgstr ""
 "Le signalement de liens partagés n'est pas autorisé pour cette installation. "
 "Veuillez contacter l'administrateur de la page pour signaler le problème."
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
@@ -2787,6 +2743,152 @@ msgstr ""
 "Les liens partagés de recettes ont été désactivés ! Pour plus "
 "d'informations, veuillez contacter l'administrateur de la page."
 
+#~ msgid "New Unit"
+#~ msgstr "Nouvelle unité"
+
+#~ msgid "New unit that other gets replaced by."
+#~ msgstr "La nouvelle unité qui remplacera l'autre."
+
+#~ msgid "Old Unit"
+#~ msgstr "Ancienne unité"
+
+#~ msgid "Unit that should be replaced."
+#~ msgstr "L'unité qui doit être remplacée."
+
+#~ msgid "New Food"
+#~ msgstr "Nouvel aliment"
+
+#~ msgid "New food that other gets replaced by."
+#~ msgstr "Nouvel aliment qui remplace les autres."
+
+#~ msgid "Old Food"
+#~ msgstr "Ancien aliment"
+
+#~ msgid "Food that should be replaced."
+#~ msgstr "Aliment qui devrait être remplacé."
+
+#~ msgid "New Entry"
+#~ msgstr "Nouvelle ligne"
+
+#~ msgid "Title"
+#~ msgstr "Titre"
+
+#~ msgid "Note (optional)"
+#~ msgstr "Note (facultatif)"
+
+#~ msgid ""
+#~ "You can use markdown to format this field. See the <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
+#~ msgstr ""
+#~ "Vous pouvez utiliser du markdown pour mettre en forme ce champ. Consultez "
+#~ "la <a href=\"/docs/markdown/\" target=\"_blank\" rel=\"noopener noreferrer"
+#~ "\">documentation ici</a>"
+
+#~ msgid "Serving Count"
+#~ msgstr "Nombre de parts"
+
+#~ msgid "Create only note"
+#~ msgstr "Créer uniquement une note"
+
+#~ msgid "Shopping list currently empty"
+#~ msgstr "La liste de courses est actuellement vide"
+
+#~ msgid "Plan"
+#~ msgstr "Menu"
+
+#~ msgid "Number of Days"
+#~ msgstr "Nombre de jours"
+
+#~ msgid "Weekday offset"
+#~ msgstr "Décalage du jour"
+
+#~ msgid ""
+#~ "Number of days starting from the first day of the week to offset the "
+#~ "default view."
+#~ msgstr ""
+#~ "Permet de décaler le premier jour de la semaine dans la vue par défaut."
+
+#~ msgid "Edit plan types"
+#~ msgstr "Modifier l'organisation du menu"
+
+#~ msgid "Show help"
+#~ msgstr "Afficher l'aide"
+
+#~ msgid "Week iCal export"
+#~ msgstr "Export iCal"
+
+#~ msgid "Add to Shopping"
+#~ msgstr "Ajouter aux courses"
+
+#~ msgid "New meal type"
+#~ msgstr "Nouveau type de repas"
+
+#~ msgid "Meal Plan Help"
+#~ msgstr "Aide sur le menu de la semaine"
+
+#~ msgid ""
+#~ "\n"
+#~ "                            <p>The meal plan module allows planning of "
+#~ "meals both with recipes and notes.</p>\n"
+#~ "                            <p>Simply select a recipe from the list of "
+#~ "recently viewed recipes or search the one you\n"
+#~ "                                want and drag it to the desired plan "
+#~ "position. You can also add a note and a title and\n"
+#~ "                                then drag the recipe to create a plan "
+#~ "entry with a custom title and note. Creating only\n"
+#~ "                                Notes is possible by dragging the create "
+#~ "note box into the plan.</p>\n"
+#~ "                            <p>Click on a recipe in order to open the "
+#~ "detailed view. There you can also add it to the\n"
+#~ "                                shopping list. You can also add all "
+#~ "recipes of a day to the shopping list by\n"
+#~ "                                clicking the shopping cart at the top of "
+#~ "the table.</p>\n"
+#~ "                            <p>Since a common use case is to plan meals "
+#~ "together you can define\n"
+#~ "                                users you want to share your plan with in "
+#~ "the settings.\n"
+#~ "                            </p>\n"
+#~ "                            <p>You can also edit the types of meals you "
+#~ "want to plan. If you share your plan with\n"
+#~ "                                someone with\n"
+#~ "                                different meals, their meal types will "
+#~ "appear in your list as well. To prevent\n"
+#~ "                                duplicates (e.g. Other and Misc.)\n"
+#~ "                                name your meal types the same as the "
+#~ "users you share your meals with and they will be\n"
+#~ "                                merged.</p>\n"
+#~ "                        "
+#~ msgstr ""
+#~ "\n"
+#~ "                            <p>Le module menu de la semaine permet de "
+#~ "planifier les repas grâce à des recettes et des notes.</p>\n"
+#~ "<p>Choisissez simplement une recette dans la liste des recettes récemment "
+#~ "vues ou cherchez celle de votre choix et glissez-la à l'emplacement "
+#~ "désiré. Vous pouvez aussi ajouter une notre et un titre puis glisser la "
+#~ "recette pour créer une entrée personnalisée. Il est possible de "
+#~ "n'utiliser que des notes en glissant la boîte de création de notes dans "
+#~ "le menu.</p>\n"
+#~ "<p>Cliquez sur une recette pour ouvrir la vue détaillée. Là, vous pouvez "
+#~ "aussi l'ajouter à la liste de courses.Vous pouvez aussi ajouter toutes "
+#~ "les recettes d'une journée à la liste de courses en cliquant sur le caddy "
+#~ "en haut du tableau.</p>\n"
+#~ "<p>Étant donné que les menus de la semaine sont souvent préparés "
+#~ "ensemble, vous pouvez définir des utilisateurs avec qui partager votre "
+#~ "menu dans les paramètres.</p>\n"
+#~ "<p>Vous pouvez aussi modifier le type de repas que vous voulez planifier. "
+#~ "Si vous partagez le menu avec quelqu'un qui a d'autres types de repas, "
+#~ "leurs repas apparaîtront aussi dans votre liste. Pour éviter les "
+#~ "doublons, nommez vos types de repas de la même façon que les utilisateurs "
+#~ "avec qui vous l'avez partager afin qu'ils soient fusionnés.</p>\n"
+#~ "                        "
+
+#~ msgid "Units merged!"
+#~ msgstr "Unités fusionnées !"
+
+#~ msgid "Foods merged!"
+#~ msgstr "Aliments fusionnés !"
+
 #~ msgid "Utensils"
 #~ msgstr "Ustensiles"
 
diff --git a/cookbook/locale/hu_HU/LC_MESSAGES/django.mo b/cookbook/locale/hu_HU/LC_MESSAGES/django.mo
index 35156fa9117271acee8da9aa992985eb9b323c7a..884a11067e26355129a48427ad5660ec646f26db 100644
GIT binary patch
delta 415
zcmXxgKTpC?6o=tcC?Nl}3o*z}0;_R!BP8NT=;Wf|130jD)sVOV34;p>G3i_<!%SQq
zjEj)4u<{8EzP~CbIeqTE?Y-yRzLh_V!P;{tMx2mm<eaRKO@{~ZfF3?#7N60_7i{4k
z)7VOw_3;`r_=<U4;1RxK3O~@ruRjC(W>95egWB-(|3NlsR%c$qCyHF48e6hk1=e_n
zTkPT$r)zzNLkv+3pVM6dFHz@rP>uNLT3~j=KsUU_8V*n!#uy)n4dx-zhvi7E>yMSl
tGFc=KK|gV!!(8eQsHj3saTnvBcB~gFmX20V&l&m2X>{uD5~FtJ{ufjZB&q-a

delta 642
zcmZ9|&nrYx6u|K_Kl~WKhCvpnS4yPG^UQ{l1x+?ai6|*F&ooRknR%sI%|fG4HnL!0
zXEEzpDBI^>u%Sfx1CTBGo|(6Dn{z++o_D+V%z13T50_pd!AoKE5(C5oF-T;5OpI5I
z;2VbU8`tp{<GAJ*X~Y}c#anE`wtz@0_Fyv_*np!L#PNE*Br)&6jAz_)3H9JQ_Twh%
zg+(u4#u4_Xct<f+>|?*rD_X!2Ch-hc@x#l<srHP00z*;~d1BE<;vMyYPvorppcW9|
zHvQ+#*o_g?bHk`zvrs#<fZDkY)ccCaPmY<!@EobLHZ-qY32iZT5jymep4v(z?5PiG
z5n7Nwst<M&9fS^QtUX58g$C3{i)Xu9E&JAdLkauPi05)i(Zy;u?Z{FlS<mP~GZ)YP
ztKpUCT;ASx(z$GOe%rC94a>A9qUKa|V$!gz>6kfYTBcb&2z>cx-RnKWJ#p-e=xWie
c<Q=!NZ>Nd{w~~@&rnL9HzW#UOVyCh22N9xM7ytkO

diff --git a/cookbook/locale/hu_HU/LC_MESSAGES/django.po b/cookbook/locale/hu_HU/LC_MESSAGES/django.po
index 37bec8ad5..1dd495ec1 100644
--- a/cookbook/locale/hu_HU/LC_MESSAGES/django.po
+++ b/cookbook/locale/hu_HU/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2020-06-02 19:28+0000\n"
 "Last-Translator: igazka <igazka100@gmail.com>, 2020\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/django-recipes/"
@@ -25,11 +25,11 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Hozzávalók"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -37,12 +37,12 @@ msgstr ""
 "A felső navigációs sáv színe. Nem minden szín működik minden témával. "
 "Próbáld ki őket! "
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 "Az alapértelmezett mértékegység, új hozzávaló receptbe való beillesztésekor."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -50,25 +50,29 @@ msgstr ""
 "Lehetővé teszi az összetevők mennyiségében a törtrészek használatát (pl. A "
 "tizedesjegyek automatikus törtrészekké alakítása)"
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr ""
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr ""
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -76,215 +80,189 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "Név"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Kulcsszavak"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "Előkészítési idő percben"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Várakozási idő (sütés/főzés) percben"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "Elérési útvonal"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "Tárhely UID"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "Új Mértékegység"
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr ""
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "Régi Mértékegység"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr ""
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "Új Étel"
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr ""
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "Régi Étel"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr ""
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "Add hozzá a kommented:"
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr ""
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "Fájl ID:"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr ""
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr ""
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 msgid "Search Method"
 msgstr ""
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr ""
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 msgid "Fuzzy Search"
 msgstr ""
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 #, fuzzy
 #| msgid "Text"
 msgid "Full Text"
@@ -297,7 +275,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr ""
 
@@ -307,9 +285,9 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr ""
 
@@ -324,36 +302,36 @@ msgstr ""
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, python-format
 msgid "Imported %s recipes."
 msgstr ""
@@ -372,8 +350,8 @@ msgstr ""
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr ""
 
@@ -427,104 +405,118 @@ msgstr "Vacsora"
 msgid "Other"
 msgstr ""
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr ""
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr ""
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr ""
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr ""
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr ""
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr ""
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "Szöveg"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "Fájl ID:"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr ""
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "New Food"
+msgid "Food Alias"
+msgstr "Új Étel"
+
+#: .\cookbook\models.py:912
+msgid "Unit Alias"
+msgstr ""
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "Kulcsszavak"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr ""
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr ""
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr ""
@@ -553,7 +545,7 @@ msgstr ""
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -588,6 +580,7 @@ msgid "Re-send Verification"
 msgstr ""
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr ""
@@ -629,7 +622,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr ""
 
@@ -641,7 +634,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr ""
 
@@ -689,12 +682,16 @@ msgstr ""
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 msgid "Password"
 msgstr ""
 
@@ -725,6 +722,28 @@ msgid ""
 "within a few minutes."
 msgstr ""
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+msgid "Bad Token"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+msgid "change password"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -776,7 +795,7 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr ""
@@ -797,65 +816,90 @@ msgid "Units"
 msgstr ""
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
 #: .\cookbook\templates\base.html:163
+msgid "Supermarket Category"
+msgstr ""
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+msgid "Automations"
+msgstr ""
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+#, fuzzy
+#| msgid "File ID"
+msgid "Files"
+msgstr "Fájl ID:"
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr ""
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr ""
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr ""
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr ""
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:259
+#: .\cookbook\templates\generic\list_template.html:14
+#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
+msgid "External Recipes"
+msgstr ""
+
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:214
+#: .\cookbook\templates\base.html:269
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:218
+#: .\cookbook\templates\base.html:273
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:220
+#: .\cookbook\templates\base.html:275
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:224
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:227
+#: .\cookbook\templates\base.html:284
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
-#: .\cookbook\templates\generic\list_template.html:14
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr ""
@@ -921,18 +965,6 @@ msgstr ""
 msgid "Export Recipes"
 msgstr ""
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr ""
-
-#: .\cookbook\templates\files.html:7
-#, fuzzy
-#| msgid "File ID"
-msgid "Files"
-msgstr "Fájl ID:"
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -942,11 +974,10 @@ msgstr ""
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr ""
 
@@ -982,12 +1013,20 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1048,9 +1087,6 @@ msgstr ""
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr ""
 
@@ -1095,8 +1131,8 @@ msgstr ""
 msgid "Last viewed"
 msgstr ""
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr ""
 
@@ -1239,152 +1275,19 @@ msgstr ""
 msgid "Cell"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr ""
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1490,24 +1393,24 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr ""
 
@@ -1525,7 +1428,7 @@ msgstr ""
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 msgid "Search Settings"
 msgstr ""
 
@@ -1680,67 +1583,119 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 msgid "Search-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr ""
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr ""
@@ -1758,64 +1713,78 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:34
+msgid "Try the new shopping list"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr ""
 
@@ -2066,140 +2035,144 @@ msgstr ""
 msgid "Enter website URL"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 msgid "Preview Recipe Data"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 msgid "Prep Time"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 msgid "Cook Time"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 msgid "Discovered Attributes"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 msgid "Show Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 msgid "Delete Text"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 msgid "Delete image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr ""
+
+#: .\cookbook\templates\url_import.html:585
 #, fuzzy
 #| msgid "Keywords"
 msgid "Add Keyword"
 msgstr "Kulcsszavak"
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2210,15 +2183,15 @@ msgid ""
 "                                    github issues."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr ""
 
@@ -2231,8 +2204,7 @@ msgstr ""
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr ""
 
@@ -2245,125 +2217,124 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr ""
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr ""
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr ""
 
@@ -2383,27 +2354,19 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr ""
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
@@ -2433,6 +2396,10 @@ msgstr ""
 msgid "Shopping Categories"
 msgstr ""
 
+#: .\cookbook\views\lists.py:232
+msgid "New Shopping List"
+msgstr ""
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
@@ -2441,121 +2408,133 @@ msgstr ""
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
 msgstr ""
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
 "on how to reset passwords."
 msgstr ""
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
+
+#~ msgid "New Unit"
+#~ msgstr "Új Mértékegység"
+
+#~ msgid "Old Unit"
+#~ msgstr "Régi Mértékegység"
+
+#~ msgid "New Food"
+#~ msgstr "Új Étel"
+
+#~ msgid "Old Food"
+#~ msgstr "Régi Étel"
diff --git a/cookbook/locale/hy/LC_MESSAGES/django.mo b/cookbook/locale/hy/LC_MESSAGES/django.mo
index d66c7a0df9ee0f2e8f18ebf1e3d9a849dd3e3984..30fefc017b75256cad57fc0386a96285aa4e6f80 100644
GIT binary patch
delta 2963
zcmXZec~DkW7{~DkOvVTZ6+v(zRMb#HMQ{NVmBO^att>24!9psv6!+y7H&jeaTry2X
z#6)vR$|cc?Bu5)3wNZ0xG+WHlYHAvDob3DKT>kl-=iK|Ad!FY!_YMpH_P_F%|DODZ
zeDC|24IONDIMD3BA!a>^t6pLb?~O1!hC@b~O~ocTW+(m4R*p6sjoG<or<p&NXLg8q
z?Q3R1X7=njvr^2)FnnM<zr{!l!6f8ymOkEm)`-CXCSveqOu$0a5BB3@_zf;c|2NFq
zU<vlXLl}ksVl;-mY1Rrm<8aJEJ!n5p#A;+IOP*l%JZ_!fGwaLXJ`>5<m%FqPAEsg{
zK91kvO>CBL))nhbGK<At7>c>52TjHIa2_htn8~gJ9Z=7C0(Ji~tcM$Y47xGchFaiz
zEXP}@(v?gx>!RzZ%&uZbtUJ{$)CD7n`=Tn4jmbC{JK#ZVi8qlwS;#cEvH7TVeI*Q<
zG58AgfM2kMZk+CJ?1<WN8fw8oUOX4Gh)Yl#zlB=o4(fs7GpzP#yJKtOf!GwMpn7B_
zHsSeJ${>-6!>Ek^#C8}k)9g{~gxbK1UOd)w4W=>wIkJ%X&oVoT&9OaR$4CsF?Rq5+
zQ;5f)j(7_;;Q96?g9IinpfY-pIh|b&Y6I#K?RY%~V+AVX{n!wzQ5!#pUGY~;!d7$i
z0JC8jfMYQV^Dz#KF@$^V69&rgIJU)$7>;!cco;^Zj^rq6!Jjb(@1i!?bgoO_NsK0*
zjB{``>c}GIc|C&aooqaaE77Nk%=s?!Ij9X?#Kt&mfpa2iLrYPamZ4t51E>;TMOE%D
zY6H(Kbd|}+2;xPkifzIG+<`4|??N7@1<o<SX6z5VjQNFTw1Ev;WJZ#961Bj9#jZlb
z@GkK@)X~gd;vQUts?ZLs#v`Z=6coAFcr9iUe~W?GW+~~`XV7V>+gUoQi~D=#VGrU$
zOvf5b#lW{{G|WKt&MTPcN6E1r@rh+_qyL~P7G3O)tTXDUhoUx`>tmp1n~u71v3J7;
zj3wTUD%n|l7%yWZ{0(cne!1Ilb5t{?Vm};+kKj7&ja8_U-^Vy?`L?ToFOz{5%0ewX
z3D;l|=IF*1Zs&!lGq1p=cpCNE-bR(UMG0>Xc1Nw3jty}n9>9Fm2I5z`*K-gO`)oD?
zWw;rYaRsX6Ut>H5uQGcMQ!oijP@m4@o@a0r@g-F0d#rZmVH)u&R5PE$Q2ZUkQCY^Q
z-6I(2!QE;n%tm+?U?THn*cs2GG6;Idy~iD}Cvkt&!bP6zQ5)Zht??4-cm8YLeXUWw
z(*=Wgz71ud8*(rL3%z(FMiPI4>eefmfHyD*8^7z0CKg)}XP^>!9d!gNJa=Iu;uGHW
zt5{642CSq0jk&OTz1M7bh6`s=XS{8LD^(3f6JJJUde4i4H@e@&qcR?X9kIZhuS6Zm
z1yt|U-NgS57>`PH#U|=spTTw}bf#6<7HhCM-u4VGb=TXYGD|{bGzgP17gdoBs7md?
zNZf~dolkk*MkNrm*;TCBW*`5ZFwvU{RU!kG`AF1`XQ47GNB!_TDx(`-99HHk6pKnE
z6}5p(R1;@mFI<BS{ip=CC%(1CYzapB%IQ!B<;Y$vWh-AbZajo(#67pU1?FHjaW&>(
zY=!%VFUC>CeYU%1EJro#kEmXV+Toft4fUOQ0hP$BxBz`K7$`%(4_pNjQBC$VHo%$K
z9*a?DT!mWrCZ593o&3Lt*O0wfmtC$R*D#Ry4#r@e-LA=FQNMr6>9g?+GMQNAUHAdR
zhy(YyBZ$Us#2J{11>XD-97FsQPQd{m@}}T1q{>#b*Ht#5((F^>8oZ7RK5~`I`&bpD
z<}LS`P2)li4#z84jw$=i#^E&_j{^_zoyX5G1lt^RO_z)T#C=c|>W6VS)w^DXs^A{v
YWNZI;18YBOR(U0SUrJ@w;C{LP16df|F#rGn

delta 3002
zcmXZeeN@j^9Ki8Up{?YhQYp5yWKro?O@t;g9HTi#V-}@CLnT=c!`BK!jbzM5$a8sE
z2s!d_jKd70IeR$c%tmv@)*PIj&34%P)BXDAbwBs}{oQ*%pL_3DHy=4Kee7JD*Vek~
zB$6~%<b<2Z%i}}_5jRby4}()g&g1-4kpdi=CUV)Cchg1Ev2?n~HToZ9iX10CGgHJ}
zL>6X=RADK0!tiX7E;t0+<78wynVl_`c+)7LBM?_&1lFSd;1>4A|F9fGb66xcU>x2-
ze|%|<NC3uRcTC1)EJmH^7S6@{$WSsRS7ZWyook7Vpb^5;7@UK;kli>CFXF5CT%O21
z9ESZcavs&ecd;XuqfS(XmADr*(~<9)3QR<uCkyrcqxd{tuxP~6xQ04F+kBB7=!06i
z2JEZPQ8RNbU~=q@I#3Gw;T+Tolwu6-K?nYVLFiQ|!kVNn>caM+j%zj0c!9=a)CoL`
zC@1zseerG7i84_KEVAQ0IFYykb>Tkmn{fhBCme*{n1(&D5WC_Q)H8AdyD-08q!CTW
zuc#UO&u5=80(;^l)CDZD<8`*DF`oW=$UqXhK;$eA$1rqXXetwnal~)p09=i_#h1~O
z`Q=X<5p+1y){LT1GcQA3zy{P6pTl<8h??;&^uqh73x9_Fu+t)uJ~$dZu>@Uk9r|M>
z_QHB>&u`>54bAW&hG44?C?|$tH71~L$sec#b}Tj-1feeQHPi&MF#tE?B0Pn<W$`8U
z89_ZerFaZaprsx8i%sU$s0(VfM5Hs8*lt8!&|%a}FQHz;pV1Fpmzv)Pp)OznYGo?X
z7Z0FT>`QdP>llPTE@e6$;29k(M*Kb$xq+3)agd^AA|x$;p$<^6+*GIppAhdw-I`r1
z%*1u56}paR@Gj~CYD&#DK7)zGPGx4iF}lYdbWEZ{S2i2<Hssk>pdOxD9E#025Tid5
zc@c9^OTP-EohUi#;eE8yEHq%1sn`e%q(2#Tt1Z-pmTN-~+cwnF9<*OLkHN&>qb}?z
zcEC2}=304U%c)0Q@Nm?UXW&RI#BO*NhhP(G$wO9~!#4`uh^>4YI#4m{ecgngU>&C6
zs0y?4TGTyn#IE=R_1gNbF(rN-U5V3B$D55_xE$-T5_JJdADio0gv6HYqM;dng_?0A
zYRUh`aEw_i@)o9}UaJPwPv=A1e=(J~^*U4fX|@#@Pyb2O!~6_8VrR1R!JZhX$332g
zPCT`xLu8q44Mx*{312~3Z!+kEdXFdKAk0G@xX$(*>cYRp9@zR*^Se;g_ufD~J1OYS
z{9@TJl%X$itsP%LKjPm}_sZonbJ#r4op><np-RN=n1h<gTGTB#Zu=d26F;(_yKdmX
zIx!Ynoq2F-qkY)0kq1vv_xRc-Q>tbRAa1kSWDtxR$DmG_gqrbujKmtd{|4%9aNc6h
zPH#*nPC`xe_!jE#LE{@bbWfWw1e;My<XdHoL47_RHM7a685Lm+mZMhWJZhz`qgL)G
z)Z6iot?yQoKp)hK4clt5KQw02p_Rx%&3rlPY2S&O(G}FalWis=57amg^)Mx(CX#`=
zfPB<LT#SS9G<rEviS6d}`|J=|L4Sfpg99vAkhMtqPQHY^cn9N&XY4iuRO3|Q`<RA_
z)#e+15L1a~)tJM01@*AD-($8W0sV<HQNJ^bQ5U`jm!P$shGy7nuc^R07(qM_J#hzy
zVLj>|H(@Y(?Gw3*u{a*x_M88#Qcx@6_PMD<AO;eLVGt&w{yx`e$$A=zbeyyww5v5=
z!f4bj7=f{vg9EX~?!SvOh&vph+*p8L-~*)EQg_f)cETYJIB_%H#{G4sautWQV$^)p
z5k8kZD8poQIcoj{OUEo?w|etOV<Ao>{tesXm}BP9O+gppS*R77i@mVQetrqHf<GWT
z+wzZ_*z!@6LpObn4CpZ~JRvtDH7_$eD|~2bUPk|JQI4p{a7R?QBeq*)zy6NMP)DT0
Laj1Ok=;{9hIiTx2

diff --git a/cookbook/locale/it/LC_MESSAGES/django.mo b/cookbook/locale/it/LC_MESSAGES/django.mo
index c3171dbf30bdee6c677547baabceecee22ef7814..9179ae1b051ba9e429a948fd6bfd49107ae4e498 100644
GIT binary patch
delta 9695
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
EKYugPF8}}l

delta 13920
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
GYW@%Q`f&{a

diff --git a/cookbook/locale/it/LC_MESSAGES/django.po b/cookbook/locale/it/LC_MESSAGES/django.po
index f5992280d..40e026cdc 100644
--- a/cookbook/locale/it/LC_MESSAGES/django.po
+++ b/cookbook/locale/it/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2021-09-18 23:06+0000\n"
 "Last-Translator: Oliver Cervera <olivercervera@yahoo.it>\n"
 "Language-Team: Italian <http://translate.tandoor.dev/projects/tandoor/"
@@ -26,11 +26,11 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Ingredienti"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -38,13 +38,13 @@ msgstr ""
 "Colore della barra di navigazione in alto. Non tutti i colori funzionano con "
 "tutti i temi, provali e basta!"
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 "Unità di misura predefinita da utilizzare quando si inserisce un nuovo "
 "ingrediente in una ricetta."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -52,7 +52,11 @@ msgstr ""
 "Abilita il supporto alle frazioni per le quantità degli ingredienti (ad "
 "esempio converte i decimali in frazioni automaticamente)"
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -60,20 +64,20 @@ msgstr ""
 "Gli utenti con i quali le nuove voci del piano alimentare/lista della spesa "
 "devono essere condivise per impostazione predefinita."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "Mostra le ricette visualizzate di recente nella pagina di ricerca."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "Numero di decimali per approssimare gli ingredienti."
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 "Se vuoi essere in grado di creare e vedere i commenti sotto le ricette."
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -87,11 +91,11 @@ msgstr ""
 "di dati mobili. Se inferiore al limite della istanza viene ripristinato "
 "durante il salvataggio."
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr "Fissa la barra di navigazione nella parte superiore della pagina."
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -99,39 +103,39 @@ msgstr ""
 "Entrambi i campi sono facoltativi. Se non viene fornito, verrà visualizzato "
 "il nome utente"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "Nome"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Parole chiave"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "Tempo di preparazione in minuti"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Tempo di attesa (cottura) in minuti"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "Percorso"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "UID di archiviazione"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr "Predefinito"
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
@@ -139,52 +143,20 @@ msgstr ""
 "Per prevenire duplicati, vengono ignorate le ricette che hanno lo stesso "
 "nome di quelle esistenti. Metti la spunta per importare tutto."
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "Nuova unità di misura"
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr "Nuova unità di misura che sostituisce le altre."
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "Vecchia unità di misura"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr "Unità di misura che dovrebbe essere rimpiazzata."
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "Nuovo alimento"
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr "Nuovo alimento che sostituisce gli altri."
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "Vecchio alimento"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr "Alimento che dovrebbe essere rimpiazzato."
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "Aggiungi il tuo commento: "
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 "Lascia vuoto per dropbox e inserisci la password dell'app per nextcloud."
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr "Lascia vuoto per nextcloud e inserisci l'api token per dropbox."
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -192,25 +164,25 @@ msgstr ""
 "Lascia vuoto per dropbox e inserisci solo l'url base per nextcloud (<code>/"
 "remote.php/webdav/</code> è aggiunto automaticamente)"
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr "Stringa di Ricerca"
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "ID del File"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr "Devi fornire almeno una ricetta o un titolo."
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 "È possibile visualizzare l'elenco degli utenti predefiniti con cui "
 "condividere le ricette nelle impostazioni."
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -218,15 +190,15 @@ msgstr ""
 "Puoi usare markdown per formattare questo campo. Guarda la <a href=\"/docs/"
 "markdown/\">documentazione qui</a>"
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr "È stato raggiunto il numero massimo di utenti per questa istanza."
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr "Questo indirizzo email è già in uso!"
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
@@ -234,15 +206,21 @@ msgstr ""
 "Non è obbligatorio specificare l'indirizzo email, ma se presente verrà "
 "utilizzato per mandare all'utente un link di invito."
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr "Nome già in uso."
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr "Accetta i Termini d'uso e Privacy"
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
@@ -250,69 +228,69 @@ msgstr ""
 "Seleziona il metodo di ricerca.  Clicca<a href=\"/docs/search/\">qui</a> per "
 "avere maggiori informazioni."
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 msgid "Search Method"
 msgstr "Metodo di ricerca"
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr "Ignora accento"
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr "Corrispondenza parziale"
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr "Inizia con"
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 #, fuzzy
 #| msgid "Search"
 msgid "Fuzzy Search"
 msgstr "Cerca"
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 msgid "Full Text"
 msgstr "Full Text"
 
@@ -325,7 +303,7 @@ msgstr ""
 "riprova."
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "Non hai fatto l'accesso e quindi non puoi visualizzare questa pagina!"
 
@@ -335,9 +313,9 @@ msgstr "Non hai fatto l'accesso e quindi non puoi visualizzare questa pagina!"
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr "Non hai i permessi necessari per visualizzare questa pagina!"
 
@@ -352,20 +330,20 @@ msgstr "Non puoi interagire con questo oggetto perché non ne hai i diritti!"
 msgid "Could not parse template code."
 msgstr "Impossibile elaborare il codice del template."
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importa"
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
@@ -373,7 +351,7 @@ msgstr ""
 "La procedura di import necessita di un file .zip. Hai scelto il tipo di "
 "importazione corretta per i tuoi dati?"
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
@@ -381,11 +359,11 @@ msgstr ""
 "Un errore imprevisto si è verificato durante l'importazione. Assicurati di "
 "aver caricato un file valido."
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr "Le seguenti ricette sono state ignorate perché già esistenti:"
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, python-format
 msgid "Imported %s recipes."
 msgstr "Importate %s ricette."
@@ -404,8 +382,8 @@ msgstr "Fonte"
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr "Porzioni"
 
@@ -461,7 +439,7 @@ msgstr "Cena"
 msgid "Other"
 msgstr "Altro"
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
@@ -469,96 +447,112 @@ msgstr ""
 "Archiviazione massima in MB. 0 per illimitata, -1 per disabilitare il "
 "caricamento dei file."
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr "Cerca"
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr "Piano alimentare"
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Libri"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr "Piccolo"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr "Grande"
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr "Nuovo"
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr " è parte dello step di una ricetta e non può essere eliminato"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "Testo"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr "Tempo"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "File"
 msgstr "File"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Ricetta"
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr "Semplice"
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr "Frase"
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr "Web"
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr "Raw"
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Food"
+msgid "Food Alias"
+msgstr "Alimento"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Units"
+msgid "Unit Alias"
+msgstr "Unità di misura"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "Parole chiave"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr "Il caricamento dei file non è abilitato in questa istanza."
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr "Hai raggiungo il limite per il caricamento dei file."
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr "Modifica"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr "Elimina"
@@ -587,7 +581,7 @@ msgstr "Indirizzi email"
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -622,6 +616,7 @@ msgid "Re-send Verification"
 msgstr "Invia verifica di nuovo"
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr "Rimuovi"
@@ -669,7 +664,7 @@ msgstr ""
 "            ."
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -684,7 +679,7 @@ msgstr ""
 "            <a href=\"%(email_url)s\">richiedere un nuovo link di conferma</"
 "a>."
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr "Login"
 
@@ -732,12 +727,16 @@ msgstr "Sei sicuro di voler uscire?"
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr "Cambia Password"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 msgid "Password"
 msgstr "Password"
 
@@ -772,6 +771,32 @@ msgstr ""
 "Ti abbiamo mandato una mail. Contattaci se non la ricevi entro qualche "
 "minuto."
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#, fuzzy
+#| msgid "API Token"
+msgid "Bad Token"
+msgstr "Token API"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+#, fuzzy
+#| msgid "Change Password"
+msgid "change password"
+msgstr "Cambia Password"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -823,7 +848,7 @@ msgstr "Iscrizioni chiuse"
 msgid "We are sorry, but the sign up is currently closed."
 msgstr "Spiacenti, al momento le iscrizioni sono chiuse."
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentazione API"
@@ -844,65 +869,92 @@ msgid "Units"
 msgstr "Unità di misura"
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #: .\cookbook\templates\base.html:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarket Category"
+msgstr "Supermercato"
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+#, fuzzy
+#| msgid "Information"
+msgid "Automations"
+msgstr "Informazioni"
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+msgid "Files"
+msgstr "File"
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr "Modifica in blocco"
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Cronologia"
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr "Esporta"
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr "Importa Ricetta"
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr "Crea"
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
-#: .\cookbook\templates\space.html:19
-msgid "Space Settings"
-msgstr "Impostazioni Istanza"
-
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
-msgid "System"
-msgstr "Sistema"
-
-#: .\cookbook\templates\base.html:214
-msgid "Admin"
-msgstr "Amministratore"
-
-#: .\cookbook\templates\base.html:218
-msgid "Markdown Guide"
-msgstr "Informazioni su Markdown"
-
-#: .\cookbook\templates\base.html:220
-msgid "GitHub"
-msgstr "GitHub"
-
-#: .\cookbook\templates\base.html:224
-msgid "API Browser"
-msgstr "Browser API"
-
-#: .\cookbook\templates\base.html:227
-msgid "Log out"
-msgstr "Esci"
-
-#: .\cookbook\templates\base.html:229
+#: .\cookbook\templates\base.html:259
 #: .\cookbook\templates\generic\list_template.html:14
 #: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
 msgid "External Recipes"
 msgstr "Ricette esterne"
 
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\space.html:19
+msgid "Space Settings"
+msgstr "Impostazioni Istanza"
+
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
+msgid "System"
+msgstr "Sistema"
+
+#: .\cookbook\templates\base.html:269
+msgid "Admin"
+msgstr "Amministratore"
+
+#: .\cookbook\templates\base.html:273
+msgid "Markdown Guide"
+msgstr "Informazioni su Markdown"
+
+#: .\cookbook\templates\base.html:275
+msgid "GitHub"
+msgstr "GitHub"
+
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
+msgid "API Browser"
+msgstr "Browser API"
+
+#: .\cookbook\templates\base.html:284
+msgid "Log out"
+msgstr "Esci"
+
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Modifica in blocco per categoria"
@@ -978,16 +1030,6 @@ msgstr "Libri di Ricette"
 msgid "Export Recipes"
 msgstr "Esporta Ricette"
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr "Esporta"
-
-#: .\cookbook\templates\files.html:7
-msgid "Files"
-msgstr "File"
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -997,11 +1039,10 @@ msgstr "Importa nuova Ricetta"
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr "Salva"
 
@@ -1043,12 +1084,20 @@ msgstr "Unisci"
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Sei sicuro di volere unire questi due ingredienti?"
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr "Sei sicuro di volere eliminare %(title)s: <b>%(object)s</b>"
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1109,9 +1158,6 @@ msgstr "Valutazione"
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr "Chiudi"
 
@@ -1162,8 +1208,8 @@ msgstr "Ripristina Ricerca"
 msgid "Last viewed"
 msgstr "Recenti"
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr "Ricette"
 
@@ -1327,181 +1373,19 @@ msgstr "Intestazione"
 msgid "Cell"
 msgstr "Cella"
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
-msgstr "Nuovo Campo"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
+msgstr "Mostra il piano alimentare"
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr "Cerca Ricetta"
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr "Titolo"
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr "Nota (opzionale)"
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-"Puoi usare markdown per formattare questo campo. Guarda la <a href=\"/docs/"
-"markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">documentazione "
-"qui</a>"
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr "Numero di porzioni"
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr "Crea solo una nota"
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr "Lista della spesa"
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr "La lista della spesa è vuota"
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr "Apri lista della spesa"
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr "Piano"
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr "Numero di giorni"
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr "Correzione giorni feriali"
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-"Numero di giorni a partire dal primo giorno della settimana per correggere "
-"la visualizzazione predefinita."
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr "Modifica i tipi di piano"
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr "Mostra aiuto"
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr "Esporta iCall settimanale"
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Nota"
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr "Creato da"
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr "Condiviso con"
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr "Aggiunti a lista della spesa"
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr "Nuovo tipo di pasto"
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr "Aiuto per il piano alimentare"
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-"\n"
-"<p>Il modulo del piano alimentare consente di pianificare i pasti sia con "
-"ricette che con semplici note.</p>\n"
-"<p>Seleziona una ricetta dalla lista delle ricette recenti o cercane una,\n"
-"quindi spostala sulla posizione desiderata. Puoi anche aggiungere una nota e "
-"un titolo e\n"
-"poi trascinare la ricetta per creare una voce nel piano con un titolo e una "
-"nota personalizzata. Si possono anche creare\n"
-"delle note trascinando la casella della nota nel piano.</p>\n"
-"<p>Clicca su una ricetta per aprire la vista dettagliata. Qui potrai anche "
-"aggiungerla alla lista della spesa. Puoi anche aggiungere tutte le ricette "
-"di un giorno alla lista della spesa, basterà cliccare sul carrello sopra la "
-"tabella.</p>\n"
-"<p>Dato che è comune pianificare i pasti con altre persone, nelle "
-"impostazioni puoi scegliere gli utenti con i quali condividere il tuo piano."
-"</p>\n"
-"<p>Puoi anche modificare i tipi di pasto che vuoi pianificare. Se condividi "
-"il piano con\n"
-"qualcuno\n"
-"con pasti differenti, i loro tipi di pasto appariranno anche nella tua "
-"lista. Per evitare\n"
-"duplicati (es. Altri e Varie)\n"
-"dai nomi ai tuoi tipi di pasto uguali ai tuoi utenti in modo che verranno "
-"uniti.</p>"
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr "Mostra il piano alimentare"
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1618,24 +1502,24 @@ msgstr "Commenti"
 msgid "by"
 msgstr "di"
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Commento"
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr "Immagine ricetta"
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr "Tempo di preparazione circa"
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr "Tempo di cottura circa"
 
@@ -1653,7 +1537,7 @@ msgstr "Pagina iniziale ricette"
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 #, fuzzy
 #| msgid "Search String"
 msgid "Search Settings"
@@ -1824,54 +1708,54 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr "Account"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 msgid "API-Settings"
 msgstr "Impostazioni API"
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 #, fuzzy
 #| msgid "Search String"
 msgid "Search-Settings"
 msgstr "Stringa di Ricerca"
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 msgid "Name Settings"
 msgstr "Impostazioni Nome"
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 msgid "Account Settings"
 msgstr "Impostazioni Account"
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 msgid "Emails"
 msgstr "Email"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr "Social"
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr "Lingua"
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr "Stile"
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr "Token API"
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1879,7 +1763,7 @@ msgstr ""
 "Per accedere alle API REST puoi usare sia l'autenticazione base sia quella "
 "tramite token."
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1887,10 +1771,62 @@ msgstr ""
 "Usa il token come header Authorization preceduto dalla parola Token come "
 "negli esempi seguenti:"
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr "o"
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr "Configurazione del ricettario"
@@ -1909,64 +1845,80 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr "Crea super utente"
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr "Lista della spesa"
+
+#: .\cookbook\templates\shopping_list.html:34
+#, fuzzy
+#| msgid "Open Shopping List"
+msgid "Try the new shopping list"
+msgstr "Apri lista della spesa"
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr "Cerca Ricetta"
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr "Ricette per la spesa"
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr "Nessuna ricetta selezionata"
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr "Modalità di inserimento"
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr "Aggiungi voce"
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr "Quantità"
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr "Seleziona unità di misura"
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr "Seleziona"
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr "Seleziona alimento"
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr "Seleziona supermercato"
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr "Seleziona utente"
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr "Completato"
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr "Sei offline: la lista della spesa potrebbe non sincronizzarsi."
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr "Copia/Esporta"
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr "Prefisso lista"
 
@@ -2245,84 +2197,84 @@ msgstr "Salvami nei preferiti!"
 msgid "Enter website URL"
 msgstr "Inserisci l'indirizzo del sito web"
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr "Seleziona i file delle ricette da importare o spostarli qui..."
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr "Incolla qui il codice html o json per caricare una ricetta."
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 msgid "Preview Recipe Data"
 msgstr "Anteprima dati della ricetta"
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr "Trascina gli attributi della ricetta da destra nella casella in basso."
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr "Cancella il contenuto"
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr "Il testo trascinato qui sarà aggiunto al nome."
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr "Descrizione"
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr "Il testo trascinato qui sarà aggiunto alla descrizione."
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr "Le parole chiave trascinate qui saranno aggiunte alla lista corrente"
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr "Immagine"
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 msgid "Prep Time"
 msgstr "Tempo di preparazione"
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 msgid "Cook Time"
 msgstr "Tempo di cottura"
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr "Gli ingredienti trascinati qui saranno aggiunti alla lista corrente."
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr "Istruzioni"
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 "Le istruzioni per la ricetta trascinate qui saranno aggiunte alle istruzioni "
 "correnti."
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 msgid "Discovered Attributes"
 msgstr "Attributi trovati"
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
@@ -2330,57 +2282,61 @@ msgstr ""
 "Trascina gli attributi delle ricette dal basso nella casella sulla sinistra. "
 "Clicca su qualsiasi nodo per mostrare le sue proprietà complete."
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 msgid "Show Blank Field"
 msgstr "Mostra campo vuoto"
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr "Campo vuoto"
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr "Gli elementi trascinati nel campo vuoto saranno ignorati."
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 msgid "Delete Text"
 msgstr "Elimina testo"
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 msgid "Delete image"
 msgstr "Elimina immagine"
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr "Nome Ricetta"
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr "Descrizione ricetta"
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr "Seleziona un elemento"
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr "Nota"
+
+#: .\cookbook\templates\url_import.html:585
 msgid "Add Keyword"
 msgstr "Aggiungi parole chiave"
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr "Tutte le parole chiave"
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr "Importa tutte le parole chiave, non solo quelle che già esistono."
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr "Informazioni"
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2398,15 +2354,15 @@ msgstr ""
 "struttura dati, puoi inviare un esempio nella sezione Issues \n"
 "                                    su GitHub."
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr "Info Google Id+json"
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr "Issues (Problemi aperti) su GitHub"
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr "Specifica di Markup della ricetta"
 
@@ -2419,8 +2375,7 @@ msgstr "Il parametro updated_at non è formattato correttamente"
 msgid "No {self.basename} with id {pk} exists"
 msgstr "Non esiste nessun {self.basename} con id {pk}"
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr "Non è possibile unirlo con lo stesso oggetto!"
 
@@ -2435,72 +2390,72 @@ msgstr "Non esiste nessun {self.basename} con id {target}"
 msgid "Cannot merge with child object!"
 msgstr "Non è possibile unirlo con lo stesso oggetto!"
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr "{source.name} è stato unito con successo a {target.name}"
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 "Si è verificato un errore durante l'unione di {source.name} con {target.name}"
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr "Non esiste nessun {self.basename} con id {child}"
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr "{child.name} è stato spostato con successo alla radice."
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr "Si è verificato un errore durante lo spostamento "
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr "Non è possibile muovere un oggetto a sé stesso!"
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr "Non esiste nessun {self.basename} con id {parent}"
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr "{child.name} è stato spostato con successo al primario {parent.name}"
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr "Questa funzione non è disponibile nella versione demo!"
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr "Sincronizzazione completata con successo!"
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr "Errore di sincronizzazione con questo backend"
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr "Nulla da fare."
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 "Il sito richiesto ha fornito dati in formato non corretto e non può essere "
 "letto."
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr "La pagina richiesta non è stata trovata."
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2508,27 +2463,27 @@ msgstr ""
 "Il sito richiesto non fornisce un formato di dati riconosciuto da cui "
 "importare la ricetta."
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr "Nessuna informazione utilizzabile è stata trovata."
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr "Non è stato trovato nulla da fare."
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr "Hai raggiunto il numero massimo di ricette nella tua istanza."
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr "Hai più utenti di quanti permessi nella tua istanza."
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
@@ -2536,32 +2491,31 @@ msgstr[0] "Modifica di massa completata. %(count)d ricetta è stata aggiornata."
 msgstr[1] ""
 "Modifica in blocco completata. %(count)d ricette sono state aggiornate."
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr "Monitoraggio"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Backend di archiviazione"
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 "Non è possibile eliminare questo backend di archiviazione perchè è usato in "
 "almeno un monitoraggio."
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr "Libro delle ricette"
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr "Preferiti"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr "Link di invito"
 
@@ -2583,27 +2537,19 @@ msgstr ""
 msgid "Storage"
 msgstr "Archiviazione"
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr "Modifiche salvate!"
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr "Si è verificato un errore durante il salvataggio delle modifiche!"
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr "Le unità sono state unite!"
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr "Gli alimenti sono stati uniti!"
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr "Questo provider non permette l'importazione"
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr "Questo provider non permette l'esportazione"
 
@@ -2637,6 +2583,12 @@ msgstr "Supermercato"
 msgid "Shopping Categories"
 msgstr "Ricette per la spesa"
 
+#: .\cookbook\views\lists.py:232
+#, fuzzy
+#| msgid "Shopping List"
+msgid "New Shopping List"
+msgstr "Lista della spesa"
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "La nuova ricetta è stata importata!"
@@ -2645,49 +2597,49 @@ msgstr "La nuova ricetta è stata importata!"
 msgid "There was an error importing this recipe!"
 msgstr "Si è verificato un errore durante l'importazione di questa ricetta!"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr "Ciao"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr "Sei stato invitato da "
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr " per entrare nella sua istanza di Tandoor Recipes "
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr "Clicca il link qui di seguito per attivare il tuo account: "
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 "Se il link non funziona, usa il seguente codice per entrare manualmente "
 "nell'istanza: "
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr "L'invito è valido fino al "
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 "Tandoor Recipes è un gestore di ricette Open Source. Dagli una occhiata su "
 "GitHub "
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr "Invito per Tandoor Recipes"
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr "Link di invito inviato con successo all'utente."
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
@@ -2695,13 +2647,13 @@ msgstr ""
 "Hai mandato troppe email, condividi il link manualmente o aspetta qualche "
 "ora."
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 "Non è stato possibile inviare l'email all'utente, condividi il link "
 "manualmente."
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
@@ -2709,19 +2661,19 @@ msgstr ""
 "Hai creato la tua istanza personale per le ricette. Inizia aggiungendo "
 "qualche ricetta o invita altre persone a unirsi a te."
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr "Non hai i permessi necessari per completare questa operazione!"
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr "Commento salvato!"
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr "Devi selezionare almeno un campo da cercare!"
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
@@ -2729,11 +2681,11 @@ msgstr ""
 "Per utilizzare questo metodo di ricerca devi selezionare almeno un campo di "
 "ricerca full text!"
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
@@ -2743,32 +2695,32 @@ msgstr ""
 "utente! Se hai dimenticato le credenziali del tuo super utente controlla la "
 "documentazione di Django per resettare le password."
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr "Le password non combaciano!"
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr "L'utente è stato creato e ora può essere usato per il login!"
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr "È stato fornito un link di invito non valido!"
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 "Sei già membro di una istanza e quindi non puoi entrare in quest'altra."
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr "Sei entrato a far parte di questa istanza."
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr "Il link di invito non è valido o è stato già usato!"
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
@@ -2776,7 +2728,7 @@ msgstr ""
 "La segnalazione dei link di condivisione non è abilitata per questa istanza. "
 "Notifica l'amministratore per segnalare i problemi."
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
@@ -2784,6 +2736,156 @@ msgstr ""
 "Il link per la condivisione delle ricette è stato disabilitato! Per maggiori "
 "informazioni contatta l'amministratore."
 
+#~ msgid "New Unit"
+#~ msgstr "Nuova unità di misura"
+
+#~ msgid "New unit that other gets replaced by."
+#~ msgstr "Nuova unità di misura che sostituisce le altre."
+
+#~ msgid "Old Unit"
+#~ msgstr "Vecchia unità di misura"
+
+#~ msgid "Unit that should be replaced."
+#~ msgstr "Unità di misura che dovrebbe essere rimpiazzata."
+
+#~ msgid "New Food"
+#~ msgstr "Nuovo alimento"
+
+#~ msgid "New food that other gets replaced by."
+#~ msgstr "Nuovo alimento che sostituisce gli altri."
+
+#~ msgid "Old Food"
+#~ msgstr "Vecchio alimento"
+
+#~ msgid "Food that should be replaced."
+#~ msgstr "Alimento che dovrebbe essere rimpiazzato."
+
+#~ msgid "New Entry"
+#~ msgstr "Nuovo Campo"
+
+#~ msgid "Title"
+#~ msgstr "Titolo"
+
+#~ msgid "Note (optional)"
+#~ msgstr "Nota (opzionale)"
+
+#~ msgid ""
+#~ "You can use markdown to format this field. See the <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
+#~ msgstr ""
+#~ "Puoi usare markdown per formattare questo campo. Guarda la <a href=\"/"
+#~ "docs/markdown/\" target=\"_blank\" rel=\"noopener noreferrer"
+#~ "\">documentazione qui</a>"
+
+#~ msgid "Serving Count"
+#~ msgstr "Numero di porzioni"
+
+#~ msgid "Create only note"
+#~ msgstr "Crea solo una nota"
+
+#~ msgid "Shopping list currently empty"
+#~ msgstr "La lista della spesa è vuota"
+
+#~ msgid "Plan"
+#~ msgstr "Piano"
+
+#~ msgid "Number of Days"
+#~ msgstr "Numero di giorni"
+
+#~ msgid "Weekday offset"
+#~ msgstr "Correzione giorni feriali"
+
+#~ msgid ""
+#~ "Number of days starting from the first day of the week to offset the "
+#~ "default view."
+#~ msgstr ""
+#~ "Numero di giorni a partire dal primo giorno della settimana per "
+#~ "correggere la visualizzazione predefinita."
+
+#~ msgid "Edit plan types"
+#~ msgstr "Modifica i tipi di piano"
+
+#~ msgid "Show help"
+#~ msgstr "Mostra aiuto"
+
+#~ msgid "Week iCal export"
+#~ msgstr "Esporta iCall settimanale"
+
+#~ msgid "Add to Shopping"
+#~ msgstr "Aggiunti a lista della spesa"
+
+#~ msgid "New meal type"
+#~ msgstr "Nuovo tipo di pasto"
+
+#~ msgid "Meal Plan Help"
+#~ msgstr "Aiuto per il piano alimentare"
+
+#~ msgid ""
+#~ "\n"
+#~ "                            <p>The meal plan module allows planning of "
+#~ "meals both with recipes and notes.</p>\n"
+#~ "                            <p>Simply select a recipe from the list of "
+#~ "recently viewed recipes or search the one you\n"
+#~ "                                want and drag it to the desired plan "
+#~ "position. You can also add a note and a title and\n"
+#~ "                                then drag the recipe to create a plan "
+#~ "entry with a custom title and note. Creating only\n"
+#~ "                                Notes is possible by dragging the create "
+#~ "note box into the plan.</p>\n"
+#~ "                            <p>Click on a recipe in order to open the "
+#~ "detailed view. There you can also add it to the\n"
+#~ "                                shopping list. You can also add all "
+#~ "recipes of a day to the shopping list by\n"
+#~ "                                clicking the shopping cart at the top of "
+#~ "the table.</p>\n"
+#~ "                            <p>Since a common use case is to plan meals "
+#~ "together you can define\n"
+#~ "                                users you want to share your plan with in "
+#~ "the settings.\n"
+#~ "                            </p>\n"
+#~ "                            <p>You can also edit the types of meals you "
+#~ "want to plan. If you share your plan with\n"
+#~ "                                someone with\n"
+#~ "                                different meals, their meal types will "
+#~ "appear in your list as well. To prevent\n"
+#~ "                                duplicates (e.g. Other and Misc.)\n"
+#~ "                                name your meal types the same as the "
+#~ "users you share your meals with and they will be\n"
+#~ "                                merged.</p>\n"
+#~ "                        "
+#~ msgstr ""
+#~ "\n"
+#~ "<p>Il modulo del piano alimentare consente di pianificare i pasti sia con "
+#~ "ricette che con semplici note.</p>\n"
+#~ "<p>Seleziona una ricetta dalla lista delle ricette recenti o cercane "
+#~ "una,\n"
+#~ "quindi spostala sulla posizione desiderata. Puoi anche aggiungere una "
+#~ "nota e un titolo e\n"
+#~ "poi trascinare la ricetta per creare una voce nel piano con un titolo e "
+#~ "una nota personalizzata. Si possono anche creare\n"
+#~ "delle note trascinando la casella della nota nel piano.</p>\n"
+#~ "<p>Clicca su una ricetta per aprire la vista dettagliata. Qui potrai "
+#~ "anche aggiungerla alla lista della spesa. Puoi anche aggiungere tutte le "
+#~ "ricette di un giorno alla lista della spesa, basterà cliccare sul "
+#~ "carrello sopra la tabella.</p>\n"
+#~ "<p>Dato che è comune pianificare i pasti con altre persone, nelle "
+#~ "impostazioni puoi scegliere gli utenti con i quali condividere il tuo "
+#~ "piano.</p>\n"
+#~ "<p>Puoi anche modificare i tipi di pasto che vuoi pianificare. Se "
+#~ "condividi il piano con\n"
+#~ "qualcuno\n"
+#~ "con pasti differenti, i loro tipi di pasto appariranno anche nella tua "
+#~ "lista. Per evitare\n"
+#~ "duplicati (es. Altri e Varie)\n"
+#~ "dai nomi ai tuoi tipi di pasto uguali ai tuoi utenti in modo che verranno "
+#~ "uniti.</p>"
+
+#~ msgid "Units merged!"
+#~ msgstr "Le unità sono state unite!"
+
+#~ msgid "Foods merged!"
+#~ msgstr "Gli alimenti sono stati uniti!"
+
 #~ msgid "Utensils"
 #~ msgstr "Strumenti"
 
diff --git a/cookbook/locale/lv/LC_MESSAGES/django.mo b/cookbook/locale/lv/LC_MESSAGES/django.mo
index f3addbf9a6bba7a17978f5fdd1cfba86dc1ff1f8..ea1f9cfb9f96e8af54dd96a3d8919a14b95d97ac 100644
GIT binary patch
delta 5486
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

delta 7355
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
O4aBpL(OXMD$@x2b&!fKp

diff --git a/cookbook/locale/lv/LC_MESSAGES/django.po b/cookbook/locale/lv/LC_MESSAGES/django.po
index d41b7c87c..2f25ce216 100644
--- a/cookbook/locale/lv/LC_MESSAGES/django.po
+++ b/cookbook/locale/lv/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2020-06-02 19:28+0000\n"
 "Last-Translator: vabene1111 <vabene1234@googlemail.com>, 2021\n"
 "Language-Team: Latvian (https://www.transifex.com/django-recipes/"
@@ -26,11 +26,11 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Sastāvdaļas"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -38,11 +38,11 @@ msgstr ""
 "Augšējās navigācijas joslas krāsa. Ne visas krāsas darbojas ar visām tēmām, "
 "vienkārši izmēģiniet tās!"
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr "Noklusējuma vienība, ko izmantot, ievietojot receptē jaunu sastāvdaļu."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -50,7 +50,11 @@ msgstr ""
 "Iespējot daļskaitļus sastāvdaļu daudzumos (piemēram, decimāldaļas "
 "automātiski pārveidot par daļskaitļiem)"
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -58,20 +62,20 @@ msgstr ""
 "Lietotāji, ar kuriem jaunizveidotie maltīšu saraksti/iepirkumu saraksti tiks "
 "kopīgoti pēc noklusējuma."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "Parādīt nesen skatītās receptes meklēšanas lapā."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "Ciparu skaits pēc komata decimāldaļām sastāvdaļās."
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 "Ja vēlaties, lai jūs varētu izveidot un redzēt komentārus zem receptēm."
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -85,11 +89,11 @@ msgstr ""
 "Ja tas ir zemāks par instances ierobežojumu, tas tiek atiestatīts, "
 "saglabājot."
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -97,89 +101,57 @@ msgstr ""
 "Abi lauki nav obligāti. Ja neviens nav norādīts, tā vietā tiks parādīts "
 "lietotājvārds"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "Vārds"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Atslēgvārdi"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "Pagatavošanas laiks minūtēs"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Gaidīšanas laiks (vārīšana / cepšana) minūtēs"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "Ceļš"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "Krātuves UID"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "Jaunā vienība"
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr "Jauna vienība, ar kuru cits tiek aizstāts."
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "Vecā vienība"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr "Vienība, kas jāaizstāj."
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "Jauns ēdiens"
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr "Jauns ēdiens, ar kuru citi tiek aizstāti."
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "Vecais ēdiens"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr "Ēdiens, kas būtu jāaizstāj."
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "Pievienot komentāru: "
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr "Atstājiet tukšu Dropbox un ievadiet lietotnes paroli Nextcloud."
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr "Atstājiet tukšu Nextcloud un ievadiet API tokenu Dropbox."
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -187,25 +159,25 @@ msgstr ""
 "Atstājiet tukšu Dropbox un ievadiet tikai Nextcloud bāzes URL (<kods> /"
 "remote.php/webdav/ </code> tiek pievienots automātiski)"
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr "Meklēšanas virkne"
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "Faila ID"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr "Jums jānorāda vismaz recepte vai nosaukums."
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 "Iestatījumos varat uzskaitīt noklusējuma lietotājus, ar kuriem koplietot "
 "receptes."
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -213,99 +185,105 @@ msgstr ""
 "Lai formatētu šo lauku, varat izmantot Markdown. Skatiet <a href=\"/docs/"
 "markdown/\"> dokumentus šeit </a>"
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr ""
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 #, fuzzy
 #| msgid "Search"
 msgid "Search Method"
 msgstr "Meklēt"
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr ""
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 #, fuzzy
 #| msgid "Search"
 msgid "Fuzzy Search"
 msgstr "Meklēt"
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 #, fuzzy
 #| msgid "Text"
 msgid "Full Text"
@@ -318,7 +296,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "Jūs neesat pieteicies un tāpēc nevarat skatīt šo lapu!"
 
@@ -328,9 +306,9 @@ msgstr "Jūs neesat pieteicies un tāpēc nevarat skatīt šo lapu!"
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr "Jums nav nepieciešamo atļauju, lai apskatītu šo lapu!"
 
@@ -345,36 +323,36 @@ msgstr "Jūs nevarat mainīt šo objektu, jo tas nepieder jums!"
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importēt"
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, fuzzy, python-format
 #| msgid "Imported new recipe!"
 msgid "Imported %s recipes."
@@ -398,8 +376,8 @@ msgstr ""
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr "Porciju skaits"
 
@@ -453,104 +431,120 @@ msgstr "Vakariņas"
 msgid "Other"
 msgstr "Cits"
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr "Meklēt"
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr "Maltīšu plāns"
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Grāmatas"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr "Mazs"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr "Liels"
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr "Jauns"
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "Teskts"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr "Laiks"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "Faila ID"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Recepte"
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Food"
+msgid "Food Alias"
+msgstr "Ēdiens"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Units"
+msgid "Unit Alias"
+msgstr "Vienības"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "Atslēgvārdi"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr ""
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr "Rediģēt"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr "Izdzēst"
@@ -579,7 +573,7 @@ msgstr ""
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -616,6 +610,7 @@ msgid "Re-send Verification"
 msgstr ""
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr ""
@@ -659,7 +654,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr "Apstiprināt"
 
@@ -671,7 +666,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr "Pieslēgties"
 
@@ -719,6 +714,10 @@ msgstr ""
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 #, fuzzy
 #| msgid "Changes saved!"
 msgid "Change Password"
@@ -726,7 +725,7 @@ msgstr "Izmaiņas saglabātas!"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 #, fuzzy
 #| msgid "Settings"
 msgid "Password"
@@ -759,6 +758,32 @@ msgid ""
 "within a few minutes."
 msgstr ""
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#, fuzzy
+#| msgid "API Token"
+msgid "Bad Token"
+msgstr "API Tokens"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+#, fuzzy
+#| msgid "Changes saved!"
+msgid "change password"
+msgstr "Izmaiņas saglabātas!"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -812,7 +837,7 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "API dokumentācija"
@@ -833,67 +858,96 @@ msgid "Units"
 msgstr "Vienības"
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
 #: .\cookbook\templates\base.html:163
+#, fuzzy
+#| msgid "Batch edit Category"
+msgid "Supermarket Category"
+msgstr "Rediģēt vairākas kategorijas uzreiz"
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+#, fuzzy
+#| msgid "Information"
+msgid "Automations"
+msgstr "Informācija"
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+#, fuzzy
+#| msgid "File ID"
+msgid "Files"
+msgstr "Faila ID"
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr "Rediģēt vairākus"
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Vēsture"
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr "Eksportēt"
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr "Importēt recepti"
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr "Izveidot"
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:259
+#: .\cookbook\templates\generic\list_template.html:14
+#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
+msgid "External Recipes"
+msgstr "Ārējās receptes"
+
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 #, fuzzy
 #| msgid "Settings"
 msgid "Space Settings"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Sistēma"
 
-#: .\cookbook\templates\base.html:214
+#: .\cookbook\templates\base.html:269
 msgid "Admin"
 msgstr "Administrators"
 
-#: .\cookbook\templates\base.html:218
+#: .\cookbook\templates\base.html:273
 msgid "Markdown Guide"
 msgstr "Markdown rokasgrāmata"
 
-#: .\cookbook\templates\base.html:220
+#: .\cookbook\templates\base.html:275
 msgid "GitHub"
 msgstr "Github"
 
-#: .\cookbook\templates\base.html:224
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
 msgid "API Browser"
 msgstr "API pārlūks"
 
-#: .\cookbook\templates\base.html:227
+#: .\cookbook\templates\base.html:284
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
-#: .\cookbook\templates\generic\list_template.html:14
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Ārējās receptes"
-
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Rediģēt vairākas kategorijas uzreiz"
@@ -968,18 +1022,6 @@ msgstr "Recepšu grāmatas"
 msgid "Export Recipes"
 msgstr "Eksportēt receptes"
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr "Eksportēt"
-
-#: .\cookbook\templates\files.html:7
-#, fuzzy
-#| msgid "File ID"
-msgid "Files"
-msgstr "Faila ID"
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -989,11 +1031,10 @@ msgstr "Importēt jaunu recepti"
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr "Saglabāt"
 
@@ -1036,12 +1077,20 @@ msgstr "Apvienot"
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Vai tiešām vēlaties apvienot šīs divas sastāvdaļas?"
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr "Vai tiešām vēlaties izdzēst %(title)s: <b>%(object)s</b> "
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1102,9 +1151,6 @@ msgstr "Vērtējums"
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr "Aizvērt"
 
@@ -1158,8 +1204,8 @@ msgstr "Atiestatīt meklēšanu"
 msgid "Last viewed"
 msgstr "Pēdējoreiz skatīts"
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr "Receptes"
 
@@ -1320,156 +1366,19 @@ msgstr "Galvene"
 msgid "Cell"
 msgstr "Šūna"
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
-msgstr "Jauns ieraksts"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
+msgstr "Maltītes plāna skats"
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr "Meklēt recepti"
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr "Virsraksts"
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr "Piezīme (neobligāti)"
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-"Lai formatētu šo lauku, varat izmantot Markdown. Skatiet <a href=\"/docs/"
-"markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">dokumentāciju "
-"šeit</a>"
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr "Izveidot tikai piezīmi"
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr "Iepirkumu saraksts"
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr "Iepirkumu saraksts pašlaik ir tukšs"
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr "Atvērt iepirkumu sarakstu"
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr "Plāns"
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr "Dienu skaits"
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr "Nedēļas dienas nobīde"
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-"Dienu skaits, sākot no nedēļas pirmās dienas, lai nobīdītu noklusējuma skatu."
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr "Rediģēt plānu veidus"
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr "Parādīt palīdzību"
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr "Nedēļas iCal eksports"
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Piezīme"
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr "Izveidojis"
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr "Kopīgots ar"
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr "Pievienot iepirkumiem"
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr "Jauns maltītes veids"
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr "Ēdienreižu plāna palīdzība"
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr "Maltītes plāna skats"
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1581,24 +1490,24 @@ msgstr "Komentāri"
 msgid "by"
 msgstr "pēc"
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Komentēt"
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr "Receptes attēls"
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr "Pagatavošanas laiks apm."
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr "Gaidīšanas laiks apm."
 
@@ -1616,7 +1525,7 @@ msgstr "Recepšu Sākums"
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 #, fuzzy
 #| msgid "Search String"
 msgid "Search Settings"
@@ -1779,62 +1688,62 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr "Konts"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 #, fuzzy
 #| msgid "Settings"
 msgid "API-Settings"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 #, fuzzy
 #| msgid "Search String"
 msgid "Search-Settings"
 msgstr "Meklēšanas virkne"
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 #, fuzzy
 #| msgid "Settings"
 msgid "Name Settings"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 #, fuzzy
 #| msgid "Settings"
 msgid "Account Settings"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 #, fuzzy
 #| msgid "Settings"
 msgid "Emails"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr "Valoda"
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr "Stils"
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr "API Tokens"
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1842,7 +1751,7 @@ msgstr ""
 "Lai piekļūtu REST API, varat izmantot gan pamata autentifikāciju, gan tokena "
 "autentifikāciju."
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1850,10 +1759,62 @@ msgstr ""
 "Izmantojiet token, kā Authorization header, kas pievienota vārdam token, kā "
 "parādīts šajos piemēros:"
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr "vai"
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr "Pavārgrāmatu iestatīšana"
@@ -1873,64 +1834,80 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr "Izveidojiet superlietotāja kontu"
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr "Iepirkumu saraksts"
+
+#: .\cookbook\templates\shopping_list.html:34
+#, fuzzy
+#| msgid "Open Shopping List"
+msgid "Try the new shopping list"
+msgstr "Atvērt iepirkumu sarakstu"
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr "Meklēt recepti"
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr "Iepirkšanās receptes"
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr "Nav izvēlēta neviena recepte"
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr "Summa"
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr "Atlasiet vienību"
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr "Atlasīt"
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr "Atlasīt ēdienu"
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr "Atlasīt lietotāju"
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr "Pabeigts"
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr "Jūs esat bezsaistē. Iepirkumu saraksts netiek sinhronizēts."
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr "Kopēt/eksportēt"
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr "Saraksta prefikss"
 
@@ -2225,156 +2202,160 @@ msgstr "Grāmatzīme saglabāta!"
 msgid "Enter website URL"
 msgstr "Ievadiet vietnes URL"
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 #, fuzzy
 #| msgid "View Recipe"
 msgid "Preview Recipe Data"
 msgstr "Skatīt recepti"
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 #, fuzzy
 #| msgid "Preparation Time"
 msgid "Prep Time"
 msgstr "Pagatavošanas laiks"
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 #, fuzzy
 #| msgid "Time"
 msgid "Cook Time"
 msgstr "Laiks"
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr "Instrukcijas"
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 #, fuzzy
 #| msgid "Discovered Recipes"
 msgid "Discovered Attributes"
 msgstr "Atrastās receptes"
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 #, fuzzy
 #| msgid "Show as header"
 msgid "Show Blank Field"
 msgstr "Rādīt kā galveni"
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 #, fuzzy
 #| msgid "Delete Step"
 msgid "Delete Text"
 msgstr "Dzēst soli"
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 #, fuzzy
 #| msgid "Delete Recipe"
 msgid "Delete image"
 msgstr "Dzēst recepti"
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr "Receptes nosaukums"
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 #, fuzzy
 #| msgid "Recipe Markup Specification"
 msgid "Recipe Description"
 msgstr "Recepšu Markup specifikācija"
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr "Izvēlies vienu"
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr "Piezīme"
+
+#: .\cookbook\templates\url_import.html:585
 #, fuzzy
 #| msgid "All Keywords"
 msgid "Add Keyword"
 msgstr "Visi atslēgvārdi"
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr "Visi atslēgvārdi"
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr "Importējiet visus atslēgvārdus, ne tikai jau esošos."
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr "Informācija"
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2393,15 +2374,15 @@ msgstr ""
 "nekautrējieties ievietot piemēru\n"
 "                                     Github."
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr "Google ld+json informācija"
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr "GitHub Issues"
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr "Recepšu Markup specifikācija"
 
@@ -2416,8 +2397,7 @@ msgstr "Parametrs filter_list ir nepareizi formatēts"
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr ""
 
@@ -2430,69 +2410,69 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr "Sinhronizācija ir veiksmīga!"
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr "Sinhronizējot ar krātuvi, radās kļūda"
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr "Pieprasītā vietne sniedza nepareizus datus, kurus nevar nolasīt."
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr "Pieprasīto lapu nevarēja atrast."
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2500,29 +2480,29 @@ msgstr ""
 "Pieprasītajā vietnē nav norādīts atzīts datu formāts, no kura varētu "
 "importēt recepti."
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 #, fuzzy
 #| msgid "The requested page could not be found."
 msgid "No useable data could be found."
 msgstr "Pieprasīto lapu nevarēja atrast."
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr ""
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
@@ -2530,32 +2510,31 @@ msgstr[0] "Partijas rediģēšana pabeigta. %(count)d recepte tika atjaunināta.
 msgstr[1] "Partijas rediģēšana pabeigta. %(count)d receptes tika atjauninātas."
 msgstr[2] "Partijas rediģēšana pabeigta. %(count)d receptes tika atjauninātas."
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr "Uzraudzīt"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Krātuves aizmugursistēma"
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 "Nevarēja izdzēst šo krātuves aizmugursistēmu, jo tā tiek izmantota vismaz "
 "vienā uzraugā."
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr "Recepšu grāmata"
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr "Grāmatzīmes"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr "Uzaicinājuma saite"
 
@@ -2575,27 +2554,19 @@ msgstr "Atjauninot šo krātuves aizmugursistēmu, radās kļūda!"
 msgid "Storage"
 msgstr "Krātuve"
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr "Izmaiņas saglabātas!"
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr "Saglabājot izmaiņas, radās kļūda!"
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr "Vienības ir apvienotas!"
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr "Ēdieni apvienoti!"
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
@@ -2627,6 +2598,12 @@ msgstr ""
 msgid "Shopping Categories"
 msgstr "Iepirkšanās receptes"
 
+#: .\cookbook\views\lists.py:232
+#, fuzzy
+#| msgid "Shopping List"
+msgid "New Shopping List"
+msgstr "Iepirkumu saraksts"
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Importēta jauna recepte!"
@@ -2635,83 +2612,83 @@ msgstr "Importēta jauna recepte!"
 msgid "There was an error importing this recipe!"
 msgstr "Importējot šo recepti, radās kļūda!"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
 msgstr ""
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr "Jums nav nepieciešamo atļauju, lai veiktu šo darbību!"
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr "Komentārs saglabāts!"
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
@@ -2721,44 +2698,131 @@ msgstr ""
 "aizmirsis sava superlietotāja informāciju, lūdzu, skatiet Django "
 "dokumentāciju par paroļu atiestatīšanu."
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr "Paroles nesakrīt!"
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr "Lietotājs ir izveidots, lūdzu, piesakieties!"
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr "Nepareiza uzaicinājuma saite!"
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 #, fuzzy
 #| msgid "You are not logged in and therefore cannot view this page!"
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr "Jūs neesat pieteicies un tāpēc nevarat skatīt šo lapu!"
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr "Uzaicinājuma saite nav derīga vai jau izmantota!"
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "New Unit"
+#~ msgstr "Jaunā vienība"
+
+#~ msgid "New unit that other gets replaced by."
+#~ msgstr "Jauna vienība, ar kuru cits tiek aizstāts."
+
+#~ msgid "Old Unit"
+#~ msgstr "Vecā vienība"
+
+#~ msgid "Unit that should be replaced."
+#~ msgstr "Vienība, kas jāaizstāj."
+
+#~ msgid "New Food"
+#~ msgstr "Jauns ēdiens"
+
+#~ msgid "New food that other gets replaced by."
+#~ msgstr "Jauns ēdiens, ar kuru citi tiek aizstāti."
+
+#~ msgid "Old Food"
+#~ msgstr "Vecais ēdiens"
+
+#~ msgid "Food that should be replaced."
+#~ msgstr "Ēdiens, kas būtu jāaizstāj."
+
+#~ msgid "New Entry"
+#~ msgstr "Jauns ieraksts"
+
+#~ msgid "Title"
+#~ msgstr "Virsraksts"
+
+#~ msgid "Note (optional)"
+#~ msgstr "Piezīme (neobligāti)"
+
+#~ msgid ""
+#~ "You can use markdown to format this field. See the <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
+#~ msgstr ""
+#~ "Lai formatētu šo lauku, varat izmantot Markdown. Skatiet <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">dokumentāciju "
+#~ "šeit</a>"
+
+#~ msgid "Create only note"
+#~ msgstr "Izveidot tikai piezīmi"
+
+#~ msgid "Shopping list currently empty"
+#~ msgstr "Iepirkumu saraksts pašlaik ir tukšs"
+
+#~ msgid "Plan"
+#~ msgstr "Plāns"
+
+#~ msgid "Number of Days"
+#~ msgstr "Dienu skaits"
+
+#~ msgid "Weekday offset"
+#~ msgstr "Nedēļas dienas nobīde"
+
+#~ msgid ""
+#~ "Number of days starting from the first day of the week to offset the "
+#~ "default view."
+#~ msgstr ""
+#~ "Dienu skaits, sākot no nedēļas pirmās dienas, lai nobīdītu noklusējuma "
+#~ "skatu."
+
+#~ msgid "Edit plan types"
+#~ msgstr "Rediģēt plānu veidus"
+
+#~ msgid "Show help"
+#~ msgstr "Parādīt palīdzību"
+
+#~ msgid "Week iCal export"
+#~ msgstr "Nedēļas iCal eksports"
+
+#~ msgid "Add to Shopping"
+#~ msgstr "Pievienot iepirkumiem"
+
+#~ msgid "New meal type"
+#~ msgstr "Jauns maltītes veids"
+
+#~ msgid "Meal Plan Help"
+#~ msgstr "Ēdienreižu plāna palīdzība"
+
+#~ msgid "Units merged!"
+#~ msgstr "Vienības ir apvienotas!"
+
+#~ msgid "Foods merged!"
+#~ msgstr "Ēdieni apvienoti!"
+
 #~ msgid "Utensils"
 #~ msgstr "Piederumi"
 
diff --git a/cookbook/locale/nl/LC_MESSAGES/django.mo b/cookbook/locale/nl/LC_MESSAGES/django.mo
index 19ec762183d135d65f2c04e720058ce5b385e5da..fbd1a0bd695efcc0d49f5499cf709cca9e0715ee 100644
GIT binary patch
delta 10363
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

delta 14728
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
UD^7kDbkFMRAD(>tol!Oa2mZ#4^#A|>

diff --git a/cookbook/locale/nl/LC_MESSAGES/django.po b/cookbook/locale/nl/LC_MESSAGES/django.po
index 81c7e42b0..2b574bdcf 100644
--- a/cookbook/locale/nl/LC_MESSAGES/django.po
+++ b/cookbook/locale/nl/LC_MESSAGES/django.po
@@ -12,11 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2021-10-26 10:06+0000\n"
 "Last-Translator: Jesse <jesse.kamps@pm.me>\n"
-"Language-Team: Dutch <http://translate.tandoor.dev/projects/tandoor/"
-"recipes-backend/nl/>\n"
+"Language-Team: Dutch <http://translate.tandoor.dev/projects/tandoor/recipes-"
+"backend/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +27,11 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Ingrediënten"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -39,13 +39,13 @@ msgstr ""
 "De kleur van de bovenste navigatie balk. Niet alle kleuren werken met alle "
 "thema's, je dient ze dus simpelweg uit te proberen!"
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 "Standaard eenheid die gebruikt wordt wanneer een nieuw ingrediënt aan een "
 "recept wordt toegevoegd."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -53,7 +53,11 @@ msgstr ""
 "Mogelijk maken van breuken bij ingrediënt aantallen (het automatisch "
 "converteren van decimalen naar breuken)"
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -61,19 +65,19 @@ msgstr ""
 "Gebruikers waarmee een nieuw maaltijdplan/boodschappenlijst standaard "
 "gedeeld moeten worden."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "Geef recent bekeken recepten op de zoekpagina weer."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "Aantal decimalen om ingrediënten op af te ronden."
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr "Als je opmerkingen onder recepten wil kunnen maken en zien."
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -86,11 +90,11 @@ msgstr ""
 "gelijktijdig boodschappen doen maar verbruikt mogelijk extra mobiele data. "
 "Wordt gereset bij opslaan wanneer de limiet niet bereikt is."
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr "Zet de navbar vast aan de bovenkant van de pagina."
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -98,39 +102,39 @@ msgstr ""
 "Beide velden zijn optioneel. Indien niks is opgegeven wordt de "
 "gebruikersnaam weergegeven"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "Naam"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Etiketten"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "Voorbereidingstijd in minuten"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Wacht tijd in minuten (koken en bakken)"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "Pad"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "Opslag UID"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr "Standaard waarde"
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
@@ -138,51 +142,19 @@ msgstr ""
 "Om dubbelingen te voorkomen worden recepten met dezelfde naam als een "
 "bestaand recept genegeerd. Vink aan om alles te importeren."
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "Nieuwe eenheid"
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr "Nieuwe eenheid waarmee de andere wordt vervangen."
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "Oude eenheid"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr "Eenheid die vervangen dient te worden."
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "Nieuw Ingredïent"
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr "Nieuw Ingredïent dat Oud Ingrediënt vervangt."
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "Oud Ingrediënt"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr "Te vervangen Ingrediënt."
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "Voeg een opmerking toe: "
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr "Laat leeg voor dropbox en vul het app wachtwoord in voor nextcloud."
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr "Laat leeg voor nextcloud en vul de api token in voor dropbox."
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -190,25 +162,25 @@ msgstr ""
 "Laat leeg voor dropbox en vul enkel de base url voor nextcloud in. (<code>/"
 "remote.php/webdav/</code> wordt automatisch toegevoegd.)"
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr "Zoekopdracht"
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "Bestands ID"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr "Je moet minimaal één recept of titel te specificeren."
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 "Je kan in de instellingen standaard gebruikers in stellen om de recepten met "
 "te delen."
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -216,15 +188,15 @@ msgstr ""
 "Je kunt markdown gebruiken om dit veld te op te maken. Bekijk de <a href=\"/"
 "docs/markdown/\">documentatie hier</a>"
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr "Maximum aantal gebruikers voor deze ruimte bereikt."
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr "E-mailadres reeds in gebruik!"
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
@@ -232,15 +204,21 @@ msgstr ""
 "Een e-mailadres is niet vereist, maar indien aanwezig zal de "
 "uitnodigingslink naar de gebruiker worden gestuurd."
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr "Naam reeds in gebruik."
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr "Accepteer voorwaarden"
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
@@ -248,7 +226,7 @@ msgstr ""
 "Selecteer zoekmethode.  Klik <a href=\"/docs/search/\">hier</a> voor een "
 "beschrijving van de keuzes."
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
@@ -256,7 +234,7 @@ msgstr ""
 "Gebruik 'fuzzy' koppelen bij eenheden, etiketten en ingrediënten bij "
 "bewerken en importeren van recepten."
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
@@ -265,7 +243,7 @@ msgstr ""
 "deze optie kan de zoekkwaliteit afhankelijk van de taal, zowel verbeteren "
 "als verslechteren"
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
@@ -273,7 +251,7 @@ msgstr ""
 "Velden doorzoeken op gedeelde overeenkomsten. (zoeken op 'Appel' vindt "
 "'appel', 'aardappel' en 'appelsap')"
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
@@ -281,7 +259,7 @@ msgstr ""
 "Velden doorzoeken op overeenkomsten aan het begin van het woord. (zoeken op "
 "'sa' vindt 'salade' en 'sandwich')"
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
@@ -289,7 +267,7 @@ msgstr ""
 "Velden 'fuzzy' doorzoeken. (zoeken op 'recetp' vindt ook 'recept')  Noot: "
 "deze optie conflicteert met de zoekmethoden 'web' en 'raw'."
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
@@ -297,31 +275,31 @@ msgstr ""
 "Velden doorzoeken op volledige tekst.  Noot: Web, Zin en Raw zoekmethoden "
 "werken alleen met volledige tekstvelden."
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 msgid "Search Method"
 msgstr "Zoekmethode"
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr "'Fuzzy' zoekopdrachten"
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr "Negeer accent"
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr "Gedeeltelijke overeenkomst"
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr "Begint met"
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 msgid "Fuzzy Search"
 msgstr "'Fuzzy' zoeken"
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 msgid "Full Text"
 msgstr "Volledige tekst"
 
@@ -334,7 +312,7 @@ msgstr ""
 "minuten en probeer het opnieuw."
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "Je bent niet ingelogd en kan deze pagina daarom niet bekijken!"
 
@@ -344,9 +322,9 @@ msgstr "Je bent niet ingelogd en kan deze pagina daarom niet bekijken!"
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr "Je hebt niet de benodigde machtigingen om deze pagina te bekijken!"
 
@@ -362,27 +340,27 @@ msgstr ""
 msgid "Could not parse template code."
 msgstr "Sjablooncode kon niet verwerkt worden."
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importeer"
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 "De importtool verwachtte een .zip bestand. Heb je het juiste type gekozen?"
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
@@ -390,11 +368,11 @@ msgstr ""
 "Er is een onverwachte fout opgetreden tijdens het importeren. Controleer of "
 "u een geldig bestand hebt geüpload."
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr "De volgende recepten zijn genegeerd omdat ze al bestonden:"
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, python-format
 msgid "Imported %s recipes."
 msgstr "%s recepten geïmporteerd."
@@ -413,8 +391,8 @@ msgstr "Bron"
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr "Porties"
 
@@ -470,7 +448,7 @@ msgstr "Avondeten"
 msgid "Other"
 msgstr "Overige"
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
@@ -478,96 +456,112 @@ msgstr ""
 "Maximale bestandsopslag voor ruimte in MB. 0 voor onbeperkt, -1 om uploaden "
 "van bestanden uit te schakelen."
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr "Zoeken"
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr "Maaltijdplan"
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Boeken"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr "Klein"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr "Groot"
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr "Nieuw"
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr " is deel van een receptstap en kan niet verwijderd worden"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "Tekst"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr "Tijd"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "File"
 msgstr "Bestand"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Recept"
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr "Simpel"
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr "Zin"
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr "Web"
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr "Raw"
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Foods"
+msgid "Food Alias"
+msgstr "Ingrediënten"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Units"
+msgid "Unit Alias"
+msgstr "Eenheden"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "Etiketten"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr "Bestandsuploads zijn niet ingeschakeld voor deze Ruimte."
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr "U heeft de uploadlimiet bereikt."
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr "Bewerken"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr "Verwijder"
@@ -596,7 +590,7 @@ msgstr "E-mailadressen"
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -631,6 +625,7 @@ msgid "Re-send Verification"
 msgstr "Verificatie opnieuw verzenden"
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr "Verwijder"
@@ -678,7 +673,7 @@ msgstr ""
 " ."
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr "Bevestigen"
 
@@ -692,7 +687,7 @@ msgstr ""
 "Deze e-mail bevestigingslink is verlopen of ongeldig.\n"
 "<a href=\"%(email_url)s\">Vraag een nieuwe bevestigingslink aan</a>."
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr "Inloggen"
 
@@ -740,12 +735,16 @@ msgstr "Weet je zeker dat je uit wil loggen?"
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -780,6 +779,32 @@ msgstr ""
 "Er is een e-mail verstuurd. Neem contact op als je deze niet binnen een paar "
 "minuten ontvangen hebt."
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#, fuzzy
+#| msgid "API Token"
+msgid "Bad Token"
+msgstr "API Token"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+#, fuzzy
+#| msgid "Change Password"
+msgid "change password"
+msgstr "Wijzig wachtwoord"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -831,7 +856,7 @@ msgstr "Registratie gesloten"
 msgid "We are sorry, but the sign up is currently closed."
 msgstr "Excuses, registratie is op dit moment gesloten."
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "API documentatie"
@@ -852,65 +877,92 @@ msgid "Units"
 msgstr "Eenheden"
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #: .\cookbook\templates\base.html:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarket Category"
+msgstr "Supermarkt"
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+#, fuzzy
+#| msgid "Information"
+msgid "Automations"
+msgstr "Informatie"
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+msgid "Files"
+msgstr "Bestanden"
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr "Batchbewerking"
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Geschiedenis"
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr "Exporteren"
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr "Recept importeren"
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr "Nieuw recept"
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
-#: .\cookbook\templates\space.html:19
-msgid "Space Settings"
-msgstr "Ruimte Instellingen"
-
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
-msgid "System"
-msgstr "Systeem"
-
-#: .\cookbook\templates\base.html:214
-msgid "Admin"
-msgstr "Beheer"
-
-#: .\cookbook\templates\base.html:218
-msgid "Markdown Guide"
-msgstr "Markdown gids"
-
-#: .\cookbook\templates\base.html:220
-msgid "GitHub"
-msgstr "GitHub"
-
-#: .\cookbook\templates\base.html:224
-msgid "API Browser"
-msgstr "API Browser"
-
-#: .\cookbook\templates\base.html:227
-msgid "Log out"
-msgstr "Uitloggen"
-
-#: .\cookbook\templates\base.html:229
+#: .\cookbook\templates\base.html:259
 #: .\cookbook\templates\generic\list_template.html:14
 #: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
 msgid "External Recipes"
 msgstr "Externe recepten"
 
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\space.html:19
+msgid "Space Settings"
+msgstr "Ruimte Instellingen"
+
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
+msgid "System"
+msgstr "Systeem"
+
+#: .\cookbook\templates\base.html:269
+msgid "Admin"
+msgstr "Beheer"
+
+#: .\cookbook\templates\base.html:273
+msgid "Markdown Guide"
+msgstr "Markdown gids"
+
+#: .\cookbook\templates\base.html:275
+msgid "GitHub"
+msgstr "GitHub"
+
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
+msgid "API Browser"
+msgstr "API Browser"
+
+#: .\cookbook\templates\base.html:284
+msgid "Log out"
+msgstr "Uitloggen"
+
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Batch bewerking toepassen op categorie"
@@ -982,16 +1034,6 @@ msgstr "Kookboeken"
 msgid "Export Recipes"
 msgstr "Recepten exporteren"
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr "Exporteren"
-
-#: .\cookbook\templates\files.html:7
-msgid "Files"
-msgstr "Bestanden"
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -1001,11 +1043,10 @@ msgstr "Nieuw recept importeren"
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr "Opslaan"
 
@@ -1028,8 +1069,8 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"        Het volgende formulier kan worden gebruikt wanneer per ongeluk twee ("
-"of meer) eenheden of ingrediënten zijn gemaakt die eigenlijk\n"
+"        Het volgende formulier kan worden gebruikt wanneer per ongeluk twee "
+"(of meer) eenheden of ingrediënten zijn gemaakt die eigenlijk\n"
 "        hetzelfde zijn\n"
 "        Het voegt de twee eenheden of ingrediënten samen en past alle "
 "bijbehorende recepten aan.\n"
@@ -1048,12 +1089,20 @@ msgstr "Samenvoegen"
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Weet je zeker dat je deze ingrediënten wil samenvoegen?"
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr "Weet je zeker dat je %(title)s: <b>%(object)s</b> wil verwijderen "
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr "Annuleer"
 
@@ -1114,9 +1163,6 @@ msgstr "Beoordeling"
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr "Sluiten"
 
@@ -1169,8 +1215,8 @@ msgstr "Zoekopdracht opnieuw instellen"
 msgid "Last viewed"
 msgstr "Laatst bekeken"
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr "Recepten"
 
@@ -1334,179 +1380,19 @@ msgstr "Kop"
 msgid "Cell"
 msgstr "Cel"
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
-msgstr "Nieuw item"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
+msgstr "Maaltijdenplan bekijken"
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr "Zoek recept"
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr "Titel"
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr "Notitie (optioneel)"
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-"Je kan markdown gebruiken om dit veld op te maken. Zie de <a href=\"/docs/"
-"markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">documentatie</a>"
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr "Portie teller"
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr "Maak alleen een notitie"
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr "Boodschappenlijst"
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr "Boodschappenlijst is momenteel leeg"
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr "Open boodschappenlijst"
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr "Plan"
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr "Aantal dagen"
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr "Weekdag aanpassing"
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-"Aantal dagen startende met de eerste dag van de week om het standaard "
-"overzicht aan te passen."
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr "Bewerk maaltijdplan types"
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr "Help"
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr "Exporteer week als iCal"
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Notitie"
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr "Gemaakt door"
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr "Gedeeld met"
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr "Voeg toe aan boodschappenlijst"
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr "Nieuwe maaltijdsoort"
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr "Maaltijdplanner hulp"
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-"\n"
-"                            <p>De maaltijdplan module maakt plannen van "
-"maaltijden met recepten en notities mogelijk.</p>\n"
-" <p>Selecteer een recept van de lijst recent bekeken recepten of zoek naar\n"
-" het gewenste recept en sleep het naar de juiste positie in het "
-"maaltijdplan. Je kan ook eerst een notitie en titel toevoegen en dan het "
-"recept naar de juiste positie slepen om een unieke maaltijdplan inschrijving "
-"te maken.\n"
-" Alleen notities aanmaken is mogelijk door het Maak notitie vlak in het "
-"maaltijdplan te slepen.</p>\n"
-" <p>Klik op een recept om de gedetailleerde weergave te openen. Daar kan je "
-"het ook toevoegen aan je boodschappenlijst.\n"
-" Je kan ook alle recepten van een dag aan je boodschappenlijst toevoegen "
-"door op het winkelwagentje boven aan de tabel te klikken.</p>\n"
-" <p>Omdat maaltijden samen gepland kunnen worden kan je in de instellingen "
-"kiezen met welke gebruikers je het maaltijd plan wil delen.</p>\n"
-" <p>Je kan ook het type maaltijd dat je wil plannen bewerken. Als je een "
-"maaltijdplan deelt met iemand met andere maaltijden, dan zullen hun "
-"maaltijdtypes ook in jouw lijst verschijnen. Geef, om dubbelingen (zoals "
-"Overig en Anders) te voorkomen, je maaltijdtypes daarom dezelfde naam als de "
-"gebruikers waarmee je maaltijdplannen deelt. In dat geval worden de "
-"maaltijden samengevoegd.</p>\n"
-"                        "
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr "Maaltijdenplan bekijken"
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1622,24 +1508,24 @@ msgstr "Opmerkingen"
 msgid "by"
 msgstr "door"
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Opmerking"
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr "Recept afbeelding"
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr "Geschatte voorbereidingstijd"
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr "Geschatte wachttijd"
 
@@ -1657,7 +1543,7 @@ msgstr "Recept thuis"
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 msgid "Search Settings"
 msgstr "Zoekinstellingen"
 
@@ -1707,8 +1593,8 @@ msgstr ""
 "beschreven, die het zoekgedrag bepalen wanneer er naar meerdere woorden "
 "gezocht wordt.\n"
 "            Volledige technische details kunnen bekene worden op <a "
-"href=https://www.postgresql.org/docs/current/textsearch-controls.html"
-"#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
 "            "
 
 #: .\cookbook\templates\search_info.html:29
@@ -1911,52 +1797,52 @@ msgstr ""
 "managementcommando 'python manage.py rebuildindex'\n"
 "            "
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr "Account"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 msgid "API-Settings"
 msgstr "API-instellingen"
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 msgid "Search-Settings"
 msgstr "Zoek instellingen"
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 msgid "Name Settings"
 msgstr "Naam instellingen"
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 msgid "Account Settings"
 msgstr "Account instellingen"
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 msgid "Emails"
 msgstr "E-mails"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr "Socials"
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr "Taal"
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr "Stijl"
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr "API Token"
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1964,7 +1850,7 @@ msgstr ""
 "Je kan zowel basale verificatie als verificatie op basis van tokens "
 "gebruiken om toegang tot de REST API te krijgen."
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1972,10 +1858,62 @@ msgstr ""
 "Gebruik de token als een 'Authorization header'voorafgegaan door het woord "
 "token zoals in de volgende voorbeelden:"
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr "of"
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr "Kookboek Setup"
@@ -1994,64 +1932,80 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr "Maak Superuser acount"
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr "Boodschappenlijst"
+
+#: .\cookbook\templates\shopping_list.html:34
+#, fuzzy
+#| msgid "Open Shopping List"
+msgid "Try the new shopping list"
+msgstr "Open boodschappenlijst"
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr "Zoek recept"
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr "Recepten op boodschappenlijst"
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr "Geen recepten geselecteerd"
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr "Invoermodus"
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr "Voeg toe aan boodschappenlijst"
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr "Hoeveelheid"
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr "Selecteer eenheid"
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr "Selecteer"
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr "Selecteer ingrediënt"
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr "Selecteer supermarkt"
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr "Selecteer gebruiker"
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr "Afgerond"
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr "Je bent offline, de boodschappenlijst synchroniseert mogelijk niet."
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr "Kopieër/exporteer"
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr "Lijst voorvoegsel"
 
@@ -2340,86 +2294,86 @@ msgstr "Sla mij op als bladwijzer!"
 msgid "Enter website URL"
 msgstr "Vul website URL in"
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 "Selecteer receptbestanden om te importeren of sleep ze hier naar toe..."
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr "Plak json of html bron om recept te laden."
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 msgid "Preview Recipe Data"
 msgstr "Bekijk recept gegevens"
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 "Sleep eigenschappen van het recept van rechts naar het juiste vlak beneden."
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr "Wis inhoud"
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr "Hierheen gesleepte tekst wordt aan de naam toegevoegd."
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr "Beschrijving"
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr "Hierheen gesleepte tekst wordt aan de beschrijving toegevoegd."
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr "Hierheen gesleepte Etiketten worden aan de huidige lijst toegevoegd"
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr "Afbeelding"
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 msgid "Prep Time"
 msgstr "Voorbereidingstijd"
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 msgid "Cook Time"
 msgstr "Kooktijd"
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 "Hierheen gesleepte Ingrediënten worden aan de huidige lijst toegevoegd."
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr "Instructies"
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 "Hierheen gesleepte Recept instructies worden aan de huidige lijst toegevoegd."
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 msgid "Discovered Attributes"
 msgstr "Ontdekte Eigenschappen"
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
@@ -2427,57 +2381,61 @@ msgstr ""
 "Sleep recept eigenschappen van beneden naar de juiste doos aan de "
 "linkerzijde. Klik er op om alle eigenschappen te zien."
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 msgid "Show Blank Field"
 msgstr "Toon Leeg Veld"
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr "Leeg Veld"
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr "Naar Leeg Veld gesleepte items worden toegevoegd."
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 msgid "Delete Text"
 msgstr "Verwijder tekst"
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 msgid "Delete image"
 msgstr "Verwijder afbeelding"
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr "Naam Recept"
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr "Beschrijving recept"
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr "Selecteer één"
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr "Notitie"
+
+#: .\cookbook\templates\url_import.html:585
 msgid "Add Keyword"
 msgstr "Voeg Etiket toe"
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr "Alle etiketten"
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr "Importeer alle etiketten, niet alleen de bestaande."
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr "Informatie"
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2495,15 +2453,15 @@ msgstr ""
 "vrij om een voorbeeld te posten in \n"
 " de GitHub issues."
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr "Google Id+json Info"
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr "GitHub issues"
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr "Recept opmaak specificatie"
 
@@ -2516,8 +2474,7 @@ msgstr "Parameter updatet_at is onjuist geformateerd"
 msgid "No {self.basename} with id {pk} exists"
 msgstr "Er bestaat geen {self.basename} met id {pk}"
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr "Kan niet met hetzelfde object samenvoegen!"
 
@@ -2530,73 +2487,73 @@ msgstr "Er bestaat geen {self.basename} met id {target}"
 msgid "Cannot merge with child object!"
 msgstr "Kan niet met kindobject samenvoegen!"
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr "{source.name} is succesvol samengevoegd met {target.name}"
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 "Er is een error opgetreden bij het samenvoegen van {source.name} met {target."
 "name}"
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr "Er bestaat geen {self.basename} met id {child}"
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr "{child.name} is succesvol verplaatst naar het hoogste niveau."
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr "Er is een error opgetreden bij het verplaatsen "
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr "Kan object niet verplaatsen naar zichzelf!"
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr "Er bestaat geen {self.basename} met id {parent}"
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr "{child.name} is succesvol verplaatst naar {parent.name}"
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr "Deze optie is niet beschikbaar in de demo versie!"
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr "Synchronisatie succesvol!"
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr "Er is een fout opgetreden bij het synchroniseren met Opslag"
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr "Niks te doen."
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 "De opgevraagde site heeft misvormde data verstrekt en kan niet gelezen "
 "worden."
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr "De opgevraagde pagina kon niet gevonden worden."
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2604,59 +2561,58 @@ msgstr ""
 "De opgevraagde site biedt geen bekend gegevensformaat aan om het recept van "
 "te importeren."
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr "Er is geen bruikbare data gevonden."
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr "Ik kon niks vinden om te doen."
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr "Je hebt het maximaal aantal recepten voor jouw ruimte bereikt."
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr "Je hebt meer gebruikers dan toegestaan in jouw ruimte."
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
 msgstr[0] "Batch bewerking voldaan. %(count)d het recept is ge-update."
 msgstr[1] "Batch bewerking voldaan. %(count)d Recepten zijn geupdatet."
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr "Bewaker"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Opslag backend"
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 "Dit Opslag backend kon niet verwijderd worden omdat het gebruikt wordt in "
 "tenminste een Bewaker."
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr "Kookboek"
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr "Uitnodigingslink"
 
@@ -2676,27 +2632,19 @@ msgstr "Er is een fout opgetreden bij het updaten van deze opslag backend!"
 msgid "Storage"
 msgstr "Opslag"
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr "Wijzigingen opgeslagen!"
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr "Fout bij het opslaan van de wijzigingen!"
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr "Eenheden samengevoegd!"
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr "Ingrediënten samengevoegd!"
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr "Importeren is voor deze provider niet geïmplementeerd"
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr "Exporteren is voor deze provider niet geïmplementeerd"
 
@@ -2724,6 +2672,12 @@ msgstr "Supermarkten"
 msgid "Shopping Categories"
 msgstr "Boodschappencategorieën"
 
+#: .\cookbook\views\lists.py:232
+#, fuzzy
+#| msgid "Shopping List"
+msgid "New Shopping List"
+msgstr "Boodschappenlijst"
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Nieuw recept geïmporteerd!"
@@ -2732,48 +2686,48 @@ msgstr "Nieuw recept geïmporteerd!"
 msgid "There was an error importing this recipe!"
 msgstr "Er is een fout opgetreden bij het importeren van dit recept!"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr "Hallo"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr "Je bent uitgenodigd door "
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr " om zijn/haar Tandoor Recepten ruimte "
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr "Klik om de volgende link om je account te activeren: "
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 "Als de linkt niet werkt, gebruik dan de volgende code om handmatig tot de "
 "ruimte toe te treden: "
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr "De uitnodiging is geldig tot "
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 "Tandoor Recepten is een Open Source recepten manager. Bekijk het op GitHub "
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr "Tandoor Recepten uitnodiging"
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr "Uitnodigingslink succesvol verstuurd naar gebruiker."
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
@@ -2781,12 +2735,12 @@ msgstr ""
 "Je hebt te veel e-mails verstuurd, deel de link handmatig of wacht enkele "
 "uren."
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 "E-mail aan gebruiker kon niet verzonden worden, deel de link handmatig."
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
@@ -2794,19 +2748,19 @@ msgstr ""
 "Je hebt je eigen recepten ruimte succesvol aangemaakt. Start met het "
 "toevoegen van recepten of nodig anderen uit om je te vergezellen."
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr "Je beschikt niet over de juiste rechten om deze actie uit te voeren!"
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr "Opmerking opgeslagen!"
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr "Je moet tenminste één veld om te doorzoeken selecteren!"
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
@@ -2814,11 +2768,11 @@ msgstr ""
 "Om deze zoekmethode te gebruiken moet je tenminste één volledig tekstveld "
 "selecteren!"
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr "'Fuzzy' zoeken is niet te gebruiken met deze zoekmethode!"
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
@@ -2829,31 +2783,31 @@ msgstr ""
 "documentatie raad moeten plegen voor een methode om je wachtwoord te "
 "resetten."
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr "Wachtwoorden komen niet overeen!"
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr "Gebruiker is gecreëerd, Log in alstublieft!"
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr "Onjuiste uitnodigingslink opgegeven!"
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr "Je bent al lid van een ruimte en kan daardoor niet toetreden tot deze."
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr "Succesvol toegetreden tot ruimte."
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr "De uitnodigingslink is niet valide of al gebruikt!"
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
@@ -2861,7 +2815,7 @@ msgstr ""
 "Het rapporteren van gedeelde links is niet geactiveerd voor deze instantie. "
 "Rapporteer problemen bij de beheerder van de pagina."
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
@@ -2869,6 +2823,155 @@ msgstr ""
 "Links voor het delen van recepten zijn gedeactiveerd. Neem contact op met de "
 "paginabeheerder voor aanvullende informatie."
 
+#~ msgid "New Unit"
+#~ msgstr "Nieuwe eenheid"
+
+#~ msgid "New unit that other gets replaced by."
+#~ msgstr "Nieuwe eenheid waarmee de andere wordt vervangen."
+
+#~ msgid "Old Unit"
+#~ msgstr "Oude eenheid"
+
+#~ msgid "Unit that should be replaced."
+#~ msgstr "Eenheid die vervangen dient te worden."
+
+#~ msgid "New Food"
+#~ msgstr "Nieuw Ingredïent"
+
+#~ msgid "New food that other gets replaced by."
+#~ msgstr "Nieuw Ingredïent dat Oud Ingrediënt vervangt."
+
+#~ msgid "Old Food"
+#~ msgstr "Oud Ingrediënt"
+
+#~ msgid "Food that should be replaced."
+#~ msgstr "Te vervangen Ingrediënt."
+
+#~ msgid "New Entry"
+#~ msgstr "Nieuw item"
+
+#~ msgid "Title"
+#~ msgstr "Titel"
+
+#~ msgid "Note (optional)"
+#~ msgstr "Notitie (optioneel)"
+
+#~ msgid ""
+#~ "You can use markdown to format this field. See the <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
+#~ msgstr ""
+#~ "Je kan markdown gebruiken om dit veld op te maken. Zie de <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">documentatie</a>"
+
+#~ msgid "Serving Count"
+#~ msgstr "Portie teller"
+
+#~ msgid "Create only note"
+#~ msgstr "Maak alleen een notitie"
+
+#~ msgid "Shopping list currently empty"
+#~ msgstr "Boodschappenlijst is momenteel leeg"
+
+#~ msgid "Plan"
+#~ msgstr "Plan"
+
+#~ msgid "Number of Days"
+#~ msgstr "Aantal dagen"
+
+#~ msgid "Weekday offset"
+#~ msgstr "Weekdag aanpassing"
+
+#~ msgid ""
+#~ "Number of days starting from the first day of the week to offset the "
+#~ "default view."
+#~ msgstr ""
+#~ "Aantal dagen startende met de eerste dag van de week om het standaard "
+#~ "overzicht aan te passen."
+
+#~ msgid "Edit plan types"
+#~ msgstr "Bewerk maaltijdplan types"
+
+#~ msgid "Show help"
+#~ msgstr "Help"
+
+#~ msgid "Week iCal export"
+#~ msgstr "Exporteer week als iCal"
+
+#~ msgid "Add to Shopping"
+#~ msgstr "Voeg toe aan boodschappenlijst"
+
+#~ msgid "New meal type"
+#~ msgstr "Nieuwe maaltijdsoort"
+
+#~ msgid "Meal Plan Help"
+#~ msgstr "Maaltijdplanner hulp"
+
+#~ msgid ""
+#~ "\n"
+#~ "                            <p>The meal plan module allows planning of "
+#~ "meals both with recipes and notes.</p>\n"
+#~ "                            <p>Simply select a recipe from the list of "
+#~ "recently viewed recipes or search the one you\n"
+#~ "                                want and drag it to the desired plan "
+#~ "position. You can also add a note and a title and\n"
+#~ "                                then drag the recipe to create a plan "
+#~ "entry with a custom title and note. Creating only\n"
+#~ "                                Notes is possible by dragging the create "
+#~ "note box into the plan.</p>\n"
+#~ "                            <p>Click on a recipe in order to open the "
+#~ "detailed view. There you can also add it to the\n"
+#~ "                                shopping list. You can also add all "
+#~ "recipes of a day to the shopping list by\n"
+#~ "                                clicking the shopping cart at the top of "
+#~ "the table.</p>\n"
+#~ "                            <p>Since a common use case is to plan meals "
+#~ "together you can define\n"
+#~ "                                users you want to share your plan with in "
+#~ "the settings.\n"
+#~ "                            </p>\n"
+#~ "                            <p>You can also edit the types of meals you "
+#~ "want to plan. If you share your plan with\n"
+#~ "                                someone with\n"
+#~ "                                different meals, their meal types will "
+#~ "appear in your list as well. To prevent\n"
+#~ "                                duplicates (e.g. Other and Misc.)\n"
+#~ "                                name your meal types the same as the "
+#~ "users you share your meals with and they will be\n"
+#~ "                                merged.</p>\n"
+#~ "                        "
+#~ msgstr ""
+#~ "\n"
+#~ "                            <p>De maaltijdplan module maakt plannen van "
+#~ "maaltijden met recepten en notities mogelijk.</p>\n"
+#~ " <p>Selecteer een recept van de lijst recent bekeken recepten of zoek "
+#~ "naar\n"
+#~ " het gewenste recept en sleep het naar de juiste positie in het "
+#~ "maaltijdplan. Je kan ook eerst een notitie en titel toevoegen en dan het "
+#~ "recept naar de juiste positie slepen om een unieke maaltijdplan "
+#~ "inschrijving te maken.\n"
+#~ " Alleen notities aanmaken is mogelijk door het Maak notitie vlak in het "
+#~ "maaltijdplan te slepen.</p>\n"
+#~ " <p>Klik op een recept om de gedetailleerde weergave te openen. Daar kan "
+#~ "je het ook toevoegen aan je boodschappenlijst.\n"
+#~ " Je kan ook alle recepten van een dag aan je boodschappenlijst toevoegen "
+#~ "door op het winkelwagentje boven aan de tabel te klikken.</p>\n"
+#~ " <p>Omdat maaltijden samen gepland kunnen worden kan je in de "
+#~ "instellingen kiezen met welke gebruikers je het maaltijd plan wil delen.</"
+#~ "p>\n"
+#~ " <p>Je kan ook het type maaltijd dat je wil plannen bewerken. Als je een "
+#~ "maaltijdplan deelt met iemand met andere maaltijden, dan zullen hun "
+#~ "maaltijdtypes ook in jouw lijst verschijnen. Geef, om dubbelingen (zoals "
+#~ "Overig en Anders) te voorkomen, je maaltijdtypes daarom dezelfde naam als "
+#~ "de gebruikers waarmee je maaltijdplannen deelt. In dat geval worden de "
+#~ "maaltijden samengevoegd.</p>\n"
+#~ "                        "
+
+#~ msgid "Units merged!"
+#~ msgstr "Eenheden samengevoegd!"
+
+#~ msgid "Foods merged!"
+#~ msgstr "Ingrediënten samengevoegd!"
+
 #~ msgid "Utensils"
 #~ msgstr "Kookgerei"
 
diff --git a/cookbook/locale/pl/LC_MESSAGES/django.mo b/cookbook/locale/pl/LC_MESSAGES/django.mo
index 5d8a8c77263ad91924d801177588858f91fbc08a..3e8b4e4a203839dc16961bda2ed4e802db94d4fe 100644
GIT binary patch
delta 2963
zcmXZe3ryBk7{~F4S1xi@5fKp?hM<|ZoHH*KVpB^nm1(TZODYIn$P~0R{d)lorM#e}
zsf%oxX*G?qa!zNrrL!Ad%+igT*~m5&=hUsV?~ikw@;T3W|NnE&^PF>DIkP|X#{STu
z^4MTt$n3EKvp!K~)sxJQo7s^mX3bdfq*-y8S<zIpSUfY$ERE-XnQm4}eEli22%J94
z>_;q`Z5G3O!-~!3;wbEZhp;_<it+dZM&R$o7PLO_7aa+7+`?3BJI4)_iRr}skTu#k
z)PQx~_fZ3Wj$N?9`wtE#jw~^Y!UwQFj`CLEFyc2$0<#`88tKpiB1+BLVG?S<9+-j;
zVi*|~Vixh^q}LGxjK*5;9xNh$3u7>To?Ac)_9V{0ID8n};^csaCY**^X&ElUC8&X$
zP!nB4l`Lw$SyzllO>j4=B7;!RjmEq12~_1)ph~|RXX3l4dD<^vF&L!KNTM+mlkriE
z$0F3i7Go@~MGdqGwXixY!~>{>h05IXZ84rW1+~Cz?1cAXIF3O*pO1_eSb=NUEYu6-
zsEh(s>9=4c9`OB#F@g9qRK^WHzJ!a3uVZH{ecFw)8kJxzcE|mw1)aud=C?)~iFEvp
zx%eL{<D7-=#XMBTGf<_Ui^^afYQZ(Ay?h0Amg-Ome1UOz7L~w7)I66_<J`s==C{;m
z+(22Vl?^}*I2tG5c+`t^zQ5kb$FM#9-(m-BL}l87BQc7Dr18dLJDh=;xDdJFwhaTl
zc!kCY3{k&1_z)_ygWe<Flio9^YkC$tVhfJK$Z|JfK5D|5-bJVitU*<-8g<q-l~aGM
za339G@EC5!@CvsT+i@K6S=1I}Epex|KfX>p0X1L?>d@WvapY37XNlu55vx$QVF&iX
zk5F54aVhoJb+}502D*iM;SQ=YiHxE%(E|rzG3t8lLS=p&yI}*K!YioC9DUAxfBb~1
zL^CSUJE*Pgw9L($9?;N4*{F$!pcaycIwTWO*Jc4G;38BdR--cBh{|NA|9l_zB>oUJ
z?gi|P&8UT>E_bExjY>SorIAGA5!9Yf!|_;(6Y&$&A&Y(9Eg%h*`8}xja!{X7!Vngr
z7FvRua4D|A^*)YS;jU*Y@_t|gX|#SZ_z&`N058l&WwsrM;a*I|3#ba*L@hY9k}nsG
zM^!KfyI=u!!}+L8H=ruJ)yF$9S@*xLwZWl4P4EqBpe9ra|3zJ!1fEr915taJi|IHP
zRe@5}1j|t4tU^7%3stEDs9SIXHU5{1`Df?&p;9%XUbupK;f{}!R=F25F^&G-sEo#-
zwqiVX##yK{u^cr)HENvQsQ$y=6F4-?>}w3Pq9`^<rB1*~KIn=nZQWYee-KrPk5SK`
zMlJMvZzF1=X6%mPl`f%dOeP-e<8e5gcq+CY+DhuLO!m>C(!GaW@dMNXzVrTu;l!6v
zU(J_MXW#~E3&N`0`x&V5vQd@khpOyI)b%SsO<aOXsG^DzYvA>CL|~17U@K~X*H9DG
zqcU$m4Rj7QQM2#Afy(?gMqtJ|cZjpGFL5F6!7A*9nd|v_$NYfCWE!>JCj65)=LNI-
zFsquYhEq|uq8inI6!|W(7VLxbH;^svM4kSxFa!U<6l}B6C7Onj#NBZQ2EAw~(`wY7
z?!hd42cxk8wTI_Xhw2*YutnCmUsTdj3)+HZcnWnphP>$B&qZxP9%}q4sM|8v8Q5|f
zy1zB3fsdm~_%p`gc~r@oP}eH)C6`fO97#MHM_@IU;%QufgEsNY4DLn#+EsqMjH@@B
z&BK%}`tO?kucR@Zj<+!nqqn*TCgc6YCovaqV_zIm>lRpss!%z$!IfBuYfxW2zxvN_
dVg_+&8wVBj=T-jcS*yR0d}Mh2v4YLH{{xN^q<{bb

delta 3002
zcmXZd3rv+|9LMoLDChwZMMQ40gQYO>$bk$KvWaNUQprnFktv#TQ9<#bDCu#EcSVKF
zm1#9yk(N2k=G0s|b)DI=(rTHe<($qguAJRy)%WN7GT7(&Kkxh8{?GHg>~0PJq&56N
zAUaqYZZ>&>*?>-FZIjH7o7t68v)j1qS+iMTW=&JfqVeu?W~sa%HqES(IBmLF1g@Q7
zc0unwZx%(n8MDl)uo}DLH`on-#2EYsBQUDmg7;qNR&LgniawZ(IjD}tU>cSnbF_u1
z4nwZrqB{H;ld#>jXN6fFaW;0sS(uI0uDdXw_|uA@+5HqemCghPVl44cREJ|R5z8@*
z6)wlV#4A`{4{Svb9&<f|Gl@ULD9oGfOrQ`mh(}`=oR6JxS&)JTT!WhFcC5wMP#wq3
zaRy37rOb~hn1>o*0xBa@P!p=bKDZK<xi?X%KaK2`eT5ol$Xqio1`8>~Q<#nkxCmpg
z2{o}-F&f`Nb#xdtu@IKvdDO(Rs-5?9Fow7gHNj%+iO*n1oQHb94(Tsw4Nk!}q8jW(
zt*8~1`Xd;L=iT~?*p>Jv)Qa2PIJU-Y0dX4k!e&%Idr=EKhUxe@YC?C=!}#WzN1CbV
zfrZ!)wc-j?!vJc<>rkn0L9O6D)PxVA_VOdtSqh;B{sp_B&36_MgBm9u)lUXSF}@Y4
zfa6dzdm7bY4L*VOsD>f8{*oJC$8OaBiQUn|!O?_Ma5(x={Vl*)T!;7J%g7D44>72Q
zN#t!9W??zbK~3m_>lN2qu6I$_)B?^Hq~J)xY}9~tr~x;)?m%tfK2+w~P-pFMfc&e$
zIVwisb=-o!I%g}6<5*%_=xo6_^b$UWZ{T87hbfDkLzj+<v#}l@#5mlKx(z3A0A59H
zO-w!c*L6tdZ8hwJYLJP_OabaljKx8?8Fjr*VGq24y|Eobn6%i*%r(^a<6l%J5|=oc
z$wY1KBdBpl1u1BtV${H8sEGtnhhz!r+Ps81^*d09aWCqcy^mVSN%#3V%pm>_)o)~j
zS$|AKO{54Da3X2~!72*z6lzg>z6Oi28OP%fs6#gB1!n>yQ7fN>YFB}Jz7)f;2{qBJ
zr~zNc6?njnA6V*K&myFK&`K%X`!Ki<>d;SvO{kR}$9z1C$r!oJ$v`@4!daMud8iCl
zpi<v}y>T0Ar3X=&J?h3MFhTb}bgy7`6*a&gsE*=zrWE!?U7NwEm6f9QunN;~0V)H{
zr~!7P`gt4m{wY+Z&ZBO@O;rE474v7|%biqtPz{n$4Km$$D5~KYOvQ<)70p9!MLqVy
zji@uR2Q@$&s-M%S`irhNaY&fi?-*3ael|#{9*m7V7=cP{Xr)ts0hNjGQSaYDP4sV9
zPopzXBBoRCL+yPr>ab09<Aqp2yc#v$$wu<8m7JqOsrwpJ@G@!wf4O#C<(!dN)TcQf
zbql<xE$ELCI2zSoF)A}9sEN!*eP<d_18+qwXxA$8-;u%rDkAWZ`@&IF2OpybxP)4H
zJF27b)y_bPsCqAI<rx@(qfv*r7=5@LcjA7`#4&5k9>uyKg(oQ-bB$ZeSCF^@2jjSP
zoN!!?>aYz}e+~JzSju|mi?$615}!n!{$J6H(Horqq61J19f^_n7*50BcnVr+8){F_
zU|;+aJ=l)g!-$Q}p-M#^wrs4$QK$(W!D{>sJ7d`<r+pP_3j(PA8&S8V#W84mDCqtk
zLUnutmBRn93q~|KDT_m0s{%~K$v7Nqa2U2>CEmfgIAt^0!?Vb*C2!#?ihFT37H-wQ
zYxe(L3R9{00w2fRX6J=v_%QJ;EX0f!XD=&J6Wor<&`#`tZ(#}ULw$HUyy!enM=x;}
zhM|65;ZN_{!OICB6!e?qE2^DY7O1SL_KheD%*^-Z`g3!9{#>7bh&Sh<e1A@sKgaJs
JxMf01;s46UsFeT!

diff --git a/cookbook/locale/pt/LC_MESSAGES/django.mo b/cookbook/locale/pt/LC_MESSAGES/django.mo
index 4c2505ca9763e86d0b81e8ebfbc2702158eb4723..53a3db1147d259cfc64d4361c04b33b312388c0f 100644
GIT binary patch
delta 2902
zcmZA3drX&A9LMp)kBcPW1%3jN#l;_}fh3wz+)@IH0#Ot*CE^kYCPH$NLj7r|O`>5j
zqDDEZjg~WJ{i;=4t5$8!RjZuSKg{c<rOujvvE{7y=Xs88b>{c?I_EskbMDWBqg6-B
z{imZth7D;aF_Z9x81p`6g!4l>JK31BAY;zq8OoWF#@vQeqKt{ac$|(t%*DkRjhitP
zcjHui5i@ZVm*P>RNxzAlVoVGbai|B=Q4bbiB^IGN96`or-m=%na1G@{I0-}PMPrV#
z#$p)dL@dEHTW&=!<xZ#UH)byxHM|d};V^1uW6ll6e2Da6K0|eM#Mb|W%)p$m<@46x
zQTP36oj^UW#x<a+$mC5dPN9F}Bcp~EqL#A2x*Ro-dSunjCRD?{sG0VmR%!rs-z(Pr
zm{0j2Zo%I$2Wx4(7)MbPK8JoaaFI+kUPWy|DL<;Ow$@`T<!02#{irQ@$zC5pHTWh5
z<J+hSjoJDSa1P~9Py;=Kn$VSK_Fo-M*c)%+9h8GP5YFCN(@+o0L#;rLEf-oVPy?t&
zJy(YsXtT8&nVZ>#EQWa%b>F)&tiMJyPKB2AbL%(O?=ge=<EVjpI60bGIO@3=RL6;^
z74e}O&P3h6$d+?a6DUO8UxD*+m7k23W;Z^L<5-2^Gu#o^pdM&PHQ0qZOue?gA2skn
zR6DPs_WEnoYjy+IVgdW7*YkDE#N+5ee@L9$!6ZzjA`-P!3s4OgA(J=dxQp*V9Twun
zcw>H{er|$$-wo8#hO&R`qKU;4T}PdrcH~7cFWBoNn5XyuAQ_GLlD#2?uMlmS1xO#J
z9JQoPSc|QwhJHj1@U*>t3HfKP+4_h(-80}t7S*JnRxlfjFdxI{-#kx79qn~0IK9^Q
zP%}S_TJmpE9Ueoi&?(eFuAvU)P1GKT-Q^BA26a{vP-i98ma|aL<zcwq|1vUKx++w|
zO{mk`gKVGKgBr*is16QWzd+r06g9w;sFk{eYUdj2ev@d-a)`oRScCa^0sT63$w~IZ
zf@+`-+p!<DGJl~)>`iv>^PvWoVJ$=ra1HADji^K0VeLT;WScGb<2{rIlUaYw;7ckr
zgC9_PbPBbk=P?N{qgE&)#jT%-I%Gc7mSm%@FG0<G1!^D-_WB0Y1UhWF4>jO{6u)~o
z4p5=J`WV&lSE%>-7;5Cdq6Tysv+%kt`)0XYkbyd6IjFs^u&zTrw;na1He2qtZugVX
zjQ1duGy^yX$FTrUU=7Cl+%IDn>i(BeGao_C<NyZaN2mdRimCV=F2*ZZiz!rgVjrfX
ze}ar=<V$lKSdD6UEovYQsP}ik*1v<ispb#{p=KLKC~@AL&Ys4lL^d&-2qBaji4{bi
z3Z!Pe|LUC8bdpZ#bHr-5=zIsBB7Yz8F!3ZYpXeYSAvE)H;!#5BSwi1{N)<?TF3xWo
zzgvlFf^V3U*6RINN+O;h?k98(v}dJ+4wYtqD}|DoZVPu?b&_>vw48hb{*zWx+CVHM
zY*(g<{6mC?Xi;SYp|q1&@8sM+I%VW_sFd_}Y$w<)=kLTiyp^_)(Vi-8BXkbtsqnwF
ziLws$4&rt~$r)5486CDR;xVF?(4m`4bQ6U{1;H8mH|cEX8=%*!htQc&+DNP-9#ny}
z$i+N>vuwWI+N=IKN6v{Y#%JsWQABJe^Z`mH^qo+;m#A`b?*IQ5kk2G?ZCyB)5c<L`
zA(jzJwS@l8)DvcMl1+i@5r2dP{+{-;C!(^kp{2diENkm*99rp35A5>}djh3#GlBva
t;=MtEq=e?M!2YDI!I9k9*wR_2JL`r9eOZCCzLTDzle4b|R?jUC`Uima{CEHW

delta 3782
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

diff --git a/cookbook/locale/pt/LC_MESSAGES/django.po b/cookbook/locale/pt/LC_MESSAGES/django.po
index 0cfe87238..c0c626a53 100644
--- a/cookbook/locale/pt/LC_MESSAGES/django.po
+++ b/cookbook/locale/pt/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2020-06-02 19:28+0000\n"
 "Last-Translator: João Cunha <st0rmss95@gmail.com>, 2020\n"
 "Language-Team: Portuguese (https://www.transifex.com/django-recipes/"
@@ -26,45 +26,49 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Ingredientes"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
 msgstr "Cor da barra de navegação."
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr "Unidade defeito a ser usada quando um novo ingrediente for inserido."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "Mostrar receitas recentes na página de pesquisa."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "Número de casas decimais para arredondamentos."
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -72,11 +76,11 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -84,91 +88,59 @@ msgstr ""
 "Ambos os campos são opcionais. Se nenhum for preenchido o nome de utilizador "
 "será apresentado."
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "Nome"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Palavras-chave"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "Tempo de preparação em minutos"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Tempo de espera (cozedura) em minutos"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "Caminho"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "UID de armazenamento"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "Nova Unidade"
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr "Nova unidade substituta."
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "Unidade Anterior"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr "Unidade a ser alterada."
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "Novo Prato"
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr "Novo prato a ser alterado."
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "Prato Anterior"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr "Prato a ser alterado."
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "Adicionar comentário:"
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 "Deixar vazio para Dropbox e inserir palavra-passe de aplicação para "
 "Nextcloud."
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr "Deixar vazio para Nextcloud e inserir token api para Dropbox."
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -176,25 +148,25 @@ msgstr ""
 "Deixar vazio para Dropbox e inserir apenas url base para Nextcloud (<code>/"
 "remote.php/webdav/</code>é adicionado automaticamente). "
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr "Procurar"
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "ID the ficheiro"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr "É necessário inserir uma receita ou um título."
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 "É possível escolher os utilizadores com quem partilhar receitas por defeitos "
 "nas definições."
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -202,99 +174,105 @@ msgstr ""
 "É possível utilizar markdown para editar este campo. Documentação <a href=\"/"
 "docs/markdown/\">disponível aqui</a>"
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr ""
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 #, fuzzy
 #| msgid "Search"
 msgid "Search Method"
 msgstr "Procurar"
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr ""
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 #, fuzzy
 #| msgid "Search"
 msgid "Fuzzy Search"
 msgstr "Procurar"
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 #, fuzzy
 #| msgid "Text"
 msgid "Full Text"
@@ -307,7 +285,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "Autenticação necessária para aceder a esta página!"
 
@@ -317,9 +295,9 @@ msgstr "Autenticação necessária para aceder a esta página!"
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr "Sem permissões para aceder a esta página!"
 
@@ -334,36 +312,36 @@ msgstr ""
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importar"
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, fuzzy, python-format
 #| msgid "Import Recipes"
 msgid "Imported %s recipes."
@@ -385,8 +363,8 @@ msgstr ""
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr "Porções"
 
@@ -440,104 +418,120 @@ msgstr "Jantar"
 msgid "Other"
 msgstr "Outro"
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr "Procurar"
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr "Plano de refeição"
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Livros"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr "Pequeno"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr "Grande"
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr "Novo"
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "Texto"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr "Tempo"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "ID the ficheiro"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Receita"
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "New Food"
+msgid "Food Alias"
+msgstr "Novo Prato"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Units"
+msgid "Unit Alias"
+msgstr "Unidades"
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "Palavras-chave"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr ""
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr "Editar"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr "Apagar"
@@ -566,7 +560,7 @@ msgstr ""
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -603,6 +597,7 @@ msgid "Re-send Verification"
 msgstr ""
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr ""
@@ -644,7 +639,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr "Confirme"
 
@@ -656,7 +651,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr "Iniciar sessão"
 
@@ -704,12 +699,16 @@ msgstr ""
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 #, fuzzy
 #| msgid "Settings"
 msgid "Password"
@@ -742,6 +741,30 @@ msgid ""
 "within a few minutes."
 msgstr ""
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+msgid "Bad Token"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+#, fuzzy
+#| msgid "Settings"
+msgid "change password"
+msgstr "Definições"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -793,7 +816,7 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentação API"
@@ -814,67 +837,94 @@ msgid "Units"
 msgstr "Unidades"
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
 #: .\cookbook\templates\base.html:163
+#, fuzzy
+#| msgid "Batch edit Category"
+msgid "Supermarket Category"
+msgstr "Editar Categorias em massa"
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+msgid "Automations"
+msgstr ""
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+#, fuzzy
+#| msgid "File ID"
+msgid "Files"
+msgstr "ID the ficheiro"
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr "Editor em massa"
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Histórico"
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr "Exportar"
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr "Importar Receita"
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr "Criar"
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:259
+#: .\cookbook\templates\generic\list_template.html:14
+#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
+msgid "External Recipes"
+msgstr ""
+
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 #, fuzzy
 #| msgid "Settings"
 msgid "Space Settings"
 msgstr "Definições"
 
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Sistema"
 
-#: .\cookbook\templates\base.html:214
+#: .\cookbook\templates\base.html:269
 msgid "Admin"
 msgstr "Administração"
 
-#: .\cookbook\templates\base.html:218
+#: .\cookbook\templates\base.html:273
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:220
+#: .\cookbook\templates\base.html:275
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:224
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
 msgid "API Browser"
 msgstr "Navegador de API"
 
-#: .\cookbook\templates\base.html:227
+#: .\cookbook\templates\base.html:284
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
-#: .\cookbook\templates\generic\list_template.html:14
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Editar Categorias em massa"
@@ -946,18 +996,6 @@ msgstr "Livros de Receitas"
 msgid "Export Recipes"
 msgstr "Exportar Receitas"
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr "Exportar"
-
-#: .\cookbook\templates\files.html:7
-#, fuzzy
-#| msgid "File ID"
-msgid "Files"
-msgstr "ID the ficheiro"
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -967,11 +1005,10 @@ msgstr "Importar nova Receita"
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr "Gravar"
 
@@ -1012,12 +1049,20 @@ msgstr "Juntar"
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr "Tem a certeza que quer apagar %(title)s: <b>%(object)s</b>"
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1078,9 +1123,6 @@ msgstr "Classificação "
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr "Fechar"
 
@@ -1133,8 +1175,8 @@ msgstr "Redefinir Procura"
 msgid "Last viewed"
 msgstr "Ultimo visto"
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr "Receitas"
 
@@ -1281,154 +1323,19 @@ msgstr "Cabeçalho"
 msgid "Cell"
 msgstr "Célula "
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
-msgstr "Nova Entrada"
-
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr "Procure Receita"
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr "Título"
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr "Nota (opcional)"
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-"Pode usar markdown para formatar este campo. Veja a <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\"> documentação aqui </a>"
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Nota"
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr ""
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1540,24 +1447,24 @@ msgstr ""
 msgid "by"
 msgstr "por"
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr ""
 
@@ -1575,7 +1482,7 @@ msgstr ""
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 #, fuzzy
 #| msgid "Search String"
 msgid "Search Settings"
@@ -1738,77 +1645,129 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 #, fuzzy
 #| msgid "Settings"
 msgid "API-Settings"
 msgstr "Definições"
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 #, fuzzy
 #| msgid "Search String"
 msgid "Search-Settings"
 msgstr "Procurar"
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 #, fuzzy
 #| msgid "Settings"
 msgid "Name Settings"
 msgstr "Definições"
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 #, fuzzy
 #| msgid "Settings"
 msgid "Account Settings"
 msgstr "Definições"
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 #, fuzzy
 #| msgid "Settings"
 msgid "Emails"
 msgstr "Definições"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr ""
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr ""
@@ -1826,64 +1785,78 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:34
+msgid "Try the new shopping list"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr "Procure Receita"
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr "Selecionar Unidade"
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr "Selecionar"
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr ""
 
@@ -2138,154 +2111,158 @@ msgstr ""
 msgid "Enter website URL"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 #, fuzzy
 #| msgid "View Recipe"
 msgid "Preview Recipe Data"
 msgstr "Ver Receita"
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 #, fuzzy
 #| msgid "Time"
 msgid "Prep Time"
 msgstr "Tempo"
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 #, fuzzy
 #| msgid "Time"
 msgid "Cook Time"
 msgstr "Tempo"
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr "Instruções"
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 #, fuzzy
 #| msgid "Discovered Recipes"
 msgid "Discovered Attributes"
 msgstr "Descobrir Receitas"
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 #, fuzzy
 #| msgid "Show as header"
 msgid "Show Blank Field"
 msgstr "Mostrar como cabeçalho"
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 #, fuzzy
 #| msgid "Delete Step"
 msgid "Delete Text"
 msgstr "Apagar Passo"
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 #, fuzzy
 #| msgid "Delete Recipe"
 msgid "Delete image"
 msgstr "Apagar Receita"
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr "Nota"
+
+#: .\cookbook\templates\url_import.html:585
 #, fuzzy
 #| msgid "Keyword"
 msgid "Add Keyword"
 msgstr "Palavra-chave"
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2296,15 +2273,15 @@ msgid ""
 "                                    github issues."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr ""
 
@@ -2317,8 +2294,7 @@ msgstr ""
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr ""
 
@@ -2331,125 +2307,124 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr "Esta página não contém uma receita que eu consiga entender."
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr ""
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr ""
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr ""
 
@@ -2469,27 +2444,19 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr ""
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
@@ -2519,6 +2486,12 @@ msgstr ""
 msgid "Shopping Categories"
 msgstr ""
 
+#: .\cookbook\views\lists.py:232
+#, fuzzy
+#| msgid "Shopping"
+msgid "New Shopping List"
+msgstr "Compras"
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
@@ -2527,127 +2500,168 @@ msgstr ""
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
 msgstr ""
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
 "on how to reset passwords."
 msgstr ""
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 #, fuzzy
 #| msgid "You are not logged in and therefore cannot view this page!"
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr "Autenticação necessária para aceder a esta página!"
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "New Unit"
+#~ msgstr "Nova Unidade"
+
+#~ msgid "New unit that other gets replaced by."
+#~ msgstr "Nova unidade substituta."
+
+#~ msgid "Old Unit"
+#~ msgstr "Unidade Anterior"
+
+#~ msgid "Unit that should be replaced."
+#~ msgstr "Unidade a ser alterada."
+
+#~ msgid "New Food"
+#~ msgstr "Novo Prato"
+
+#~ msgid "New food that other gets replaced by."
+#~ msgstr "Novo prato a ser alterado."
+
+#~ msgid "Old Food"
+#~ msgstr "Prato Anterior"
+
+#~ msgid "Food that should be replaced."
+#~ msgstr "Prato a ser alterado."
+
+#~ msgid "New Entry"
+#~ msgstr "Nova Entrada"
+
+#~ msgid "Title"
+#~ msgstr "Título"
+
+#~ msgid "Note (optional)"
+#~ msgstr "Nota (opcional)"
+
+#~ msgid ""
+#~ "You can use markdown to format this field. See the <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
+#~ msgstr ""
+#~ "Pode usar markdown para formatar este campo. Veja a <a href=\"/docs/"
+#~ "markdown/\" target=\"_blank\" rel=\"noopener noreferrer\"> documentação "
+#~ "aqui </a>"
+
 #~ msgid "Utensils"
 #~ msgstr "Utensílios"
 
diff --git a/cookbook/locale/rn/LC_MESSAGES/django.mo b/cookbook/locale/rn/LC_MESSAGES/django.mo
index 7dcc051fbbeb047380e015460f83408d28b9f79d..195f680235559240d4999f0ffecfc030177c09bf 100644
GIT binary patch
delta 15
WcmZ3>+`>FTh0$xGYT(BCe2f4lO$40)

delta 54
zcmZo+Uduc|g|T>|YM@$(u5(dpVo7Fxo~}z`Nvf5Ck%5t+u7Rblp|OIIk(G&owt<m>
J!Ny`iMgXzo4tW3o

diff --git a/cookbook/locale/rn/LC_MESSAGES/django.po b/cookbook/locale/rn/LC_MESSAGES/django.po
index 2ac212310..4be11a042 100644
--- a/cookbook/locale/rn/LC_MESSAGES/django.po
+++ b/cookbook/locale/rn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,45 +21,49 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr ""
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
 msgstr ""
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr ""
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr ""
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -67,215 +71,189 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr ""
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr ""
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr ""
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr ""
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr ""
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr ""
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr ""
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr ""
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr ""
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr ""
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr ""
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr ""
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr ""
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr ""
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr ""
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr ""
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr ""
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 msgid "Search Method"
 msgstr ""
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr ""
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 msgid "Fuzzy Search"
 msgstr ""
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 msgid "Full Text"
 msgstr ""
 
@@ -286,7 +264,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr ""
 
@@ -296,9 +274,9 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr ""
 
@@ -313,36 +291,36 @@ msgstr ""
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, python-format
 msgid "Imported %s recipes."
 msgstr ""
@@ -361,8 +339,8 @@ msgstr ""
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr ""
 
@@ -416,102 +394,112 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr ""
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr ""
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr ""
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr ""
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr ""
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr ""
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "File"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr ""
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+msgid "Food Alias"
+msgstr ""
+
+#: .\cookbook\models.py:912
+msgid "Unit Alias"
+msgstr ""
+
+#: .\cookbook\models.py:912
+msgid "Keyword Alias"
+msgstr ""
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr ""
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr ""
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr ""
@@ -540,7 +528,7 @@ msgstr ""
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -575,6 +563,7 @@ msgid "Re-send Verification"
 msgstr ""
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr ""
@@ -616,7 +605,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr ""
 
@@ -628,7 +617,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr ""
 
@@ -676,12 +665,16 @@ msgstr ""
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 msgid "Password"
 msgstr ""
 
@@ -712,6 +705,28 @@ msgid ""
 "within a few minutes."
 msgstr ""
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+msgid "Bad Token"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+msgid "change password"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -763,7 +778,7 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr ""
@@ -784,65 +799,88 @@ msgid "Units"
 msgstr ""
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
 #: .\cookbook\templates\base.html:163
+msgid "Supermarket Category"
+msgstr ""
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+msgid "Automations"
+msgstr ""
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+msgid "Files"
+msgstr ""
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr ""
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr ""
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr ""
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr ""
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:259
+#: .\cookbook\templates\generic\list_template.html:14
+#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
+msgid "External Recipes"
+msgstr ""
+
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:214
+#: .\cookbook\templates\base.html:269
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:218
+#: .\cookbook\templates\base.html:273
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:220
+#: .\cookbook\templates\base.html:275
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:224
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:227
+#: .\cookbook\templates\base.html:284
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
-#: .\cookbook\templates\generic\list_template.html:14
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr ""
@@ -908,16 +946,6 @@ msgstr ""
 msgid "Export Recipes"
 msgstr ""
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr ""
-
-#: .\cookbook\templates\files.html:7
-msgid "Files"
-msgstr ""
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -927,11 +955,10 @@ msgstr ""
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr ""
 
@@ -967,12 +994,20 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1033,9 +1068,6 @@ msgstr ""
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr ""
 
@@ -1080,8 +1112,8 @@ msgstr ""
 msgid "Last viewed"
 msgstr ""
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr ""
 
@@ -1224,152 +1256,19 @@ msgstr ""
 msgid "Cell"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr ""
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1475,24 +1374,24 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr ""
 
@@ -1510,7 +1409,7 @@ msgstr ""
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 msgid "Search Settings"
 msgstr ""
 
@@ -1665,67 +1564,119 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 msgid "Search-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr ""
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr ""
@@ -1743,64 +1694,78 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:34
+msgid "Try the new shopping list"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr ""
 
@@ -2051,138 +2016,142 @@ msgstr ""
 msgid "Enter website URL"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 msgid "Preview Recipe Data"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 msgid "Prep Time"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 msgid "Cook Time"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 msgid "Discovered Attributes"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 msgid "Show Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 msgid "Delete Text"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 msgid "Delete image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr ""
+
+#: .\cookbook\templates\url_import.html:585
 msgid "Add Keyword"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2193,15 +2162,15 @@ msgid ""
 "                                    github issues."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr ""
 
@@ -2214,8 +2183,7 @@ msgstr ""
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr ""
 
@@ -2228,125 +2196,124 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr ""
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr ""
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr ""
 
@@ -2366,27 +2333,19 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr ""
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
@@ -2414,6 +2373,10 @@ msgstr ""
 msgid "Shopping Categories"
 msgstr ""
 
+#: .\cookbook\views\lists.py:232
+msgid "New Shopping List"
+msgstr ""
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
@@ -2422,120 +2385,120 @@ msgstr ""
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
 msgstr ""
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
 "on how to reset passwords."
 msgstr ""
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
diff --git a/cookbook/locale/ru/LC_MESSAGES/django.mo b/cookbook/locale/ru/LC_MESSAGES/django.mo
index 6e90aacaa3bf539f6ecb93e6307e94d4c1a5ffa5..0057972851e0ee939c1c4341fb30b54514252751 100644
GIT binary patch
delta 377
zcmXBPJuib%7{>8`JBXC3mxtDCyNLxcuys+w7ckLS8kz`QENB{urHRQ@qfek|7mOrN
zVq_8_wTYco{N<T`_jTvwI_K02AIr_NSnVwai6m?SpM5Z+g%mV(Ut5~(hYNkyw3Y^<
zeO2eo^Mi1r+xn{SY9%*Ac4?^R+7rNtHgr_418N*QJh}*VWf*p~*HdLZ)Vg-GOUvFq
ztrh(*XsF$^bWKBD)l>%dbVJAWL9M2v-TI?T`kUE-S%*d2?zE&=ambCqf%$$Sdhx;}
ne4E!bulXs<w5mtCm5uf<dTUPS{GC2&QBT`n@nWJ~NnQqj8m2T%

delta 416
zcmXBQy-Pw-9LDiSA-M>W)$PSz%qfYub-fvtLj+#J_Le9N2Qi@(#Hj+82!wEOi6DX&
zhn6I#+Fbe@qK0aW0wJ1e=^IX;^LsewIfwI_th&u(Po>8z`2*6nq+qW!jr-WdGrYxA
zP^#lE4r8san>TQdd9z<S!YV$YZ$P3_Z|GtNPcd#vL)gX;KANiNki{3l0~Q9QU0h&S
z9xt(q2DkdKj!`_v|AIEst!GSO2iI_EMB2j&j^QU#ErUY_hH(+2p`0|!Vu#=!Yk0+v
ztdB}X=8y62i?=4EZ{`xNU@k1ZU;_{EWU`xkBGMi6D&F7^rt!M<?oIorHmqbRn<?ju
h1<TEpvx$gfJ2A^%wqo-U$4SKP8QZb#mK(S*{{XnzJv;ya

diff --git a/cookbook/locale/tr/LC_MESSAGES/django.mo b/cookbook/locale/tr/LC_MESSAGES/django.mo
index fcd9108d78047c034bbb80a47856aae77f09314e..94cbafa572cc5343a16230a9d0135917f0d2f361 100644
GIT binary patch
delta 85
zcmX@kKaYPxifbw(1A{*^14BFm1H)Dp1_pN^Ey~Kk-~^;&fixG8UI3(lh+#F5&;!yN
ZfpiN{-vc0R0pzD{T=|%3^Hydd762i%4WR%4

delta 124
zcmbQof1H0pifbPu1A{*^14BFm1H(NQ1_pN^ZO6*M-~^=GfHW77J_)3Oh~Wy5&;!!9
zfOHE`A150Fg9VV^w{hiTCbbY<=c3falFa-(U6;g?R4WA|10zFS14~^)V+A84D-#24
N10w^2&7I7mEC5EG7sdbp

diff --git a/cookbook/locale/tr/LC_MESSAGES/django.po b/cookbook/locale/tr/LC_MESSAGES/django.po
index 9528169c9..0fd27908c 100644
--- a/cookbook/locale/tr/LC_MESSAGES/django.po
+++ b/cookbook/locale/tr/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2020-06-02 19:28+0000\n"
 "Last-Translator: Emre S, 2020\n"
 "Language-Team: Turkish (https://www.transifex.com/django-recipes/"
@@ -25,11 +25,11 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "Malzemeler"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -37,35 +37,39 @@ msgstr ""
 "Gezinti çubuğunun rengi. Bütün renkeler bütün temalarla çalışmayabilir, önce "
 "deneyin!"
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr "Bir tarife yeni bir malzeme eklenirken kullanılacak Varsayılan Birim."
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "Son görüntülenen tarifleri arama sayfasında göster."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "Malzeme birimleri için yuvarlanma basamağı."
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr "Tariflerin altında yorumlar oluşturup görebilmek istiyorsanız."
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -78,215 +82,189 @@ msgstr ""
 "fazla kişiyle alışveriş yaparken kullanışlıdır, ancak biraz mobil veri "
 "kullanabilir. Örnek sınırından düşükse, kaydederken sıfırlanır."
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "İsim"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr ""
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr ""
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr ""
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr ""
-
-#: .\cookbook\forms.py:166
-msgid "New unit that other gets replaced by."
-msgstr ""
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr ""
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr ""
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr ""
-
-#: .\cookbook\forms.py:190
-msgid "New food that other gets replaced by."
-msgstr ""
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr ""
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr ""
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr ""
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr ""
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr ""
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr ""
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr ""
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 msgid "Search Method"
 msgstr ""
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr ""
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 msgid "Fuzzy Search"
 msgstr ""
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 msgid "Full Text"
 msgstr ""
 
@@ -297,7 +275,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr ""
 
@@ -307,9 +285,9 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr ""
 
@@ -324,36 +302,36 @@ msgstr ""
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, python-format
 msgid "Imported %s recipes."
 msgstr ""
@@ -372,8 +350,8 @@ msgstr ""
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr ""
 
@@ -427,102 +405,112 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr ""
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr ""
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr ""
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr ""
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr ""
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr ""
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "File"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr ""
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+msgid "Food Alias"
+msgstr ""
+
+#: .\cookbook\models.py:912
+msgid "Unit Alias"
+msgstr ""
+
+#: .\cookbook\models.py:912
+msgid "Keyword Alias"
+msgstr ""
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr ""
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr ""
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr ""
@@ -551,7 +539,7 @@ msgstr ""
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -586,6 +574,7 @@ msgid "Re-send Verification"
 msgstr ""
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr ""
@@ -627,7 +616,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr ""
 
@@ -639,7 +628,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr ""
 
@@ -687,12 +676,16 @@ msgstr ""
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 msgid "Password"
 msgstr ""
 
@@ -723,6 +716,28 @@ msgid ""
 "within a few minutes."
 msgstr ""
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+msgid "Bad Token"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+msgid "change password"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -774,7 +789,7 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr ""
@@ -795,65 +810,88 @@ msgid "Units"
 msgstr ""
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
 #: .\cookbook\templates\base.html:163
+msgid "Supermarket Category"
+msgstr ""
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+msgid "Automations"
+msgstr ""
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+msgid "Files"
+msgstr ""
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr ""
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr ""
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr ""
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr ""
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:259
+#: .\cookbook\templates\generic\list_template.html:14
+#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
+msgid "External Recipes"
+msgstr ""
+
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:214
+#: .\cookbook\templates\base.html:269
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:218
+#: .\cookbook\templates\base.html:273
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:220
+#: .\cookbook\templates\base.html:275
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:224
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:227
+#: .\cookbook\templates\base.html:284
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
-#: .\cookbook\templates\generic\list_template.html:14
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr ""
@@ -919,16 +957,6 @@ msgstr ""
 msgid "Export Recipes"
 msgstr ""
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr ""
-
-#: .\cookbook\templates\files.html:7
-msgid "Files"
-msgstr ""
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -938,11 +966,10 @@ msgstr ""
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr ""
 
@@ -978,12 +1005,20 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1044,9 +1079,6 @@ msgstr ""
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr ""
 
@@ -1091,8 +1123,8 @@ msgstr ""
 msgid "Last viewed"
 msgstr ""
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr ""
 
@@ -1235,152 +1267,19 @@ msgstr ""
 msgid "Cell"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr ""
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1486,24 +1385,24 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr ""
 
@@ -1521,7 +1420,7 @@ msgstr ""
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 msgid "Search Settings"
 msgstr ""
 
@@ -1676,67 +1575,119 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 msgid "Search-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr ""
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr ""
@@ -1754,64 +1705,78 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:34
+msgid "Try the new shopping list"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr ""
 
@@ -2062,138 +2027,142 @@ msgstr ""
 msgid "Enter website URL"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 msgid "Preview Recipe Data"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 msgid "Prep Time"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 msgid "Cook Time"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 msgid "Discovered Attributes"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 msgid "Show Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 msgid "Delete Text"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 msgid "Delete image"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr ""
+
+#: .\cookbook\templates\url_import.html:585
 msgid "Add Keyword"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2204,15 +2173,15 @@ msgid ""
 "                                    github issues."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr ""
 
@@ -2225,8 +2194,7 @@ msgstr ""
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr ""
 
@@ -2239,125 +2207,124 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr ""
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr ""
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr ""
 
@@ -2377,27 +2344,19 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr ""
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
@@ -2425,6 +2384,10 @@ msgstr ""
 msgid "Shopping Categories"
 msgstr ""
 
+#: .\cookbook\views\lists.py:232
+msgid "New Shopping List"
+msgstr ""
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
@@ -2433,120 +2396,120 @@ msgstr ""
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
 msgstr ""
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
 "on how to reset passwords."
 msgstr ""
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
diff --git a/cookbook/locale/zh_CN/LC_MESSAGES/django.mo b/cookbook/locale/zh_CN/LC_MESSAGES/django.mo
index a48d59a726e491585a036bb849100cc5e240d257..d2157bbbb5be3ac72a11ac8dfe60498d049b4cdb 100644
GIT binary patch
delta 3252
zcmZA3drZ}39LMnoxoO~?Lx`dz%E7xKh8IdvK}-@9Q$a!$?+7Z2_dH$_?|7kxS?QM5
za=L1sW=(76Qsyc%oor^}%5=>?vNoIRGPU>ToG)AJ8K3idp67RYe$Vs!{m$W=lE&%2
zn;pVlbCmt03ppO<+<DAs#Rnxn+BsDxVtbs9aae&*U=4P_edasJpZkOl?RO3fu?b5t
zy|r`Q@c?qX&z+_cMMnc_peq=TH*gZ(vi`wsoNG&a1oG$d%o3bNyTaNH7)iSkW3dT!
z-aoJ<KEkdT$;qM^-z8Jg%u-PYj=^lq#R#lJUEo2~%-*wpKkCG%a44R`cK8TcMAw#v
zCK7{M*?63b>8S08Fp}}z5h{K081m<?@v#K&B9nJTT%ArdA2p*&%)%|!|267DFXIrr
zhB4Tl`!W@iaW<|;P2^`x#^2DV8OL@EE=^a|Kwf+n`&qjj`EyIHy#@Qz-iZ_O6b`^>
zM%9XBpw63(n&|{&7gvCxI1e>Wc?|2HLS-o(PvSw_Z~}F&K1FVqJBwPO@6dw}Q77(5
zLj%U4R<1jC#zCm#@{nC!32KFwA(M7%P%E+9!}@EW*KLQlQTO;LvWo7c^<O~Uic6@O
zHKCsVJE-G-M;-SUCWbH=_euR;W+exrE@&v~LUT|PD)dp&32RV0)>^wBb--cNQhk6L
z;A7NG&LYp5yMUU>HPrsMF&^(*e;eLG9T$&U2`_5pGH@jNGOe-+^;&$11MwCHmbeqk
zMmr8Q<6YPT>rof{8ESy@n1WZV{~t`H9mdrZV>;@geHDk{b<EWJ@8O0$L&sD+fVDUr
zy}UCzVHx(vU8slWG#+P(&!8@75m&8eU?o0<8&UW82r>tE616gyP%C!RyoW`4{~uAA
z%Z9>k!H4Gy)QoPRPJ9=&<oC_LF`ITsVz564wSOM!-WFTC0vFO=gX+J7I?n^tg+0V*
zAC*`xTN{#)$-CaD6K0zQw!IX!QuC~R$hN<0p0NHiW&;jl|BI*<3E_KJ<HVrO-x+;O
z#-&i1fH}59z3p%aSsZr^wRB(M4!myL=OhJBScTfY8Z&Ua^*5LoQP0#>)I%7~12i4u
zd$9gxR94WTE4z-mpr24nAJQ{u6o%6F;M3R%wf}h3z>};!3pvy+z!_MJUc6`9W0Ql&
zC73;uS$|$x*M|-bkZBvTPzUCsmTI~6Z#1`A{~pwSZ=&w;IosZ7+i#e6Q8RyF?I;e?
zEs66{iJ;O4HBhQK!uoT~0@MLTW`*@{K&`-5)CB5L=Xt}nzi;gi(G$Y!YW-JuwKT5p
zdn!8MN7RXaMcu21wnP73!5s&i8L0h7qXx{k_GH^W)7tY<uV*#t!Z)B+x(+q)QRF;6
z_YoBh{JCwoh<a+T;!teaJNV-<3iU8fL7ku)OK}~x!Y14Pi?t*A1TVB5YUvX&5>rtV
z9EJ<@{+C-vBkJLb=o=h(2<mmK!ozqJ^+hzUU+^JYg}TtUP%Cj6Sz$MYsA!O_gwqDf
z60;Z=kucJQ@dH;^fvw4I!dG`-MYLRNNi7K{T1L&Fil`(L{YWh!y70k-Z(TQ@G?#Hy
zRuO%#Xw~#~l#y!k64Cf>FVPH&)S$Eo61aa>bsMNeTSK=&MendyM9V*lG?$T7=8~4y
zF&T5LE-J}HGSkLaU*Nl2_9BZ_q3E9wm8C?tLS+-tRqrCp$wsoB%pofIWK5tI{MhlI
z`cCSr$yo9{8KN`k*KHe_M;4M7NGX|5(n%ZgBAG<?kt8yKtRZ`dmrNt=NCM&cb6d#E
zL`C2A9f=-hm2474_yKe&n#pjog5;5MvY9j&p1Huk%OkL#b*7omna!-HGJ|B1ZlsXp
zl6B<&rG$=H;+tw)UcvoV7qdtznN50<=CYECo_du5BvBPBnOH!ES$j0<_n=1Yw1H`f
zSyfewt6XOOxWqAw%c?8pR4(^Fj$Rh#-`jqFXkD6Ttbe!XhcJIld}XLVq3gHd{>Mpc
UL+kc=GyJ!`#bN%*egACnFH71dB>(^b

delta 3593
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
K--R~!D*p>PzK|#Y

diff --git a/cookbook/locale/zh_CN/LC_MESSAGES/django.po b/cookbook/locale/zh_CN/LC_MESSAGES/django.po
index 891d17d2a..cd3db431f 100644
--- a/cookbook/locale/zh_CN/LC_MESSAGES/django.po
+++ b/cookbook/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: 2021-08-20 19:28+0000\n"
 "Last-Translator: Danny Tsui <dannytszho@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <http://translate.tandoor.dev/projects/"
@@ -22,47 +22,51 @@ msgstr ""
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:43 .\cookbook\templates\stats.html:28
-#: .\cookbook\templates\url_import.html:270
+#: .\cookbook\templates\url_import.html:272
 msgid "Ingredients"
 msgstr "材料"
 
-#: .\cookbook\forms.py:50
+#: .\cookbook\forms.py:53
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
 msgstr ""
 "顶部导航栏的颜色。并非所有的颜色都适用于所有的主题，只要试一试就可以了!"
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:55
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr "在配方中插入新原料时使用的默认单位。"
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:57
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr "启用对原料数量的分数支持（例如自动将小数转换为分数）"
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:59
+msgid "Display nutritional energy amounts in joules instead of calories"
+msgstr ""
+
+#: .\cookbook\forms.py:61
 #, fuzzy
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr "默认情况下，新创建的膳食计划/购物清单条目应与之共享的用户。"
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:63
 msgid "Show recently viewed recipes on search page."
 msgstr "在搜索页面上显示最近查看的菜谱。"
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:64
 msgid "Number of decimals to round ingredients."
 msgstr "四舍五入成分的小数点数目。"
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:65
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr "如果你希望能够在菜谱下面创建并看到评论。"
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:67
 msgid ""
 "Setting to 0 will disable auto sync. When viewing a shopping list the list "
 "is updated every set seconds to sync changes someone else might have made. "
@@ -73,221 +77,193 @@ msgstr ""
 "人可能做出的改变。在与多人一起购物时很有用，但可能会消耗一点移动数据。如果低"
 "于实例限制，它将在保存时被重置。"
 
-#: .\cookbook\forms.py:66
+#: .\cookbook\forms.py:70
 msgid "Makes the navbar stick to the top of the page."
 msgstr "使导航条粘在页面的顶部。"
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:86
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr "这两个字段都是可选的。如果没有给出,将显示用户名"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
-#: .\cookbook\templates\url_import.html:154
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:266
+#: .\cookbook\templates\url_import.html:156
 msgid "Name"
 msgstr "名称"
 
-#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
+#: .\cookbook\forms.py:108 .\cookbook\forms.py:267
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
-#: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
+#: .\cookbook\templates\url_import.html:190
+#: .\cookbook\templates\url_import.html:575 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "关键字"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:109
 msgid "Preparation time in minutes"
 msgstr "准备时间(分钟)"
 
-#: .\cookbook\forms.py:106
+#: .\cookbook\forms.py:110
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "等候时间(分钟)"
 
-#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
+#: .\cookbook\forms.py:111 .\cookbook\forms.py:268
 msgid "Path"
 msgstr "路径"
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:112
 msgid "Storage UID"
 msgstr "存储 UID"
 
-#: .\cookbook\forms.py:134
+#: .\cookbook\forms.py:140
 msgid "Default"
 msgstr "预置"
 
-#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:151 .\cookbook\templates\url_import.html:92
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr "為了防止與現有菜谱同名的重複菜谱被忽略。勾选此框以导入所有内容。"
 
-#: .\cookbook\forms.py:165
-msgid "New Unit"
-msgstr "新单位"
-
-#: .\cookbook\forms.py:166
-#, fuzzy
-msgid "New unit that other gets replaced by."
-msgstr "新的单位被其他取代."
-
-#: .\cookbook\forms.py:171
-msgid "Old Unit"
-msgstr "旧单位"
-
-#: .\cookbook\forms.py:172
-msgid "Unit that should be replaced."
-msgstr "单位应被取代."
-
-#: .\cookbook\forms.py:189
-msgid "New Food"
-msgstr "新的食品"
-
-#: .\cookbook\forms.py:190
-#, fuzzy
-msgid "New food that other gets replaced by."
-msgstr "新食品被其他取代."
-
-#: .\cookbook\forms.py:195
-msgid "Old Food"
-msgstr "旧的食品"
-
-#: .\cookbook\forms.py:196
-msgid "Food that should be replaced."
-msgstr "食品应被取代."
-
-#: .\cookbook\forms.py:214
+#: .\cookbook\forms.py:173
 msgid "Add your comment: "
 msgstr "发表评论: "
 
-#: .\cookbook\forms.py:256
+#: .\cookbook\forms.py:188
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr "dropbox留空和为nextcloud输入应用密码。"
 
-#: .\cookbook\forms.py:263
+#: .\cookbook\forms.py:195
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:272
+#: .\cookbook\forms.py:204
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:310
+#: .\cookbook\forms.py:242
 msgid "Search String"
 msgstr "搜索字符串"
 
-#: .\cookbook\forms.py:337
+#: .\cookbook\forms.py:269
 msgid "File ID"
 msgstr "文件编号"
 
-#: .\cookbook\forms.py:373
+#: .\cookbook\forms.py:290
 msgid "You must provide at least a recipe or a title."
 msgstr "你必须至少提供一份菜谱或一个标题。"
 
-#: .\cookbook\forms.py:386
+#: .\cookbook\forms.py:303
 msgid "You can list default users to share recipes with in the settings."
 msgstr "你可以在设置中列出默认用户来分享食谱。"
 
-#: .\cookbook\forms.py:387
+#: .\cookbook\forms.py:304
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:412
+#: .\cookbook\forms.py:329
 msgid "Maximum number of users for this space reached."
 msgstr "已达到该空间的最大用户数。"
 
-#: .\cookbook\forms.py:418
+#: .\cookbook\forms.py:335
 msgid "Email address already taken!"
 msgstr "电子邮件地址已被注册!"
 
-#: .\cookbook\forms.py:426
+#: .\cookbook\forms.py:343
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr "电子邮件地址不是必需的，但如果存在，邀请链接将被发送给用户。"
 
-#: .\cookbook\forms.py:441
+#: .\cookbook\forms.py:358
 msgid "Name already taken."
 msgstr "名字已被占用。"
 
-#: .\cookbook\forms.py:452
+#: .\cookbook\forms.py:369
 msgid "Accept Terms and Privacy"
 msgstr "接受条款细则及私隐政策"
 
-#: .\cookbook\forms.py:487
+#: .\cookbook\forms.py:399
+msgid ""
+"Determines how fuzzy a search is if it uses trigram similarity matching (e."
+"g. low values mean more typos are ignored)."
+msgstr ""
+
+#: .\cookbook\forms.py:407
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full desciption of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:488
+#: .\cookbook\forms.py:408
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:489
+#: .\cookbook\forms.py:409
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:490
+#: .\cookbook\forms.py:410
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:491
+#: .\cookbook\forms.py:411
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:492
+#: .\cookbook\forms.py:412
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
 
-#: .\cookbook\forms.py:493
+#: .\cookbook\forms.py:413
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:497
+#: .\cookbook\forms.py:417
 #, fuzzy
 #| msgid "Search"
 msgid "Search Method"
 msgstr "搜索"
 
-#: .\cookbook\forms.py:498
+#: .\cookbook\forms.py:418
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:499
+#: .\cookbook\forms.py:419
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:500
+#: .\cookbook\forms.py:420
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:501
+#: .\cookbook\forms.py:421
 msgid "Starts Wtih"
 msgstr ""
 
-#: .\cookbook\forms.py:502
+#: .\cookbook\forms.py:422
 #, fuzzy
 #| msgid "Search"
 msgid "Fuzzy Search"
 msgstr "搜索"
 
-#: .\cookbook\forms.py:503
+#: .\cookbook\forms.py:423
 #, fuzzy
 #| msgid "Text"
 msgid "Full Text"
@@ -300,7 +276,7 @@ msgid ""
 msgstr "为了防止垃圾邮件，所要求的电子邮件没有被发送。请等待几分钟后再试。"
 
 #: .\cookbook\helper\permission_helper.py:136
-#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:149
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "你没有登录，因此不能查看这个页面!"
 
@@ -310,9 +286,9 @@ msgstr "你没有登录，因此不能查看这个页面!"
 #: .\cookbook\helper\permission_helper.py:216
 #: .\cookbook\helper\permission_helper.py:230
 #: .\cookbook\helper\permission_helper.py:241
-#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:161 .\cookbook\views\views.py:168
-#: .\cookbook\views\views.py:245
+#: .\cookbook\helper\permission_helper.py:252 .\cookbook\views\data.py:42
+#: .\cookbook\views\views.py:160 .\cookbook\views\views.py:167
+#: .\cookbook\views\views.py:233
 msgid "You do not have the required permissions to view this page!"
 msgstr "你没有必要的权限来查看这个页面!"
 
@@ -328,36 +304,36 @@ msgstr "你不能与这个对象进行互动，因为它不属于你！"
 msgid "Could not parse template code."
 msgstr "无法解析模板代码。"
 
-#: .\cookbook\integration\integration.py:119
+#: .\cookbook\integration\integration.py:126
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
 #: .\cookbook\templates\import_response.html:7
 #: .\cookbook\templates\test.html:14 .\cookbook\templates\test.html:20
 #: .\cookbook\templates\url_import.html:27
-#: .\cookbook\templates\url_import.html:101
-#: .\cookbook\templates\url_import.html:123
-#: .\cookbook\templates\url_import.html:317
-#: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
+#: .\cookbook\templates\url_import.html:103
+#: .\cookbook\templates\url_import.html:125
+#: .\cookbook\templates\url_import.html:319
+#: .\cookbook\templates\url_import.html:606 .\cookbook\views\delete.py:89
 #: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "导入"
 
-#: .\cookbook\integration\integration.py:200
+#: .\cookbook\integration\integration.py:208
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr "输入者需要一个.zip文件。你为你的数据选择了正确的导入器类型吗？"
 
-#: .\cookbook\integration\integration.py:203
+#: .\cookbook\integration\integration.py:211
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr "在导入过程中发生了一个意外的错误。请确认你已经上传了一个有效的文件。"
 
-#: .\cookbook\integration\integration.py:208
+#: .\cookbook\integration\integration.py:216
 msgid "The following recipes were ignored because they already existed:"
 msgstr "以下菜谱被忽略了，因为它们已经存在了："
 
-#: .\cookbook\integration\integration.py:212
+#: .\cookbook\integration\integration.py:220
 #, python-format
 msgid "Imported %s recipes."
 msgstr "导入了%s菜谱。"
@@ -376,8 +352,8 @@ msgstr "来源"
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\include\log_cooking.html:16
-#: .\cookbook\templates\url_import.html:224
-#: .\cookbook\templates\url_import.html:455
+#: .\cookbook\templates\url_import.html:226
+#: .\cookbook\templates\url_import.html:457
 msgid "Servings"
 msgstr "份量"
 
@@ -431,102 +407,116 @@ msgstr "晚餐"
 msgid "Other"
 msgstr "其他"
 
-#: .\cookbook\models.py:144
+#: .\cookbook\models.py:150
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr "空间的最大文件存储量，单位为MB。0表示无限制，-1表示禁止文件上传。"
 
-#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
-#: .\cookbook\templates\shopping_list.html:52
+#: .\cookbook\models.py:202 .\cookbook\templates\search.html:7
+#: .\cookbook\templates\shopping_list.html:59
 msgid "Search"
 msgstr "搜索"
 
-#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
-#: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
+#: .\cookbook\models.py:203 .\cookbook\templates\base.html:82
+#: .\cookbook\templates\meal_plan.html:7
+#: .\cookbook\templates\meal_plan_new.html:7 .\cookbook\views\delete.py:181
+#: .\cookbook\views\edit.py:217 .\cookbook\views\new.py:180
 msgid "Meal-Plan"
 msgstr "餐单"
 
-#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
+#: .\cookbook\models.py:204 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "书籍"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Small"
 msgstr "小"
 
-#: .\cookbook\models.py:206
+#: .\cookbook\models.py:212
 msgid "Large"
 msgstr "大"
 
-#: .\cookbook\models.py:206 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:212 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
-#: .\cookbook\templates\meal_plan.html:323
 msgid "New"
 msgstr "新"
 
-#: .\cookbook\models.py:389
+#: .\cookbook\models.py:396
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Text"
 msgstr "文本"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "Time"
 msgstr "时间"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 msgid "File"
 msgstr "文件"
 
-#: .\cookbook\models.py:429
+#: .\cookbook\models.py:441
 #: .\cookbook\templates\include\recipe_open_modal.html:7
-#: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
+#: .\cookbook\views\delete.py:39 .\cookbook\views\edit.py:257
+#: .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "菜谱"
 
-#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:871 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:872 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:873 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:874 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\serializer.py:112
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Food"
+msgid "Food Alias"
+msgstr "食物"
+
+#: .\cookbook\models.py:912
+msgid "Unit Alias"
+msgstr ""
+
+#: .\cookbook\models.py:912
+#, fuzzy
+#| msgid "Keywords"
+msgid "Keyword Alias"
+msgstr "关键字"
+
+#: .\cookbook\serializer.py:157
 msgid "File uploads are not enabled for this Space."
 msgstr "文件不能上载此空间。"
 
-#: .\cookbook\serializer.py:125
+#: .\cookbook\serializer.py:168
 msgid "You have reached your file upload limit."
 msgstr "你已达到文件上载的上限。"
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
-#: .\cookbook\templates\meal_plan.html:281
 #: .\cookbook\templates\recipes_table.html:82
-#: .\cookbook\templates\shopping_list.html:33
+#: .\cookbook\templates\shopping_list.html:40
 #: .\cookbook\templates\space.html:90
 msgid "Edit"
 msgstr "编辑"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
-#: .\cookbook\templates\generic\delete_template.html:5
-#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\delete_template.html:7
+#: .\cookbook\templates\generic\delete_template.html:15
 #: .\cookbook\templates\generic\edit_template.html:28
-#: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
 msgstr "删除"
@@ -555,7 +545,7 @@ msgstr "电子邮件地址"
 #: .\cookbook\templates\account\email.html:12
 #: .\cookbook\templates\account\password_change.html:11
 #: .\cookbook\templates\account\password_set.html:11
-#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:257 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -592,6 +582,7 @@ msgid "Re-send Verification"
 msgstr "重新发送验证"
 
 #: .\cookbook\templates\account\email.html:50
+#: .\cookbook\templates\generic\delete_template.html:56
 #: .\cookbook\templates\socialaccount\connections.html:44
 msgid "Remove"
 msgstr "移除"
@@ -635,7 +626,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:22
+#: .\cookbook\templates\generic\delete_template.html:71
 msgid "Confirm"
 msgstr "确认"
 
@@ -647,7 +638,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:289
 msgid "Login"
 msgstr "登录"
 
@@ -695,12 +686,16 @@ msgstr "你确定你要登出吗？"
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
 #: .\cookbook\templates\account\password_change.html:21
+#: .\cookbook\templates\account\password_reset_from_key.html:7
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+#: .\cookbook\templates\account\password_reset_from_key_done.html:7
+#: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
 msgstr "更改密码"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:64
+#: .\cookbook\templates\settings.html:69
 msgid "Password"
 msgstr "密码"
 
@@ -733,6 +728,30 @@ msgid ""
 "within a few minutes."
 msgstr "我们已经向您发送了一封电子邮件。如果你在几分钟内没有收到，请联系我们。"
 
+#: .\cookbook\templates\account\password_reset_from_key.html:13
+msgid "Bad Token"
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:25
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.\n"
+"                    Please request a <a href=\"%(passwd_reset_url)s\">new "
+"password reset</a>."
+msgstr ""
+
+#: .\cookbook\templates\account\password_reset_from_key.html:33
+#, fuzzy
+#| msgid "Change Password"
+msgid "change password"
+msgstr "更改密码"
+
+#: .\cookbook\templates\account\password_reset_from_key.html:36
+#: .\cookbook\templates\account\password_reset_from_key_done.html:19
+msgid "Your password is now changed."
+msgstr ""
+
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
@@ -784,7 +803,7 @@ msgstr "注册关闭"
 msgid "We are sorry, but the sign up is currently closed."
 msgstr "我们很抱歉，但目前注册已经结束。"
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:279
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "API文档"
@@ -805,65 +824,90 @@ msgid "Units"
 msgstr ""
 
 #: .\cookbook\templates\base.html:151
-#: .\cookbook\templates\shopping_list.html:230
+#: .\cookbook\templates\shopping_list.html:237
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "超市"
 
 #: .\cookbook\templates\base.html:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarket Category"
+msgstr "超市"
+
+#: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
+msgid "Automations"
+msgstr ""
+
+#: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
+msgid "Files"
+msgstr ""
+
+#: .\cookbook\templates\base.html:201
 msgid "Batch Edit"
 msgstr "批量编辑"
 
-#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:213 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:191 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:228 .\cookbook\templates\export.html:14
+#: .\cookbook\templates\export.html:20
+#: .\cookbook\templates\shopping_list.html:358
+#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
+msgid "Export"
+msgstr ""
+
+#: .\cookbook\templates\base.html:244 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr ""
 
-#: .\cookbook\templates\base.html:193
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
+#: .\cookbook\templates\base.html:246
+#: .\cookbook\templates\shopping_list.html:195
+#: .\cookbook\templates\shopping_list.html:217
 msgid "Create"
 msgstr ""
 
-#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:259
+#: .\cookbook\templates\generic\list_template.html:14
+#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
+msgid "External Recipes"
+msgstr ""
+
+#: .\cookbook\templates\base.html:262 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:267 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:214
+#: .\cookbook\templates\base.html:269
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:218
+#: .\cookbook\templates\base.html:273
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:220
+#: .\cookbook\templates\base.html:275
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:224
+#: .\cookbook\templates\base.html:277
+msgid "Translate Tandoor"
+msgstr ""
+
+#: .\cookbook\templates\base.html:281
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:227
+#: .\cookbook\templates\base.html:284
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
-#: .\cookbook\templates\generic\list_template.html:14
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr ""
@@ -933,16 +977,6 @@ msgstr ""
 msgid "Export Recipes"
 msgstr ""
 
-#: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
-#: .\cookbook\templates\shopping_list.html:351
-#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
-msgid "Export"
-msgstr ""
-
-#: .\cookbook\templates\files.html:7
-msgid "Files"
-msgstr ""
-
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
@@ -952,11 +986,10 @@ msgstr ""
 #: .\cookbook\templates\generic\edit_template.html:23
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\include\log_cooking.html:28
-#: .\cookbook\templates\meal_plan.html:325
-#: .\cookbook\templates\settings.html:58 .\cookbook\templates\settings.html:99
-#: .\cookbook\templates\settings.html:117
-#: .\cookbook\templates\settings.html:162
-#: .\cookbook\templates\shopping_list.html:353
+#: .\cookbook\templates\settings.html:63 .\cookbook\templates\settings.html:105
+#: .\cookbook\templates\settings.html:123
+#: .\cookbook\templates\settings.html:195
+#: .\cookbook\templates\shopping_list.html:360
 msgid "Save"
 msgstr ""
 
@@ -992,12 +1025,20 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:19
+#: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:23
+#: .\cookbook\templates\generic\delete_template.html:26
+msgid "Protected"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:41
+msgid "Cascade"
+msgstr ""
+
+#: .\cookbook\templates\generic\delete_template.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -1058,9 +1099,6 @@ msgstr ""
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
-#: .\cookbook\templates\meal_plan.html:283
-#: .\cookbook\templates\meal_plan.html:327
-#: .\cookbook\templates\meal_plan.html:366
 msgid "Close"
 msgstr ""
 
@@ -1105,8 +1143,8 @@ msgstr ""
 msgid "Last viewed"
 msgstr ""
 
-#: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
-#: .\cookbook\templates\space.html:35 .\cookbook\templates\stats.html:22
+#: .\cookbook\templates\index.html:87 .\cookbook\templates\space.html:35
+#: .\cookbook\templates\stats.html:22
 msgid "Recipes"
 msgstr ""
 
@@ -1249,152 +1287,19 @@ msgstr ""
 msgid "Cell"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:101
-msgid "New Entry"
+#: .\cookbook\templates\meal_plan_entry.html:6
+msgid "Meal Plan View"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:113
-#: .\cookbook\templates\shopping_list.html:56
-msgid "Search Recipe"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:139
-msgid "Title"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:141
-msgid "Note (optional)"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:143
-msgid ""
-"You can use markdown to format this field. See the <a href=\"/docs/markdown/"
-"\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:147
-#: .\cookbook\templates\meal_plan.html:251
-msgid "Serving Count"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:153
-msgid "Create only note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:168
-#: .\cookbook\templates\shopping_list.html:7
-#: .\cookbook\templates\shopping_list.html:29
-#: .\cookbook\templates\shopping_list.html:714
-msgid "Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:172
-msgid "Shopping list currently empty"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:175
-msgid "Open Shopping List"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:189
-msgid "Plan"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:196
-msgid "Number of Days"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:206
-msgid "Weekday offset"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:209
-msgid ""
-"Number of days starting from the first day of the week to offset the default "
-"view."
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:217
-#: .\cookbook\templates\meal_plan.html:294
-msgid "Edit plan types"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:219
-msgid "Show help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:220
-msgid "Week iCal export"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
-#: .\cookbook\templates\shopping_list.html:254
+#: .\cookbook\templates\shopping_list.html:261
 msgid "Shared with"
 msgstr ""
 
-#: .\cookbook\templates\meal_plan.html:280
-msgid "Add to Shopping"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:323
-msgid "New meal type"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:338
-msgid "Meal Plan Help"
-msgstr ""
-
-#: .\cookbook\templates\meal_plan.html:344
-msgid ""
-"\n"
-"                            <p>The meal plan module allows planning of meals "
-"both with recipes and notes.</p>\n"
-"                            <p>Simply select a recipe from the list of "
-"recently viewed recipes or search the one you\n"
-"                                want and drag it to the desired plan "
-"position. You can also add a note and a title and\n"
-"                                then drag the recipe to create a plan entry "
-"with a custom title and note. Creating only\n"
-"                                Notes is possible by dragging the create "
-"note box into the plan.</p>\n"
-"                            <p>Click on a recipe in order to open the "
-"detailed view. There you can also add it to the\n"
-"                                shopping list. You can also add all recipes "
-"of a day to the shopping list by\n"
-"                                clicking the shopping cart at the top of the "
-"table.</p>\n"
-"                            <p>Since a common use case is to plan meals "
-"together you can define\n"
-"                                users you want to share your plan with in "
-"the settings.\n"
-"                            </p>\n"
-"                            <p>You can also edit the types of meals you want "
-"to plan. If you share your plan with\n"
-"                                someone with\n"
-"                                different meals, their meal types will "
-"appear in your list as well. To prevent\n"
-"                                duplicates (e.g. Other and Misc.)\n"
-"                                name your meal types the same as the users "
-"you share your meals with and they will be\n"
-"                                merged.</p>\n"
-"                        "
-msgstr ""
-
-#: .\cookbook\templates\meal_plan_entry.html:6
-msgid "Meal Plan View"
-msgstr ""
-
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
@@ -1500,24 +1405,24 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
+#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:147
 #: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:19
 #: .\cookbook\templates\recipes_table.html:23
-#: .\cookbook\templates\url_import.html:440
+#: .\cookbook\templates\url_import.html:442
 msgid "Recipe Image"
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:51
-#: .\cookbook\templates\url_import.html:445
+#: .\cookbook\templates\url_import.html:447
 msgid "Preparation time ca."
 msgstr ""
 
 #: .\cookbook\templates\recipes_table.html:57
-#: .\cookbook\templates\url_import.html:450
+#: .\cookbook\templates\url_import.html:452
 msgid "Waiting time ca."
 msgstr ""
 
@@ -1535,7 +1440,7 @@ msgstr ""
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
-#: .\cookbook\templates\settings.html:157
+#: .\cookbook\templates\settings.html:165
 #, fuzzy
 #| msgid "Search String"
 msgid "Search Settings"
@@ -1698,69 +1603,121 @@ msgid ""
 "            "
 msgstr ""
 
-#: .\cookbook\templates\settings.html:27
+#: .\cookbook\templates\settings.html:28
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:35
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:39
+#: .\cookbook\templates\settings.html:42
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:45
+#: .\cookbook\templates\settings.html:49
 #, fuzzy
 #| msgid "Search String"
 msgid "Search-Settings"
 msgstr "搜索字符串"
 
-#: .\cookbook\templates\settings.html:53
+#: .\cookbook\templates\settings.html:58
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:61
+#: .\cookbook\templates\settings.html:66
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:63
+#: .\cookbook\templates\settings.html:68
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:71
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:78
+#: .\cookbook\templates\settings.html:84
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:108
+#: .\cookbook\templates\settings.html:114
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:128
+#: .\cookbook\templates\settings.html:135
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:129
+#: .\cookbook\templates\settings.html:136
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:146
+#: .\cookbook\templates\settings.html:153
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:148
+#: .\cookbook\templates\settings.html:155
 msgid "or"
 msgstr ""
 
+#: .\cookbook\templates\settings.html:166
+msgid ""
+"There are many options to configure the search depending on your personal "
+"preferences."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:167
+msgid ""
+"Usually you do <b>not need</b> to configure any of them and can just stick "
+"with either the default or one of the following presets."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:168
+msgid ""
+"If you do want to configure the search you can read about the different "
+"options <a href=\"/docs/search/\">here</a>."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:173
+msgid "Fuzzy"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:174
+msgid ""
+"Find what you need even if your search or the recipe contains typos. Might "
+"return more results than needed to make sure you find what you are looking "
+"for."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:175
+msgid "This is the default behavior"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:176
+#: .\cookbook\templates\settings.html:184
+msgid "Apply"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:181
+msgid "Precise"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:182
+msgid ""
+"Allows fine control over search results but might not return results if too "
+"many spelling mistakes are made."
+msgstr ""
+
+#: .\cookbook\templates\settings.html:183
+msgid "Perfect for large Databases"
+msgstr ""
+
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"
 msgstr ""
@@ -1778,64 +1735,78 @@ msgstr ""
 msgid "Create Superuser account"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:79
+#: .\cookbook\templates\shopping_list.html:7
+#: .\cookbook\templates\shopping_list.html:29
+#: .\cookbook\templates\shopping_list.html:721
+msgid "Shopping List"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:34
+msgid "Try the new shopping list"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:63
+msgid "Search Recipe"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:86
 msgid "Shopping Recipes"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:83
+#: .\cookbook\templates\shopping_list.html:90
 msgid "No recipes selected"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:150
+#: .\cookbook\templates\shopping_list.html:157
 msgid "Entry Mode"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:158
+#: .\cookbook\templates\shopping_list.html:165
 msgid "Add Entry"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:174
+#: .\cookbook\templates\shopping_list.html:181
 msgid "Amount"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:187
+#: .\cookbook\templates\shopping_list.html:194
 msgid "Select Unit"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:189
-#: .\cookbook\templates\shopping_list.html:211
-#: .\cookbook\templates\shopping_list.html:241
-#: .\cookbook\templates\shopping_list.html:265
-#: .\cookbook\templates\url_import.html:495
-#: .\cookbook\templates\url_import.html:527
+#: .\cookbook\templates\shopping_list.html:196
+#: .\cookbook\templates\shopping_list.html:218
+#: .\cookbook\templates\shopping_list.html:248
+#: .\cookbook\templates\shopping_list.html:272
+#: .\cookbook\templates\url_import.html:497
+#: .\cookbook\templates\url_import.html:529
 msgid "Select"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:209
+#: .\cookbook\templates\shopping_list.html:216
 msgid "Select Food"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:240
+#: .\cookbook\templates\shopping_list.html:247
 msgid "Select Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:264
+#: .\cookbook\templates\shopping_list.html:271
 msgid "Select User"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:283
+#: .\cookbook\templates\shopping_list.html:290
 msgid "Finished"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:296
+#: .\cookbook\templates\shopping_list.html:303
 msgid "You are offline, shopping list might not syncronize."
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:361
+#: .\cookbook\templates\shopping_list.html:368
 msgid "Copy/Export"
 msgstr ""
 
-#: .\cookbook\templates\shopping_list.html:365
+#: .\cookbook\templates\shopping_list.html:372
 msgid "List Prefix"
 msgstr ""
 
@@ -2086,138 +2057,142 @@ msgstr ""
 msgid "Enter website URL"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:97
+#: .\cookbook\templates\url_import.html:99
 msgid "Select recipe files to import or drop them here..."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:118
+#: .\cookbook\templates\url_import.html:120
 msgid "Paste json or html source here to load recipe."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:146
+#: .\cookbook\templates\url_import.html:148
 msgid "Preview Recipe Data"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:147
+#: .\cookbook\templates\url_import.html:149
 msgid "Drag recipe attributes from the right into the appropriate box below."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:156
-#: .\cookbook\templates\url_import.html:173
-#: .\cookbook\templates\url_import.html:190
-#: .\cookbook\templates\url_import.html:209
-#: .\cookbook\templates\url_import.html:227
-#: .\cookbook\templates\url_import.html:242
-#: .\cookbook\templates\url_import.html:257
-#: .\cookbook\templates\url_import.html:273
-#: .\cookbook\templates\url_import.html:300
-#: .\cookbook\templates\url_import.html:351
+#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:211
+#: .\cookbook\templates\url_import.html:229
+#: .\cookbook\templates\url_import.html:244
+#: .\cookbook\templates\url_import.html:259
+#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:353
 msgid "Clear Contents"
 msgstr "清除内容"
 
-#: .\cookbook\templates\url_import.html:158
+#: .\cookbook\templates\url_import.html:160
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:171
+#: .\cookbook\templates\url_import.html:173
 msgid "Description"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:175
+#: .\cookbook\templates\url_import.html:177
 msgid "Text dragged here will be appended to the description."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:192
+#: .\cookbook\templates\url_import.html:194
 msgid "Keywords dragged here will be appended to current list"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:207
+#: .\cookbook\templates\url_import.html:209
 msgid "Image"
 msgstr "影像"
 
-#: .\cookbook\templates\url_import.html:239
+#: .\cookbook\templates\url_import.html:241
 msgid "Prep Time"
 msgstr "准备时间"
 
-#: .\cookbook\templates\url_import.html:254
+#: .\cookbook\templates\url_import.html:256
 msgid "Cook Time"
 msgstr "烹调时间"
 
-#: .\cookbook\templates\url_import.html:275
+#: .\cookbook\templates\url_import.html:277
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
+#: .\cookbook\templates\url_import.html:299
+#: .\cookbook\templates\url_import.html:569
 msgid "Instructions"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:302
+#: .\cookbook\templates\url_import.html:304
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:325
+#: .\cookbook\templates\url_import.html:327
 msgid "Discovered Attributes"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:327
+#: .\cookbook\templates\url_import.html:329
 msgid ""
 "Drag recipe attributes from below into the appropriate box on the left. "
 "Click any node to display its full properties."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:344
+#: .\cookbook\templates\url_import.html:346
 msgid "Show Blank Field"
 msgstr "显示空白域"
 
-#: .\cookbook\templates\url_import.html:349
+#: .\cookbook\templates\url_import.html:351
 msgid "Blank Field"
 msgstr "空白域"
 
-#: .\cookbook\templates\url_import.html:353
+#: .\cookbook\templates\url_import.html:355
 msgid "Items dragged to Blank Field will be appended."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:400
+#: .\cookbook\templates\url_import.html:402
 msgid "Delete Text"
 msgstr "删除文本"
 
-#: .\cookbook\templates\url_import.html:413
+#: .\cookbook\templates\url_import.html:415
 msgid "Delete image"
 msgstr "删除影像"
 
-#: .\cookbook\templates\url_import.html:429
+#: .\cookbook\templates\url_import.html:431
 msgid "Recipe Name"
 msgstr "菜谱名称"
 
-#: .\cookbook\templates\url_import.html:433
+#: .\cookbook\templates\url_import.html:435
 msgid "Recipe Description"
 msgstr "菜谱描述"
 
-#: .\cookbook\templates\url_import.html:494
-#: .\cookbook\templates\url_import.html:526
-#: .\cookbook\templates\url_import.html:582
+#: .\cookbook\templates\url_import.html:496
+#: .\cookbook\templates\url_import.html:528
+#: .\cookbook\templates\url_import.html:584
 msgid "Select one"
 msgstr "选择一项"
 
-#: .\cookbook\templates\url_import.html:583
+#: .\cookbook\templates\url_import.html:544
+msgid "Note"
+msgstr ""
+
+#: .\cookbook\templates\url_import.html:585
 msgid "Add Keyword"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:596
+#: .\cookbook\templates\url_import.html:598
 msgid "All Keywords"
 msgstr "所有关键字"
 
-#: .\cookbook\templates\url_import.html:599
+#: .\cookbook\templates\url_import.html:601
 msgid "Import all keywords, not only the ones already existing."
 msgstr "导入所有关键字，并不只是现有的。"
 
-#: .\cookbook\templates\url_import.html:626
+#: .\cookbook\templates\url_import.html:628
 msgid "Information"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:628
+#: .\cookbook\templates\url_import.html:630
 msgid ""
 " Only websites containing ld+json or microdata information can currently\n"
 "                                    be imported. Most big recipe pages "
@@ -2228,15 +2203,15 @@ msgid ""
 "                                    github issues."
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:636
+#: .\cookbook\templates\url_import.html:638
 msgid "Google ld+json Info"
 msgstr ""
 
-#: .\cookbook\templates\url_import.html:639
+#: .\cookbook\templates\url_import.html:641
 msgid "GitHub Issues"
 msgstr "GitHub问题"
 
-#: .\cookbook\templates\url_import.html:641
+#: .\cookbook\templates\url_import.html:643
 msgid "Recipe Markup Specification"
 msgstr ""
 
@@ -2249,8 +2224,7 @@ msgstr ""
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
-#: .\cookbook\views\edit.py:316
+#: .\cookbook\views\api.py:155
 msgid "Cannot merge with the same object!"
 msgstr ""
 
@@ -2263,125 +2237,124 @@ msgstr ""
 msgid "Cannot merge with child object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:195
+#: .\cookbook\views\api.py:200
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:199
+#: .\cookbook\views\api.py:204
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:239
+#: .\cookbook\views\api.py:248
 #, python-brace-format
 msgid "No {self.basename} with id {child} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:248
+#: .\cookbook\views\api.py:257
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+#: .\cookbook\views\api.py:260 .\cookbook\views\api.py:278
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:254
+#: .\cookbook\views\api.py:263
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:260
+#: .\cookbook\views\api.py:269
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:266
+#: .\cookbook\views\api.py:275
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
+#: .\cookbook\views\api.py:723 .\cookbook\views\views.py:277
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:727
+#: .\cookbook\views\api.py:746
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:732
+#: .\cookbook\views\api.py:751
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:810
+#: .\cookbook\views\api.py:829
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:825
+#: .\cookbook\views\api.py:844
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:832
+#: .\cookbook\views\api.py:851
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:841
+#: .\cookbook\views\api.py:860
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:855
+#: .\cookbook\views\api.py:874
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:871
+#: .\cookbook\views\api.py:890
 msgid "I couldn't find anything to do."
 msgstr ""
 
-#: .\cookbook\views\data.py:31 .\cookbook\views\data.py:122
-#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:67
+#: .\cookbook\views\data.py:33 .\cookbook\views\data.py:124
+#: .\cookbook\views\edit.py:50 .\cookbook\views\import_export.py:73
 #: .\cookbook\views\new.py:32
 msgid "You have reached the maximum number of recipes for your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:35 .\cookbook\views\data.py:126
-#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:71
+#: .\cookbook\views\data.py:37 .\cookbook\views\data.py:128
+#: .\cookbook\views\edit.py:54 .\cookbook\views\import_export.py:77
 #: .\cookbook\views\new.py:36
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\views\data.py:104
+#: .\cookbook\views\data.py:106
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: .\cookbook\views\delete.py:72
+#: .\cookbook\views\delete.py:101
 msgid "Monitor"
 msgstr "监测"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\delete.py:125 .\cookbook\views\lists.py:86
 #: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "存储后端"
 
-#: .\cookbook\views\delete.py:106
+#: .\cookbook\views\delete.py:135
 msgid ""
 "Could not delete this storage backend as it is used in at least one monitor."
 msgstr ""
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
-#: .\cookbook\views\new.py:155
+#: .\cookbook\views\delete.py:158
 msgid "Recipe Book"
 msgstr ""
 
-#: .\cookbook\views\delete.py:141
+#: .\cookbook\views\delete.py:170
 msgid "Bookmarks"
 msgstr "书签"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
+#: .\cookbook\views\delete.py:192 .\cookbook\views\new.py:231
 msgid "Invite Link"
 msgstr ""
 
@@ -2401,27 +2374,19 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:259
+#: .\cookbook\views\edit.py:245
 msgid "Changes saved!"
 msgstr "更改已保存!"
 
-#: .\cookbook\views\edit.py:263
+#: .\cookbook\views\edit.py:249
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:298
-msgid "Units merged!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:314
-msgid "Foods merged!"
-msgstr ""
-
-#: .\cookbook\views\import_export.py:93
+#: .\cookbook\views\import_export.py:99
 msgid "Importing is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\import_export.py:115
+#: .\cookbook\views\import_export.py:121
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
@@ -2455,6 +2420,12 @@ msgstr "超市"
 msgid "Shopping Categories"
 msgstr "购物清单"
 
+#: .\cookbook\views\lists.py:232
+#, fuzzy
+#| msgid "Shopping Lists"
+msgid "New Shopping List"
+msgstr "购物清单"
+
 #: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
@@ -2463,125 +2434,151 @@ msgstr ""
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "Hello"
 msgstr "你好"
 
-#: .\cookbook\views\new.py:225
+#: .\cookbook\views\new.py:205
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:206
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:207
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:208
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:209
 msgid "The invitation is valid until "
 msgstr "邀请有效期至 "
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:210
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:233
+#: .\cookbook\views\new.py:213
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:240
+#: .\cookbook\views\new.py:220
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:243
+#: .\cookbook\views\new.py:223
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:245
+#: .\cookbook\views\new.py:225
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:128
+#: .\cookbook\views\views.py:127
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
 msgstr ""
 
-#: .\cookbook\views\views.py:176
+#: .\cookbook\views\views.py:175
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:186
 msgid "Comment saved!"
 msgstr "评论已保存!"
 
-#: .\cookbook\views\views.py:351
+#: .\cookbook\views\views.py:340
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:354
+#: .\cookbook\views\views.py:345
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:357
+#: .\cookbook\views\views.py:349
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:437
+#: .\cookbook\views\views.py:452
 msgid ""
 "The setup page can only be used to create the first user! If you have "
 "forgotten your superuser credentials please consult the django documentation "
 "on how to reset passwords."
 msgstr ""
 
-#: .\cookbook\views\views.py:444
+#: .\cookbook\views\views.py:459
 msgid "Passwords dont match!"
 msgstr "密码不匹配!"
 
-#: .\cookbook\views\views.py:460
+#: .\cookbook\views\views.py:475
 msgid "User has been created, please login!"
 msgstr "用户已创建，請登录！"
 
-#: .\cookbook\views\views.py:476
+#: .\cookbook\views\views.py:491
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:483
+#: .\cookbook\views\views.py:498
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr "你已是空间的成员，因此未能加入。"
 
-#: .\cookbook\views\views.py:494
+#: .\cookbook\views\views.py:509
 msgid "Successfully joined space."
 msgstr "成功加入空间。"
 
-#: .\cookbook\views\views.py:500
+#: .\cookbook\views\views.py:515
 msgid "Invite Link not valid or already used!"
 msgstr "邀请连结无效或已使用!"
 
-#: .\cookbook\views\views.py:564
+#: .\cookbook\views\views.py:579
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:570
+#: .\cookbook\views\views.py:585
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "New Unit"
+#~ msgstr "新单位"
+
+#, fuzzy
+#~ msgid "New unit that other gets replaced by."
+#~ msgstr "新的单位被其他取代."
+
+#~ msgid "Old Unit"
+#~ msgstr "旧单位"
+
+#~ msgid "Unit that should be replaced."
+#~ msgstr "单位应被取代."
+
+#~ msgid "New Food"
+#~ msgstr "新的食品"
+
+#, fuzzy
+#~ msgid "New food that other gets replaced by."
+#~ msgstr "新食品被其他取代."
+
+#~ msgid "Old Food"
+#~ msgstr "旧的食品"
+
+#~ msgid "Food that should be replaced."
+#~ msgstr "食品应被取代."
+
 #~ msgid "Utensils"
 #~ msgstr "厨具"
 
diff --git a/recipes/locale/ca/LC_MESSAGES/django.mo b/recipes/locale/ca/LC_MESSAGES/django.mo
index 4855a0f561313a546fde88de85e293d5134a3291..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845 100644
GIT binary patch
delta 15
WcmZ3={D*0R3Zv6R)xeGO*%$#Ukp%nz

delta 54
zcmeyvw3K;*3S;&})j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?<Ui~z^i4%h$y

diff --git a/recipes/locale/ca/LC_MESSAGES/django.po b/recipes/locale/ca/LC_MESSAGES/django.po
index bdb3e9f05..8a1d6bdbd 100644
--- a/recipes/locale/ca/LC_MESSAGES/django.po
+++ b/recipes/locale/ca/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/de/LC_MESSAGES/django.mo b/recipes/locale/de/LC_MESSAGES/django.mo
index 93a5e2b9c163477fb1f71b9e6b256870e38eaa76..24682470f68657f27807f1ee2d3cce7c520e2390 100644
GIT binary patch
delta 35
ncmaFMe1v&|iKr7J1497=0|N&TZw9j2f%Kk<o+%rzi8BHKg?R^{

delta 74
zcmX@Y{FZrwiD)(>1497=0|N&T-vP4Of%Mafo+)Y}y3R$Zi6xo&dAcr%C8<^lMg~TP
ax(1fIhQ<m;Mph;U+6G1j1{+sNF#-UPUJ=d!

diff --git a/recipes/locale/de/LC_MESSAGES/django.po b/recipes/locale/de/LC_MESSAGES/django.po
index 1a74c3e18..a0d0226d4 100644
--- a/recipes/locale/de/LC_MESSAGES/django.po
+++ b/recipes/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr "Englisch"
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr "Deutsch"
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+#, fuzzy
+#| msgid "English"
+msgid "Polish"
+msgstr "Englisch"
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/en/LC_MESSAGES/django.mo b/recipes/locale/en/LC_MESSAGES/django.mo
index 4855a0f561313a546fde88de85e293d5134a3291..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845 100644
GIT binary patch
delta 15
WcmZ3={D*0R3Zv6R)xeGO*%$#Ukp%nz

delta 54
zcmeyvw3K;*3S;&})j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?<Ui~z^i4%h$y

diff --git a/recipes/locale/en/LC_MESSAGES/django.po b/recipes/locale/en/LC_MESSAGES/django.po
index bdb3e9f05..8a1d6bdbd 100644
--- a/recipes/locale/en/LC_MESSAGES/django.po
+++ b/recipes/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/es/LC_MESSAGES/django.mo b/recipes/locale/es/LC_MESSAGES/django.mo
index 4855a0f561313a546fde88de85e293d5134a3291..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845 100644
GIT binary patch
delta 15
WcmZ3={D*0R3Zv6R)xeGO*%$#Ukp%nz

delta 54
zcmeyvw3K;*3S;&})j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?<Ui~z^i4%h$y

diff --git a/recipes/locale/es/LC_MESSAGES/django.po b/recipes/locale/es/LC_MESSAGES/django.po
index bdb3e9f05..8a1d6bdbd 100644
--- a/recipes/locale/es/LC_MESSAGES/django.po
+++ b/recipes/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/fr/LC_MESSAGES/django.mo b/recipes/locale/fr/LC_MESSAGES/django.mo
index e832d0129b571ffae2a310ff5c5e7779ff0ec2b7..2c90dd0c81aca562856271a6885816b565885734 100644
GIT binary patch
delta 15
WcmZ3&{F`Zl3Zvsh)xeGOSs4K<YXtZJ

delta 54
zcmey(w1jzr3S-tp)j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?-;i~z?x4%7eu

diff --git a/recipes/locale/fr/LC_MESSAGES/django.po b/recipes/locale/fr/LC_MESSAGES/django.po
index 9c61c04a7..f13053063 100644
--- a/recipes/locale/fr/LC_MESSAGES/django.po
+++ b/recipes/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/hu_HU/LC_MESSAGES/django.mo b/recipes/locale/hu_HU/LC_MESSAGES/django.mo
index a05eae72e62c79bbebb313045832f626c39e29a6..6c5906d1cd061dff54de8b533942893de34efc9e 100644
GIT binary patch
delta 14
WcmeyxbdhO-3ZwW$)xe4KZvy}*as{pc

delta 53
zcmcb}^owbN3ZuhB)j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
IgNeoW0J)G4iU0rr

diff --git a/recipes/locale/hu_HU/LC_MESSAGES/django.po b/recipes/locale/hu_HU/LC_MESSAGES/django.po
index 167fb8ea4..c4eb90675 100644
--- a/recipes/locale/hu_HU/LC_MESSAGES/django.po
+++ b/recipes/locale/hu_HU/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,42 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/it/LC_MESSAGES/django.mo b/recipes/locale/it/LC_MESSAGES/django.mo
index 4855a0f561313a546fde88de85e293d5134a3291..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845 100644
GIT binary patch
delta 15
WcmZ3={D*0R3Zv6R)xeGO*%$#Ukp%nz

delta 54
zcmeyvw3K;*3S;&})j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?<Ui~z^i4%h$y

diff --git a/recipes/locale/it/LC_MESSAGES/django.po b/recipes/locale/it/LC_MESSAGES/django.po
index bdb3e9f05..8a1d6bdbd 100644
--- a/recipes/locale/it/LC_MESSAGES/django.po
+++ b/recipes/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/lv/LC_MESSAGES/django.mo b/recipes/locale/lv/LC_MESSAGES/django.mo
index 15578a6f3719594dfcefdc35a0498bd8c7a21b39..474e9d253da756a13197fc093b106cfc04f61958 100644
GIT binary patch
delta 15
WcmX@XJfC@j3S;U-)xeGOH5maaPX!48

delta 54
zcmbQwe1ds`3S-|y)j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?;Hi~zzt4&?v<

diff --git a/recipes/locale/lv/LC_MESSAGES/django.po b/recipes/locale/lv/LC_MESSAGES/django.po
index 4bd918827..3f600eb2d 100644
--- a/recipes/locale/lv/LC_MESSAGES/django.po
+++ b/recipes/locale/lv/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,42 +19,50 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/nl/LC_MESSAGES/django.mo b/recipes/locale/nl/LC_MESSAGES/django.mo
index 4855a0f561313a546fde88de85e293d5134a3291..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845 100644
GIT binary patch
delta 15
WcmZ3={D*0R3Zv6R)xeGO*%$#Ukp%nz

delta 54
zcmeyvw3K;*3S;&})j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?<Ui~z^i4%h$y

diff --git a/recipes/locale/nl/LC_MESSAGES/django.po b/recipes/locale/nl/LC_MESSAGES/django.po
index bdb3e9f05..8a1d6bdbd 100644
--- a/recipes/locale/nl/LC_MESSAGES/django.po
+++ b/recipes/locale/nl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/pt/LC_MESSAGES/django.mo b/recipes/locale/pt/LC_MESSAGES/django.mo
index 4855a0f561313a546fde88de85e293d5134a3291..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845 100644
GIT binary patch
delta 15
WcmZ3={D*0R3Zv6R)xeGO*%$#Ukp%nz

delta 54
zcmeyvw3K;*3S;&})j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?<Ui~z^i4%h$y

diff --git a/recipes/locale/pt/LC_MESSAGES/django.po b/recipes/locale/pt/LC_MESSAGES/django.po
index bdb3e9f05..8a1d6bdbd 100644
--- a/recipes/locale/pt/LC_MESSAGES/django.po
+++ b/recipes/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/rn/LC_MESSAGES/django.mo b/recipes/locale/rn/LC_MESSAGES/django.mo
index a05eae72e62c79bbebb313045832f626c39e29a6..6c5906d1cd061dff54de8b533942893de34efc9e 100644
GIT binary patch
delta 14
WcmeyxbdhO-3ZwW$)xe4KZvy}*as{pc

delta 53
zcmcb}^owbN3ZuhB)j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
IgNeoW0J)G4iU0rr

diff --git a/recipes/locale/rn/LC_MESSAGES/django.po b/recipes/locale/rn/LC_MESSAGES/django.po
index 167fb8ea4..c4eb90675 100644
--- a/recipes/locale/rn/LC_MESSAGES/django.po
+++ b/recipes/locale/rn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,42 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/tr/LC_MESSAGES/django.mo b/recipes/locale/tr/LC_MESSAGES/django.mo
index e832d0129b571ffae2a310ff5c5e7779ff0ec2b7..2c90dd0c81aca562856271a6885816b565885734 100644
GIT binary patch
delta 15
WcmZ3&{F`Zl3Zvsh)xeGOSs4K<YXtZJ

delta 54
zcmey(w1jzr3S-tp)j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
JgN?-;i~z?x4%7eu

diff --git a/recipes/locale/tr/LC_MESSAGES/django.po b/recipes/locale/tr/LC_MESSAGES/django.po
index 9c61c04a7..f13053063 100644
--- a/recipes/locale/tr/LC_MESSAGES/django.po
+++ b/recipes/locale/tr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,42 +18,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/zh_CN/LC_MESSAGES/django.mo b/recipes/locale/zh_CN/LC_MESSAGES/django.mo
index a05eae72e62c79bbebb313045832f626c39e29a6..6c5906d1cd061dff54de8b533942893de34efc9e 100644
GIT binary patch
delta 14
WcmeyxbdhO-3ZwW$)xe4KZvy}*as{pc

delta 53
zcmcb}^owbN3ZuhB)j+inUFV|I#FEVXJYAQ>l2j`NBLgEtT?0#9Lt_OaBP$aFZ380%
IgNeoW0J)G4iU0rr

diff --git a/recipes/locale/zh_CN/LC_MESSAGES/django.po b/recipes/locale/zh_CN/LC_MESSAGES/django.po
index 167fb8ea4..c4eb90675 100644
--- a/recipes/locale/zh_CN/LC_MESSAGES/django.po
+++ b/recipes/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-13 22:40+0200\n"
+"POT-Creation-Date: 2021-11-04 12:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,42 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:353
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:354
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:355
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:327
+#: .\recipes\settings.py:356
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:328
+#: .\recipes\settings.py:357
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:329
+#: .\recipes\settings.py:358
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:330
+#: .\recipes\settings.py:359
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:331
+#: .\recipes\settings.py:360
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:332
+#: .\recipes\settings.py:361
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:333
+#: .\recipes\settings.py:362
+msgid "Polish"
+msgstr ""
+
+#: .\recipes\settings.py:363
+msgid "Russian"
+msgstr ""
+
+#: .\recipes\settings.py:364
 msgid "Spanish"
 msgstr ""