diff --git a/cookbook/locale/ca/LC_MESSAGES/django.mo b/cookbook/locale/ca/LC_MESSAGES/django.mo
index 5e08d9fd..995e8218 100644
Binary files a/cookbook/locale/ca/LC_MESSAGES/django.mo and b/cookbook/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/cookbook/locale/cs/LC_MESSAGES/django.mo b/cookbook/locale/cs/LC_MESSAGES/django.mo
index fe70e404..3853f5ec 100644
Binary files a/cookbook/locale/cs/LC_MESSAGES/django.mo and b/cookbook/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/cookbook/locale/de/LC_MESSAGES/django.mo b/cookbook/locale/de/LC_MESSAGES/django.mo
index 03249004..78118e92 100644
Binary files a/cookbook/locale/de/LC_MESSAGES/django.mo and b/cookbook/locale/de/LC_MESSAGES/django.mo differ
diff --git a/cookbook/locale/el/LC_MESSAGES/django.mo b/cookbook/locale/el/LC_MESSAGES/django.mo
index 1735fd90..b4b07db6 100644
Binary files a/cookbook/locale/el/LC_MESSAGES/django.mo and b/cookbook/locale/el/LC_MESSAGES/django.mo differ
diff --git a/cookbook/locale/en/LC_MESSAGES/django.po b/cookbook/locale/en/LC_MESSAGES/django.po
index 64406341..a5abded5 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: 2023-05-18 14:28+0200\n"
+"POT-Creation-Date: 2023-08-29 13:09+0200\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,91 +18,95 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\cookbook\forms.py:52
+#: .\cookbook\forms.py:53
 msgid "Default unit"
 msgstr ""
 
-#: .\cookbook\forms.py:53
+#: .\cookbook\forms.py:54
 msgid "Use fractions"
 msgstr ""
 
-#: .\cookbook\forms.py:54
+#: .\cookbook\forms.py:55
 msgid "Use KJ"
 msgstr ""
 
-#: .\cookbook\forms.py:55
+#: .\cookbook\forms.py:56
 msgid "Theme"
 msgstr ""
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid "Navbar color"
 msgstr ""
 
-#: .\cookbook\forms.py:57
+#: .\cookbook\forms.py:58
 msgid "Sticky navbar"
 msgstr ""
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Default page"
 msgstr ""
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Plan sharing"
 msgstr ""
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 msgid "Ingredient decimal places"
 msgstr ""
 
-#: .\cookbook\forms.py:61
+#: .\cookbook\forms.py:62
 msgid "Shopping list auto sync period"
 msgstr ""
 
-#: .\cookbook\forms.py:62 .\cookbook\templates\recipe_view.html:36
+#: .\cookbook\forms.py:63 .\cookbook\templates\recipe_view.html:36
 msgid "Comments"
 msgstr ""
 
-#: .\cookbook\forms.py:63
+#: .\cookbook\forms.py:64
 msgid "Left-handed mode"
 msgstr ""
 
-#: .\cookbook\forms.py:67
+#: .\cookbook\forms.py:65
+msgid "Show step ingredients table"
+msgstr ""
+
+#: .\cookbook\forms.py:69
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
 msgstr ""
 
-#: .\cookbook\forms.py:69
+#: .\cookbook\forms.py:71
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 
-#: .\cookbook\forms.py:71
+#: .\cookbook\forms.py:73
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:73
+#: .\cookbook\forms.py:75
 msgid "Display nutritional energy amounts in joules instead of calories"
 msgstr ""
 
-#: .\cookbook\forms.py:74
+#: .\cookbook\forms.py:76
 msgid "Users with whom newly created meal plans should be shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:75
+#: .\cookbook\forms.py:77
 msgid "Users with whom to share shopping lists."
 msgstr ""
 
-#: .\cookbook\forms.py:76
+#: .\cookbook\forms.py:78
 msgid "Number of decimals to round ingredients."
 msgstr ""
 
-#: .\cookbook\forms.py:77
+#: .\cookbook\forms.py:79
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:79 .\cookbook\forms.py:509
+#: .\cookbook\forms.py:81 .\cookbook\forms.py:512
 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. "
@@ -110,311 +114,318 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 
-#: .\cookbook\forms.py:82
+#: .\cookbook\forms.py:84
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:83 .\cookbook\forms.py:512
+#: .\cookbook\forms.py:85 .\cookbook\forms.py:515
 msgid "Automatically add meal plan ingredients to shopping list."
 msgstr ""
 
-#: .\cookbook\forms.py:84
+#: .\cookbook\forms.py:86
 msgid "Exclude ingredients that are on hand."
 msgstr ""
 
-#: .\cookbook\forms.py:85
+#: .\cookbook\forms.py:87
 msgid "Will optimize the UI for use with your left hand."
 msgstr ""
 
-#: .\cookbook\forms.py:102
+#: .\cookbook\forms.py:88
+msgid ""
+"Add ingredients table next to recipe steps. Applies at creation time for "
+"manually created and URL imported recipes. Individual steps can be "
+"overridden in the edit recipe view."
+msgstr ""
+
+#: .\cookbook\forms.py:105
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
 
-#: .\cookbook\forms.py:123 .\cookbook\forms.py:314
+#: .\cookbook\forms.py:126 .\cookbook\forms.py:317
 msgid "Name"
 msgstr ""
 
-#: .\cookbook\forms.py:124 .\cookbook\forms.py:315 .\cookbook\views\lists.py:88
+#: .\cookbook\forms.py:127 .\cookbook\forms.py:318 .\cookbook\views\lists.py:88
 msgid "Keywords"
 msgstr ""
 
-#: .\cookbook\forms.py:125
+#: .\cookbook\forms.py:128
 msgid "Preparation time in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:126
+#: .\cookbook\forms.py:129
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:127 .\cookbook\forms.py:283 .\cookbook\forms.py:316
+#: .\cookbook\forms.py:130 .\cookbook\forms.py:286 .\cookbook\forms.py:319
 msgid "Path"
 msgstr ""
 
-#: .\cookbook\forms.py:128
+#: .\cookbook\forms.py:131
 msgid "Storage UID"
 msgstr ""
 
-#: .\cookbook\forms.py:161
+#: .\cookbook\forms.py:164
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:190
+#: .\cookbook\forms.py:193
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:213
+#: .\cookbook\forms.py:216
 msgid "Add your comment: "
 msgstr ""
 
-#: .\cookbook\forms.py:228
+#: .\cookbook\forms.py:231
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 
-#: .\cookbook\forms.py:235
+#: .\cookbook\forms.py:238
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:244
+#: .\cookbook\forms.py:247
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:282 .\cookbook\views\edit.py:157
+#: .\cookbook\forms.py:285 .\cookbook\views\edit.py:157
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\forms.py:284
+#: .\cookbook\forms.py:287
 msgid "Active"
 msgstr ""
 
-#: .\cookbook\forms.py:290
+#: .\cookbook\forms.py:293
 msgid "Search String"
 msgstr ""
 
-#: .\cookbook\forms.py:317
+#: .\cookbook\forms.py:320
 msgid "File ID"
 msgstr ""
 
-#: .\cookbook\forms.py:339
+#: .\cookbook\forms.py:342
 msgid "You must provide at least a recipe or a title."
 msgstr ""
 
-#: .\cookbook\forms.py:352
+#: .\cookbook\forms.py:355
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 
-#: .\cookbook\forms.py:353
+#: .\cookbook\forms.py:356
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:379
+#: .\cookbook\forms.py:382
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:385
+#: .\cookbook\forms.py:388
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:393
+#: .\cookbook\forms.py:396
 msgid ""
 "An email address is not required but if present the invite link will be sent "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:408
+#: .\cookbook\forms.py:411
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:419
+#: .\cookbook\forms.py:422
 msgid "Accept Terms and Privacy"
 msgstr ""
 
-#: .\cookbook\forms.py:451
+#: .\cookbook\forms.py:454
 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:461
+#: .\cookbook\forms.py:464
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full description of choices."
 msgstr ""
 
-#: .\cookbook\forms.py:462
+#: .\cookbook\forms.py:465
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:464
+#: .\cookbook\forms.py:467
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
 
-#: .\cookbook\forms.py:466
+#: .\cookbook\forms.py:469
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
 
-#: .\cookbook\forms.py:468
+#: .\cookbook\forms.py:471
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
 
-#: .\cookbook\forms.py:470
+#: .\cookbook\forms.py:473
 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:472
+#: .\cookbook\forms.py:475
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
 
-#: .\cookbook\forms.py:476
+#: .\cookbook\forms.py:479
 msgid "Search Method"
 msgstr ""
 
-#: .\cookbook\forms.py:477
+#: .\cookbook\forms.py:480
 msgid "Fuzzy Lookups"
 msgstr ""
 
-#: .\cookbook\forms.py:478
+#: .\cookbook\forms.py:481
 msgid "Ignore Accent"
 msgstr ""
 
-#: .\cookbook\forms.py:479
+#: .\cookbook\forms.py:482
 msgid "Partial Match"
 msgstr ""
 
-#: .\cookbook\forms.py:480
+#: .\cookbook\forms.py:483
 msgid "Starts With"
 msgstr ""
 
-#: .\cookbook\forms.py:481
+#: .\cookbook\forms.py:484
 msgid "Fuzzy Search"
 msgstr ""
 
-#: .\cookbook\forms.py:482
+#: .\cookbook\forms.py:485
 msgid "Full Text"
 msgstr ""
 
-#: .\cookbook\forms.py:507
+#: .\cookbook\forms.py:510
 msgid ""
 "Users will see all items you add to your shopping list.  They must add you "
 "to see items on their list."
 msgstr ""
 
-#: .\cookbook\forms.py:513
+#: .\cookbook\forms.py:516
 msgid ""
 "When adding a meal plan to the shopping list (manually or automatically), "
 "include all related recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:514
+#: .\cookbook\forms.py:517
 msgid ""
 "When adding a meal plan to the shopping list (manually or automatically), "
 "exclude ingredients that are on hand."
 msgstr ""
 
-#: .\cookbook\forms.py:515
+#: .\cookbook\forms.py:518
 msgid "Default number of hours to delay a shopping list entry."
 msgstr ""
 
-#: .\cookbook\forms.py:516
+#: .\cookbook\forms.py:519
 msgid "Filter shopping list to only include supermarket categories."
 msgstr ""
 
-#: .\cookbook\forms.py:517
+#: .\cookbook\forms.py:520
 msgid "Days of recent shopping list entries to display."
 msgstr ""
 
-#: .\cookbook\forms.py:518
+#: .\cookbook\forms.py:521
 msgid "Mark food 'On Hand' when checked off shopping list."
 msgstr ""
 
-#: .\cookbook\forms.py:519
+#: .\cookbook\forms.py:522
 msgid "Delimiter to use for CSV exports."
 msgstr ""
 
-#: .\cookbook\forms.py:520
+#: .\cookbook\forms.py:523
 msgid "Prefix to add when copying list to the clipboard."
 msgstr ""
 
-#: .\cookbook\forms.py:524
+#: .\cookbook\forms.py:527
 msgid "Share Shopping List"
 msgstr ""
 
-#: .\cookbook\forms.py:525
+#: .\cookbook\forms.py:528
 msgid "Autosync"
 msgstr ""
 
-#: .\cookbook\forms.py:526
+#: .\cookbook\forms.py:529
 msgid "Auto Add Meal Plan"
 msgstr ""
 
-#: .\cookbook\forms.py:527
+#: .\cookbook\forms.py:530
 msgid "Exclude On Hand"
 msgstr ""
 
-#: .\cookbook\forms.py:528
+#: .\cookbook\forms.py:531
 msgid "Include Related"
 msgstr ""
 
-#: .\cookbook\forms.py:529
+#: .\cookbook\forms.py:532
 msgid "Default Delay Hours"
 msgstr ""
 
-#: .\cookbook\forms.py:530
+#: .\cookbook\forms.py:533
 msgid "Filter to Supermarket"
 msgstr ""
 
-#: .\cookbook\forms.py:531
+#: .\cookbook\forms.py:534
 msgid "Recent Days"
 msgstr ""
 
-#: .\cookbook\forms.py:532
+#: .\cookbook\forms.py:535
 msgid "CSV Delimiter"
 msgstr ""
 
-#: .\cookbook\forms.py:533
+#: .\cookbook\forms.py:536
 msgid "List Prefix"
 msgstr ""
 
-#: .\cookbook\forms.py:534
+#: .\cookbook\forms.py:537
 msgid "Auto On Hand"
 msgstr ""
 
-#: .\cookbook\forms.py:544
+#: .\cookbook\forms.py:547
 msgid "Reset Food Inheritance"
 msgstr ""
 
-#: .\cookbook\forms.py:545
+#: .\cookbook\forms.py:548
 msgid "Reset all food to inherit the fields configured."
 msgstr ""
 
-#: .\cookbook\forms.py:557
+#: .\cookbook\forms.py:560
 msgid "Fields on food that should be inherited by default."
 msgstr ""
 
-#: .\cookbook\forms.py:558
+#: .\cookbook\forms.py:561
 msgid "Show recipe counts on search filters"
 msgstr ""
 
-#: .\cookbook\forms.py:559
+#: .\cookbook\forms.py:562
 msgid "Use the plural form for units and food inside this space."
 msgstr ""
 
@@ -425,7 +436,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:164
-#: .\cookbook\helper\permission_helper.py:187 .\cookbook\views\views.py:117
+#: .\cookbook\helper\permission_helper.py:187 .\cookbook\views\views.py:113
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr ""
 
@@ -438,7 +449,7 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:305
 #: .\cookbook\helper\permission_helper.py:321
 #: .\cookbook\helper\permission_helper.py:342 .\cookbook\views\data.py:36
-#: .\cookbook\views\views.py:128 .\cookbook\views\views.py:135
+#: .\cookbook\views\views.py:124 .\cookbook\views\views.py:131
 msgid "You do not have the required permissions to view this page!"
 msgstr ""
 
@@ -457,35 +468,35 @@ msgstr ""
 msgid "You have more users than allowed in your space."
 msgstr ""
 
-#: .\cookbook\helper\recipe_search.py:630
+#: .\cookbook\helper\recipe_search.py:632
 msgid "One of queryset or hash_key must be provided"
 msgstr ""
 
-#: .\cookbook\helper\recipe_url_import.py:266
+#: .\cookbook\helper\recipe_url_import.py:316
 msgid "reverse rotation"
 msgstr ""
 
-#: .\cookbook\helper\recipe_url_import.py:267
+#: .\cookbook\helper\recipe_url_import.py:317
 msgid "careful rotation"
 msgstr ""
 
-#: .\cookbook\helper\recipe_url_import.py:268
+#: .\cookbook\helper\recipe_url_import.py:318
 msgid "knead"
 msgstr ""
 
-#: .\cookbook\helper\recipe_url_import.py:269
+#: .\cookbook\helper\recipe_url_import.py:319
 msgid "thicken"
 msgstr ""
 
-#: .\cookbook\helper\recipe_url_import.py:270
+#: .\cookbook\helper\recipe_url_import.py:320
 msgid "warm up"
 msgstr ""
 
-#: .\cookbook\helper\recipe_url_import.py:271
+#: .\cookbook\helper\recipe_url_import.py:321
 msgid "ferment"
 msgstr ""
 
-#: .\cookbook\helper\recipe_url_import.py:272
+#: .\cookbook\helper\recipe_url_import.py:322
 msgid "sous-vide"
 msgstr ""
 
@@ -493,8 +504,8 @@ msgstr ""
 msgid "You must supply a servings size"
 msgstr ""
 
-#: .\cookbook\helper\template_helper.py:79
-#: .\cookbook\helper\template_helper.py:81
+#: .\cookbook\helper\template_helper.py:90
+#: .\cookbook\helper\template_helper.py:92
 msgid "Could not parse template code."
 msgstr ""
 
@@ -597,155 +608,205 @@ msgstr ""
 msgid "Dinner"
 msgstr ""
 
-#: .\cookbook\migrations\0047_auto_20200602_1133.py:29
+#: .\cookbook\migrations\0047_auto_20200602_1133.py:29 .\cookbook\models.py:774
 msgid "Other"
 msgstr ""
 
-#: .\cookbook\models.py:261
+#: .\cookbook\migrations\0190_auto_20230525_1506.py:17
+msgid "Fat"
+msgstr ""
+
+#: .\cookbook\migrations\0190_auto_20230525_1506.py:17
+#: .\cookbook\migrations\0190_auto_20230525_1506.py:18
+#: .\cookbook\migrations\0190_auto_20230525_1506.py:19
+msgid "g"
+msgstr ""
+
+#: .\cookbook\migrations\0190_auto_20230525_1506.py:18
+msgid "Carbohydrates"
+msgstr ""
+
+#: .\cookbook\migrations\0190_auto_20230525_1506.py:19
+msgid "Proteins"
+msgstr ""
+
+#: .\cookbook\migrations\0190_auto_20230525_1506.py:20
+msgid "Calories"
+msgstr ""
+
+#: .\cookbook\migrations\0190_auto_20230525_1506.py:20
+msgid "kcal"
+msgstr ""
+
+#: .\cookbook\models.py:264
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:365 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:372 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\settings.html:18
 #: .\cookbook\templates\space_manage.html:7
 msgid "Search"
 msgstr ""
 
-#: .\cookbook\models.py:366 .\cookbook\templates\base.html:110
+#: .\cookbook\models.py:373 .\cookbook\templates\base.html:112
 #: .\cookbook\templates\meal_plan.html:7 .\cookbook\views\delete.py:178
 #: .\cookbook\views\edit.py:211 .\cookbook\views\new.py:179
 msgid "Meal-Plan"
 msgstr ""
 
-#: .\cookbook\models.py:367 .\cookbook\templates\base.html:118
+#: .\cookbook\models.py:374 .\cookbook\templates\base.html:120
 msgid "Books"
 msgstr ""
 
-#: .\cookbook\models.py:580
+#: .\cookbook\models.py:611
 msgid " is part of a recipe step and cannot be deleted"
 msgstr ""
 
-#: .\cookbook\models.py:1181 .\cookbook\templates\search_info.html:28
+#: .\cookbook\models.py:773
+msgid "Nutrition"
+msgstr ""
+
+#: .\cookbook\models.py:773
+msgid "Allergen"
+msgstr ""
+
+#: .\cookbook\models.py:774
+msgid "Price"
+msgstr ""
+
+#: .\cookbook\models.py:774
+msgid "Goal"
+msgstr ""
+
+#: .\cookbook\models.py:1275 .\cookbook\templates\search_info.html:28
 msgid "Simple"
 msgstr ""
 
-#: .\cookbook\models.py:1182 .\cookbook\templates\search_info.html:33
+#: .\cookbook\models.py:1276 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
 msgstr ""
 
-#: .\cookbook\models.py:1183 .\cookbook\templates\search_info.html:38
+#: .\cookbook\models.py:1277 .\cookbook\templates\search_info.html:38
 msgid "Web"
 msgstr ""
 
-#: .\cookbook\models.py:1184 .\cookbook\templates\search_info.html:47
+#: .\cookbook\models.py:1278 .\cookbook\templates\search_info.html:47
 msgid "Raw"
 msgstr ""
 
-#: .\cookbook\models.py:1231
+#: .\cookbook\models.py:1327
 msgid "Food Alias"
 msgstr ""
 
-#: .\cookbook\models.py:1231
+#: .\cookbook\models.py:1327
 msgid "Unit Alias"
 msgstr ""
 
-#: .\cookbook\models.py:1231
+#: .\cookbook\models.py:1327
 msgid "Keyword Alias"
 msgstr ""
 
-#: .\cookbook\models.py:1232
+#: .\cookbook\models.py:1328
 msgid "Description Replace"
 msgstr ""
 
-#: .\cookbook\models.py:1232
+#: .\cookbook\models.py:1328
 msgid "Instruction Replace"
 msgstr ""
 
-#: .\cookbook\models.py:1258 .\cookbook\views\delete.py:36
+#: .\cookbook\models.py:1329
+msgid "Never Unit"
+msgstr ""
+
+#: .\cookbook\models.py:1329
+msgid "Transpose Words"
+msgstr ""
+
+#: .\cookbook\models.py:1355 .\cookbook\views\delete.py:36
 #: .\cookbook\views\edit.py:251 .\cookbook\views\new.py:48
 msgid "Recipe"
 msgstr ""
 
-#: .\cookbook\models.py:1259
+#: .\cookbook\models.py:1356
 msgid "Food"
 msgstr ""
 
-#: .\cookbook\models.py:1260 .\cookbook\templates\base.html:141
+#: .\cookbook\models.py:1357 .\cookbook\templates\base.html:147
 msgid "Keyword"
 msgstr ""
 
-#: .\cookbook\serializer.py:198
+#: .\cookbook\serializer.py:222
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:209
+#: .\cookbook\serializer.py:233
 msgid "You have reached your file upload limit."
 msgstr ""
 
-#: .\cookbook\serializer.py:291
+#: .\cookbook\serializer.py:318
 msgid "Cannot modify Space owner permission."
 msgstr ""
 
-#: .\cookbook\serializer.py:1093
+#: .\cookbook\serializer.py:1233
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\serializer.py:1093
+#: .\cookbook\serializer.py:1233
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\serializer.py:1094
+#: .\cookbook\serializer.py:1235
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\serializer.py:1095
+#: .\cookbook\serializer.py:1237
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\serializer.py:1096
+#: .\cookbook\serializer.py:1239
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\serializer.py:1097
+#: .\cookbook\serializer.py:1241
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\serializer.py:1098
+#: .\cookbook\serializer.py:1243
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\serializer.py:1101
+#: .\cookbook\serializer.py:1246
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\serializer.py:1242
+#: .\cookbook\serializer.py:1388
 msgid "Existing shopping list to update"
 msgstr ""
 
-#: .\cookbook\serializer.py:1244
+#: .\cookbook\serializer.py:1390
 msgid ""
 "List of ingredient IDs from the recipe to add, if not provided all "
 "ingredients will be added."
 msgstr ""
 
-#: .\cookbook\serializer.py:1246
+#: .\cookbook\serializer.py:1392
 msgid ""
 "Providing a list_recipe ID and servings of 0 will delete that shopping list."
 msgstr ""
 
-#: .\cookbook\serializer.py:1255
+#: .\cookbook\serializer.py:1401
 msgid "Amount of food to add to the shopping list"
 msgstr ""
 
-#: .\cookbook\serializer.py:1257
+#: .\cookbook\serializer.py:1403
 msgid "ID of unit to use for the shopping list"
 msgstr ""
 
-#: .\cookbook\serializer.py:1259
+#: .\cookbook\serializer.py:1405
 msgid "When set to true will delete all food from active shopping lists."
 msgstr ""
 
@@ -780,7 +841,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:296 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:329 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 #: .\cookbook\templates\user_settings.html:8
@@ -870,7 +931,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:343
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:382
 #: .\cookbook\templates\openid\login.html:8
 msgid "Login"
 msgstr ""
@@ -1033,124 +1094,132 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:333
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:372
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr ""
 
-#: .\cookbook\templates\base.html:106 .\cookbook\templates\index.html:87
+#: .\cookbook\templates\base.html:108 .\cookbook\templates\index.html:87
 msgid "Recipes"
 msgstr ""
 
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:116
 msgid "Shopping"
 msgstr ""
 
-#: .\cookbook\templates\base.html:153 .\cookbook\views\lists.py:105
+#: .\cookbook\templates\base.html:159 .\cookbook\views\lists.py:105
 msgid "Foods"
 msgstr ""
 
-#: .\cookbook\templates\base.html:165 .\cookbook\views\lists.py:122
+#: .\cookbook\templates\base.html:171 .\cookbook\views\lists.py:122
 msgid "Units"
 msgstr ""
 
-#: .\cookbook\templates\base.html:179 .\cookbook\templates\supermarket.html:7
+#: .\cookbook\templates\base.html:185 .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\base.html:191
+#: .\cookbook\templates\base.html:197
 msgid "Supermarket Category"
 msgstr ""
 
-#: .\cookbook\templates\base.html:203 .\cookbook\views\lists.py:171
+#: .\cookbook\templates\base.html:209 .\cookbook\views\lists.py:171
 msgid "Automations"
 msgstr ""
 
-#: .\cookbook\templates\base.html:217 .\cookbook\views\lists.py:207
+#: .\cookbook\templates\base.html:223 .\cookbook\views\lists.py:207
 msgid "Files"
 msgstr ""
 
-#: .\cookbook\templates\base.html:229
+#: .\cookbook\templates\base.html:235
 msgid "Batch Edit"
 msgstr ""
 
-#: .\cookbook\templates\base.html:241 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:247 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:255
+#: .\cookbook\templates\base.html:261
 #: .\cookbook\templates\ingredient_editor.html:7
 #: .\cookbook\templates\ingredient_editor.html:13
 msgid "Ingredient Editor"
 msgstr ""
 
-#: .\cookbook\templates\base.html:267
+#: .\cookbook\templates\base.html:273
 #: .\cookbook\templates\export_response.html:7
 #: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
 msgid "Export"
 msgstr ""
 
-#: .\cookbook\templates\base.html:283 .\cookbook\templates\index.html:47
+#: .\cookbook\templates\base.html:285
+msgid "Properties"
+msgstr ""
+
+#: .\cookbook\templates\base.html:299 .\cookbook\views\lists.py:240
+msgid "Unit Conversions"
+msgstr ""
+
+#: .\cookbook\templates\base.html:316 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
 msgstr ""
 
-#: .\cookbook\templates\base.html:285
+#: .\cookbook\templates\base.html:318
 msgid "Create"
 msgstr ""
 
-#: .\cookbook\templates\base.html:298
+#: .\cookbook\templates\base.html:331
 #: .\cookbook\templates\generic\list_template.html:14
 msgid "External Recipes"
 msgstr ""
 
-#: .\cookbook\templates\base.html:301 .\cookbook\templates\space_manage.html:15
+#: .\cookbook\templates\base.html:334 .\cookbook\templates\space_manage.html:15
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:306 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:339 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:308
+#: .\cookbook\templates\base.html:341
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:312
+#: .\cookbook\templates\base.html:345
 #: .\cookbook\templates\space_overview.html:25
 msgid "Your Spaces"
 msgstr ""
 
-#: .\cookbook\templates\base.html:323
+#: .\cookbook\templates\base.html:356
 #: .\cookbook\templates\space_overview.html:6
 msgid "Overview"
 msgstr ""
 
-#: .\cookbook\templates\base.html:327
+#: .\cookbook\templates\base.html:366
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:329
+#: .\cookbook\templates\base.html:368
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:331
+#: .\cookbook\templates\base.html:370
 msgid "Translate Tandoor"
 msgstr ""
 
-#: .\cookbook\templates\base.html:335
+#: .\cookbook\templates\base.html:374
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:338
+#: .\cookbook\templates\base.html:377
 msgid "Log out"
 msgstr ""
 
-#: .\cookbook\templates\base.html:360
+#: .\cookbook\templates\base.html:400
 msgid "You are using the free version of Tandor"
 msgstr ""
 
-#: .\cookbook\templates\base.html:361
+#: .\cookbook\templates\base.html:401
 msgid "Upgrade Now"
 msgstr ""
 
@@ -1918,11 +1987,7 @@ msgstr ""
 msgid "Start your own recipe space and invite other users to it."
 msgstr ""
 
-#: .\cookbook\templates\system.html:20
-msgid "System Information"
-msgstr ""
-
-#: .\cookbook\templates\system.html:22
+#: .\cookbook\templates\system.html:14
 msgid ""
 "\n"
 "        Django Recipes is an open source free software application. It can "
@@ -1933,21 +1998,33 @@ msgid ""
 "    "
 msgstr ""
 
-#: .\cookbook\templates\system.html:36
+#: .\cookbook\templates\system.html:20
+msgid "System Information"
+msgstr ""
+
+#: .\cookbook\templates\system.html:41
+msgid ""
+"\n"
+"            You need to execute <code>version.py</code> in your update "
+"script to generate version information (done automatically in docker).\n"
+"        "
+msgstr ""
+
+#: .\cookbook\templates\system.html:46
 msgid "Media Serving"
 msgstr ""
 
-#: .\cookbook\templates\system.html:37 .\cookbook\templates\system.html:52
-#: .\cookbook\templates\system.html:68
+#: .\cookbook\templates\system.html:47 .\cookbook\templates\system.html:61
+#: .\cookbook\templates\system.html:75
 msgid "Warning"
 msgstr ""
 
-#: .\cookbook\templates\system.html:37 .\cookbook\templates\system.html:52
-#: .\cookbook\templates\system.html:68 .\cookbook\templates\system.html:83
+#: .\cookbook\templates\system.html:47 .\cookbook\templates\system.html:61
+#: .\cookbook\templates\system.html:75 .\cookbook\templates\system.html:88
 msgid "Ok"
 msgstr ""
 
-#: .\cookbook\templates\system.html:39
+#: .\cookbook\templates\system.html:49
 msgid ""
 "Serving media files directly using gunicorn/python is <b>not recommend</b>!\n"
 "            Please follow the steps described\n"
@@ -1957,16 +2034,16 @@ msgid ""
 "        "
 msgstr ""
 
-#: .\cookbook\templates\system.html:45 .\cookbook\templates\system.html:61
-#: .\cookbook\templates\system.html:76 .\cookbook\templates\system.html:90
+#: .\cookbook\templates\system.html:55 .\cookbook\templates\system.html:70
+#: .\cookbook\templates\system.html:83 .\cookbook\templates\system.html:95
 msgid "Everything is fine!"
 msgstr ""
 
-#: .\cookbook\templates\system.html:50
+#: .\cookbook\templates\system.html:59
 msgid "Secret Key"
 msgstr ""
 
-#: .\cookbook\templates\system.html:54
+#: .\cookbook\templates\system.html:63
 msgid ""
 "\n"
 "            You do not have a <code>SECRET_KEY</code> configured in your "
@@ -1979,11 +2056,11 @@ msgid ""
 "        "
 msgstr ""
 
-#: .\cookbook\templates\system.html:66
+#: .\cookbook\templates\system.html:73
 msgid "Debug Mode"
 msgstr ""
 
-#: .\cookbook\templates\system.html:70
+#: .\cookbook\templates\system.html:77
 msgid ""
 "\n"
 "            This application is still running in debug mode. This is most "
@@ -1994,15 +2071,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: .\cookbook\templates\system.html:81
+#: .\cookbook\templates\system.html:86
 msgid "Database"
 msgstr ""
 
-#: .\cookbook\templates\system.html:83
+#: .\cookbook\templates\system.html:88
 msgid "Info"
 msgstr ""
 
-#: .\cookbook\templates\system.html:85
+#: .\cookbook\templates\system.html:90
 msgid ""
 "\n"
 "            This application is not running with a Postgres database "
@@ -2015,258 +2092,258 @@ msgstr ""
 msgid "URL Import"
 msgstr ""
 
-#: .\cookbook\views\api.py:110 .\cookbook\views\api.py:202
+#: .\cookbook\views\api.py:120 .\cookbook\views\api.py:214
 msgid "Parameter updated_at incorrectly formatted"
 msgstr ""
 
-#: .\cookbook\views\api.py:222 .\cookbook\views\api.py:325
+#: .\cookbook\views\api.py:234 .\cookbook\views\api.py:341
 #, python-brace-format
 msgid "No {self.basename} with id {pk} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:226
+#: .\cookbook\views\api.py:238
 msgid "Cannot merge with the same object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:233
+#: .\cookbook\views\api.py:245
 #, python-brace-format
 msgid "No {self.basename} with id {target} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:238
+#: .\cookbook\views\api.py:250
 msgid "Cannot merge with child object!"
 msgstr ""
 
-#: .\cookbook\views\api.py:271
+#: .\cookbook\views\api.py:286
 #, python-brace-format
 msgid "{source.name} was merged successfully with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:276
+#: .\cookbook\views\api.py:292
 #, python-brace-format
 msgid "An error occurred attempting to merge {source.name} with {target.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:334
+#: .\cookbook\views\api.py:350
 #, python-brace-format
 msgid "{child.name} was moved successfully to the root."
 msgstr ""
 
-#: .\cookbook\views\api.py:337 .\cookbook\views\api.py:355
+#: .\cookbook\views\api.py:353 .\cookbook\views\api.py:371
 msgid "An error occurred attempting to move "
 msgstr ""
 
-#: .\cookbook\views\api.py:340
+#: .\cookbook\views\api.py:356
 msgid "Cannot move an object to itself!"
 msgstr ""
 
-#: .\cookbook\views\api.py:346
+#: .\cookbook\views\api.py:362
 #, python-brace-format
 msgid "No {self.basename} with id {parent} exists"
 msgstr ""
 
-#: .\cookbook\views\api.py:352
+#: .\cookbook\views\api.py:368
 #, python-brace-format
 msgid "{child.name} was moved successfully to parent {parent.name}"
 msgstr ""
 
-#: .\cookbook\views\api.py:553
+#: .\cookbook\views\api.py:586
 #, python-brace-format
 msgid "{obj.name} was removed from the shopping list."
 msgstr ""
 
-#: .\cookbook\views\api.py:558 .\cookbook\views\api.py:888
-#: .\cookbook\views\api.py:901
+#: .\cookbook\views\api.py:591 .\cookbook\views\api.py:1006
+#: .\cookbook\views\api.py:1019
 #, python-brace-format
 msgid "{obj.name} was added to the shopping list."
 msgstr ""
 
-#: .\cookbook\views\api.py:685
+#: .\cookbook\views\api.py:778
 msgid "ID of recipe a step is part of. For multiple repeat parameter."
 msgstr ""
 
-#: .\cookbook\views\api.py:687
+#: .\cookbook\views\api.py:780
 msgid "Query string matched (fuzzy) against object name."
 msgstr ""
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:824
 msgid ""
 "Query string matched (fuzzy) against recipe name. In the future also "
 "fulltext search."
 msgstr ""
 
-#: .\cookbook\views\api.py:733
+#: .\cookbook\views\api.py:826
 msgid ""
 "ID of keyword a recipe should have. For multiple repeat parameter. "
 "Equivalent to keywords_or"
 msgstr ""
 
-#: .\cookbook\views\api.py:736
+#: .\cookbook\views\api.py:829
 msgid ""
 "Keyword IDs, repeat for multiple. Return recipes with any of the keywords"
 msgstr ""
 
-#: .\cookbook\views\api.py:739
+#: .\cookbook\views\api.py:832
 msgid ""
 "Keyword IDs, repeat for multiple. Return recipes with all of the keywords."
 msgstr ""
 
-#: .\cookbook\views\api.py:742
+#: .\cookbook\views\api.py:835
 msgid ""
 "Keyword IDs, repeat for multiple. Exclude recipes with any of the keywords."
 msgstr ""
 
-#: .\cookbook\views\api.py:745
+#: .\cookbook\views\api.py:838
 msgid ""
 "Keyword IDs, repeat for multiple. Exclude recipes with all of the keywords."
 msgstr ""
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:840
 msgid "ID of food a recipe should have. For multiple repeat parameter."
 msgstr ""
 
-#: .\cookbook\views\api.py:750
+#: .\cookbook\views\api.py:843
 msgid "Food IDs, repeat for multiple. Return recipes with any of the foods"
 msgstr ""
 
-#: .\cookbook\views\api.py:752
+#: .\cookbook\views\api.py:845
 msgid "Food IDs, repeat for multiple. Return recipes with all of the foods."
 msgstr ""
 
-#: .\cookbook\views\api.py:754
+#: .\cookbook\views\api.py:847
 msgid "Food IDs, repeat for multiple. Exclude recipes with any of the foods."
 msgstr ""
 
-#: .\cookbook\views\api.py:756
+#: .\cookbook\views\api.py:849
 msgid "Food IDs, repeat for multiple. Exclude recipes with all of the foods."
 msgstr ""
 
-#: .\cookbook\views\api.py:757
+#: .\cookbook\views\api.py:850
 msgid "ID of unit a recipe should have."
 msgstr ""
 
-#: .\cookbook\views\api.py:759
+#: .\cookbook\views\api.py:852
 msgid ""
 "Rating a recipe should have or greater. [0 - 5] Negative value filters "
 "rating less than."
 msgstr ""
 
-#: .\cookbook\views\api.py:760
+#: .\cookbook\views\api.py:853
 msgid "ID of book a recipe should be in. For multiple repeat parameter."
 msgstr ""
 
-#: .\cookbook\views\api.py:762
+#: .\cookbook\views\api.py:855
 msgid "Book IDs, repeat for multiple. Return recipes with any of the books"
 msgstr ""
 
-#: .\cookbook\views\api.py:764
+#: .\cookbook\views\api.py:857
 msgid "Book IDs, repeat for multiple. Return recipes with all of the books."
 msgstr ""
 
-#: .\cookbook\views\api.py:766
+#: .\cookbook\views\api.py:859
 msgid "Book IDs, repeat for multiple. Exclude recipes with any of the books."
 msgstr ""
 
-#: .\cookbook\views\api.py:768
+#: .\cookbook\views\api.py:861
 msgid "Book IDs, repeat for multiple. Exclude recipes with all of the books."
 msgstr ""
 
-#: .\cookbook\views\api.py:770
+#: .\cookbook\views\api.py:863
 msgid "If only internal recipes should be returned. [true/<b>false</b>]"
 msgstr ""
 
-#: .\cookbook\views\api.py:772
+#: .\cookbook\views\api.py:865
 msgid "Returns the results in randomized order. [true/<b>false</b>]"
 msgstr ""
 
-#: .\cookbook\views\api.py:774
+#: .\cookbook\views\api.py:867
 msgid "Returns new results first in search results. [true/<b>false</b>]"
 msgstr ""
 
-#: .\cookbook\views\api.py:776
+#: .\cookbook\views\api.py:869
 msgid ""
 "Filter recipes cooked X times or more.  Negative values returns cooked less "
 "than X times"
 msgstr ""
 
-#: .\cookbook\views\api.py:778
+#: .\cookbook\views\api.py:871
 msgid ""
 "Filter recipes last cooked on or after YYYY-MM-DD. Prepending - filters on "
 "or before date."
 msgstr ""
 
-#: .\cookbook\views\api.py:780
+#: .\cookbook\views\api.py:873
 msgid ""
 "Filter recipes created on or after YYYY-MM-DD. Prepending - filters on or "
 "before date."
 msgstr ""
 
-#: .\cookbook\views\api.py:782
+#: .\cookbook\views\api.py:875
 msgid ""
 "Filter recipes updated on or after YYYY-MM-DD. Prepending - filters on or "
 "before date."
 msgstr ""
 
-#: .\cookbook\views\api.py:784
+#: .\cookbook\views\api.py:877
 msgid ""
 "Filter recipes lasts viewed on or after YYYY-MM-DD. Prepending - filters on "
 "or before date."
 msgstr ""
 
-#: .\cookbook\views\api.py:786
+#: .\cookbook\views\api.py:879
 msgid "Filter recipes that can be made with OnHand food. [true/<b>false</b>]"
 msgstr ""
 
-#: .\cookbook\views\api.py:946
+#: .\cookbook\views\api.py:1099
 msgid ""
 "Returns the shopping list entry with a primary key of id.  Multiple values "
 "allowed."
 msgstr ""
 
-#: .\cookbook\views\api.py:951
+#: .\cookbook\views\api.py:1104
 msgid ""
 "Filter shopping list entries on checked.  [true, false, both, <b>recent</"
 "b>]<br>  - recent includes unchecked items and recently completed items."
 msgstr ""
 
-#: .\cookbook\views\api.py:954
+#: .\cookbook\views\api.py:1107
 msgid "Returns the shopping list entries sorted by supermarket category order."
 msgstr ""
 
-#: .\cookbook\views\api.py:1166
+#: .\cookbook\views\api.py:1343
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:1198
+#: .\cookbook\views\api.py:1384
 msgid "Invalid Url"
 msgstr ""
 
-#: .\cookbook\views\api.py:1205
+#: .\cookbook\views\api.py:1391
 msgid "Connection Refused."
 msgstr ""
 
-#: .\cookbook\views\api.py:1210
+#: .\cookbook\views\api.py:1396
 msgid "Bad URL Schema."
 msgstr ""
 
-#: .\cookbook\views\api.py:1233
+#: .\cookbook\views\api.py:1423
 msgid "No usable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:1326 .\cookbook\views\import_export.py:117
+#: .\cookbook\views\api.py:1516 .\cookbook\views\import_export.py:117
 msgid "Importing is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\api.py:1372 .\cookbook\views\data.py:31
+#: .\cookbook\views\api.py:1595 .\cookbook\views\data.py:31
 #: .\cookbook\views\edit.py:120 .\cookbook\views\new.py:90
 msgid "This feature is not yet available in the hosted version of tandoor!"
 msgstr ""
 
-#: .\cookbook\views\api.py:1394
+#: .\cookbook\views\api.py:1617
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:1399
+#: .\cookbook\views\api.py:1622
 msgid "Error synchronizing with Storage"
 msgstr ""
 
@@ -2365,6 +2442,10 @@ msgstr ""
 msgid "Steps"
 msgstr ""
 
+#: .\cookbook\views\lists.py:255
+msgid "Property Types"
+msgstr ""
+
 #: .\cookbook\views\new.py:121
 msgid "Imported new recipe!"
 msgstr ""
@@ -2373,73 +2454,73 @@ msgstr ""
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\views.py:73 .\cookbook\views\views.py:191
-#: .\cookbook\views\views.py:213 .\cookbook\views\views.py:399
+#: .\cookbook\views\views.py:69 .\cookbook\views\views.py:187
+#: .\cookbook\views\views.py:209 .\cookbook\views\views.py:395
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\views.py:89
+#: .\cookbook\views\views.py:85
 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:143
+#: .\cookbook\views\views.py:139
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:154
+#: .\cookbook\views\views.py:150
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:253
+#: .\cookbook\views\views.py:249
 msgid "You must select at least one field to search!"
 msgstr ""
 
-#: .\cookbook\views\views.py:258
+#: .\cookbook\views\views.py:254
 msgid ""
 "To use this search method you must select at least one full text search "
 "field!"
 msgstr ""
 
-#: .\cookbook\views\views.py:262
+#: .\cookbook\views\views.py:258
 msgid "Fuzzy search is not compatible with this search method!"
 msgstr ""
 
-#: .\cookbook\views\views.py:338
+#: .\cookbook\views\views.py:334
 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:345
+#: .\cookbook\views\views.py:341
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:353
+#: .\cookbook\views\views.py:349
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:369
+#: .\cookbook\views\views.py:365
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:386
+#: .\cookbook\views\views.py:382
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:392
+#: .\cookbook\views\views.py:388
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:409
+#: .\cookbook\views\views.py:405
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:415
+#: .\cookbook\views\views.py:411
 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 70a5c0c4..a5a17f3c 100644
Binary files a/cookbook/locale/es/LC_MESSAGES/django.mo and b/cookbook/locale/es/LC_MESSAGES/django.mo differ
diff --git a/cookbook/locale/fr/LC_MESSAGES/django.mo b/cookbook/locale/fr/LC_MESSAGES/django.mo
index 6982ac61..ff2ecd18 100644
Binary files a/cookbook/locale/fr/LC_MESSAGES/django.mo and b/cookbook/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/cookbook/locale/nb_NO/LC_MESSAGES/django.mo b/cookbook/locale/nb_NO/LC_MESSAGES/django.mo
index 14d53c8f..94b70168 100644
Binary files a/cookbook/locale/nb_NO/LC_MESSAGES/django.mo and b/cookbook/locale/nb_NO/LC_MESSAGES/django.mo differ
diff --git a/cookbook/locale/nl/LC_MESSAGES/django.mo b/cookbook/locale/nl/LC_MESSAGES/django.mo
index e9bf3ea4..a316e1ca 100644
Binary files a/cookbook/locale/nl/LC_MESSAGES/django.mo and b/cookbook/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/cookbook/locale/sl/LC_MESSAGES/django.mo b/cookbook/locale/sl/LC_MESSAGES/django.mo
index d2a3587b..fd1453e1 100644
Binary files a/cookbook/locale/sl/LC_MESSAGES/django.mo and b/cookbook/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/recipes/locale/en/LC_MESSAGES/django.po b/recipes/locale/en/LC_MESSAGES/django.po
index 7d991c0d..d0026e61 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: 2023-04-26 07:46+0200\n"
+"POT-Creation-Date: 2023-08-29 13:09+0200\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,66 +18,120 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:436
+#: .\recipes\plugins\enterprise_plugin\helper\permission_helper.py:58
+msgid ""
+"You do not have the required permissions to view this page! You need to have "
+"the following modules licensed: "
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\helper\permission_helper.py:76
+msgid "You are not logged in and therefore cannot view this page!"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\helper\permission_helper.py:79
+msgid "You do not have the required modules to view this page!"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\helper\permission_helper.py:90
+msgid "You do not have the required module to view this page!"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\models.py:32
+msgid "Recipe"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\models.py:32
+msgid "Recipe Keyword"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\models.py:32
+msgid "Meal Plan"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\models.py:32
+msgid "Shopping"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\models.py:32
+msgid "Book"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\models.py:37
+msgid "start"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\models.py:37
+msgid "center"
+msgstr ""
+
+#: .\recipes\plugins\enterprise_plugin\models.py:37
+msgid "end"
+msgstr ""
+
+#: .\recipes\settings.py:455
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:437
+#: .\recipes\settings.py:456
 msgid "Bulgarian"
 msgstr ""
 
-#: .\recipes\settings.py:438
+#: .\recipes\settings.py:457
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:439
+#: .\recipes\settings.py:458
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:440
+#: .\recipes\settings.py:459
 msgid "Danish"
 msgstr ""
 
-#: .\recipes\settings.py:441
+#: .\recipes\settings.py:460
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:442
+#: .\recipes\settings.py:461
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:443
+#: .\recipes\settings.py:462
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:444
+#: .\recipes\settings.py:463
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:445
+#: .\recipes\settings.py:464
 msgid "Hungarian"
 msgstr ""
 
-#: .\recipes\settings.py:446
+#: .\recipes\settings.py:465
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:447
+#: .\recipes\settings.py:466
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:448
+#: .\recipes\settings.py:467
+msgid "Norwegian "
+msgstr ""
+
+#: .\recipes\settings.py:468
 msgid "Polish"
 msgstr ""
 
-#: .\recipes\settings.py:449
+#: .\recipes\settings.py:469
 msgid "Russian"
 msgstr ""
 
-#: .\recipes\settings.py:450
+#: .\recipes\settings.py:470
 msgid "Spanish"
 msgstr ""
 
-#: .\recipes\settings.py:451
+#: .\recipes\settings.py:471
 msgid "Swedish"
 msgstr ""